From dc39c7b630a607b96c25f8ea50f0bb1af619928a Mon Sep 17 00:00:00 2001 From: Anup Patel Date: Thu, 22 Apr 2021 10:27:15 +0530 Subject: 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 Reviewed-by: Alistair Francis --- include/sbi/sbi_ipi.h | 18 ++++++++++++++++++ include/sbi/sbi_platform.h | 30 ------------------------------ include/sbi_utils/ipi/fdt_ipi.h | 6 ------ include/sbi_utils/sys/clint.h | 4 ---- 4 files changed, 18 insertions(+), 40 deletions(-) (limited to 'include') diff --git a/include/sbi/sbi_ipi.h b/include/sbi/sbi_ipi.h index 617872c..fb7d658 100644 --- a/include/sbi/sbi_ipi.h +++ b/include/sbi/sbi_ipi.h @@ -18,6 +18,18 @@ /* clang-format on */ +/** IPI hardware device */ +struct sbi_ipi_device { + /** Name of the IPI device */ + char name[32]; + + /** Send IPI to a target HART */ + void (*ipi_send)(u32 target_hart); + + /** Clear IPI for a target HART */ + void (*ipi_clear)(u32 target_hart); +}; + struct sbi_scratch; /** IPI event operations or callbacks */ @@ -63,6 +75,12 @@ int sbi_ipi_send_halt(ulong hmask, ulong hbase); void sbi_ipi_process(void); +void sbi_ipi_raw_send(u32 target_hart); + +const struct sbi_ipi_device *sbi_ipi_get_device(void); + +void sbi_ipi_set_device(const struct sbi_ipi_device *dev); + int sbi_ipi_init(struct sbi_scratch *scratch, bool cold_boot); void sbi_ipi_exit(struct sbi_scratch *scratch); diff --git a/include/sbi/sbi_platform.h b/include/sbi/sbi_platform.h index a2084c1..2756d73 100644 --- a/include/sbi/sbi_platform.h +++ b/include/sbi/sbi_platform.h @@ -101,10 +101,6 @@ struct sbi_platform_operations { /** Exit the platform interrupt controller for current HART */ void (*irqchip_exit)(void); - /** Send IPI to a target HART */ - void (*ipi_send)(u32 target_hart); - /** Clear IPI for a target HART */ - void (*ipi_clear)(u32 target_hart); /** Initialize IPI for current HART */ int (*ipi_init)(bool cold_boot); /** Exit IPI for current HART */ @@ -522,32 +518,6 @@ static inline void sbi_platform_irqchip_exit(const struct sbi_platform *plat) sbi_platform_ops(plat)->irqchip_exit(); } -/** - * Send IPI to a target HART - * - * @param plat pointer to struct sbi_platform - * @param target_hart HART ID of IPI target - */ -static inline void sbi_platform_ipi_send(const struct sbi_platform *plat, - u32 target_hart) -{ - if (plat && sbi_platform_ops(plat)->ipi_send) - sbi_platform_ops(plat)->ipi_send(target_hart); -} - -/** - * Clear IPI for a target HART - * - * @param plat pointer to struct sbi_platform - * @param target_hart HART ID of IPI target - */ -static inline void sbi_platform_ipi_clear(const struct sbi_platform *plat, - u32 target_hart) -{ - if (plat && sbi_platform_ops(plat)->ipi_clear) - sbi_platform_ops(plat)->ipi_clear(target_hart); -} - /** * Initialize the platform IPI support for current HART * diff --git a/include/sbi_utils/ipi/fdt_ipi.h b/include/sbi_utils/ipi/fdt_ipi.h index e817141..9337353 100644 --- a/include/sbi_utils/ipi/fdt_ipi.h +++ b/include/sbi_utils/ipi/fdt_ipi.h @@ -17,14 +17,8 @@ struct fdt_ipi { int (*cold_init)(void *fdt, int nodeoff, const struct fdt_match *match); int (*warm_init)(void); void (*exit)(void); - void (*send)(u32 target_hart); - void (*clear)(u32 target_hart); }; -void fdt_ipi_send(u32 target_hart); - -void fdt_ipi_clear(u32 target_hart); - void fdt_ipi_exit(void); int fdt_ipi_init(bool cold_boot); diff --git a/include/sbi_utils/sys/clint.h b/include/sbi_utils/sys/clint.h index e102196..1e2b40b 100644 --- a/include/sbi_utils/sys/clint.h +++ b/include/sbi_utils/sys/clint.h @@ -29,10 +29,6 @@ struct clint_data { void (*time_wr)(u64 value, volatile u64 *addr); }; -void clint_ipi_send(u32 target_hart); - -void clint_ipi_clear(u32 target_hart); - int clint_warm_ipi_init(void); int clint_cold_ipi_init(struct clint_data *clint); -- cgit v1.2.3