Skip to content

Commit 91926d8

Browse files
committed
powerpc/rtas: Fix RTAS MSR[HV] handling for Cell
The semi-recent changes to MSR handling when entering RTAS (firmware) cause crashes on IBM Cell machines. An example trace: kernel tried to execute user page (2fff01a8) - exploit attempt? (uid: 0) BUG: Unable to handle kernel instruction fetch Faulting instruction address: 0x2fff01a8 Oops: Kernel access of bad area, sig: 11 [#1] BE PAGE_SIZE=64K MMU=Hash SMP NR_CPUS=4 NUMA Cell Modules linked in: CPU: 0 PID: 0 Comm: swapper/0 Tainted: G W 6.0.0-rc2-00433-gede0a8d3307a torvalds#207 NIP: 000000002fff01a8 LR: 0000000000032608 CTR: 0000000000000000 REGS: c0000000015236b0 TRAP: 0400 Tainted: G W (6.0.0-rc2-00433-gede0a8d3307a) MSR: 0000000008001002 <ME,RI> CR: 00000000 XER: 20000000 ... NIP 0x2fff01a8 LR 0x32608 Call Trace: 0xc00000000143c5f8 (unreliable) .rtas_call+0x224/0x320 .rtas_get_boot_time+0x70/0x150 .read_persistent_clock64+0x114/0x140 .read_persistent_wall_and_boot_offset+0x24/0x80 .timekeeping_init+0x40/0x29c .start_kernel+0x674/0x8f0 start_here_common+0x1c/0x50 Unlike PAPR platforms where RTAS is only used in guests, on the IBM Cell machines Linux runs with MSR[HV] set but also uses RTAS, provided by SLOF. Fix it by copying the MSR[HV] bit from the MSR value we've just read using mfmsr into the value used for RTAS. It seems like we could also fix it using an #ifdef CELL to set MSR[HV], but that doesn't work because it's possible to build a single kernel image that runs on both Cell native and pseries. Fixes: b6b1c3c ("powerpc/rtas: Keep MSR[RI] set when calling RTAS") Cc: [email protected] # v5.19+ Signed-off-by: Michael Ellerman <[email protected]> Reviewed-by: Jordan Niethe <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 310d134 commit 91926d8

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

arch/powerpc/kernel/rtas_entry.S

+4
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,12 @@ __enter_rtas:
109109
* its critical regions (as specified in PAPR+ section 7.2.1). MSR[S]
110110
* is not impacted by RFI_TO_KERNEL (only urfid can unset it). So if
111111
* MSR[S] is set, it will remain when entering RTAS.
112+
* If we're in HV mode, RTAS must also run in HV mode, so extract MSR_HV
113+
* from the saved MSR value and insert into the value RTAS will use.
112114
*/
115+
extrdi r0, r6, 1, 63 - MSR_HV_LG
113116
LOAD_REG_IMMEDIATE(r6, MSR_ME | MSR_RI)
117+
insrdi r6, r0, 1, 63 - MSR_HV_LG
114118

115119
li r0,0
116120
mtmsrd r0,1 /* disable RI before using SRR0/1 */

0 commit comments

Comments
 (0)