| Message ID | 20230327124520.2707537-11-npiggin@gmail.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | powerpc: updates, P10, PNV support | expand |
On 27/03/2023 14.45, Nicholas Piggin wrote: > Interrupt vectors were not being populated for all architected > interrupt types, which could lead to crashes rather than a message for > unhandled interrupts. > > 0x20 sized vectors require some reworking of the code to fit. This > also adds support for HV / HSRR type interrupts which will be used in > a later change. > > Signed-off-by: Nicholas Piggin <npiggin@gmail.com> > --- > powerpc/cstart64.S | 79 ++++++++++++++++++++++++++++++++++++++-------- > 1 file changed, 65 insertions(+), 14 deletions(-) Acked-by: Thomas Huth <thuth@redhat.com>
Hi Nick, On Mon, 27 Mar 2023 at 12:55, Nicholas Piggin <npiggin@gmail.com> wrote: > > Interrupt vectors were not being populated for all architected > interrupt types, which could lead to crashes rather than a message for > unhandled interrupts. > > 0x20 sized vectors require some reworking of the code to fit. This > also adds support for HV / HSRR type interrupts which will be used in > a later change. > > Signed-off-by: Nicholas Piggin <npiggin@gmail.com> > --- > powerpc/cstart64.S | 79 ++++++++++++++++++++++++++++++++++++++-------- > 1 file changed, 65 insertions(+), 14 deletions(-) > > diff --git a/powerpc/cstart64.S b/powerpc/cstart64.S > +handler_trampoline: > + mfctr r0 > + std r0,_CTR(r1) > + > + ld r0, P_HANDLER(0) > + mtctr r0 > + > + /* nip and msr */ > + mfsrr0 r0 I tried building the tests on a power8 box with binutils 2.34 and gas complains: powerpc/cstart64.S: Assembler messages: powerpc/cstart64.S:337: Error: unrecognized opcode: `mfhsrr0' powerpc/cstart64.S:340: Error: unrecognized opcode: `mfhsrr1' It appears this mnemonic is only supported for power10 (and were only added in binutils 2.36): $ git grep -i mfhsrr opcodes/ppc-opc.c:{"mfhsrr0", XSPR(31,339,314), XSPR_MASK, POWER10, EXT, {RS}}, opcodes/ppc-opc.c:{"mfhsrr1", XSPR(31,339,315), XSPR_MASK, POWER10, EXT, {RS}}, I replaced it with mfspr and the tests ran fine: @@ -334,10 +338,10 @@ handler_htrampoline: mtctr r0 /* nip and msr */ - mfhsrr0 r0 + mfspr r0, SPRN_HSRR0 std r0, _NIP(r1) - mfhsrr1 r0 + mfspr r0, SPRN_HSRR1 std r0, _MSR(r1) Cheers, Joel
diff --git a/powerpc/cstart64.S b/powerpc/cstart64.S index 34e3934..1bd0437 100644 --- a/powerpc/cstart64.S +++ b/powerpc/cstart64.S @@ -184,14 +184,6 @@ call_handler: mfcr r0 std r0,_CCR(r1) - /* nip and msr */ - - mfsrr0 r0 - std r0, _NIP(r1) - - mfsrr1 r0 - std r0, _MSR(r1) - /* restore TOC pointer */ LOAD_REG_IMMEDIATE(r31, SPAPR_KERNEL_LOAD_ADDR) @@ -238,6 +230,7 @@ call_handler: .section .text.ex +/* [H]VECTOR must not be more than 8 instructions to fit in 0x20 vectors */ .macro VECTOR vec . = \vec @@ -246,19 +239,28 @@ call_handler: subi r1,r1, INT_FRAME_SIZE /* save r0 and ctr to call generic handler */ - SAVE_GPR(0,r1) - mfctr r0 - std r0,_CTR(r1) + li r0,\vec + std r0,_TRAP(r1) - ld r0, P_HANDLER(0) - mtctr r0 + b handler_trampoline +.endm + +.macro HVECTOR vec + . = \vec + + mtsprg1 r1 /* save r1 */ + mfsprg0 r1 /* get exception stack address */ + subi r1,r1, INT_FRAME_SIZE + + /* save r0 and ctr to call generic handler */ + SAVE_GPR(0,r1) li r0,\vec std r0,_TRAP(r1) - bctr + b handler_htrampoline .endm . = 0x100 @@ -268,12 +270,61 @@ __start_interrupts: VECTOR(0x100) VECTOR(0x200) VECTOR(0x300) +VECTOR(0x380) VECTOR(0x400) +VECTOR(0x480) VECTOR(0x500) VECTOR(0x600) VECTOR(0x700) VECTOR(0x800) VECTOR(0x900) +HVECTOR(0x980) +VECTOR(0xa00) +VECTOR(0xc00) +VECTOR(0xd00) +HVECTOR(0xe00) +HVECTOR(0xe20) +HVECTOR(0xe40) +HVECTOR(0xe60) +HVECTOR(0xe80) +HVECTOR(0xea0) +VECTOR(0xf00) +VECTOR(0xf20) +VECTOR(0xf40) +VECTOR(0xf60) +HVECTOR(0xf80) + +handler_trampoline: + mfctr r0 + std r0,_CTR(r1) + + ld r0, P_HANDLER(0) + mtctr r0 + + /* nip and msr */ + mfsrr0 r0 + std r0, _NIP(r1) + + mfsrr1 r0 + std r0, _MSR(r1) + + bctr + +handler_htrampoline: + mfctr r0 + std r0,_CTR(r1) + + ld r0, P_HANDLER(0) + mtctr r0 + + /* nip and msr */ + mfhsrr0 r0 + std r0, _NIP(r1) + + mfhsrr1 r0 + std r0, _MSR(r1) + + bctr .align 7 .globl __end_interrupts
Interrupt vectors were not being populated for all architected interrupt types, which could lead to crashes rather than a message for unhandled interrupts. 0x20 sized vectors require some reworking of the code to fit. This also adds support for HV / HSRR type interrupts which will be used in a later change. Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- powerpc/cstart64.S | 79 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 65 insertions(+), 14 deletions(-)