OMAP: Timer: Replace bss variable by gd
RFC PATCH 1/1 OMAP: Timer: Replace bss variable by gd
Reuse the gd->tbl value for timestamp and add gd->lastinc for lastinc bss values in the OMAP timer driver.
The usage of bss values in drivers before initialisation of bss is forbidden. In that special case some data in .rel.dyn gets corrupted.
---
Note: This is compile tested only (therefore the RFC). Please *test*
on real OMAP HW, e.g. Beagle.
This is change is inspired by
http://git.denx.de/u-boot.git/?p=u-boot.git;a=commitdiff;h=a429db7e3ce6136f80f22584588247926ba60b05
arch/arm/cpu/armv7/omap-common/timer.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
arch/arm/cpu/armv7/omap-common/timer.c +11 -11
@@ -35,8 +35,8 @@#include <common.h> #include <asm/io.h> -static ulong timestamp; -static ulong lastinc; +DECLARE_GLOBAL_DATA_PTR ; +static struct gptimer *timer_base = (struct gptimer *)CONFIG_SYS_TIMERBASE ;/*
@@ -74,7 +74,7 @@ ulong get_timer(ulong base)void set_timer (ulong t) { - timestamp = t; + gd->tbl = t; }/* delay x useconds */
@@ -96,8 +96,8 @@ void __udelay(unsigned long usec)void reset_timer_masked (void ) {/* reset time, capture current incrementer value time */ - lastinc =readl (&timer_base->tcrr) / (TIMER_CLOCK /CONFIG_SYS_HZ ); - timestamp =0 ;/* start "advancing" time stamp from 0 */ + gd->lastinc =readl (&timer_base->tcrr) / (TIMER_CLOCK /CONFIG_SYS_HZ ); + gd->tbl =0 ;/* start "advancing" time stamp from 0 */ }ulong get_timer_masked (void )
@@ -105,14 +105,14 @@ ulong get_timer_masked(void)/* current tick value */ ulong now =readl (&timer_base->tcrr) / (TIMER_CLOCK /CONFIG_SYS_HZ ); -if (now >= lastinc)/* normal mode (non roll) */ +if (now >= gd->lastinc)/* normal mode (non roll) */ /* move stamp fordward with absoulte diff ticks */ - timestamp += (now - lastinc); + gd->tbl += (now - gd->lastinc);else /* we have rollover of incrementer */ - timestamp += ((TIMER_LOAD_VAL / (TIMER_CLOCK /CONFIG_SYS_HZ )) - - lastinc) + now; - lastinc = now; -return timestamp; + gd->tbl += ((TIMER_LOAD_VAL / (TIMER_CLOCK /CONFIG_SYS_HZ )) + - gd->lastinc) + now; + gd->lastinc = now; +return gd->tbl; }/*
RFC PATCH 1/1 OMAP: Timer: Replace bss variable by gd
Quoted 8 lines · Dirk Behme
Reuse the
gd->tblvalue for timestamp and addgd->lastincfor lastinc bss values in the OMAP timer driver.The usage of bss values in drivers before initialisation of bss is forbidden. In that special case some data in .rel.dyn gets corrupted.
Signed-off-by Dirk Behme <[email protected]>
Works for me on Beagle xM Rev A
RFC PATCH 1/1 OMAP: Timer: Replace bss variable by gd
In reply to Dirk BehmeQuoted 34 lines · Dirk Behme
Reuse the
gd->tblvalue for timestamp and addgd->lastincfor lastinc bss values in the OMAP timer driver.The usage of bss values in drivers before initialisation of bss is forbidden. In that special case some data in .rel.dyn gets corrupted.
Signed-off-by Dirk Behme <[email protected]>---
Note: This is compile tested only (therefore the RFC). Please *test* ? ? ?on real OMAP HW, e.g. Beagle.
This is change is inspired by
http://git.denx.de/u-boot.git/?p=u-boot.git;a=commitdiff;h=a429db7e3ce6136f80f22584588247926ba60b05
?arch/arm/cpu/armv7/omap-common/timer.c | ? 22 +++++++++++----------- ?1 file changed, 11 insertions(+), 11 deletions(-)
Index:
u-boot.git/arch/arm/cpu/armv7/omap-common/timer.c
===================================================================arch/arm/cpu/armv7/omap-common/timer.c +0
-0@@ -35,8 +35,8 @@?#include <
common.h>
?#include <asm/io.h>arch/arm/cpu/armv7/omap-common/timer.c +2
-2-static ulong timestamp; -static ulong lastinc; +DECLARE_GLOBAL_DATA_PTR ; +?static struct gptimer
*timer_base= (struct gptimer *)CONFIG_SYS_TIMERBASE;
[...]
Tested on OMAP4 pandaboard with codesourcery 2010.09 gcc 4.5.1 and is seen to fix the issue I reported on
http://groups.google.com/group/pandaboard/browse_thread/thread/d59461353a5e693f
Tests:
on u-boot prompt:
sleep 5 (test if time delays are still functional) -> Pass mmc boot to MeeGo filesystem -> Pass
Thanks a bunch Dirk - just had started to debug this and steve pointed this out.
Regards,
Nishanth Menon
RFC PATCH 1/1 OMAP: Timer: Replace bss variable by gd
In reply to Dirk BehmeQuoted 7 lines · Dirk Behme
Reuse the
gd->tblvalue for timestamp and addgd->lastincfor lastinc bss values in the OMAP timer driver.The usage of bss values in drivers before initialisation of bss is forbidden. In that special case some data in .rel.dyn gets corrupted.
Signed-off-by Dirk Behme<[email protected]>
Quoted 2 lines
Note: This is compile tested only (therefore the RFC). Please *test*
on real OMAP HW, e.g. Beagle.
To the custodian who has to apply this: Regarding the RFC in the
subject: Now that this patch is confirmed to work, will you apply this patch as is? Or do I have to resend it without 'RFC'?
Many tanks for testing!
Dirk
Quoted 64 lines
This is change is inspired by
http://git.denx.de/u-boot.git/?p=u-boot.git;a=commitdiff;h=a429db7e3ce6136f80f22584588247926ba60b05
arch/arm/cpu/armv7/omap-common/timer.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)Index:
u-boot.git/arch/arm/cpu/armv7/omap-common/timer.c
===================================================================arch/arm/cpu/armv7/omap-common/timer.c +11
-11@@ -35,8 +35,8 @@#include <common.h> #include <asm/io.h> -static ulong timestamp; -static ulong lastinc; +DECLARE_GLOBAL_DATA_PTR ; +static struct gptimer *timer_base = (struct gptimer *)CONFIG_SYS_TIMERBASE ;/* @@ -74,7 +74,7 @@ ulong get_timer(ulong base)void set_timer (ulong t) { - timestamp = t; + gd->tbl = t; }/* delay x useconds */ @@ -96,8 +96,8 @@ void __udelay(unsigned long usec)void reset_timer_masked (void ) {/* reset time, capture current incrementer value time */ - lastinc =readl (&timer_base->tcrr) / (TIMER_CLOCK /CONFIG_SYS_HZ ); - timestamp =0 ;/* start "advancing" time stamp from 0 */ + gd->lastinc =readl (&timer_base->tcrr) / (TIMER_CLOCK /CONFIG_SYS_HZ ); + gd->tbl =0 ;/* start "advancing" time stamp from 0 */ }ulong get_timer_masked (void )@@ -105,14 +105,14 @@ ulong get_timer_masked(void)/* current tick value */ ulong now =readl (&timer_base->tcrr) / (TIMER_CLOCK /CONFIG_SYS_HZ ); -if (now>= lastinc)/* normal mode (non roll) */ +if (now>= gd->lastinc)/* normal mode (non roll) */ /* move stamp fordward with absoulte diff ticks */ - timestamp += (now - lastinc); + gd->tbl += (now - gd->lastinc);else /* we have rollover of incrementer */ - timestamp += ((TIMER_LOAD_VAL / (TIMER_CLOCK /CONFIG_SYS_HZ )) - - lastinc) + now; - lastinc = now; -return timestamp; + gd->tbl += ((TIMER_LOAD_VAL / (TIMER_CLOCK /CONFIG_SYS_HZ )) + - gd->lastinc) + now; + gd->lastinc = now; +return gd->tbl; }/*
RFC PATCH 1/1 OMAP: Timer: Replace bss variable by gd
Dear Dirk Behme,
Quoted 7 lines · In message <[email protected]> you wrote:
Quoted 3 lines
Note: This is compile tested only (therefore the RFC). Please *test*
on real OMAP HW, e.g. Beagle.To the custodian who has to apply this: Regarding the RFC in the
subject: Now that this patch is confirmed to work, will you apply this patch as is? Or do I have to resend it without 'RFC'?
If Sandeep agrees, I wil pull this directly, as this fixes a real problem for many of us.
Thanks!
Best regards,
Wolfgang Denk
Signature · 6 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
The moral of the story is: "Don't stop to tighten your shoe laces
during the Olympics 100m finals".
- Kevin Jones in <[email protected]>RFC PATCH 1/1 OMAP: Timer: Replace bss variable by gd
Quoted 7 lines · Wolfgang Denk
Dear Dirk Behme,
Quoted 4 lines · In message <[email protected]> you wrote:
Quoted 3 lines
Note: This is compile tested only (therefore the RFC). Please *test* ? ? ? ?on real OMAP HW, e.g. Beagle.
Quoted 6 lines
Quoted 3 lines
To the custodian who has to apply this: Regarding the RFC in the
subject: Now that this patch is confirmed to work, will you apply this patch as is? Or do I have to resend it without 'RFC'?If Sandeep agrees, I wil pull this directly, as this fixes a real problem for many of us.
Sorry for the delay in testing, jury duty this week :-(
I build tested for Beagle, Overo, Panda, and SDP4430 - no issues.
Run tested on Beagle, Overo, and Panda - no issues.
RFC PATCH 1/1 OMAP: Timer: Replace bss variable by gd
In reply to Dirk BehmeHello Dirk,
Quoted 6 lines · Dirk Behme
Reuse the
gd->tblvalue for timestamp and addgd->lastincfor lastinc bss values in the OMAP timer driver.The usage of bss values in drivers before initialisation of bss is forbidden. In that special case some data in .rel.dyn gets corrupted.
Quoted 6 lines
Signed-off-by Dirk Behme <[email protected]>---
Note: This is compile tested only (therefore the RFC). Please *test*
on real OMAP HW, e.g. Beagle.
Works for me on:
U-Boot 2010.12-rc2-00245-g13e984c (Dec 10 2010 - 08:28:22) OMAP3530-GP ES3.0, CPU-OPP2, L3-165MHz, Max CPU Clock 600 mHz OMAP3 Beagle board + LPDDR/NAND
Thanks!
But mmc does not longer work on my beagle board... searching for it
bye,
Heiko
Signature · 2 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
RFC PATCH 1/1 OMAP: Timer: Replace bss variable by gd
Hello Dirk,
Quoted 20 lines · Heiko Schocher
Quoted 6 lines · Dirk Behme
Reuse the
gd->tblvalue for timestamp and addgd->lastincfor lastinc bss values in the OMAP timer driver.The usage of bss values in drivers before initialisation of bss is forbidden. In that special case some data in .rel.dyn gets corrupted.
Quoted 6 lines
Signed-off-by Dirk Behme <[email protected]>---
Note: This is compile tested only (therefore the RFC). Please *test*
on real OMAP HW, e.g. Beagle.Works for me on:
U-Boot 2010.12-rc2-00245-g13e984c (Dec 10 2010 - 08:28:22) OMAP3530-GP ES3.0, CPU-OPP2, L3-165MHz, Max CPU Clock 600 mHz OMAP3 Beagle board + LPDDR/NAND
Quoted 5 lines
Thanks!
Tested-by Heiko Schocher<[email protected]>But mmc does not longer work on my beagle board... searching for it
User error, mmc works fine, sorry for the noise.
bye,
Heiko
Signature · 2 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany