Skip to contentSkip to conversation

ARM: fix co-processor register typo

PATCH In review Russell King (Oracle) 2 participants 2 messages Mar 9, 2022 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: fix co-processor register typo

In the recent Spectre BHB patches, there was a typo that is only exposed in certain configurations: mcr p15,0,XX,c7,r5,4 should have been mcr p15,0,XX,c7,c5,4

Fixes b9baf5c8c5c3 ("ARM: Spectre-BHB workaround")
---
 arch/arm/include/asm/assembler.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/include/asm/assembler.h +1 -1
index cc8851e09f0d..34fe8d2dd5d1 100644
@@ -117,7 +117,7 @@ THUMB(	fpreg	.req	r7	)
 	.endm
 
 	.macro	isb, args
-	mcr	p15, 0, r0, c7, r5, 4
+	mcr	p15, 0, r0, c7, c5, 4
 	.endm
 #endif
 
Signature · 7 lines
2.30.2


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Acked-by on v1 1/1
#1 lore raw
Quoted 16 lines · Russell King

In the recent Spectre BHB patches, there was a typo that is only exposed in certain configurations: mcr p15,0,XX,c7,r5,4 should have been mcr p15,0,XX,c7,c5,4

Fixes b9baf5c8c5c3 ("ARM: Spectre-BHB workaround")
---
 arch/arm/include/asm/assembler.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/include/asm/assembler.h +0 -0
index cc8851e09f0d..34fe8d2dd5d1 100644

arch/arm/include/asm/assembler.h THUMB( fpreg .req r7 ) · line 122

Quoted 7 lines
arch/arm/include/asm/assembler.h +1 -1
@@ -117,7 +117,7 @@ THUMB(	fpreg	.req	r7	)
 	.endm
 
 	.macro	isb, args
-	mcr	p15, 0, r0, c7, r5, 4
+	mcr	p15, 0, r0, c7, c5, 4
 	.endm
 #endif

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel