i.MX31: switch to CFG_HZ=1000
PATCH 1/1 i.MX31: switch to CFG_HZ=1000
Switch to the standard CFG_HZ=1000 value, while at it, minor white-space cleanup, remove CFG_CLKS_IN_HZ from config-headers. Tested on mx31ads, provides 2% or 0.4% precision depending on the CONFIG_MX31_TIMER_HIGH_PRECISION flag. Measured with stop-watch on 100s boot-delay.
---
Based on the current arm/next + the "i.MX31: Add reset_timer() and modify get_timer_masked()" patch from Magnus Lilja. Tests on other i.MX31 boards requested!
cpu/arm1136/mx31/interrupts.c +50 -29
@@ -27,30 +27,49 @@#define TIMER_BASE 0x53f90000/* General purpose timer 1 */ /* General purpose timers registers */ -#define GPTCR __REG(TIMER_BASE)/* Control register */ -#define GPTPR __REG(TIMER_BASE + 0x4)/* Prescaler register */ -#define GPTSR __REG(TIMER_BASE + 0x8)/* Status register */ -#define GPTCNT __REG(TIMER_BASE + 0x24)/* Counter register */ +#define GPTCR __REG(TIMER_BASE)/* Control register */ +#define GPTPR __REG(TIMER_BASE + 0x4)/* Prescaler register */ +#define GPTSR __REG(TIMER_BASE + 0x8)/* Status register */ +#define GPTCNT __REG(TIMER_BASE + 0x24)/* Counter register */ /* General purpose timers bitfields */ -#define GPTCR_SWR (1<<15)/* Software reset */ -#define GPTCR_FRR (1<<9)/* Freerun / restart */ -#define GPTCR_CLKSOURCE_32 (4<<6)/* Clock source */ -#define GPTCR_TEN (1)/* Timer enable */ +#define GPTCR_SWR (1 << 15)/* Software reset */ +#define GPTCR_FRR (1 << 9)/* Freerun / restart */ +#define GPTCR_CLKSOURCE_32 (4 << 6)/* Clock source */ +#define GPTCR_TEN 1/* Timer enable */ + +/* "time" is measured in 1 / CFG_HZ seconds, "tick" is internal timer period */ +#ifdef CONFIG_MX31_TIMER_HIGH_PRECISION +/* ~0.4% error - measured with stop-watch on 100s boot-delay */ +#define TICK_TO_TIME (t) ((t) * CFG_HZ / CONFIG_MX31_CLK32) +#define TIME_TO_TICK (t) ((unsigned long long)(t) * CONFIG_MX31_CLK32 / CFG_HZ) +#define US_TO_TICK (t) (((unsigned long long)(t) * CONFIG_MX31_CLK32 + \ + 999999) / 1000000) +#else +/* ~2% error */ +#define TICK_PER_TIME ((CONFIG_MX31_CLK32 + CFG_HZ / 2) / CFG_HZ) +#define US_PER_TICK (1000000 / CONFIG_MX31_CLK32) +#define TICK_TO_TIME (t) ((t) / TICK_PER_TIME) +#define TIME_TO_TICK (t) ((unsigned long long)(t) * TICK_PER_TIME) +#define US_TO_TICK (t) (((t) + US_PER_TICK - 1) / US_PER_TICK) +#endif static ulong timestamp;static ulong lastinc;/* nothing really to do with interrupts, just starts up a counter. */ +/* The 32768Hz 32-bit timer overruns in 131072 seconds */ int interrupt_init (void ) {int i;/* setup GP Timer 1 */ GPTCR =GPTCR_SWR ; -for ( i=0 ; i<100 ; i++)GPTCR =0 ;/* We have no udelay by now */ +for (i =0 ; i <100 ; i++) +GPTCR =0 ;/* We have no udelay by now */ GPTPR =0 ;/* 32Khz */ -GPTCR |=GPTCR_CLKSOURCE_32 |GPTCR_TEN ;/* Freerun Mode, PERCLK1 input */ +/* Freerun Mode, PERCLK1 input */ +GPTCR |=GPTCR_CLKSOURCE_32 |GPTCR_TEN ;return 0 ; }
@@ -66,7 +85,7 @@ void reset_timer(void)reset_timer_masked (); } -ulong get_timer_masked (void ) +unsigned long long get_ticks (void ) {ulong now =GPTCNT ;
@@ -78,6 +97,17 @@ ulong get_timer_masked (void)return timestamp; } +ulong get_timer_masked (void ) +{ +/* +* get_ticks() returns a long long (64 bit), it wraps in +* 2^64 / CONFIG_MX31_CLK32 = 2^64 / 2^15 = 2^49 ~ 5 * 10^14 (s) ~ +* 5 * 10^9 days... and get_ticks() * CFG_HZ wraps in +* 5 * 10^6 days - long enough. +*/ +return TICK_TO_TIME (get_ticks ()); +} +ulong get_timer (ulong base) {return get_timer_masked () - base;
@@ -85,29 +115,20 @@ ulong get_timer (ulong base)void set_timer (ulong t) { + timestamp =TIME_TO_TICK (t); }/* delay x useconds AND perserve advance timstamp value */ void udelay (unsigned long usec) { -ulong tmo, tmp; - -if (usec >=1000 ) {/* if "big" number, spread normalization to seconds */ - tmo = usec /1000 ;/* start to normalize for usec to ticks per sec */ - tmo *=CFG_HZ ;/* find number of "ticks" to wait to achieve target */ - tmo /=1000 ;/* finish normalize. */ - }else {/* else small number, don't kill it prior to HZ multiply */ - tmo = usec *CFG_HZ ; - tmo /= (1000 *1000 ); - } - - tmp =get_timer (0 );/* get current timestamp */ -if ( (tmo + tmp +1 ) < tmp )/* if setting this forward will roll time stamp */ -reset_timer_masked ();/* reset "advancing" timestamp to 0, set lastinc value */ -else - tmo += tmp;/* else, set advancing stamp wake up time */ -while (get_timer_masked () < tmo)/* loop till event */ -/*NOP*/ ; +unsigned long long tmp; +ulong tmo; + + tmo =US_TO_TICK (usec); + tmp =get_ticks () + tmo;/* get current timestamp */ + +while (get_ticks () < tmp)/* loop till event */ +/*NOP*/ ; }void reset_cpu (ulong addr)
include/configs/imx31_litekit.h +1 -3
@@ -119,11 +119,9 @@#define CFG_MEMTEST_START 0/* memtest works on */ #define CFG_MEMTEST_END 0x10000 -#undef CFG_CLKS_IN_HZ/* everything, incl board info, in Hz */ -#define CFG_LOAD_ADDR 0/* default load address */ -#define CFG_HZ 32000 +#define CFG_HZ 1000#define CONFIG_CMDLINE_EDITING 1
include/configs/imx31_phycore.h +1 -1
@@ -126,7 +126,7 @@#define CFG_LOAD_ADDR 0/* default load address */ -#define CFG_HZ 32000 +#define CFG_HZ 1000#define CONFIG_CMDLINE_EDITING 1
include/configs/mx31ads.h +1 -3
@@ -136,11 +136,9 @@#define CFG_MEMTEST_START 0/* memtest works on */ #define CFG_MEMTEST_END 0x10000 -#undef CFG_CLKS_IN_HZ/* everything, incl board info, in Hz */ -#define CFG_LOAD_ADDR CONFIG_LOADADDR -#define CFG_HZ CONFIG_MX31_CLK32/* use 32kHz clock as source */ +#define CFG_HZ 1000#define CONFIG_CMDLINE_EDITING 1
PATCH 1/1 i.MX31: switch to CFG_HZ=1000
Hi,
Quoted 6 lines · Guennadi Liakhovetski
Switch to the standard CFG_HZ=1000 value, while at it, minor white-space cleanup, remove
CFG_CLKS_IN_HZfrom config-headers. Tested on mx31ads, provides 2% or 0.4% precision depending on theCONFIG_MX31_TIMER_HIGH_PRECISIONflag. Measured with stop-watch on 100s boot-delay.
Quoted 6 lines
Signed-off-by Guennadi Liakhovetski <[email protected]>---
Based on the current arm/next + the "i.MX31: Add
reset_timer()and modifyget_timer_masked()" patch from Magnus Lilja. Tests on other i.MX31 boards requested!
Litekit seems to be OK. Tested with stop-watch on 100s boot-delay without the HIGH_PRECISION flag, better than 2% precision.
Regards, Magnus
PATCH 1/1 i.MX31: switch to CFG_HZ=1000
In reply to Guennadi LiakhovetskiHi Guennadi,
Quoted 6 lines
Switch to the standard CFG_HZ=1000 value, while at it, minor white-space cleanup, remove
CFG_CLKS_IN_HZfrom config-headers. Tested on mx31ads, provides 2% or 0.4% precision depending on theCONFIG_MX31_TIMER_HIGH_PRECISIONflag. Measured with stop-watch on 100s boot-delay.
Quoted 7 lines
Signed-off-by Guennadi Liakhovetski <[email protected]>---
Based on the current arm/next + the "i.MX31: Add
reset_timer()and modifyget_timer_masked()" patch from Magnus Lilja. Tests on other i.MX31 boards requested!
i tried to test your patch against latest git with "imx31_phycore_config" and
The patch applied without problems but the compilation failed with :
..
.. /opt/OSELAS.Toolchain-1.1.0/arm-1136jfs-linux-gnueabi/gcc-4.1.2-glibc-2.5-kernel-2.6.18/lib/gcc/arm-1136jfs-linux-gnueabi/4.1.2/libgcc.a(_udivdi3.o):
(.ARM.exidx+0x0): undefined reference to `__aeabi_unwind_cpp_pr0'
make: *** [u-boot] Fehler 1
-Juergen
PATCH 1/1 i.MX31: switch to CFG_HZ=1000
Dear Juergen,
Quoted 9 lines · In message <[email protected]> you wrote:
i tried to test your patch against latest git with "
imx31_phycore_config" andThe patch applied without problems but the compilation failed with :
..
.. /opt/OSELAS.Toolchain-1.1.0/arm-1136jfs-linux-gnueabi/gcc-4.1.2-glibc-2.5-kernel-2.6.18/lib/gcc/arm-1136jfs-linux-gnueabi/4.1.2/libgcc.a(_udivdi3.o):
(.ARM.exidx+0x0): undefined reference to `__aeabi_unwind_cpp_pr0'
make: *** [u-boot] Fehler 1
This seems to be a toolchain isse. We see other, similar problems with ARM board with EABI conformant compilers.
I think we'll post a patch soon.
Best regards,
Wolfgang Denk
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-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de A year spent in artificial intelligence is enough to make one believe in God.
PATCH 1/1 i.MX31: switch to CFG_HZ=1000
In reply to Guennadi LiakhovetskiHi
2008/8/12 Guennadi Liakhovetski <[email protected]>:
Quoted 5 lines
Switch to the standard CFG_HZ=1000 value, while at it, minor white-space cleanup, remove
CFG_CLKS_IN_HZfrom config-headers. Tested on mx31ads, provides 2% or 0.4% precision depending on theCONFIG_MX31_TIMER_HIGH_PRECISIONflag. Measured with stop-watch on 100s boot-delay.
It seems to me that this patch is not present in 2008.10-rc2, but the patch adding the README.imx31 describing the HIGH_PRECISION-flag has been merged (looking in both Wolfgang's tree and the arm-next tree).
Regards/Magnus
PATCH 1/1 i.MX31: switch to CFG_HZ=1000
Dear Magnus,
Quoted 4 lines · In message <[email protected]> you…
It seems to me that this patch is not present in 2008.10-rc2, but the patch adding the README.imx31 describing the HIGH_PRECISION-flag has been merged (looking in both Wolfgang's tree and the arm-next tree).
I agree. The partial mergiong of some parts of the patches series while omitting other parts makes it really difficult for me, too, to track what's going on.
I can only trust that Jean-Christophe keeps this is a working state. Please help testing the code!
Thanks.
Best regards,
Wolfgang Denk
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-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de This restaurant was advertising breakfast any time. So I ordered french toast in the renaissance. - Steven Wright, comedian