@@ -45,6 +45,8 @@ void gicv2_ipi_send_single(int irq, int cpu)
{
assert(cpu < 8);
assert(irq < 16);
+
+ smp_wmb();
writel(1 << (cpu + 16) | irq, gicv2_dist_base() + GICD_SGIR);
}
@@ -53,5 +55,7 @@ void gicv2_ipi_send_mask(int irq, const cpumask_t *dest)
u8 tlist = (u8)cpumask_bits(dest)[0];
assert(irq < 16);
+
+ smp_wmb();
writel(tlist << 16 | irq, gicv2_dist_base() + GICD_SGIR);
}
@@ -13,6 +13,7 @@
*/
#include <libcflat.h>
#include <errata.h>
+#include <linux/compiler.h>
#include <asm/setup.h>
#include <asm/processor.h>
#include <asm/delay.h>
@@ -260,11 +261,14 @@ static void check_lpi_hits(int *expected, const char *msg)
static void gicv2_ipi_send_self(void)
{
+ /* Prevent the compiler from optimizing memory accesses */
+ barrier();
writel(2 << 24 | IPI_IRQ, gicv2_dist_base() + GICD_SGIR);
}
static void gicv2_ipi_send_broadcast(void)
{
+ smp_wmb();
writel(1 << 24 | IPI_IRQ, gicv2_dist_base() + GICD_SGIR);
}
GICv2 generates IPIs with a MMIO write to the GICD_SGIR register. A common pattern for IPI usage is for the IPI receiver to read data written to memory by the sender. The armv7 and armv8 architectures implement a weakly-ordered memory model, which means that barriers are required to make sure that the expected values are observed. It turns out that because the receiver CPU must observe the write to memory that generated the IPI when reading the GICC_IAR MMIO register, we only need to ensure ordering of memory accesses, and not completion. Use a smp_wmb (DMB ISHST) barrier before sending the IPI. This also matches what the Linux GICv2 irqchip driver does (more details in commit 8adbf57fc429 ("irqchip: gic: use dmb ishst instead of dsb when raising a softirq")). The gicv2_ipi_send_self() function sends an IPI from a CPU to itself. The tests that use this function rely on the interrupt handler to record information about the interrupt by using several arrays. It is possible for the compiler to infer that the arrays won't be changed during normal program flow and try to perform harmful optimizations (like stashing a previous read in a register and reusing it). To prevent this, for GICv2, a compile barrier is added to gicv2_ipi_send_self(). For GICv3, the wmb() barrier in gic_ipi_send_single() (which is also used when a CPU sends an IPI to itself) already implies a compiler barrier. Reviewed-by: Eric Auger <eric.auger@redhat.com> Signed-off-by: Alexandru Elisei <alexandru.elisei@arm.com> --- lib/arm/gic-v2.c | 4 ++++ arm/gic.c | 4 ++++ 2 files changed, 8 insertions(+)