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

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

Pull powerpc fixes from Michael Ellerman:
 "This is a bit of a big batch for rc4, but just due to holiday hangover
  and because I didn't send any fixes last week due to a late revert
  request. I think next week should be back to normal.

   - Fix ftrace bug on boot caused by exit text sections with
     '-fpatchable-function-entry'

   - Fix accuracy of stolen time on pseries since the switch to
     VIRT_CPU_ACCOUNTING_GEN

   - Fix a crash in the IOMMU code when doing DLPAR remove

   - Set pt_regs->link on scv entry to fix BPF stack unwinding

   - Add missing PPC_FEATURE_BOOKE on 64-bit e5500/e6500, which broke
     gdb

   - Fix boot on some 6xx platforms with STRICT_KERNEL_RWX enabled

   - Fix build failures with KASAN enabled and 32KB stack size

   - Some other minor fixes

  Thanks to Arnd Bergmann, Benjamin Gray, Christophe Leroy, David
  Engraf, Gaurav Batra, Jason Gunthorpe, Jiangfeng Xiao, Matthias
  Schiffer, Nathan Lynch, Naveen N Rao, Nicholas Piggin, Nysal Jan K.A,
  R Nageswara Sastry, Shivaprasad G Bhat, Shrikanth Hegde, Spoorthy,
  Srikar Dronamraju, and Venkat Rao Bagalkote"

* tag 'powerpc-6.8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/iommu: Fix the missing iommu_group_put() during platform domain attach
  powerpc/pseries: fix accuracy of stolen time
  powerpc/ftrace: Ignore ftrace locations in exit text sections
  powerpc/cputable: Add missing PPC_FEATURE_BOOKE on PPC64 Book-E
  powerpc/kasan: Limit KASAN thread size increase to 32KB
  Revert "powerpc/pseries/iommu: Fix iommu initialisation during DLPAR add"
  powerpc: 85xx: mark local functions static
  powerpc: udbg_memcons: mark functions static
  powerpc/kasan: Fix addr error caused by page alignment
  powerpc/6xx: set High BAT Enable flag on G2_LE cores
  selftests/powerpc/papr_vpd: Check devfd before get_system_loc_code()
  powerpc/64: Set task pt_regs->link to the LR value on scv entry
  powerpc/pseries/iommu: Fix iommu initialisation during DLPAR add
  powerpc/pseries/papr-sysparm: use u8 arrays for payloads
parents f2667e0c 0846dd77

arch/powerpc/include/asm/ftrace.h

+2 −8
Original line number Diff line number Diff line
@@ -20,14 +20,6 @@ 
#ifndef __ASSEMBLY__

extern void _mcount(void);



static inline unsigned long ftrace_call_adjust(unsigned long addr)

{

	if (IS_ENABLED(CONFIG_ARCH_USING_PATCHABLE_FUNCTION_ENTRY))

		addr += MCOUNT_INSN_SIZE;



	return addr;

}



unsigned long prepare_ftrace_return(unsigned long parent, unsigned long ip,

				    unsigned long sp);
@@ -142,8 +134,10 @@ static inline u8 this_cpu_get_ftrace_enabled(void) { return 1; } 
#ifdef CONFIG_FUNCTION_TRACER

extern unsigned int ftrace_tramp_text[], ftrace_tramp_init[];

void ftrace_free_init_tramp(void);

unsigned long ftrace_call_adjust(unsigned long addr);

#else

static inline void ftrace_free_init_tramp(void) { }

static inline unsigned long ftrace_call_adjust(unsigned long addr) { return addr; }

#endif

#endif /* !__ASSEMBLY__ */

arch/powerpc/include/asm/papr-sysparm.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ typedef struct { 
 */

struct papr_sysparm_buf {

	__be16 len;

	char val[PAPR_SYSPARM_MAX_OUTPUT];

	u8 val[PAPR_SYSPARM_MAX_OUTPUT];

};



struct papr_sysparm_buf *papr_sysparm_buf_alloc(void);

arch/powerpc/include/asm/reg.h

+2 −0
Original line number Diff line number Diff line
@@ -617,6 +617,8 @@ 
#endif

#define SPRN_HID2	0x3F8		/* Hardware Implementation Register 2 */

#define SPRN_HID2_GEKKO	0x398		/* Gekko HID2 Register */

#define SPRN_HID2_G2_LE	0x3F3		/* G2_LE HID2 Register */

#define  HID2_G2_LE_HBE	(1<<18)		/* High BAT Enable (G2_LE) */

#define SPRN_IABR	0x3F2	/* Instruction Address Breakpoint Register */

#define SPRN_IABR2	0x3FA		/* 83xx */

#define SPRN_IBCR	0x135		/* 83xx Insn Breakpoint Control Reg */

arch/powerpc/include/asm/sections.h

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ typedef struct func_desc func_desc_t; 


extern char __head_end[];

extern char __srwx_boundary[];

extern char __exittext_begin[], __exittext_end[];



/* Patch sites */

extern s32 patch__call_flush_branch_caches1;

arch/powerpc/include/asm/thread_info.h

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 


#ifdef __KERNEL__



#ifdef CONFIG_KASAN

#if defined(CONFIG_KASAN) && CONFIG_THREAD_SHIFT < 15

#define MIN_THREAD_SHIFT	(CONFIG_THREAD_SHIFT + 1)

#else

#define MIN_THREAD_SHIFT	CONFIG_THREAD_SHIFT