Skip to content

Commit 3f28aca

Browse files
chleroyksacilotto
authored andcommitted
powerpc/8xx: Fix software emulation interrupt
BugLink: https://bugs.launchpad.net/bugs/1918974 [ Upstream commit 903178d ] For unimplemented instructions or unimplemented SPRs, the 8xx triggers a "Software Emulation Exception" (0x1000). That interrupt doesn't set reason bits in SRR1 as the "Program Check Exception" does. Go through emulation_assist_interrupt() to set REASON_ILLEGAL. Fixes: fbbcc3b ("powerpc/8xx: Remove SoftwareEmulation()") Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/ad782af87a222efc79cfb06079b0fd23d4224eaf.1612515180.git.christophe.leroy@csgroup.eu Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Kamal Mostafa <kamal@canonical.com> Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>
1 parent 31e2f73 commit 3f28aca

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/powerpc/kernel/head_8xx.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ SystemCall:
191191
/* On the MPC8xx, this is a software emulation interrupt. It occurs
192192
* for all unimplemented and illegal instructions.
193193
*/
194-
EXCEPTION(0x1000, SoftEmu, program_check_exception, EXC_XFER_STD)
194+
EXCEPTION(0x1000, SoftEmu, emulation_assist_interrupt, EXC_XFER_STD)
195195

196196
/* Called from DataStoreTLBMiss when perf TLB misses events are activated */
197197
#ifdef CONFIG_PERF_EVENTS

0 commit comments

Comments
 (0)