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

Merge tag 'powerpc-6.1-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Michael Ellerman:

 - Fix an endian thinko in the asm-generic compat_arg_u64() which led to
   syscall arguments being swapped for some compat syscalls.

 - Fix syscall wrapper handling of syscalls with 64-bit arguments on
   32-bit kernels, which led to syscall arguments being misplaced.

 - A build fix for amdgpu on Book3E with AltiVec disabled.

Thanks to Andreas Schwab, Christian Zigotzky, and Arnd Bergmann.

* tag 'powerpc-6.1-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/32: Select ARCH_SPLIT_ARG64
  powerpc/32: fix syscall wrappers with 64-bit arguments
  asm-generic: compat: fix compat_arg_u64() and compat_arg_u64_dual()
  powerpc/64e: Fix amdgpu build on Book3E w/o AltiVec
parents 8e5423e9 02a771c9

arch/powerpc/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ config PPC 
	select ARCH_MIGHT_HAVE_PC_SERIO

	select ARCH_OPTIONAL_KERNEL_RWX		if ARCH_HAS_STRICT_KERNEL_RWX

	select ARCH_OPTIONAL_KERNEL_RWX_DEFAULT

	select ARCH_SPLIT_ARG64			if PPC32

	select ARCH_STACKWALK

	select ARCH_SUPPORTS_ATOMIC_RMW

	select ARCH_SUPPORTS_DEBUG_PAGEALLOC	if PPC_BOOK3S || PPC_8xx || 40x
@@ -285,7 +286,7 @@ config PPC 
	#



config PPC_LONG_DOUBLE_128

	depends on PPC64

	depends on PPC64 && ALTIVEC

	def_bool $(success,test "$(shell,echo __LONG_DOUBLE_128__ | $(CC) -E -P -)" = 1)



config PPC_BARRIER_NOSPEC

arch/powerpc/include/asm/syscalls.h

+7 −0
Original line number Diff line number Diff line
@@ -104,6 +104,13 @@ long sys_ppc_ftruncate64(unsigned int fd, u32 reg4, 
			 unsigned long len1, unsigned long len2);

long sys_ppc32_fadvise64(int fd, u32 unused, u32 offset1, u32 offset2,

			 size_t len, int advice);

long sys_ppc_sync_file_range2(int fd, unsigned int flags,

			      unsigned int offset1,

			      unsigned int offset2,

			      unsigned int nbytes1,

			      unsigned int nbytes2);

long sys_ppc_fallocate(int fd, int mode, u32 offset1, u32 offset2,

		       u32 len1, u32 len2);

#endif

#ifdef CONFIG_COMPAT

long compat_sys_mmap2(unsigned long addr, size_t len,

arch/powerpc/kernel/sys_ppc32.c

+12 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ PPC32_SYSCALL_DEFINE6(ppc32_fadvise64, 
				 advice);

}



COMPAT_SYSCALL_DEFINE6(ppc_sync_file_range2,

PPC32_SYSCALL_DEFINE6(ppc_sync_file_range2,

		       int, fd, unsigned int, flags,

		       unsigned int, offset1, unsigned int, offset2,

		       unsigned int, nbytes1, unsigned int, nbytes2)
@@ -122,3 +122,14 @@ COMPAT_SYSCALL_DEFINE6(ppc_sync_file_range2, 


	return ksys_sync_file_range(fd, offset, nbytes, flags);

}



#ifdef CONFIG_PPC32

SYSCALL_DEFINE6(ppc_fallocate,

		int, fd, int, mode,

		u32, offset1, u32, offset2, u32, len1, u32, len2)

{

	return ksys_fallocate(fd, mode,

			      merge_64(offset1, offset2),

			      merge_64(len1, len2));

}

#endif

arch/powerpc/kernel/syscalls/syscall.tbl

+5 −2
Original line number Diff line number Diff line
@@ -394,8 +394,11 @@ 
305	common	signalfd			sys_signalfd			compat_sys_signalfd

306	common	timerfd_create			sys_timerfd_create

307	common	eventfd				sys_eventfd

308	common	sync_file_range2		sys_sync_file_range2		compat_sys_ppc_sync_file_range2

309	nospu	fallocate			sys_fallocate			compat_sys_fallocate

308	32	sync_file_range2		sys_ppc_sync_file_range2	compat_sys_ppc_sync_file_range2

308	64	sync_file_range2		sys_sync_file_range2

308	spu	sync_file_range2		sys_sync_file_range2

309	32	fallocate			sys_ppc_fallocate		compat_sys_fallocate

309	64	fallocate			sys_fallocate

310	nospu	subpage_prot			sys_subpage_prot

311	32	timerfd_settime			sys_timerfd_settime32

311	64	timerfd_settime			sys_timerfd_settime

include/asm-generic/compat.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#endif



#ifndef compat_arg_u64

#ifdef CONFIG_CPU_BIG_ENDIAN

#ifndef CONFIG_CPU_BIG_ENDIAN

#define compat_arg_u64(name)		u32  name##_lo, u32  name##_hi

#define compat_arg_u64_dual(name)	u32, name##_lo, u32, name##_hi

#else