From 508a27204cbbca0a9430236e56681e5e0d343fb9 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Fri, 8 Mar 2019 11:22:22 -0800 Subject: lib: Create a sbi_ipi_data structure Create a sbi_ipi_data structure that holds unpacked IPI information. At the same time remove ipi_type from the sbi_scratch struct and use a fixed offset to access it. This structure fits in behind the sbi_scratch structure. This fixes https://github.com/riscv/opensbi/issues/81 Signed-off-by: Alistair Francis --- lib/sbi_ipi.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'lib/sbi_ipi.c') diff --git a/lib/sbi_ipi.c b/lib/sbi_ipi.c index 0e371d7..e0f2a19 100644 --- a/lib/sbi_ipi.c +++ b/lib/sbi_ipi.c @@ -31,7 +31,7 @@ static int sbi_ipi_send(struct sbi_scratch *scratch, u32 hartid, u32 event) * trigger the interrupt */ remote_scratch = sbi_hart_id_to_scratch(scratch, hartid); - atomic_raw_set_bit(event, &remote_scratch->ipi_type); + atomic_raw_set_bit(event, &sbi_ipi_data_ptr(remote_scratch)->ipi_type); mb(); sbi_platform_ipi_send(plat, hartid); if (event != SBI_IPI_EVENT_SOFT) @@ -80,7 +80,7 @@ void sbi_ipi_process(struct sbi_scratch *scratch) sbi_platform_ipi_clear(plat, hartid); do { - ipi_type = scratch->ipi_type; + ipi_type = sbi_ipi_data_ptr(scratch)->ipi_type; rmb(); ipi_event = __ffs(ipi_type); switch (ipi_event) { @@ -97,12 +97,14 @@ void sbi_ipi_process(struct sbi_scratch *scratch) sbi_hart_hang(); break; }; - ipi_type = atomic_raw_clear_bit(ipi_event, &scratch->ipi_type); + ipi_type = atomic_raw_clear_bit(ipi_event, &sbi_ipi_data_ptr(scratch)->ipi_type); } while(ipi_type > 0); } int sbi_ipi_init(struct sbi_scratch *scratch, bool cold_boot) { + sbi_ipi_data_ptr(scratch)->ipi_type = 0x00; + /* Enable software interrupts */ csr_set(CSR_MIE, MIP_MSIP); -- cgit v1.2.3