From 55e79f823dfa65022a561d3078ac50d49262e246 Mon Sep 17 00:00:00 2001 From: Anup Patel Date: Tue, 29 Jun 2021 13:29:52 +0530 Subject: [PATCH] lib: sbi: Enable mie.MEIE bit for IPIs based on external interrupts. We can have IPIs based on external interrupts provided by devices such as AIA IMSIC so we should enable mie.MEIE bit at appropriate places in generic library. Signed-off-by: Anup Patel Signed-off-by: Anup Patel Reviewed-by: Atish Patra --- lib/sbi/sbi_hsm.c | 4 ++-- lib/sbi/sbi_init.c | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/sbi/sbi_hsm.c b/lib/sbi/sbi_hsm.c index ecd2e45f..c4d2c6d3 100644 --- a/lib/sbi/sbi_hsm.c +++ b/lib/sbi/sbi_hsm.c @@ -113,8 +113,8 @@ static void sbi_hsm_hart_wait(struct sbi_scratch *scratch, u32 hartid) /* Save MIE CSR */ saved_mie = csr_read(CSR_MIE); - /* Set MSIE bit to receive IPI */ - csr_set(CSR_MIE, MIP_MSIP); + /* Set MSIE and MEIE bits to receive IPI */ + csr_set(CSR_MIE, MIP_MSIP | MIP_MEIP); /* Wait for hart_add call*/ while (atomic_read(&hdata->state) != SBI_HSM_STATE_START_PENDING) { diff --git a/lib/sbi/sbi_init.c b/lib/sbi/sbi_init.c index 27d03a7c..6876eb2f 100644 --- a/lib/sbi/sbi_init.c +++ b/lib/sbi/sbi_init.c @@ -165,8 +165,8 @@ static void wait_for_coldboot(struct sbi_scratch *scratch, u32 hartid) /* Save MIE CSR */ saved_mie = csr_read(CSR_MIE); - /* Set MSIE bit to receive IPI */ - csr_set(CSR_MIE, MIP_MSIP); + /* Set MSIE and MEIE bits to receive IPI */ + csr_set(CSR_MIE, MIP_MSIP | MIP_MEIP); /* Acquire coldboot lock */ spin_lock(&coldboot_lock); @@ -182,7 +182,7 @@ static void wait_for_coldboot(struct sbi_scratch *scratch, u32 hartid) do { wfi(); cmip = csr_read(CSR_MIP); - } while (!(cmip & MIP_MSIP)); + } while (!(cmip & (MIP_MSIP | MIP_MEIP))); }; /* Acquire coldboot lock */ @@ -276,6 +276,7 @@ static void __noreturn init_coldboot(struct sbi_scratch *scratch, u32 hartid) __func__, rc); sbi_hart_hang(); } + csr_set(CSR_MIE, MIP_MEIP); rc = sbi_ipi_init(scratch, TRUE); if (rc) { @@ -376,6 +377,7 @@ static void init_warm_startup(struct sbi_scratch *scratch, u32 hartid) rc = sbi_platform_irqchip_init(plat, FALSE); if (rc) sbi_hart_hang(); + csr_set(CSR_MIE, MIP_MEIP); rc = sbi_ipi_init(scratch, FALSE); if (rc) @@ -550,6 +552,7 @@ void __noreturn sbi_exit(struct sbi_scratch *scratch) sbi_ipi_exit(scratch); + csr_clear(CSR_MIE, MIP_MEIP); sbi_platform_irqchip_exit(plat); sbi_platform_final_exit(plat);