Excerpts from Christophe Leroy's message of February 9, 2021 1:10 am: > In system_call_exception(), MSR_RI also needs to be checked on 8xx. > Only booke and 40x doesn't have MSR_RI.
Reviewed-by: Nicholas Piggin <npig...@gmail.com> ... > > Signed-off-by: Christophe Leroy <christophe.le...@csgroup.eu> > --- > v5: Also in interrupt exit prepare > --- > arch/powerpc/kernel/interrupt.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/arch/powerpc/kernel/interrupt.c b/arch/powerpc/kernel/interrupt.c > index 1a2dec49f811..107ec39f05cb 100644 > --- a/arch/powerpc/kernel/interrupt.c > +++ b/arch/powerpc/kernel/interrupt.c > @@ -39,7 +39,7 @@ notrace long system_call_exception(long r3, long r4, long > r5, > > trace_hardirqs_off(); /* finish reconciling */ > > - if (IS_ENABLED(CONFIG_PPC_BOOK3S)) > + if (!IS_ENABLED(CONFIG_BOOKE) && !IS_ENABLED(CONFIG_40x)) > BUG_ON(!(regs->msr & MSR_RI)); > BUG_ON(!(regs->msr & MSR_PR)); > BUG_ON(!FULL_REGS(regs)); > @@ -338,7 +338,7 @@ notrace unsigned long interrupt_exit_user_prepare(struct > pt_regs *regs, unsigned > unsigned long flags; > unsigned long ret = 0; > > - if (IS_ENABLED(CONFIG_PPC_BOOK3S)) > + if (!IS_ENABLED(CONFIG_BOOKE) && !IS_ENABLED(CONFIG_40x)) > BUG_ON(!(regs->msr & MSR_RI)); > BUG_ON(!(regs->msr & MSR_PR)); > BUG_ON(!FULL_REGS(regs)); > @@ -436,7 +436,8 @@ notrace unsigned long > interrupt_exit_kernel_prepare(struct pt_regs *regs, unsign > unsigned long amr; > #endif > > - if (IS_ENABLED(CONFIG_PPC_BOOK3S) && unlikely(!(regs->msr & MSR_RI))) > + if (!IS_ENABLED(CONFIG_BOOKE) && !IS_ENABLED(CONFIG_40x) && > + unlikely(!(regs->msr & MSR_RI))) > unrecoverable_exception(regs); > BUG_ON(regs->msr & MSR_PR); > BUG_ON(!FULL_REGS(regs)); > -- > 2.25.0 > >
