| Message ID | 20140829091437.B3FE71ABD63@localhost.localdomain (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Scott Wood |
| Headers | show |
Christophe Leroy <christophe.leroy@c-s.fr> wrote on 2014/08/29 11:14:37: > > Exception InstructionAccess does not exist on MPC8xx. No need to branch there from somewhere else. > Handling can be done directly in InstructionTLBError Exception. > > Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> > > --- > arch/powerpc/kernel/head_8xx.S | 17 +++++++---------- > 1 files changed, 7 insertions(+), 10 deletions(-) > > diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S > index 3af6db1..fbe5d10 100644 > --- a/arch/powerpc/kernel/head_8xx.S > +++ b/arch/powerpc/kernel/head_8xx.S > @@ -234,15 +234,9 @@ DataAccess: > EXC_XFER_LITE(0x300, handle_page_fault) > > /* Instruction access exception. > - * This is "never generated" by the MPC8xx. We jump to it for other > - * translation errors. > + * This is "never generated" by the MPC8xx. > */ > - . = 0x400 > -InstructionAccess: > - EXCEPTION_PROLOG > - mr r4,r12 > - mr r5,r9 > - EXC_XFER_LITE(0x400, handle_page_fault) > + EXCEPTION(0x400, InstructionAccess, unknown_exception, EXC_XFER_STD) > > /* External interrupt */ > EXCEPTION(0x500, HardwareInterrupt, do_IRQ, EXC_XFER_LITE) > @@ -382,7 +376,7 @@ InstructionTLBMiss: > #endif > mfspr r10, SPRN_SPRG_SCRATCH2 > EXCEPTION_EPILOG_0 > - b InstructionAccess > + b InstructionTLBError > > . = 0x1200 > DataStoreTLBMiss: > @@ -477,7 +471,10 @@ DataStoreTLBMiss: > */ > . = 0x1300 > InstructionTLBError: > - b InstructionAccess > + EXCEPTION_PROLOG > + mr r4,r12 > + mr r5,r9 > + EXC_XFER_LITE(0x1300, handle_page_fault) This changes trap nr from 0x400 to 0x1300 for InstuctionAccess which I think bad as Linux uses the trap nr in arch/powerpc/mm/fault.c Same comment for patch 7 Jocke
diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S index 3af6db1..fbe5d10 100644 --- a/arch/powerpc/kernel/head_8xx.S +++ b/arch/powerpc/kernel/head_8xx.S @@ -234,15 +234,9 @@ DataAccess: EXC_XFER_LITE(0x300, handle_page_fault) /* Instruction access exception. - * This is "never generated" by the MPC8xx. We jump to it for other - * translation errors. + * This is "never generated" by the MPC8xx. */ - . = 0x400 -InstructionAccess: - EXCEPTION_PROLOG - mr r4,r12 - mr r5,r9 - EXC_XFER_LITE(0x400, handle_page_fault) + EXCEPTION(0x400, InstructionAccess, unknown_exception, EXC_XFER_STD) /* External interrupt */ EXCEPTION(0x500, HardwareInterrupt, do_IRQ, EXC_XFER_LITE) @@ -382,7 +376,7 @@ InstructionTLBMiss: #endif mfspr r10, SPRN_SPRG_SCRATCH2 EXCEPTION_EPILOG_0 - b InstructionAccess + b InstructionTLBError . = 0x1200 DataStoreTLBMiss: @@ -477,7 +471,10 @@ DataStoreTLBMiss: */ . = 0x1300 InstructionTLBError: - b InstructionAccess + EXCEPTION_PROLOG + mr r4,r12 + mr r5,r9 + EXC_XFER_LITE(0x1300, handle_page_fault) /* This is the data TLB error on the MPC8xx. This could be due to * many reasons, including a dirty update to a pte. We can catch that
Exception InstructionAccess does not exist on MPC8xx. No need to branch there from somewhere else. Handling can be done directly in InstructionTLBError Exception. Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> --- arch/powerpc/kernel/head_8xx.S | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-)