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/sbi | |
| 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/sbi')
| -rw-r--r-- | lib/sbi/sbi_hsm.c | 2 | ||||
| -rw-r--r-- | lib/sbi/sbi_init.c | 4 | ||||
| -rw-r--r-- | lib/sbi/sbi_ipi.c | 32 |
3 files changed, 28 insertions, 10 deletions
diff --git a/lib/sbi/sbi_hsm.c b/lib/sbi/sbi_hsm.c index bbc4ce9..64d299b 100644 --- a/lib/sbi/sbi_hsm.c +++ b/lib/sbi/sbi_hsm.c @@ -238,7 +238,7 @@ int sbi_hsm_hart_start(struct sbi_scratch *scratch, return sbi_platform_hart_start(plat, hartid, scratch->warmboot_addr); } else { - sbi_platform_ipi_send(plat, hartid); + sbi_ipi_raw_send(hartid); } return 0; diff --git a/lib/sbi/sbi_init.c b/lib/sbi/sbi_init.c index 4de2dfa..7380d01 100644 --- a/lib/sbi/sbi_init.c +++ b/lib/sbi/sbi_init.c @@ -178,8 +178,6 @@ static void wait_for_coldboot(struct sbi_scratch *scratch, u32 hartid) static void wake_coldboot_harts(struct sbi_scratch *scratch, u32 hartid) { - const struct sbi_platform *plat = sbi_platform_ptr(scratch); - /* Mark coldboot done */ __smp_store_release(&coldboot_done, 1); @@ -190,7 +188,7 @@ static void wake_coldboot_harts(struct sbi_scratch *scratch, u32 hartid) for (int i = 0; i <= sbi_scratch_last_hartid(); i++) { if ((i != hartid) && sbi_hartmask_test_hart(i, &coldboot_wait_hmask)) - sbi_platform_ipi_send(plat, i); + sbi_ipi_raw_send(i); } /* Release coldboot lock */ diff --git a/lib/sbi/sbi_ipi.c b/lib/sbi/sbi_ipi.c index b50735e..bfaf4e9 100644 --- a/lib/sbi/sbi_ipi.c +++ b/lib/sbi/sbi_ipi.c @@ -25,7 +25,7 @@ struct sbi_ipi_data { }; static unsigned long ipi_data_off; - +static const struct sbi_ipi_device *ipi_dev = NULL; static const struct sbi_ipi_event_ops *ipi_ops_array[SBI_IPI_EVENT_MAX]; static int sbi_ipi_send(struct sbi_scratch *scratch, u32 remote_hartid, @@ -33,7 +33,6 @@ static int sbi_ipi_send(struct sbi_scratch *scratch, u32 remote_hartid, { int ret; struct sbi_scratch *remote_scratch = NULL; - const struct sbi_platform *plat = sbi_platform_ptr(scratch); struct sbi_ipi_data *ipi_data; const struct sbi_ipi_event_ops *ipi_ops; @@ -61,7 +60,9 @@ static int sbi_ipi_send(struct sbi_scratch *scratch, u32 remote_hartid, */ atomic_raw_set_bit(event, &ipi_data->ipi_type); smp_wmb(); - sbi_platform_ipi_send(plat, remote_hartid); + + if (ipi_dev && ipi_dev->ipi_send) + ipi_dev->ipi_send(remote_hartid); if (ipi_ops->sync) ipi_ops->sync(scratch); @@ -178,12 +179,12 @@ void sbi_ipi_process(void) unsigned int ipi_event; const struct sbi_ipi_event_ops *ipi_ops; struct sbi_scratch *scratch = sbi_scratch_thishart_ptr(); - const struct sbi_platform *plat = sbi_platform_ptr(scratch); struct sbi_ipi_data *ipi_data = sbi_scratch_offset_ptr(scratch, ipi_data_off); - u32 hartid = current_hartid(); - sbi_platform_ipi_clear(plat, hartid); + + if (ipi_dev && ipi_dev->ipi_clear) + ipi_dev->ipi_clear(hartid); ipi_type = atomic_raw_xchg_ulong(&ipi_data->ipi_type, 0); ipi_event = 0; @@ -201,6 +202,25 @@ skip: }; } +void sbi_ipi_raw_send(u32 target_hart) +{ + if (ipi_dev && ipi_dev->ipi_send) + ipi_dev->ipi_send(target_hart); +} + +const struct sbi_ipi_device *sbi_ipi_get_device(void) +{ + return ipi_dev; +} + +void sbi_ipi_set_device(const struct sbi_ipi_device *dev) +{ + if (!dev || ipi_dev) + return; + + ipi_dev = dev; +} + int sbi_ipi_init(struct sbi_scratch *scratch, bool cold_boot) { int ret; |