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

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

Pull powerpc fixes from Michael Ellerman:
 "A couple of weeks of fixes.

  There's one fix for an oops on Power9 machines with Open CAPI
  adapters.

  And a fix for probable memory corruption in some of the new NPU code,
  caught by smatch though and not seen in the wild.

  Plus a few other minor fixes.

  There's one non-fix which is the perf_regs change. That was sent
  during the merge window but I accidentally only merged the first of
  two patches in the series. It's been in linux-next so hopefully
  doesn't conflict with anything in acme's tree.

  Thanks to: Alexey Kardashevskiy, Andrew Donnellan, Breno Leitao,
  Christian Lamparter, Christophe Leroy, Dan Carpenter, Frederic Barrat,
  Greg Kurz, Jason A. Donenfeld, Madhavan Srinivasan"

* tag 'powerpc-5.0-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/syscalls: Fix syscall tracing
  powerpc/pseries: Fix build break due to pnv_npu2_init()
  powerpc/4xx/ocm: Fix fix for phys_addr_t printf warnings
  powerpc/powernv/npu: Fix oops in pnv_try_setup_npu_table_group()
  powerpc/tm: Limit TM code inside PPC_TRANSACTIONAL_MEM
  powerpc/8xx: fix setting of pagetable for Abatron BDI debug tool.
  powerpc/powernv/npu: Allocate enough memory in pnv_try_setup_npu_table_group()
  powerpc/perf: Update perf_regs structure to include MMCRA
parents e6ec2fda 7bea7ac0

arch/powerpc/include/uapi/asm/perf_regs.h

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ enum perf_event_powerpc_regs { 
	PERF_REG_POWERPC_DAR,

	PERF_REG_POWERPC_DSISR,

	PERF_REG_POWERPC_SIER,

	PERF_REG_POWERPC_MMCRA,

	PERF_REG_POWERPC_MAX,

};

#endif /* _UAPI_ASM_POWERPC_PERF_REGS_H */

arch/powerpc/kernel/head_8xx.S

+2 −1
Original line number Diff line number Diff line
@@ -852,11 +852,12 @@ start_here: 


	/* set up the PTE pointers for the Abatron bdiGDB.

	*/

	tovirt(r6,r6)

	lis	r5, abatron_pteptrs@h

	ori	r5, r5, abatron_pteptrs@l

	stw	r5, 0xf0(0)	/* Must match your Abatron config file */

	tophys(r5,r5)

	lis	r6, swapper_pg_dir@h

	ori	r6, r6, swapper_pg_dir@l

	stw	r6, 0(r5)



/* Now turn on the MMU for real! */

arch/powerpc/kernel/signal_64.c

+4 −3
Original line number Diff line number Diff line
@@ -755,11 +755,12 @@ SYSCALL_DEFINE0(rt_sigreturn) 
		if (restore_tm_sigcontexts(current, &uc->uc_mcontext,

					   &uc_transact->uc_mcontext))

			goto badframe;

	}

	} else

#endif

	/* Fall through, for non-TM restore */

	if (!MSR_TM_ACTIVE(msr)) {

	{

		/*

		 * Fall through, for non-TM restore

		 *

		 * Unset MSR[TS] on the thread regs since MSR from user

		 * context does not have MSR active, and recheckpoint was

		 * not called since restore_tm_sigcontexts() was not called

arch/powerpc/kernel/trace/ftrace.c

+0 −7
Original line number Diff line number Diff line
@@ -967,13 +967,6 @@ out: 
}

#endif /* CONFIG_FUNCTION_GRAPH_TRACER */



#if defined(CONFIG_FTRACE_SYSCALLS) && defined(CONFIG_PPC64)

unsigned long __init arch_syscall_addr(int nr)

{

	return sys_call_table[nr*2];

}

#endif /* CONFIG_FTRACE_SYSCALLS && CONFIG_PPC64 */



#ifdef PPC64_ELF_ABI_v1

char *arch_ftrace_match_adjust(char *str, const char *search)

{

arch/powerpc/perf/perf_regs.c

+6 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ static unsigned int pt_regs_offset[PERF_REG_POWERPC_MAX] = { 
	PT_REGS_OFFSET(PERF_REG_POWERPC_DAR, dar),

	PT_REGS_OFFSET(PERF_REG_POWERPC_DSISR, dsisr),

	PT_REGS_OFFSET(PERF_REG_POWERPC_SIER, dar),

	PT_REGS_OFFSET(PERF_REG_POWERPC_MMCRA, dsisr),

};



u64 perf_reg_value(struct pt_regs *regs, int idx)
@@ -83,6 +84,11 @@ u64 perf_reg_value(struct pt_regs *regs, int idx) 
	    !is_sier_available()))

		return 0;



	if (idx == PERF_REG_POWERPC_MMCRA &&

	   (IS_ENABLED(CONFIG_FSL_EMB_PERF_EVENT) ||

	    IS_ENABLED(CONFIG_PPC32)))

		return 0;



	return regs_get_register(regs, pt_regs_offset[idx]);

}