Skip to content

Commit 825c78e

Browse files
Xu LuKAGA-KOKO
authored andcommitted
irqchip/riscv: Ensure ordering of memory writes and IPI writes
RISC-V distinguishes between memory accesses and device I/O and uses FENCE instruction to order them as viewed by other RISC-V harts and external devices or coprocessors. The FENCE instruction can order any combination of device input(I), device output(O), memory reads(R) and memory writes(W). For example, 'fence w, o' is used to ensure all memory writes from instructions preceding the FENCE instruction appear earlier in the global memory order than device output writes from instructions after the FENCE instruction. RISC-V issues IPIs by writing to the IMSIC/ACLINT MMIO registers, which is regarded as device output operation. However, the existing implementation of the IMSIC/ACLINT drivers issue the IPI via writel_relaxed(), which does not guarantee the order of device output operation and preceding memory writes. As a consequence the hart receiving the IPI might not observe the IPI related data. Fix this by replacing writel_relaxed() with writel() when issuing IPIs, which uses 'fence w, o' to ensure all previous writes made by the current hart are visible to other harts before they receive the IPI. Signed-off-by: Xu Lu <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Link: https://lore.kernel.org/all/[email protected]
1 parent e06c9e3 commit 825c78e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

drivers/irqchip/irq-riscv-imsic-early.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ static void imsic_ipi_send(unsigned int cpu)
2727
{
2828
struct imsic_local_config *local = per_cpu_ptr(imsic->global.local, cpu);
2929

30-
writel_relaxed(IMSIC_IPI_ID, local->msi_va);
30+
writel(IMSIC_IPI_ID, local->msi_va);
3131
}
3232

3333
static void imsic_ipi_starting_cpu(void)

drivers/irqchip/irq-thead-c900-aclint-sswi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ static DEFINE_PER_CPU(void __iomem *, sswi_cpu_regs);
3131

3232
static void thead_aclint_sswi_ipi_send(unsigned int cpu)
3333
{
34-
writel_relaxed(0x1, per_cpu(sswi_cpu_regs, cpu));
34+
writel(0x1, per_cpu(sswi_cpu_regs, cpu));
3535
}
3636

3737
static void thead_aclint_sswi_ipi_clear(void)

0 commit comments

Comments
 (0)