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

Merge tag 'powerpc-5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Michael Ellerman:

 - A series of bpf fixes, including an oops fix and some codegen fixes.

 - Fix a regression in syscall_get_arch() for compat processes.

 - Fix boot failure on some 32-bit systems with KASAN enabled.

 - A couple of other build/minor fixes.

Thanks to Athira Rajeev, Christophe Leroy, Dmitry V. Levin, Jiri Olsa,
Johan Almbladh, Maxime Bizon, Naveen N. Rao, and Nicholas Piggin.

* tag 'powerpc-5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/64s: Mask SRR0 before checking against the masked NIP
  powerpc/perf: Only define power_pmu_wants_prompt_pmi() for CONFIG_PPC64
  powerpc/32s: Fix kasan_init_region() for KASAN
  powerpc/time: Fix build failure due to do_hard_irq_enable() on PPC32
  powerpc/audit: Fix syscall_get_arch()
  powerpc64/bpf: Limit 'ldbrx' to processors compliant with ISA v2.06
  tools/bpf: Rename 'struct event' to avoid naming conflict
  powerpc/bpf: Update ldimm64 instructions during extra pass
  powerpc32/bpf: Fix codegen for bpf-to-bpf calls
  bpf: Guard against accessing NULL pt_regs in bpf_get_task_stack()
parents ac5a9bb6 aee101d7

arch/powerpc/include/asm/book3s/32/mmu-hash.h

+2 −0
Original line number Diff line number Diff line
@@ -223,6 +223,8 @@ static __always_inline void update_user_segments(u32 val) 
	update_user_segment(15, val);

}



int __init find_free_bat(void);

unsigned int bat_block_size(unsigned long base, unsigned long top);

#endif /* !__ASSEMBLY__ */



/* We happily ignore the smaller BATs on 601, we don't actually use

arch/powerpc/include/asm/hw_irq.h

+1 −1
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ static inline bool arch_irq_disabled_regs(struct pt_regs *regs) 
	return !(regs->msr & MSR_EE);

}



static inline bool should_hard_irq_enable(void)

static __always_inline bool should_hard_irq_enable(void)

{

	return false;

}

arch/powerpc/include/asm/ppc-opcode.h

+1 −0
Original line number Diff line number Diff line
@@ -500,6 +500,7 @@ 
#define PPC_RAW_LDX(r, base, b)		(0x7c00002a | ___PPC_RT(r) | ___PPC_RA(base) | ___PPC_RB(b))

#define PPC_RAW_LHZ(r, base, i)		(0xa0000000 | ___PPC_RT(r) | ___PPC_RA(base) | IMM_L(i))

#define PPC_RAW_LHBRX(r, base, b)	(0x7c00062c | ___PPC_RT(r) | ___PPC_RA(base) | ___PPC_RB(b))

#define PPC_RAW_LWBRX(r, base, b)	(0x7c00042c | ___PPC_RT(r) | ___PPC_RA(base) | ___PPC_RB(b))

#define PPC_RAW_LDBRX(r, base, b)	(0x7c000428 | ___PPC_RT(r) | ___PPC_RA(base) | ___PPC_RB(b))

#define PPC_RAW_STWCX(s, a, b)		(0x7c00012d | ___PPC_RS(s) | ___PPC_RA(a) | ___PPC_RB(b))

#define PPC_RAW_CMPWI(a, i)		(0x2c000000 | ___PPC_RA(a) | IMM_L(i))

arch/powerpc/include/asm/syscall.h

+2 −2
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static inline void syscall_get_arguments(struct task_struct *task, 
	unsigned long val, mask = -1UL;

	unsigned int n = 6;



	if (is_32bit_task())

	if (is_tsk_32bit_task(task))

		mask = 0xffffffff;



	while (n--) {
@@ -105,7 +105,7 @@ static inline void syscall_get_arguments(struct task_struct *task, 


static inline int syscall_get_arch(struct task_struct *task)

{

	if (is_32bit_task())

	if (is_tsk_32bit_task(task))

		return AUDIT_ARCH_PPC;

	else if (IS_ENABLED(CONFIG_CPU_LITTLE_ENDIAN))

		return AUDIT_ARCH_PPC64LE;

arch/powerpc/include/asm/thread_info.h

+2 −0
Original line number Diff line number Diff line
@@ -168,8 +168,10 @@ static inline bool test_thread_local_flags(unsigned int flags) 


#ifdef CONFIG_COMPAT

#define is_32bit_task()	(test_thread_flag(TIF_32BIT))

#define is_tsk_32bit_task(tsk)	(test_tsk_thread_flag(tsk, TIF_32BIT))

#else

#define is_32bit_task()	(IS_ENABLED(CONFIG_PPC32))

#define is_tsk_32bit_task(tsk)	(IS_ENABLED(CONFIG_PPC32))

#endif



#if defined(CONFIG_PPC64)