ARM: bcm2835: fix get_timer() to return mS
Subsystems (3)
PATCH 1/1 ARM: bcm2835: fix get_timer() to return mS
Apparently, CONFIG_SYS_HZ must be 1000. Change this, and fix the timer driver to conform to this.
--- arch/arm/cpu/arm1176/bcm2835/timer.c | 13 +++++++++---- include/configs/rpi_b.h | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-)
arch/arm/cpu/arm1176/bcm2835/timer.c +9 -4
@@ -23,12 +23,17 @@ int timer_init(void)return 0 ; } -ulong get_timer (ulong base) +ulong get_timer_us (void ) {struct bcm2835_timer_regs *regs = (struct bcm2835_timer_regs *)BCM2835_TIMER_PHYSADDR ; -return readl (®s->clo) - base; +return readl (®s->clo); +} + +ulong get_timer (ulong base) +{ +return (get_timer_us () /1000 ) - base; }unsigned long long get_ticks (void )
@@ -46,10 +51,10 @@ void __udelay(unsigned long usec)ulong endtime;signed long diff; - endtime =get_timer (0 ) + usec; + endtime =get_timer_us () + usec;do { -ulong now =get_timer (0 ); +ulong now =get_timer_us (); diff = endtime - now; }while (diff >=0 ); }
include/configs/rpi_b.h +1 -1
@@ -31,7 +31,7 @@#define CONFIG_MACH_TYPE MACH_TYPE_BCM2708/* Timer */ -#define CONFIG_SYS_HZ 1000000 +#define CONFIG_SYS_HZ 1000/* Memory layout */ #define CONFIG_NR_DRAM_BANKS 1
Signature · 1 line
1.7.10.4
PATCH 1/1 ARM: bcm2835: fix get_timer() to return mS
Hi Stephen,
Quoted 51 lines · Stephen Warren
Apparently,
CONFIG_SYS_HZmust be 1000. Change this, and fix the timer driver to conform to this.Signed-off-by Stephen Warren <[email protected]>--- arch/arm/cpu/arm1176/bcm2835/timer.c | 13 +++++++++---- include/configs/rpi_b.h | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-)arch/arm/cpu/arm1176/bcm2835/timer.c +9
-4@@ -23,12 +23,17 @@ int timer_init(void)return 0 ; } -ulong get_timer (ulong base) +ulong get_timer_us (void ) {struct bcm2835_timer_regs *regs = (struct bcm2835_timer_regs *)BCM2835_TIMER_PHYSADDR ; -return readl (®s->clo) - base; +return readl (®s->clo); +} + +ulong get_timer (ulong base) +{ +return (get_timer_us () /1000 ) - base; }unsigned long long get_ticks (void )@@ -46,10 +51,10 @@ void __udelay(unsigned long usec)ulong endtime;signed long diff; - endtime =get_timer (0 ) + usec; + endtime =get_timer_us () + usec;do { -ulong now =get_timer (0 ); +ulong now =get_timer_us (); diff = endtime - now; }while (diff >=0 ); }include/configs/rpi_b.h +0
-0
include/configs/rpi_b.h line 37
Quoted 8 lines
include/configs/rpi_b.h +1
-1@@ -31,7 +31,7 @@#define CONFIG_MACH_TYPE MACH_TYPE_BCM2708/* Timer */ -#define CONFIG_SYS_HZ 1000000 +#define CONFIG_SYS_HZ 1000/* Memory layout */ #define CONFIG_NR_DRAM_BANKS 1
Is this a fix to some known issue or bug?
Amicalement,
Signature · 1 line
Albert.
PATCH 1/1 ARM: bcm2835: fix get_timer() to return mS
Quoted 9 lines · Albert ARIBAUD
Hi Stephen,
Quoted 2 lines · Stephen Warren
Apparently,
CONFIG_SYS_HZmust be 1000. Change this, and fix the timer driver to conform to this.Is this a fix to some known issue or bug?
Yes. The bootdelay timeout implementation was recently(?) changed and the new code doesn't use CONFIG_SYS_HZ at all, but rather assumes that it's 1000. Since rpi_b's SYS_HZ was 1000000, the bootdelay runs by far too fast. This fixes that.