Skip to contentSkip to conversation

imx-common: timer: fix 32-bit overflow

PATCH New Dirk Behme 2 participants 4 messages Mar 4, 2013 – Mar 20, 2013

Subsystems (2)
lore
Share & tools
lore

Dirk Behme

author
#0 lore raw

PATCH 1/1 imx-common: timer: fix 32-bit overflow

From: Knut Wohlrab <[email protected]>

The i.MX6 common timer uses the 32-bit variable tbl (time base lower) to record the overflow of the 32-bit counter. I.e. if the counter overflows, the variable tbl does overflow, too.

To capture this overflow, use the variable tbu (time base upper), too. Return the combined value of tbl and tbu.

lastinc is unused then, remove it.

---
Note: This replaces the patch

      http://patchwork.ozlabs.org/patch/224646/
 arch/arm/imx-common/timer.c |   26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)
arch/arm/imx-common/timer.c +7 -19
Index: freescale-u-boot-imx.git/arch/arm/imx-common/timer.c
===================================================================
@@ -48,9 +48,6 @@ static struct mxc_gpt *cur_gpt = (struct
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#define timestamp (gd->arch.tbl)
-#define lastinc (gd->arch.lastinc)
-
 static inline unsigned long long tick_to_time(unsigned long long tick)
 {
 	tick *= CONFIG_SYS_HZ;
@@ -70,7 +67,6 @@ static inline unsigned long long us_to_t
 int timer_init(void)
 {
 	int i;
-	ulong val;
 
 	/* setup GP Timer 1 */
 	__raw_writel(GPTCR_SWR, &cur_gpt->control);
@@ -85,9 +81,8 @@ int timer_init(void)
 	i = __raw_readl(&cur_gpt->control);
 	__raw_writel(i | GPTCR_CLKSOURCE_32 | GPTCR_TEN, &cur_gpt->control);
 
-	val = __raw_readl(&cur_gpt->counter);
-	lastinc = val / (MXC_CLK32 / CONFIG_SYS_HZ);
-	timestamp = 0;
+	gd->arch.tbl = __raw_readl(&cur_gpt->counter);
+	gd->arch.tbu = 0;
 
 	return 0;
 }
@@ -96,18 +91,11 @@ unsigned long long get_ticks(void)
 {
 	ulong now = __raw_readl(&cur_gpt->counter); /* current tick value */
 
-	if (now >= lastinc) {
-		/*
-		 * normal mode (non roll)
-		 * move stamp forward with absolut diff ticks
-		 */
-		timestamp += (now - lastinc);
-	} else {
-		/* we have rollover of incrementer */
-		timestamp += (0xFFFFFFFF - lastinc) + now;
-	}
-	lastinc = now;
-	return timestamp;
+	/* increment tbu if tbl has rolled over */
+	if (now < gd->arch.tbl)
+		gd->arch.tbu++;
+	gd->arch.tbl = now;
+	return (((unsigned long long)gd->arch.tbu) << 32) | gd->arch.tbl;
 }
 
 ulong get_timer_masked(void)
author
#1 lore raw

PATCH 1/1 imx-common: timer: fix 32-bit overflow

Quoted 69 lines · Dirk Behme

From: Knut Wohlrab <[email protected]>

The i.MX6 common timer uses the 32-bit variable tbl (time base lower) to record the overflow of the 32-bit counter. I.e. if the counter overflows, the variable tbl does overflow, too.

To capture this overflow, use the variable tbu (time base upper), too. Return the combined value of tbl and tbu.

lastinc is unused then, remove it.

---
Note: This replaces the patch

      http://patchwork.ozlabs.org/patch/224646/
 arch/arm/imx-common/timer.c |   26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

Index: freescale-u-boot-imx.git/arch/arm/imx-common/timer.c
===================================================================

arch/arm/imx-common/timer.c +2 -17
@@ -48,9 +48,6 @@ static struct mxc_gpt *cur_gpt = (struct
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#define timestamp (gd->arch.tbl)
-#define lastinc (gd->arch.lastinc)
-
 static inline unsigned long long tick_to_time(unsigned long long tick)
 {
 	tick *= CONFIG_SYS_HZ;
@@ -70,7 +67,6 @@ static inline unsigned long long us_to_t
 int timer_init(void)
 {
 	int i;
-	ulong val;
 
 	/* setup GP Timer 1 */
 	__raw_writel(GPTCR_SWR, &cur_gpt->control);
@@ -85,9 +81,8 @@ int timer_init(void)
 	i = __raw_readl(&cur_gpt->control);
 	__raw_writel(i | GPTCR_CLKSOURCE_32 | GPTCR_TEN, &cur_gpt->control);
 
-	val = __raw_readl(&cur_gpt->counter);
-	lastinc = val / (MXC_CLK32 / CONFIG_SYS_HZ);
-	timestamp = 0;
+	gd->arch.tbl = __raw_readl(&cur_gpt->counter);
+	gd->arch.tbu = 0;
 
 	return 0;
 }
@@ -96,18 +91,11 @@ unsigned long long get_ticks(void)
 {
 	ulong now = __raw_readl(&cur_gpt->counter); /* current tick value */
 
-	if (now >= lastinc) {
-		/*
-		 * normal mode (non roll)
-		 * move stamp forward with absolut diff ticks
-		 */
-		timestamp += (now - lastinc);
-	} else {
-		/* we have rollover of incrementer */
-		timestamp += (0xFFFFFFFF - lastinc) + now;
-	}

arch/arm/imx-common/timer.c unsigned long long get_ticks(void) · line 101

Quoted 10 lines
arch/arm/imx-common/timer.c +5 -2
-	lastinc = now;
-	return timestamp;
+	/* increment tbu if tbl has rolled over */
+	if (now < gd->arch.tbl)
+		gd->arch.tbu++;
+	gd->arch.tbl = now;
+	return (((unsigned long long)gd->arch.tbu) << 32) | gd->arch.tbl;
 }
 
 ulong get_timer_masked(void)

Any comments on this?

Many thanks

Dirk

#2 lore raw

PATCH 1/1 imx-common: timer: fix 32-bit overflow

Quoted 78 lines · Dirk Behme
Quoted 77 lines · Dirk Behme

From: Knut Wohlrab <[email protected]>

The i.MX6 common timer uses the 32-bit variable tbl (time base lower) to record the overflow of the 32-bit counter. I.e. if the counter overflows, the variable tbl does overflow, too.

To capture this overflow, use the variable tbu (time base upper), too. Return the combined value of tbl and tbu.

lastinc is unused then, remove it.

---
Note: This replaces the patch

      http://patchwork.ozlabs.org/patch/224646/
 arch/arm/imx-common/timer.c |   26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

Index: freescale-u-boot-imx.git/arch/arm/imx-common/timer.c
===================================================================

arch/arm/imx-common/timer.c +7 -19
@@ -48,9 +48,6 @@ static struct mxc_gpt *cur_gpt = (struct
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#define timestamp (gd->arch.tbl)
-#define lastinc (gd->arch.lastinc)
-
 static inline unsigned long long tick_to_time(unsigned long long tick)
 {
     tick *= CONFIG_SYS_HZ;
@@ -70,7 +67,6 @@ static inline unsigned long long us_to_t
 int timer_init(void)
 {
     int i;
-    ulong val;
 
     /* setup GP Timer 1 */
     __raw_writel(GPTCR_SWR, &cur_gpt->control);
@@ -85,9 +81,8 @@ int timer_init(void)
     i = __raw_readl(&cur_gpt->control);
     __raw_writel(i | GPTCR_CLKSOURCE_32 | GPTCR_TEN, &cur_gpt->control);
 
-    val = __raw_readl(&cur_gpt->counter);
-    lastinc = val / (MXC_CLK32 / CONFIG_SYS_HZ);
-    timestamp = 0;
+    gd->arch.tbl = __raw_readl(&cur_gpt->counter);
+    gd->arch.tbu = 0;
 
     return 0;
 }
@@ -96,18 +91,11 @@ unsigned long long get_ticks(void)
 {
     ulong now = __raw_readl(&cur_gpt->counter); /* current tick value */
 
-    if (now >= lastinc) {
-        /*
-         * normal mode (non roll)
-         * move stamp forward with absolut diff ticks
-         */
-        timestamp += (now - lastinc);
-    } else {
-        /* we have rollover of incrementer */
-        timestamp += (0xFFFFFFFF - lastinc) + now;
-    }
-    lastinc = now;
-    return timestamp;
+    /* increment tbu if tbl has rolled over */
+    if (now < gd->arch.tbl)
+        gd->arch.tbu++;
+    gd->arch.tbl = now;
+    return (((unsigned long long)gd->arch.tbu) << 32) | gd->arch.tbl;
 }
 
Quoted 6 lines

arch/arm/imx-common/timer.c unsigned long long get_ticks(void) · line 101

Quoted 2 lines
arch/arm/imx-common/timer.c +0 -0
 ulong get_timer_masked(void)

Any comments on this?

Many thanks

Hi Dirk,

no thanks to fix this coherently with other SOCs. Checking your patch I get convinced that we have a lot of duplicated code (get_ticks() for example) in most SOCs, but let it for a further improvement.

Best regards,
Stefano

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#3 lore raw

PATCH 1/1 imx-common: timer: fix 32-bit overflow

In reply to Dirk Behme
Quoted 18 lines · Dirk Behme
Quoted 17 lines · Dirk Behme

From: Knut Wohlrab <[email protected]>

The i.MX6 common timer uses the 32-bit variable tbl (time base lower) to record the overflow of the 32-bit counter. I.e. if the counter overflows, the variable tbl does overflow, too.

To capture this overflow, use the variable tbu (time base upper), too. Return the combined value of tbl and tbu.

lastinc is unused then, remove it.

---
Note: This replaces the patch

      http://patchwork.ozlabs.org/patch/224646/
Quoted 5 lines
Quoted 5 lines
 arch/arm/imx-common/timer.c |   26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

Index: freescale-u-boot-imx.git/arch/arm/imx-common/timer.c
===================================================================

Applied to u-boot-imx, thanks.

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================