The patch titled
ieee1394: fix calculation of csr->expire
has been added to the -mm tree. Its filename is
ieee1394-fix-calculation-of-csr-expire.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: ieee1394: fix calculation of csr->expire
From: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
This variant of calculate_expire() is more correct and easier to read.
Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
Cc: Ben Collins <bcollins@xxxxxxxxxx>
Cc: Jody McIntyre <scjody@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/ieee1394/csr.c | 31 ++++++++++---------------------
1 file changed, 10 insertions(+), 21 deletions(-)
diff -puN drivers/ieee1394/csr.c~ieee1394-fix-calculation-of-csr-expire drivers/ieee1394/csr.c
--- a/drivers/ieee1394/csr.c~ieee1394-fix-calculation-of-csr-expire
+++ a/drivers/ieee1394/csr.c
@@ -17,11 +17,13 @@
*
*/
-#include <linux/string.h>
+#include <linux/jiffies.h>
+#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/param.h>
#include <linux/spinlock.h>
+#include <linux/string.h>
#include "csr1212.h"
#include "ieee1394_types.h"
@@ -149,31 +151,18 @@ static void host_reset(struct hpsb_host
/*
* HI == seconds (bits 0:2)
- * LO == fraction units of 1/8000 of a second, as per 1394 (bits 19:31)
- *
- * Convert to units and then to HZ, for comparison to jiffies.
- *
- * By default this will end up being 800 units, or 100ms (125usec per
- * unit).
+ * LO == fractions of a second in units of 125usec (bits 19:31)
*
- * NOTE: The spec says 1/8000, but also says we can compute based on 1/8192
- * like CSR specifies. Should make our math less complex.
+ * Convert SPLIT_TIMEOUT to jiffies.
+ * The default and minimum as per 1394a-2000 clause 8.3.2.2.6 is 100ms.
*/
static inline void calculate_expire(struct csr_control *csr)
{
- unsigned long units;
-
- /* Take the seconds, and convert to units */
- units = (unsigned long)(csr->split_timeout_hi & 0x07) << 13;
-
- /* Add in the fractional units */
- units += (unsigned long)(csr->split_timeout_lo >> 19);
-
- /* Convert to jiffies */
- csr->expire = (unsigned long)(units * HZ) >> 13UL;
+ unsigned long usecs =
+ (csr->split_timeout_hi & 0x07) * USEC_PER_SEC +
+ (csr->split_timeout_lo >> 19) * 125L;
- /* Just to keep from rounding low */
- csr->expire++;
+ csr->expire = usecs_to_jiffies(usecs > 100000L ? usecs : 100000L);
HPSB_VERBOSE("CSR: setting expire to %lu, HZ=%u", csr->expire, HZ);
}
_
Patches currently in -mm which might be from stefanr@xxxxxxxxxxxxxxxxx are
origin.patch
irq-flags-consolidate-flags-for-request_irq.patch
irq-flags-firewire-use-the-new-irqf_-constansts.patch
lockdep-annotate-ieee1394-skb-queue-head-locking.patch
ieee1394-sbp2-enable-auto-spin-up-for-maxtor-disks.patch
ieee1394-fix-calculation-of-csr-expire.patch
ieee1394-fix-cosmetic-problem-in-speed-probe.patch
ieee1394-skip-dummy-loop-in-build_speed_map.patch
ieee1394-replace-__inline__-by-inline.patch
ieee1394-coding-style-and-comment-fixes-in-midlayer.patch
ieee1394-update-include-directives-in-midlayer-header.patch
ieee1394-remove-redundant-code-from-ieee1394_hotplugh.patch
ieee1394-remove-unused-macros-hpsb_panic-and.patch
ieee1394-clean-up-declarations-of-hpsb__config_rom.patch
ieee1394-dv1394-sem2mutex-conversion.patch
ieee1394-raw1394-remove-redundant-counting-semaphore.patch
ieee1394-nodemgr-remove-unnecessary-includes.patch
ieee1394-nodemgr-do-not-spawn-kernel_thread-for-sysfs.patch
ieee1394-nodemgr-make-module-parameter-ignore_drivers.patch
ieee1394-nodemgr-switch-to-kthread-api-replace-reset.patch
ieee1394-nodemgr-convert-nodemgr_serialize-semaphore.patch
ieee1394-fix-kerneldoc-of-hpsb_alloc_host.patch
ieee1394-shrink-tlabel-pools-remove-tpool-semaphores.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
