Commit 016f98af authored Oct 28, 2016 by Will Deacon Committed by Marc Zyngier Nov 29, 2016

irqchip/gic-v3: Use nops macro for Cavium ThunderX erratum 23154



The workaround for Cavium ThunderX erratum 23154 has a homebrew
pipeflush built out of NOP sequences around the read of the IAR.

This patch converts the code to use the new nops macro, which makes it
a little easier to read.

Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>

parent d44ffa5a

arch/arm64/include/asm/arch_gicv3.h

+2 −7

Original line number	Diff line number	Diff line
		@@ -122,14 +122,9 @@ static inline u64 gic_read_iar_cavium_thunderx(void)
		{
		u64 irqstat;

		asm volatile(
		"nop;nop;nop;nop\n\t"
		"nop;nop;nop;nop");

		nops(8);
		irqstat = read_sysreg_s(ICC_IAR1_EL1);

		asm volatile(
		"nop;nop;nop;nop");
		nops(4);
		mb();

		return irqstat;