Skip to contentSkip to conversation

Fix for "powerpc/64: use interrupt restart table to speed up return from interrupt" SOFTE loading

PATCH New Nicholas Piggin 1 participant 1 message Jun 17, 2021 PowerPC

lore
Share & tools
lore

Nicholas Piggin

author reviewer
#0 lore raw

PATCH 1/1 Fix for "powerpc/64: use interrupt restart table to speed up return from interrupt" SOFTE loading

This patch loads SOFTE(r1) with lbz, which existing code stores to with std. This causes interrupt flag corruption on big endian (as Michael pointed out to me, lbz happens to grab the correct byte on LE kernels which explains why I didn't run into it).

---
64e still seems to have an issue I'm chasing, and I still need to send a fix for the cpu hotplug lock warning.

 arch/powerpc/kernel/interrupt_64.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/kernel/interrupt_64.S +1 -1
index 76b827ae849a..4bf859e7dc25 100644
@@ -618,7 +618,7 @@ RESTART_TABLE(.Linterrupt_return_\srr\()_user_rst_start, .Linterrupt_return_\srr
 
 	std	r1,PACA_EXIT_SAVE_R1(r13) /* save r1 for restart */
 .Linterrupt_return_\srr\()_kernel_rst_start:
-	lbz	r11,SOFTE(r1)
+	ld	r11,SOFTE(r1)
 	cmpwi	r11,IRQS_ENABLED
 	stb	r11,PACAIRQSOFTMASK(r13)
 	bne	1f
Signature · 1 line
2.23.0