Skip to contentSkip to conversation

ep93xx timer: Fix possible overflow in usecs_to_ticks()

PATCH New Matthias Kaehlcke 1 participant 1 message Mar 9, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 ep93xx timer: Fix possible overflow in usecs_to_ticks()

ep93xx timer: Use 64-bit values in usecs_to_ticks() in order to avoid overflows in intermediate values

---
 cpu/arm920t/ep93xx/timer.c |   16 ++++------------
 1 files changed, 4 insertions(+), 12 deletions(-)
cpu/arm920t/ep93xx/timer.c +4 -12
index b1a01a0..bc4ec8f 100644
@@ -36,7 +36,7 @@
 #define TIMER_CLKSEL	(1 << 3)
 #define TIMER_ENABLE	(1 << 7)
 
-#define TIMER_FREQ			508469
+#define TIMER_FREQ			508469		/* ticks / second */
 #define TIMER_MAX_VAL			0xFFFFFFFF
 
 static struct ep93xx_timer
@@ -53,18 +53,10 @@ static inline unsigned long clk_to_systicks(unsigned long long clk_ticks)
 	return (unsigned long)sys_ticks;
 }
 
-static inline unsigned long usecs_to_ticks(unsigned long usecs)
+static inline unsigned long long usecs_to_ticks(unsigned long usecs)
 {
-	unsigned long ticks;
-
-	if (usecs >= 1000) {
-		ticks = usecs / 1000;
-		ticks *= TIMER_FREQ;
-		ticks /= 1000;
-	} else {
-		ticks = usecs * TIMER_FREQ;
-		ticks /= (1000 * 1000);
-	}
+	unsigned long long ticks = (unsigned long long)usecs * TIMER_FREQ;
+	do_div(ticks, 1000 * 1000);
 
 	return ticks;
 }
Signature · 1 line
1.6.5