Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Pull powerpc fixes from Michael Ellerman:

 - Fix 32-bit TCE table init in kdump kernel from Nish

 - Fix kdump with non-power-of-2 crashkernel= from Nish

 - Abort cxl_pci_enable_device_hook() if PCI channel is offline from
   Andrew

 - Fix to release DRC when configure_connector() fails from Bharata

 - Wire up sys_userfaultfd()

 - Fix race condition in tearing down MSI interrupts from Paul

 - Fix unbalanced pci_dev_get() in cxl_probe() from Daniel

 - Fix cxl build failure due to -Wunused-variable gcc behaviour change
   from Ian

 - Tell the toolchain to use ABI v2 when building an LE boot wrapper
   from Benh

 - Fix THP to recompute hash value after a failed update from Aneesh

 - 32-bit memcpy/memset: only use dcbz once cache is enabled from
   Christophe

* tag 'powerpc-4.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc32: memset: only use dcbz once cache is enabled
  powerpc32: memcpy: only use dcbz once cache is enabled
  powerpc/mm: Recompute hash value after a failed update
  powerpc/boot: Specify ABI v2 when building an LE boot wrapper
  cxl: Fix build failure due to -Wunused-variable behaviour change
  cxl: Fix unbalanced pci_dev_get in cxl_probe
  powerpc/MSI: Fix race condition in tearing down MSI interrupts
  powerpc: Wire up sys_userfaultfd()
  powerpc/pseries: Release DRC when configure_connector fails
  cxl: abort cxl_pci_enable_device_hook() if PCI channel is offline
  powerpc/powernv/pci-ioda: fix kdump with non-power-of-2 crashkernel=
  powerpc/powernv/pci-ioda: fix 32-bit TCE table init in kdump kernel
parents a7d5c189 400c47d8

arch/powerpc/boot/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ BOOTCFLAGS += -m64 
endif

ifdef CONFIG_CPU_BIG_ENDIAN

BOOTCFLAGS	+= -mbig-endian

else

BOOTCFLAGS	+= -mlittle-endian

BOOTCFLAGS	+= $(call cc-option,-mabi=elfv2)

endif



BOOTAFLAGS	:= -D__ASSEMBLY__ $(BOOTCFLAGS) -traditional -nostdinc

arch/powerpc/include/asm/systbl.h

+1 −0
Original line number Diff line number Diff line
@@ -368,3 +368,4 @@ SYSCALL_SPU(memfd_create) 
SYSCALL_SPU(bpf)

COMPAT_SYS(execveat)

PPC64ONLY(switch_endian)

SYSCALL_SPU(userfaultfd)

arch/powerpc/include/asm/unistd.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include <uapi/asm/unistd.h>





#define __NR_syscalls		364

#define __NR_syscalls		365



#define __NR__exit __NR_exit

#define NR_syscalls	__NR_syscalls

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

+1 −0
Original line number Diff line number Diff line
@@ -386,5 +386,6 @@ 
#define __NR_bpf		361

#define __NR_execveat		362

#define __NR_switch_endian	363

#define __NR_userfaultfd	364



#endif /* _UAPI_ASM_POWERPC_UNISTD_H_ */

arch/powerpc/kernel/setup_32.c

+6 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <asm/udbg.h>

#include <asm/mmu_context.h>

#include <asm/epapr_hcalls.h>

#include <asm/code-patching.h>



#define DBG(fmt...)
@@ -109,6 +110,8 @@ notrace unsigned long __init early_init(unsigned long dt_ptr) 
 * This is called very early on the boot process, after a minimal

 * MMU environment has been set up but before MMU_init is called.

 */

extern unsigned int memset_nocache_branch; /* Insn to be replaced by NOP */



notrace void __init machine_init(u64 dt_ptr)

{

	lockdep_init();
@@ -116,6 +119,9 @@ notrace void __init machine_init(u64 dt_ptr) 
	/* Enable early debugging if any specified (see udbg.h) */

	udbg_early_init();



	patch_instruction((unsigned int *)&memcpy, PPC_INST_NOP);

	patch_instruction(&memset_nocache_branch, PPC_INST_NOP);



	/* Do some early initialization based on the flat device tree */

	early_init_devtree(__va(dt_ptr));