Firmware/opensbi
8
0
Fork 0
forked from Mirrors/opensbi
Code Pull Requests Activity

lib: utils/timer: Initialize all matching timer DT nodes

Browse Source 
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>
This commit is contained in:
Anup Patel
2020-05-13 13:11:44 +05:30
committed by Anup Patel
parent 6956e83a94
commit a63f05f3de
2 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/utils/timer/fdt_timer.c
View File

@@ -80,17 +80,19 @@ static int fdt_timer_cold_init(void)
for (pos = 0; pos < array_size(timer_drivers); pos++) { for (pos = 0; pos < array_size(timer_drivers); pos++) {
drv = timer_drivers[pos]; drv = timer_drivers[pos];
noff = fdt_find_match(fdt, -1, drv->match_table, &match); noff = -1;
if (noff < 0) while ((noff = fdt_find_match(fdt, noff,
continue; drv->match_table, &match)) >= 0) {
if (drv->cold_init) {
if (drv->cold_init) { rc = drv->cold_init(fdt, noff, match);
rc = drv->cold_init(fdt, noff, match); if (rc)
if (rc) return rc;
return rc; }
current_driver = drv;
} }
current_driver = drv;
break; if (current_driver != &dummy)
break;
} }
return 0; return 0;

17
lib/utils/timer/fdt_timer_clint.c
View File

@@ -7,22 +7,33 @@
* Anup Patel <anup.patel@wdc.com> * Anup Patel <anup.patel@wdc.com>
*/ */
#include <sbi/sbi_error.h>
#include <sbi_utils/fdt/fdt_helper.h> #include <sbi_utils/fdt/fdt_helper.h>
#include <sbi_utils/timer/fdt_timer.h> #include <sbi_utils/timer/fdt_timer.h>
#include <sbi_utils/sys/clint.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, static int timer_clint_cold_init(void *fdt, int nodeoff,
const struct fdt_match *match) const struct fdt_match *match)
{ {
int rc; int rc;
struct clint_data *ct, *ctmaster = NULL;
rc = fdt_parse_clint_node(fdt, nodeoff, TRUE, &clint_timer); 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, ct);
if (rc) if (rc)
return 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[] = { static const struct fdt_match timer_clint_match[] = {