From 025d0ae994e5663e8c2ca0e16c42e814abac027d Mon Sep 17 00:00:00 2001 From: Anup Patel Date: Wed, 23 Jan 2019 08:13:29 +0530 Subject: [PATCH] include: Rename ipi_inject() to ipi_send() for sbi_platform For better naming, we rename ipi_inject() to ipi_send() in struct sbi_platform. We also replace term "inject" with "send" in all related places. Signed-off-by: Anup Patel --- include/sbi/sbi_platform.h | 14 +++++++------- lib/sbi_hart.c | 2 +- lib/sbi_ipi.c | 2 +- platform/common/include/plat/sys/clint.h | 2 +- platform/common/sys/clint.c | 2 +- platform/kendryte/k210/platform.c | 2 +- platform/qemu/sifive_u/platform.c | 2 +- platform/qemu/virt/platform.c | 2 +- platform/sifive/fu540/platform.c | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/sbi/sbi_platform.h b/include/sbi/sbi_platform.h index e7615716..4c39418a 100644 --- a/include/sbi/sbi_platform.h +++ b/include/sbi/sbi_platform.h @@ -84,8 +84,8 @@ struct sbi_platform { /** Initialize the platform interrupt controller for current HART */ int (*irqchip_init)(bool cold_boot); - /** Inject IPI to a target HART */ - void (*ipi_inject)(u32 target_hart); + /** Send IPI to a target HART */ + void (*ipi_send)(u32 target_hart); /** Wait for target HART to acknowledge IPI */ void (*ipi_sync)(u32 target_hart); /** Clear IPI for a target HART */ @@ -321,16 +321,16 @@ static inline int sbi_platform_irqchip_init(struct sbi_platform *plat, } /** - * Inject IPI to a target HART + * 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_inject(struct sbi_platform *plat, - u32 target_hart) +static inline void sbi_platform_ipi_send(struct sbi_platform *plat, + u32 target_hart) { - if (plat && plat->ipi_inject) - plat->ipi_inject(target_hart); + if (plat && plat->ipi_send) + plat->ipi_send(target_hart); } /** diff --git a/lib/sbi_hart.c b/lib/sbi_hart.c index 68e492c8..dfa474c7 100644 --- a/lib/sbi_hart.c +++ b/lib/sbi_hart.c @@ -331,7 +331,7 @@ void sbi_hart_wake_coldboot_harts(struct sbi_scratch *scratch, u32 hartid) /* send an IPI to every other hart */ spin_lock(&coldboot_wait_bitmap_lock); if ((i != hartid) && (coldboot_wait_bitmap & (1UL << i))) - sbi_platform_ipi_inject(plat, i); + sbi_platform_ipi_send(plat, i); spin_unlock(&coldboot_wait_bitmap_lock); } } diff --git a/lib/sbi_ipi.c b/lib/sbi_ipi.c index 4ff02c6b..55896b26 100644 --- a/lib/sbi_ipi.c +++ b/lib/sbi_ipi.c @@ -35,7 +35,7 @@ int sbi_ipi_send_many(struct sbi_scratch *scratch, oth = sbi_hart_id_to_scratch(scratch, i); atomic_raw_set_bit(event, &oth->ipi_type); mb(); - sbi_platform_ipi_inject(plat, i); + sbi_platform_ipi_send(plat, i); if (event != SBI_IPI_EVENT_SOFT) sbi_platform_ipi_sync(plat, i); } diff --git a/platform/common/include/plat/sys/clint.h b/platform/common/include/plat/sys/clint.h index 8c67d94a..7da8aad1 100644 --- a/platform/common/include/plat/sys/clint.h +++ b/platform/common/include/plat/sys/clint.h @@ -12,7 +12,7 @@ #include -void clint_ipi_inject(u32 target_hart); +void clint_ipi_send(u32 target_hart); void clint_ipi_sync(u32 target_hart); diff --git a/platform/common/sys/clint.c b/platform/common/sys/clint.c index 0f530761..a518996b 100644 --- a/platform/common/sys/clint.c +++ b/platform/common/sys/clint.c @@ -16,7 +16,7 @@ static u32 clint_ipi_hart_count; static volatile void *clint_ipi_base; static volatile u32 *clint_ipi; -void clint_ipi_inject(u32 target_hart) +void clint_ipi_send(u32 target_hart) { if (clint_ipi_hart_count <= target_hart) return; diff --git a/platform/kendryte/k210/platform.c b/platform/kendryte/k210/platform.c index acb453df..5c513d4e 100644 --- a/platform/kendryte/k210/platform.c +++ b/platform/kendryte/k210/platform.c @@ -114,7 +114,7 @@ struct sbi_platform platform = { .irqchip_init = k210_irqchip_init, .ipi_init = k210_ipi_init, - .ipi_inject = clint_ipi_inject, + .ipi_send = clint_ipi_send, .ipi_sync = clint_ipi_sync, .ipi_clear = clint_ipi_clear, diff --git a/platform/qemu/sifive_u/platform.c b/platform/qemu/sifive_u/platform.c index e93554fc..9f3da1c0 100644 --- a/platform/qemu/sifive_u/platform.c +++ b/platform/qemu/sifive_u/platform.c @@ -138,7 +138,7 @@ struct sbi_platform platform = { .console_getc = sifive_uart_getc, .console_init = sifive_u_console_init, .irqchip_init = sifive_u_irqchip_init, - .ipi_inject = clint_ipi_inject, + .ipi_send = clint_ipi_send, .ipi_sync = clint_ipi_sync, .ipi_clear = clint_ipi_clear, .ipi_init = sifive_u_ipi_init, diff --git a/platform/qemu/virt/platform.c b/platform/qemu/virt/platform.c index c55b5fc8..63f4747e 100644 --- a/platform/qemu/virt/platform.c +++ b/platform/qemu/virt/platform.c @@ -139,7 +139,7 @@ struct sbi_platform platform = { .console_getc = uart8250_getc, .console_init = virt_console_init, .irqchip_init = virt_irqchip_init, - .ipi_inject = clint_ipi_inject, + .ipi_send = clint_ipi_send, .ipi_sync = clint_ipi_sync, .ipi_clear = clint_ipi_clear, .ipi_init = virt_ipi_init, diff --git a/platform/sifive/fu540/platform.c b/platform/sifive/fu540/platform.c index 266a1912..28b86eca 100644 --- a/platform/sifive/fu540/platform.c +++ b/platform/sifive/fu540/platform.c @@ -191,7 +191,7 @@ struct sbi_platform platform = { .console_getc = sifive_uart_getc, .console_init = fu540_console_init, .irqchip_init = fu540_irqchip_init, - .ipi_inject = clint_ipi_inject, + .ipi_send = clint_ipi_send, .ipi_sync = clint_ipi_sync, .ipi_clear = clint_ipi_clear, .ipi_init = fu540_ipi_init,