Commit ecf93431 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-5.14-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Michael Ellerman:

 - Fix crashes coming out of nap on 32-bit Book3s (eg. powerbooks).

 - Fix critical and debug interrupts on BookE, seen as crashes when
   using ptrace.

 - Fix an oops when running an SMP kernel on a UP system.

 - Update pseries LPAR security flavor after partition migration.

 - Fix an oops when using kprobes on BookE.

 - Fix oops on 32-bit pmac by not calling do_IRQ() from
   timer_interrupt().

 - Fix softlockups on CPU hotplug into a CPU-less node with xive (P9).

Thanks to Cédric Le Goater, Christophe Leroy, Finn Thain, Geetika
Moolchandani, Laurent Dufour, Laurent Vivier, Nicholas Piggin, Pu Lehui,
Radu Rendec, Srikar Dronamraju, and Stan Johnson.

* tag 'powerpc-5.14-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/xive: Do not skip CPU-less nodes when creating the IPIs
  powerpc/interrupt: Do not call single_step_exception() from other exceptions
  powerpc/interrupt: Fix OOPS by not calling do_IRQ() from timer_interrupt()
  powerpc/kprobes: Fix kprobe Oops happens in booke
  powerpc/pseries: Fix update of LPAR security flavor after LPM
  powerpc/smp: Fix OOPS in topology_init()
  powerpc/32: Fix critical and debug interrupts on BOOKE
  powerpc/32s: Fix napping restore in data storage interrupt (DSI)
parents c4f14eac cbc06f05

arch/powerpc/include/asm/interrupt.h

+3 −0
Original line number Diff line number Diff line
@@ -583,6 +583,9 @@ DECLARE_INTERRUPT_HANDLER_NMI(hmi_exception_realmode); 


DECLARE_INTERRUPT_HANDLER_ASYNC(TAUException);



/* irq.c */

DECLARE_INTERRUPT_HANDLER_ASYNC(do_IRQ);



void __noreturn unrecoverable_exception(struct pt_regs *regs);



void replay_system_reset(void);

arch/powerpc/include/asm/irq.h

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ extern void *mcheckirq_ctx[NR_CPUS]; 
extern void *hardirq_ctx[NR_CPUS];

extern void *softirq_ctx[NR_CPUS];



extern void do_IRQ(struct pt_regs *regs);

void __do_IRQ(struct pt_regs *regs);

extern void __init init_IRQ(void);

extern void __do_irq(struct pt_regs *regs);

arch/powerpc/include/asm/ptrace.h

+16 −0
Original line number Diff line number Diff line
@@ -70,6 +70,22 @@ struct pt_regs 
		unsigned long __pad[4];	/* Maintain 16 byte interrupt stack alignment */

	};

#endif

#if defined(CONFIG_PPC32) && defined(CONFIG_BOOKE)

	struct { /* Must be a multiple of 16 bytes */

		unsigned long mas0;

		unsigned long mas1;

		unsigned long mas2;

		unsigned long mas3;

		unsigned long mas6;

		unsigned long mas7;

		unsigned long srr0;

		unsigned long srr1;

		unsigned long csrr0;

		unsigned long csrr1;

		unsigned long dsrr0;

		unsigned long dsrr1;

	};

#endif

};

#endif

arch/powerpc/kernel/asm-offsets.c

+14 −17
Original line number Diff line number Diff line
@@ -309,24 +309,21 @@ int main(void) 
	STACK_PT_REGS_OFFSET(STACK_REGS_IAMR, iamr);

#endif



#if defined(CONFIG_PPC32)

#if defined(CONFIG_BOOKE) || defined(CONFIG_40x)

	DEFINE(EXC_LVL_SIZE, STACK_EXC_LVL_FRAME_SIZE);

	DEFINE(MAS0, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, mas0));

#if defined(CONFIG_PPC32) && defined(CONFIG_BOOKE)

	STACK_PT_REGS_OFFSET(MAS0, mas0);

	/* we overload MMUCR for 44x on MAS0 since they are mutually exclusive */

	DEFINE(MMUCR, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, mas0));

	DEFINE(MAS1, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, mas1));

	DEFINE(MAS2, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, mas2));

	DEFINE(MAS3, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, mas3));

	DEFINE(MAS6, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, mas6));

	DEFINE(MAS7, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, mas7));

	DEFINE(_SRR0, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, srr0));

	DEFINE(_SRR1, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, srr1));

	DEFINE(_CSRR0, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, csrr0));

	DEFINE(_CSRR1, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, csrr1));

	DEFINE(_DSRR0, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, dsrr0));

	DEFINE(_DSRR1, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, dsrr1));

#endif

	STACK_PT_REGS_OFFSET(MMUCR, mas0);

	STACK_PT_REGS_OFFSET(MAS1, mas1);

	STACK_PT_REGS_OFFSET(MAS2, mas2);

	STACK_PT_REGS_OFFSET(MAS3, mas3);

	STACK_PT_REGS_OFFSET(MAS6, mas6);

	STACK_PT_REGS_OFFSET(MAS7, mas7);

	STACK_PT_REGS_OFFSET(_SRR0, srr0);

	STACK_PT_REGS_OFFSET(_SRR1, srr1);

	STACK_PT_REGS_OFFSET(_CSRR0, csrr0);

	STACK_PT_REGS_OFFSET(_CSRR1, csrr1);

	STACK_PT_REGS_OFFSET(_DSRR0, dsrr0);

	STACK_PT_REGS_OFFSET(_DSRR1, dsrr1);

#endif



	/* About the CPU features table */

arch/powerpc/kernel/head_book3s_32.S

+1 −1
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ ALT_MMU_FTR_SECTION_END_IFSET(MMU_FTR_HPTE_TABLE) 
	EXCEPTION_PROLOG_1

	EXCEPTION_PROLOG_2 INTERRUPT_DATA_STORAGE DataAccess handle_dar_dsisr=1

	prepare_transfer_to_handler

	lwz	r5, _DSISR(r11)

	lwz	r5, _DSISR(r1)

	andis.	r0, r5, DSISR_DABRMATCH@h

	bne-	1f

	bl	do_page_fault