diff options
| author | Anup Patel <anup.patel@wdc.com> | 2020-05-13 13:14:33 +0530 |
|---|---|---|
| committer | Anup Patel <anup@brainfault.org> | 2020-05-23 10:36:49 +0530 |
| commit | 6956e83a944df1c54e4be3554f2ed4863ebe2f75 (patch) | |
| tree | bd02f342a6e2d7fccdec0d1375f0890988200de0 | |
| parent | 569dd64b7270fd1cd17006e1b76484d84b1a0a71 (diff) | |
lib: utils/ipi: Initialize all matching ipi DT nodes
We can have multiple matching DT nodes of the same FDT ipi 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>
| -rw-r--r-- | lib/utils/ipi/fdt_ipi.c | 22 | ||||
| -rw-r--r-- | lib/utils/ipi/fdt_ipi_clint.c | 15 |
2 files changed, 24 insertions, 13 deletions
diff --git a/lib/utils/ipi/fdt_ipi.c b/lib/utils/ipi/fdt_ipi.c index d99a941..6562469 100644 --- a/lib/utils/ipi/fdt_ipi.c +++ b/lib/utils/ipi/fdt_ipi.c @@ -69,17 +69,19 @@ static int fdt_ipi_cold_init(void) for (pos = 0; pos < array_size(ipi_drivers); pos++) { drv = ipi_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/ipi/fdt_ipi_clint.c b/lib/utils/ipi/fdt_ipi_clint.c index eead8b3..e992440 100644 --- a/lib/utils/ipi/fdt_ipi_clint.c +++ b/lib/utils/ipi/fdt_ipi_clint.c @@ -7,22 +7,31 @@ * Anup Patel <anup.patel@wdc.com> */ +#include <sbi/sbi_error.h> #include <sbi_utils/fdt/fdt_helper.h> #include <sbi_utils/ipi/fdt_ipi.h> #include <sbi_utils/sys/clint.h> -static struct clint_data clint_ipi; +#define CLINT_IPI_MAX_NR 16 + +static unsigned long clint_ipi_count = 0; +static struct clint_data clint_ipi[CLINT_IPI_MAX_NR]; static int ipi_clint_cold_init(void *fdt, int nodeoff, const struct fdt_match *match) { int rc; + struct clint_data *ci; + + if (CLINT_IPI_MAX_NR <= clint_ipi_count) + return SBI_ENOSPC; + ci = &clint_ipi[clint_ipi_count++]; - rc = fdt_parse_clint_node(fdt, nodeoff, FALSE, &clint_ipi); + rc = fdt_parse_clint_node(fdt, nodeoff, FALSE, ci); if (rc) return rc; - return clint_cold_ipi_init(&clint_ipi); + return clint_cold_ipi_init(ci); } static const struct fdt_match ipi_clint_match[] = { |