at91sam9/at91cap: fix CONFIG_SYS_HZ to 1000
PATCH 1/1 at91sam9/at91cap: fix CONFIG_SYS_HZ to 1000
The timer has been rewrote with a precision at ~0,18%
--- cpu/arm926ejs/at91/timer.c | 82 +++++++++++++++++++++------------------ include/configs/afeb9260.h | 2 +- include/configs/at91cap9adk.h | 2 +- include/configs/at91sam9260ek.h | 2 +- include/configs/at91sam9261ek.h | 2 +- include/configs/at91sam9263ek.h | 2 +- include/configs/at91sam9rlek.h | 2 +- include/configs/pm9263.h | 2 +- 8 files changed, 51 insertions(+), 45 deletions(-)
cpu/arm926ejs/at91/timer.c +44 -38
@@ -27,7 +27,9 @@#include <asm/arch/at91_pit.h> #include <asm/arch/at91_pmc.h> #include <asm/arch/at91_rstc.h> +#include <asm/arch/clk.h> #include <asm/arch/io.h> +#include <div64.h> /* * We're using the AT91CAP9/SAM9 PITC in 32 bit mode, by
@@ -36,11 +38,26 @@#define TIMER_LOAD_VAL 0xfffff#define READ_RESET_TIMER at91_sys_read(AT91_PIT_PIVR)#define READ_TIMER at91_sys_read(AT91_PIT_PIIR) -#define TIMER_FREQ (AT91C_MASTER_CLOCK << 4) -#define TICKS_TO_USEC (ticks) ((ticks) / 6) -ulong get_timer_masked (void ); -ulong resettime; +static ulong timestamp; +static ulong lastinc; +static ulong timer_freq; + +static inline unsigned long long tick_to_time (unsigned long long tick) +{ + tick *=CONFIG_SYS_HZ ; +do_div (tick, timer_freq); + +return tick; +} + +static inline unsigned long long usec_to_tick (unsigned long long usec) +{ + usec *= timer_freq; +do_div (usec,1000000 ); + +return usec; +}/* nothing really to do with interrupts, just starts up a counter. */ int timer_init (void )
@@ -56,41 +73,49 @@ int timer_init(void)reset_timer_masked (); + timer_freq =get_mck_clk_rate () >>4 ; +return 0 ; }/* * timer without interrupts */ - -static inline ulong get_timer_raw (void ) +unsigned long long get_ticks (void ) {ulong now =READ_TIMER ; -if (now >= resettime) -return now - resettime; -else -return 0xFFFFFFFFUL - (resettime - now) ; +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; }void reset_timer_masked (void ) { - resettime =READ_TIMER ; +/* reset time */ + lastinc =READ_TIMER ;/* capture current incrementer value time */ + timestamp =0 ;/* start "advancing" time stamp from 0 */ }ulong get_timer_masked (void ) { -return TICKS_TO_USEC (get_timer_raw ()); - +return tick_to_time (get_ticks ()); } -void udelay_masked (unsigned long usec) +void udelay (unsigned long usec) { -ulong tmp; +unsigned long long tmp; +ulong tmo; - tmp =get_timer (0 ); -while (get_timer (tmp) < usec)/* our timer works in usecs */ - ;/* NOP */ + tmo =usec_to_tick (usec); + tmp =get_ticks () + tmo;/* get current timestamp */ + +while (get_ticks () < tmp)/* loop till event */ +/*NOP*/ ; }void reset_timer (void )
@@ -100,26 +125,7 @@ void reset_timer(void)ulong get_timer (ulong base) { -ulong now =get_timer_masked (); - -if (now >= base) -return now - base; -else -return TICKS_TO_USEC (0xFFFFFFFFUL ) - (base - now) ; -} - -void udelay (unsigned long usec) -{ -udelay_masked (usec); -} - -/* -* This function is derived from PowerPC code (read timebase as long long). -* On ARM it just returns the timer value. -*/ -unsigned long long get_ticks (void ) -{ -return get_timer (0 ); +return get_timer_masked () - base; }/*
include/configs/afeb9260.h +1 -1
@@ -28,7 +28,7 @@/* ARM asynchronous clock */ #define AT91_MAIN_CLOCK 18429952/* from 18.432 MHz crystal */ -#define CONFIG_SYS_HZ 1000000/* 1us resolution */ +#define CONFIG_SYS_HZ 1000#define CONFIG_AT91SAM9260 1/* It's an Atmel AT91SAM9260 SoC*/ #define CONFIG_AFEB9260 1/* on an AFEB9260 Board */
include/configs/at91cap9adk.h +1 -1
@@ -30,7 +30,7 @@/* ARM asynchronous clock */ #define AT91_CPU_NAME "AT91CAP9"#define AT91_MAIN_CLOCK 12000000/* 12 MHz crystal */ -#define CONFIG_SYS_HZ 1000000/* 1us resolution */ +#define CONFIG_SYS_HZ 1000#define CONFIG_ARM926EJS 1/* This is an ARM926EJS Core */ #define CONFIG_AT91CAP9 1/* It's an Atmel AT91CAP9 SoC */
include/configs/at91sam9260ek.h +1 -1
@@ -29,7 +29,7 @@/* ARM asynchronous clock */ #define AT91_MAIN_CLOCK 18432000/* 18.432 MHz crystal */ -#define CONFIG_SYS_HZ 1000000/* 1us resolution */ +#define CONFIG_SYS_HZ 1000#define CONFIG_ARM926EJS 1/* This is an ARM926EJS Core */
include/configs/at91sam9261ek.h +1 -1
@@ -30,7 +30,7 @@/* ARM asynchronous clock */ #define AT91_CPU_NAME "AT91SAM9261"#define AT91_MAIN_CLOCK 18432000/* 18.432 MHz crystal */ -#define CONFIG_SYS_HZ 1000000/* 1us resolution */ +#define CONFIG_SYS_HZ 1000#define CONFIG_ARM926EJS 1/* This is an ARM926EJS Core */ #define CONFIG_AT91SAM9261 1/* It's an Atmel AT91SAM9261 SoC*/
include/configs/at91sam9263ek.h +1 -1
@@ -30,7 +30,7 @@/* ARM asynchronous clock */ #define AT91_CPU_NAME "AT91SAM9263"#define AT91_MAIN_CLOCK 16367660/* 16.367 MHz crystal */ -#define CONFIG_SYS_HZ 1000000/* 1us resolution */ +#define CONFIG_SYS_HZ 1000#define CONFIG_ARM926EJS 1/* This is an ARM926EJS Core */ #define CONFIG_AT91SAM9263 1/* It's an Atmel AT91SAM9263 SoC*/
include/configs/at91sam9rlek.h +1 -1
@@ -30,7 +30,7 @@/* ARM asynchronous clock */ #define AT91_CPU_NAME "AT91SAM9RL"#define AT91_MAIN_CLOCK 12000000/* 12 MHz crystal */ -#define CONFIG_SYS_HZ 1000000/* 1us resolution */ +#define CONFIG_SYS_HZ 1000#define CONFIG_ARM926EJS 1/* This is an ARM926EJS Core */ #define CONFIG_AT91SAM9RL 1/* It's an Atmel AT91SAM9RL SoC*/
include/configs/pm9263.h +1 -1
@@ -38,7 +38,7 @@#define MAIN_PLL_DIV 2/* 2 or 4 */ #define AT91_MAIN_CLOCK 18432000 -#define CONFIG_SYS_HZ 1000000 +#define CONFIG_SYS_HZ 1000#define CONFIG_ARM926EJS 1/* This is an ARM926EJS Core */ #define CONFIG_AT91SAM9263 1/* It's an Atmel AT91SAM9263 SoC*/
Signature · 1 line
1.6.1.3
PATCH 1/1 at91sam9/at91cap: fix CONFIG_SYS_HZ to 1000
Jean-Christophe PLAGNIOL-VILLARD a ?crit :
Quoted 2 lines
The timer has been rewrote with a precision at ~0,18%
works fine on an 9260 and solves TFTP timeout problem.
Eric
PATCH 1/1 at91sam9/at91cap: fix CONFIG_SYS_HZ to 1000
Quoted 4 lines · Eric BENARD
Jean-Christophe PLAGNIOL-VILLARD a ?crit :
Quoted 2 lines
The timer has been rewrote with a precision at ~0,18%
works fine on an 9260 and solves TFTP timeout problem.
Thanks for the test
btw: could you specify on wich boards?
I'll send a pull request for it within few days
Best Regards,
J.
PATCH 1/1 at91sam9/at91cap: fix CONFIG_SYS_HZ to 1000
Jean-Christophe PLAGNIOL-VILLARD a ?crit :
Quoted 8 lines · Eric BENARD
Quoted 4 lines
Jean-Christophe PLAGNIOL-VILLARD a ?crit :
Quoted 2 lines
The timer has been rewrote with a precision at ~0,18%
works fine on an 9260 and solves TFTP timeout problem.
Thanks for the test
btw: could you specify on wich boards?
AT91SAM9260B based with NOR boot without bootstrap (like PM9261/P263). This board is not yet pushed to mainline.
Eric
PATCH 1/1 at91sam9/at91cap: fix CONFIG_SYS_HZ to 1000
In reply to Jean-Christophe PLAGNIOL-VILLARDQuoted 1 line · Jean-Christophe PLAGNIOL-VILLARD
The timer has been rewrote with a precision at ~0,18%
Works perfectly with afeb9260
Quoted 2 lines
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
PATCH 1/1 at91sam9/at91cap: fix CONFIG_SYS_HZ to 1000
Quoted 6 lines · Sergey Lapin
Quoted 1 line · Jean-Christophe PLAGNIOL-VILLARD
The timer has been rewrote with a precision at ~0,18%
Works perfectly with
afeb9260Quoted 2 lines
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>Tested-by Sergey Lapin <[email protected]>
Thanks for the test
I'll send a pull request for it within few days
Best Regards,
J.