diff options
| author | Anup Patel <anup.patel@wdc.com> | 2020-05-13 13:11:44 +0530 |
|---|---|---|
| committer | Anup Patel <anup@brainfault.org> | 2020-05-23 10:36:53 +0530 |
| commit | a63f05f3dea6fde8b5d545c2c6a5762faa56539a (patch) | |
| tree | 93601cd20b7c96a842c15b93a9530ed81aa56452 /lib/utils | |
| parent | 6956e83a944df1c54e4be3554f2ed4863ebe2f75 (diff) | |
lib: utils/timer: Initialize all matching timer DT nodes
We can have multiple matching DT nodes of the same FDT timer driver
so in this case we should call cold_init() for all matching DT nodes
instead of just first matching DT node.
Signed-off-by: Anup Patel <anup.patel@wdc.com>
Reviewed-by: Atish Patra <atish.patra@wdc.com>
Diffstat (limited to 'lib/utils')
| -rw-r--r-- | lib/utils/timer/fdt_timer.c | 22 | ||||
| -rw-r--r-- | lib/utils/timer/fdt_timer_clint.c | 17 |
2 files changed, 26 insertions, 13 deletions
diff --git a/lib/utils/timer/fdt_timer.c b/lib/utils/timer/fdt_timer.c index 46edb83..d1d0e0c 100644 --- a/lib/utils/timer/fdt_timer.c +++ b/lib/utils/timer/fdt_timer.c @@ -80,17 +80,19 @@ static int fdt_timer_cold_init(void) for (pos = 0; pos < array_size(timer_drivers); pos++) { drv = timer_drivers[pos]; - noff = fdt_find_match(fdt, -1, drv->match_table, &match); - if (noff < 0) - continue; - - if (drv->cold_init) { - rc = drv->cold_init(fdt, noff, match); - if (rc) - return rc; + noff = -1; + while ((noff = fdt_find_match(fdt, noff, + drv->match_table, &match)) >= 0) { + if (drv->cold_init) { + rc = drv->cold_init(fdt, noff, match); + if (rc) + return rc; + } + current_driver = drv; } - current_driver = drv; - break; + + if (current_driver != &dummy) + break; } return 0; diff --git a/lib/utils/timer/fdt_timer_clint.c b/lib/utils/timer/fdt_timer_clint.c index 85779b7..fe66708 100644 --- a/lib/utils/timer/fdt_timer_clint.c +++ b/lib/utils/timer/fdt_timer_clint.c @@ -7,22 +7,33 @@ * Anup Patel <anup.patel@wdc.com> */ +#include <sbi/sbi_error.h> #include <sbi_utils/fdt/fdt_helper.h> #include <sbi_utils/timer/fdt_timer.h> #include <sbi_utils/sys/clint.h> -static struct clint_data clint_timer; +#define CLINT_TIMER_MAX_NR 16 + +static unsigned long clint_timer_count = 0; +static struct clint_data clint_timer[CLINT_TIMER_MAX_NR]; static int timer_clint_cold_init(void *fdt, int nodeoff, const struct fdt_match *match) { int rc; + struct clint_data *ct, *ctmaster = NULL; + + if (CLINT_TIMER_MAX_NR <= clint_timer_count) + return SBI_ENOSPC; + ct = &clint_timer[clint_timer_count++]; + if (1 < clint_timer_count) + ctmaster = &clint_timer[0]; - rc = fdt_parse_clint_node(fdt, nodeoff, TRUE, &clint_timer); + rc = fdt_parse_clint_node(fdt, nodeoff, TRUE, ct); if (rc) return rc; - return clint_cold_timer_init(&clint_timer, NULL); + return clint_cold_timer_init(ct, ctmaster); } static const struct fdt_match timer_clint_match[] = { |