diff options
| author | Anup Patel <anup.patel@wdc.com> | 2021-04-22 10:27:15 +0530 |
|---|---|---|
| committer | Anup Patel <anup@brainfault.org> | 2021-04-28 17:03:31 +0530 |
| commit | dc39c7b630a607b96c25f8ea50f0bb1af619928a (patch) | |
| tree | f0c1d9ae8c5a68cc38e4ffba772f50f43111e715 /lib/utils | |
| parent | 559a8f1d3be3210d4903c0db54c2d36e2f8d6ad4 (diff) | |
lib: sbi: Simplify ipi platform operations
Instead of having ipi_send() and ipi_clear() callbacks in
platform operations, it will be much simpler for ipi driver
to directly register these operations as a device to sbi_ipi
implementation.
Signed-off-by: Anup Patel <anup.patel@wdc.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Diffstat (limited to 'lib/utils')
| -rw-r--r-- | lib/utils/ipi/fdt_ipi.c | 20 | ||||
| -rw-r--r-- | lib/utils/ipi/fdt_ipi_clint.c | 2 | ||||
| -rw-r--r-- | lib/utils/sys/clint.c | 20 |
3 files changed, 17 insertions, 25 deletions
diff --git a/lib/utils/ipi/fdt_ipi.c b/lib/utils/ipi/fdt_ipi.c index 6562469..efca37e 100644 --- a/lib/utils/ipi/fdt_ipi.c +++ b/lib/utils/ipi/fdt_ipi.c @@ -17,35 +17,15 @@ static struct fdt_ipi *ipi_drivers[] = { &fdt_ipi_clint }; -static void dummy_send(u32 target_hart) -{ -} - -static void dummy_clear(u32 target_hart) -{ -} - static struct fdt_ipi dummy = { .match_table = NULL, .cold_init = NULL, .warm_init = NULL, .exit = NULL, - .send = dummy_send, - .clear = dummy_clear }; static struct fdt_ipi *current_driver = &dummy; -void fdt_ipi_send(u32 target_hart) -{ - current_driver->send(target_hart); -} - -void fdt_ipi_clear(u32 target_hart) -{ - current_driver->clear(target_hart); -} - void fdt_ipi_exit(void) { if (current_driver->exit) diff --git a/lib/utils/ipi/fdt_ipi_clint.c b/lib/utils/ipi/fdt_ipi_clint.c index e799fd7..529f978 100644 --- a/lib/utils/ipi/fdt_ipi_clint.c +++ b/lib/utils/ipi/fdt_ipi_clint.c @@ -45,6 +45,4 @@ struct fdt_ipi fdt_ipi_clint = { .cold_init = ipi_clint_cold_init, .warm_init = clint_warm_ipi_init, .exit = NULL, - .send = clint_ipi_send, - .clear = clint_ipi_clear, }; diff --git a/lib/utils/sys/clint.c b/lib/utils/sys/clint.c index 4b1963a..e8c2bd9 100644 --- a/lib/utils/sys/clint.c +++ b/lib/utils/sys/clint.c @@ -13,6 +13,7 @@ #include <sbi/sbi_domain.h> #include <sbi/sbi_error.h> #include <sbi/sbi_hartmask.h> +#include <sbi/sbi_ipi.h> #include <sbi/sbi_timer.h> #include <sbi_utils/sys/clint.h> @@ -27,7 +28,7 @@ static struct clint_data *clint_ipi_hartid2data[SBI_HARTMASK_MAX_BITS]; -void clint_ipi_send(u32 target_hart) +static void clint_ipi_send(u32 target_hart) { struct clint_data *clint; @@ -41,7 +42,7 @@ void clint_ipi_send(u32 target_hart) writel(1, &clint->ipi[target_hart - clint->first_hartid]); } -void clint_ipi_clear(u32 target_hart) +static void clint_ipi_clear(u32 target_hart) { struct clint_data *clint; @@ -55,6 +56,12 @@ void clint_ipi_clear(u32 target_hart) writel(0, &clint->ipi[target_hart - clint->first_hartid]); } +static struct sbi_ipi_device clint_ipi = { + .name = "clint", + .ipi_send = clint_ipi_send, + .ipi_clear = clint_ipi_clear +}; + int clint_warm_ipi_init(void) { /* Clear CLINT IPI for current HART */ @@ -66,6 +73,7 @@ int clint_warm_ipi_init(void) int clint_cold_ipi_init(struct clint_data *clint) { u32 i; + int rc; struct sbi_domain_memregion reg; if (!clint) @@ -82,7 +90,13 @@ int clint_cold_ipi_init(struct clint_data *clint) sbi_domain_memregion_init(clint->addr + CLINT_IPI_OFF, CLINT_IPI_SIZE, SBI_DOMAIN_MEMREGION_MMIO, ®); - return sbi_domain_root_add_memregion(®); + rc = sbi_domain_root_add_memregion(®); + if (rc) + return rc; + + sbi_ipi_set_device(&clint_ipi); + + return 0; } static struct clint_data *clint_timer_hartid2data[SBI_HARTMASK_MAX_BITS]; |