Firmware/opensbi
8
0
Fork 0
forked from Mirrors/opensbi
Code Pull Requests Activity

lib: Fix ipi type update

Browse Source 
IPIs are updated in scratch space by source hart.
However, different harts or same hart may want to
send different IPIs before previous IPI was read
by the target hart. Currently, previous IPI type
is overwritten in that case.

Use atomic bit set/clear operations to update IPIs.

Signed-off-by: Atish Patra <atish.patra@wdc.com>
This commit is contained in:
Atish Patra
2019-01-20 23:24:26 -08:00
committed by Anup Patel
parent 312b6bf32f
commit b9c517f559
1 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
lib/sbi_ipi.c
View File

@@ -9,7 +9,10 @@
#include <sbi/riscv_asm.h> #include <sbi/riscv_asm.h>
#include <sbi/riscv_barrier.h> #include <sbi/riscv_barrier.h>
#include <sbi/riscv_atomic.h>
#include <sbi/sbi_hart.h> #include <sbi/sbi_hart.h>
#include <sbi/sbi_bitops.h>
#include <sbi/sbi_console.h>
#include <sbi/sbi_ipi.h> #include <sbi/sbi_ipi.h>
#include <sbi/sbi_platform.h> #include <sbi/sbi_platform.h>
#include <sbi/sbi_timer.h> #include <sbi/sbi_timer.h>
@@ -30,7 +33,7 @@ int sbi_ipi_send_many(struct sbi_scratch *scratch,
for (i = 0, m = mask; m; i++, m >>= 1) { for (i = 0, m = mask; m; i++, m >>= 1) {
if ((m & 1) && (i != hartid) && !sbi_platform_hart_disabled(plat, hartid)) { if ((m & 1) && (i != hartid) && !sbi_platform_hart_disabled(plat, hartid)) {
oth = sbi_hart_id_to_scratch(scratch, i); oth = sbi_hart_id_to_scratch(scratch, i);
oth->ipi_type = event; atomic_raw_set_bit(event, &oth->ipi_type);
mb(); mb();
sbi_platform_ipi_inject(plat, i, hartid); sbi_platform_ipi_inject(plat, i, hartid);
if (event != SBI_IPI_EVENT_SOFT) if (event != SBI_IPI_EVENT_SOFT)
@@ -49,23 +52,31 @@ void sbi_ipi_clear_smode(struct sbi_scratch *scratch, u32 hartid)
void sbi_ipi_process(struct sbi_scratch *scratch, u32 hartid) void sbi_ipi_process(struct sbi_scratch *scratch, u32 hartid)
{ {
struct sbi_platform *plat = sbi_platform_ptr(scratch); struct sbi_platform *plat = sbi_platform_ptr(scratch);
volatile unsigned long ipi_type;
unsigned int ipi_event;
sbi_platform_ipi_clear(plat, hartid); sbi_platform_ipi_clear(plat, hartid);
switch (scratch->ipi_type) {
case SBI_IPI_EVENT_SOFT: do {
csr_set(mip, MIP_SSIP); ipi_type = scratch->ipi_type;
break; rmb();
case SBI_IPI_EVENT_FENCE_I: ipi_event = __ffs(ipi_type);
__asm__ __volatile("fence.i"); switch (ipi_event) {
break; case SBI_IPI_EVENT_SOFT:
case SBI_IPI_EVENT_SFENCE_VMA: csr_set(mip, MIP_SSIP);
__asm__ __volatile("sfence.vma"); break;
break; case SBI_IPI_EVENT_FENCE_I:
case SBI_IPI_EVENT_HALT: __asm__ __volatile("fence.i");
sbi_hart_hang(); break;
break; case SBI_IPI_EVENT_SFENCE_VMA:
}; __asm__ __volatile("sfence.vma");
scratch->ipi_type = 0; break;
case SBI_IPI_EVENT_HALT:
sbi_hart_hang();
break;
};
ipi_type = atomic_raw_clear_bit(ipi_event, &scratch->ipi_type);
} while(ipi_type > 0);
} }
int sbi_ipi_init(struct sbi_scratch *scratch, u32 hartid, bool cold_boot) int sbi_ipi_init(struct sbi_scratch *scratch, u32 hartid, bool cold_boot)