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

Merge tag 'powerpc-5.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Michael Ellerman:
 "Some more powerpc fixes for 5.12:

   - Fix wrong instruction encoding for lis in ppc_function_entry(),
     which could potentially lead to missed kprobes.

   - Fix SET_FULL_REGS on 32-bit and 64e, which prevented ptrace of
     non-volatile GPRs immediately after exec.

   - Clean up a missed SRR specifier in the recent interrupt rework.

   - Don't treat unrecoverable_exception() as an interrupt handler, it's
     called from other handlers so shouldn't do the interrupt entry/exit
     accounting itself.

   - Fix build errors caused by missing declarations for
     [en/dis]able_kernel_vsx().

  Thanks to Christophe Leroy, Daniel Axtens, Geert Uytterhoeven, Jiri
  Olsa, Naveen N. Rao, and Nicholas Piggin"

* tag 'powerpc-5.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/traps: unrecoverable_exception() is not an interrupt handler
  powerpc: Fix missing declaration of [en/dis]able_kernel_vsx()
  powerpc/64s/exception: Clean up a missed SRR specifier
  powerpc: Fix inverted SET_FULL_REGS bitop
  powerpc/64s: Use symbolic macros for function entry encoding
  powerpc/64s: Fix instruction encoding for lis in ppc_function_entry()
parents 9d0c8e79 0b736881

arch/powerpc/include/asm/code-patching.h

+4 −3
Original line number Diff line number Diff line
@@ -73,9 +73,10 @@ void __patch_exception(int exc, unsigned long addr); 
#endif



#define OP_RT_RA_MASK	0xffff0000UL

#define LIS_R2		0x3c020000UL

#define ADDIS_R2_R12	0x3c4c0000UL

#define ADDI_R2_R2	0x38420000UL

#define LIS_R2		(PPC_INST_ADDIS | __PPC_RT(R2))

#define ADDIS_R2_R12	(PPC_INST_ADDIS | __PPC_RT(R2) | __PPC_RA(R12))

#define ADDI_R2_R2	(PPC_INST_ADDI  | __PPC_RT(R2) | __PPC_RA(R2))





static inline unsigned long ppc_function_entry(void *func)

{

arch/powerpc/include/asm/interrupt.h

+2 −1
Original line number Diff line number Diff line
@@ -410,7 +410,6 @@ DECLARE_INTERRUPT_HANDLER(altivec_assist_exception); 
DECLARE_INTERRUPT_HANDLER(CacheLockingException);

DECLARE_INTERRUPT_HANDLER(SPEFloatingPointException);

DECLARE_INTERRUPT_HANDLER(SPEFloatingPointRoundException);

DECLARE_INTERRUPT_HANDLER(unrecoverable_exception);

DECLARE_INTERRUPT_HANDLER(WatchdogException);

DECLARE_INTERRUPT_HANDLER(kernel_bad_stack);
@@ -437,6 +436,8 @@ DECLARE_INTERRUPT_HANDLER_NMI(hmi_exception_realmode); 


DECLARE_INTERRUPT_HANDLER_ASYNC(TAUException);



void unrecoverable_exception(struct pt_regs *regs);



void replay_system_reset(void);

void replay_soft_interrupts(void);

arch/powerpc/include/asm/ptrace.h

+2 −2
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ static inline void regs_set_return_value(struct pt_regs *regs, unsigned long rc) 
#define TRAP_FLAGS_MASK		0x11

#define TRAP(regs)		((regs)->trap & ~TRAP_FLAGS_MASK)

#define FULL_REGS(regs)		(((regs)->trap & 1) == 0)

#define SET_FULL_REGS(regs)	((regs)->trap |= 1)

#define SET_FULL_REGS(regs)	((regs)->trap &= ~1)

#endif

#define CHECK_FULL_REGS(regs)	BUG_ON(!FULL_REGS(regs))

#define NV_REG_POISON		0xdeadbeefdeadbeefUL
@@ -210,7 +210,7 @@ static inline void regs_set_return_value(struct pt_regs *regs, unsigned long rc) 
#define TRAP_FLAGS_MASK		0x1F

#define TRAP(regs)		((regs)->trap & ~TRAP_FLAGS_MASK)

#define FULL_REGS(regs)		(((regs)->trap & 1) == 0)

#define SET_FULL_REGS(regs)	((regs)->trap |= 1)

#define SET_FULL_REGS(regs)	((regs)->trap &= ~1)

#define IS_CRITICAL_EXC(regs)	(((regs)->trap & 2) != 0)

#define IS_MCHECK_EXC(regs)	(((regs)->trap & 4) != 0)

#define IS_DEBUG_EXC(regs)	(((regs)->trap & 8) != 0)

arch/powerpc/include/asm/switch_to.h

+10 −0
Original line number Diff line number Diff line
@@ -71,6 +71,16 @@ static inline void disable_kernel_vsx(void) 
{

	msr_check_and_clear(MSR_FP|MSR_VEC|MSR_VSX);

}

#else

static inline void enable_kernel_vsx(void)

{

	BUILD_BUG();

}



static inline void disable_kernel_vsx(void)

{

	BUILD_BUG();

}

#endif



#ifdef CONFIG_SPE

arch/powerpc/kernel/exceptions-64s.S

+1 −1
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ DEFINE_FIXED_SYMBOL(\name\()_common_real) 


	ld	r10,PACAKMSR(r13)	/* get MSR value for kernel */

	/* MSR[RI] is clear iff using SRR regs */

	.if IHSRR == EXC_HV_OR_STD

	.if IHSRR_IF_HVMODE

	BEGIN_FTR_SECTION

	xori	r10,r10,MSR_RI

	END_FTR_SECTION_IFCLR(CPU_FTR_HVMODE)