LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

timer: orion-timer: Fix problem with early static variable 

We've noticed that at least one Kirkwood board (Pogo v4) has problems
with the new orion DM timer implementation. Debugging revealed that this
issue is related with the static variable "early_init_done" which does
not work correctly before relocation in all cases.

This patch removes this static variable and replaces it's functionality
via a function that detects if the timer is already initialized.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Pali Rohár <pali@kernel.org>
Cc: Michael Walle <michael@walle.cc>
Cc: Tony Dinh <mibodhi@gmail.com>
Tested-by: Tony Dinh <mibodhi@gmail.com>
This commit is contained in:
Stefan Roese 2022-12-21 10:18:49 +01:00
parent 3089d12a02
commit 5387b093cb
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/timer/orion-timer.c
View File

@ -23,15 +23,19 @@ struct orion_timer_priv {
#define MVEBU_TIMER_FIXED_RATE_25MHZ 25000000 #define MVEBU_TIMER_FIXED_RATE_25MHZ 25000000
static bool early_init_done __section(".data") = false; static bool early_init_done(void *base)
{
if (readl(base + TIMER_CTRL) & TIMER0_EN)
return true;
return false;
}
/* Common functions for early (boot) and DM based timer */ /* Common functions for early (boot) and DM based timer */
static void orion_timer_init(void *base, enum input_clock_type type) static void orion_timer_init(void *base, enum input_clock_type type)
{ {
/* Only init the timer once */ /* Only init the timer once */
if (early_init_done) if (early_init_done(base))
return; return;
early_init_done = true;
writel(~0, base + TIMER0_VAL); writel(~0, base + TIMER0_VAL);
writel(~0, base + TIMER0_RELOAD); writel(~0, base + TIMER0_RELOAD);