Skip to content

Commit 6237636

Browse files
chleroympe
authored andcommitted
powerpc/32s: Fix napping restore in data storage interrupt (DSI)
When a DSI (Data Storage Interrupt) is taken while in NAP mode, r11 doesn't survive the call to power_save_ppc32_restore(). So use r1 instead of r11 as they both contain the virtual stack pointer at that point. Fixes: 4c0104a ("powerpc/32: Dismantle EXC_XFER_STD/LITE/TEMPLATE") Cc: [email protected] # v5.13+ Reported-by: Finn Thain <[email protected]> Signed-off-by: Christophe Leroy <[email protected]> Signed-off-by: Michael Ellerman <[email protected]> Link: https://lore.kernel.org/r/731694e0885271f6ee9ffc179eb4bcee78313682.1628003562.git.christophe.leroy@csgroup.eu
1 parent a88603f commit 6237636

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/powerpc/kernel/head_book3s_32.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ ALT_MMU_FTR_SECTION_END_IFSET(MMU_FTR_HPTE_TABLE)
300300
EXCEPTION_PROLOG_1
301301
EXCEPTION_PROLOG_2 INTERRUPT_DATA_STORAGE DataAccess handle_dar_dsisr=1
302302
prepare_transfer_to_handler
303-
lwz r5, _DSISR(r11)
303+
lwz r5, _DSISR(r1)
304304
andis. r0, r5, DSISR_DABRMATCH@h
305305
bne- 1f
306306
bl do_page_fault

0 commit comments

Comments
 (0)