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

Commit 4b6f2316 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-5.3-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.3:

   - Wire up the new clone3 syscall.

   - A fix for the PAPR SCM nvdimm driver, to fix a crash when firmware
     gives us a device that's attached to a non-online NUMA node.

   - A fix for a boot failure on 32-bit with KASAN enabled.

   - Three fixes for implicit fall through warnings, some of which are
     errors for us due to -Werror.

  Thanks to: Aneesh Kumar K.V, Christophe Leroy, Kees Cook, Santosh
  Sivaraj, Stephen Rothwell"

* tag 'powerpc-5.3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/kasan: fix early boot failure on PPC32
  drivers/macintosh/smu.c: Mark expected switch fall-through
  powerpc/spe: Mark expected switch fall-throughs
  powerpc/nvdimm: Pick nearby online node if the device node is not online
  powerpc/kvm: Fall through switch case explicitly
  powerpc: Wire up clone3 syscall
parents 4c0d228c d7e23b88

arch/powerpc/include/asm/unistd.h

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
#define __ARCH_WANT_SYS_FORK

#define __ARCH_WANT_SYS_VFORK

#define __ARCH_WANT_SYS_CLONE

#define __ARCH_WANT_SYS_CLONE3



#endif		/* __ASSEMBLY__ */

#endif /* _ASM_POWERPC_UNISTD_H_ */

arch/powerpc/kernel/align.c

+4 −0
Original line number Diff line number Diff line
@@ -176,9 +176,11 @@ static int emulate_spe(struct pt_regs *regs, unsigned int reg, 
			ret |= __get_user_inatomic(temp.v[1], p++);

			ret |= __get_user_inatomic(temp.v[2], p++);

			ret |= __get_user_inatomic(temp.v[3], p++);

			/* fall through */

		case 4:

			ret |= __get_user_inatomic(temp.v[4], p++);

			ret |= __get_user_inatomic(temp.v[5], p++);

			/* fall through */

		case 2:

			ret |= __get_user_inatomic(temp.v[6], p++);

			ret |= __get_user_inatomic(temp.v[7], p++);
@@ -259,9 +261,11 @@ static int emulate_spe(struct pt_regs *regs, unsigned int reg, 
			ret |= __put_user_inatomic(data.v[1], p++);

			ret |= __put_user_inatomic(data.v[2], p++);

			ret |= __put_user_inatomic(data.v[3], p++);

			/* fall through */

		case 4:

			ret |= __put_user_inatomic(data.v[4], p++);

			ret |= __put_user_inatomic(data.v[5], p++);

			/* fall through */

		case 2:

			ret |= __put_user_inatomic(data.v[6], p++);

			ret |= __put_user_inatomic(data.v[7], p++);

arch/powerpc/kernel/entry_32.S

+8 −0
Original line number Diff line number Diff line
@@ -597,6 +597,14 @@ ppc_clone: 
	stw	r0,_TRAP(r1)		/* register set saved */

	b	sys_clone



	.globl	ppc_clone3

ppc_clone3:

	SAVE_NVGPRS(r1)

	lwz	r0,_TRAP(r1)

	rlwinm	r0,r0,0,0,30		/* clear LSB to indicate full */

	stw	r0,_TRAP(r1)		/* register set saved */

	b	sys_clone3



	.globl	ppc_swapcontext

ppc_swapcontext:

	SAVE_NVGPRS(r1)

arch/powerpc/kernel/entry_64.S

+5 −0
Original line number Diff line number Diff line
@@ -487,6 +487,11 @@ _GLOBAL(ppc_clone) 
	bl	sys_clone

	b	.Lsyscall_exit



_GLOBAL(ppc_clone3)

       bl      save_nvgprs

       bl      sys_clone3

       b       .Lsyscall_exit



_GLOBAL(ppc32_swapcontext)

	bl	save_nvgprs

	bl	compat_sys_swapcontext

arch/powerpc/kernel/syscalls/syscall.tbl

+1 −1
Original line number Diff line number Diff line
@@ -516,4 +516,4 @@ 
432	common	fsmount				sys_fsmount

433	common	fspick				sys_fspick

434	common	pidfd_open			sys_pidfd_open

# 435 reserved for clone3
 
435	nospu	clone3				ppc_clone3