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

Commit 078a5a4f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux 

Pull arm64 fixes from Will Deacon:
 "I'm safely chained back up to my desk, so please pull these arm64
  fixes for -rc1 that address some issues that cropped up during the
  merge window:

   - Prevent KASLR from mapping the top page of the virtual address
     space

   - Fix device-tree probing of SDEI driver

   - Fix incorrect register offset definition in Hisilicon DDRC PMU
     driver

   - Fix compilation issue with older binutils not liking unsigned
     immediates

   - Fix uapi headers so that libc can provide its own sigcontext
     definition

   - Fix handling of private compat syscalls

   - Hook up compat io_pgetevents() syscall for 32-bit tasks

   - Cleanup to arm64 Makefile (including now to avoid silly conflicts)"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: compat: Hook up io_pgetevents() for 32-bit tasks
  arm64: compat: Don't pull syscall number from regs in arm_compat_syscall
  arm64: compat: Avoid sending SIGILL for unallocated syscall numbers
  arm64/sve: Disentangle <uapi/asm/ptrace.h> from <uapi/asm/sigcontext.h>
  arm64/sve: ptrace: Fix SVE_PT_REGS_OFFSET definition
  drivers/perf: hisi: Fixup one DDRC PMU register offset
  arm64: replace arm64-obj-* in Makefile with obj-*
  arm64: kaslr: Reserve size of ARM64_MEMSTART_ALIGN in linear region
  firmware: arm_sdei: Fix DT platform device creation
  firmware: arm_sdei: fix wrong of_node_put() in init function
  arm64: entry: remove unused register aliases
  arm64: smp: Fix compilation error
parents 1205b623 7e0b44e8

arch/arm64/include/asm/smp.h

+5 −3
Original line number Diff line number Diff line
@@ -16,9 +16,11 @@ 
#ifndef __ASM_SMP_H

#define __ASM_SMP_H



#include <linux/const.h>



/* Values for secondary_data.status */

#define CPU_STUCK_REASON_SHIFT		(8)

#define CPU_BOOT_STATUS_MASK		((1U << CPU_STUCK_REASON_SHIFT) - 1)

#define CPU_BOOT_STATUS_MASK		((UL(1) << CPU_STUCK_REASON_SHIFT) - 1)



#define CPU_MMU_OFF			(-1)

#define CPU_BOOT_SUCCESS		(0)
@@ -29,8 +31,8 @@ 
/* Fatal system error detected by secondary CPU, crash the system */

#define CPU_PANIC_KERNEL		(3)



#define CPU_STUCK_REASON_52_BIT_VA	(1U << CPU_STUCK_REASON_SHIFT)

#define CPU_STUCK_REASON_NO_GRAN	(2U << CPU_STUCK_REASON_SHIFT)

#define CPU_STUCK_REASON_52_BIT_VA	(UL(1) << CPU_STUCK_REASON_SHIFT)

#define CPU_STUCK_REASON_NO_GRAN	(UL(2) << CPU_STUCK_REASON_SHIFT)



#ifndef __ASSEMBLY__

arch/arm64/include/asm/unistd.h

+4 −3
Original line number Diff line number Diff line
@@ -42,8 +42,9 @@ 
#define __ARM_NR_COMPAT_BASE		0x0f0000

#define __ARM_NR_compat_cacheflush	(__ARM_NR_COMPAT_BASE + 2)

#define __ARM_NR_compat_set_tls		(__ARM_NR_COMPAT_BASE + 5)

#define __ARM_NR_COMPAT_END		(__ARM_NR_COMPAT_BASE + 0x800)



#define __NR_compat_syscalls		399

#define __NR_compat_syscalls		400

#endif



#define __ARCH_WANT_SYS_CLONE

arch/arm64/include/asm/unistd32.h

+2 −0
Original line number Diff line number Diff line
@@ -819,6 +819,8 @@ __SYSCALL(__NR_pkey_free, sys_pkey_free) 
__SYSCALL(__NR_statx, sys_statx)

#define __NR_rseq 398

__SYSCALL(__NR_rseq, sys_rseq)

#define __NR_io_pgetevents 399

__SYSCALL(__NR_io_pgetevents, compat_sys_io_pgetevents)



/*

 * Please add new compat syscalls above this comment and update

arch/arm64/include/uapi/asm/ptrace.h

+18 −21
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <linux/types.h>



#include <asm/hwcap.h>

#include <asm/sigcontext.h>

#include <asm/sve_context.h>





/*
@@ -131,8 +131,8 @@ struct user_sve_header { 


/* Offset from the start of struct user_sve_header to the register data */

#define SVE_PT_REGS_OFFSET						\

	((sizeof(struct sve_context) + (SVE_VQ_BYTES - 1))	\

		/ SVE_VQ_BYTES * SVE_VQ_BYTES)

	((sizeof(struct user_sve_header) + (__SVE_VQ_BYTES - 1))	\

		/ __SVE_VQ_BYTES * __SVE_VQ_BYTES)



/*

 * The register data content and layout depends on the value of the
@@ -178,39 +178,36 @@ struct user_sve_header { 
 * Additional data might be appended in the future.

 */



#define SVE_PT_SVE_ZREG_SIZE(vq)	SVE_SIG_ZREG_SIZE(vq)

#define SVE_PT_SVE_PREG_SIZE(vq)	SVE_SIG_PREG_SIZE(vq)

#define SVE_PT_SVE_FFR_SIZE(vq)		SVE_SIG_FFR_SIZE(vq)

#define SVE_PT_SVE_ZREG_SIZE(vq)	__SVE_ZREG_SIZE(vq)

#define SVE_PT_SVE_PREG_SIZE(vq)	__SVE_PREG_SIZE(vq)

#define SVE_PT_SVE_FFR_SIZE(vq)		__SVE_FFR_SIZE(vq)

#define SVE_PT_SVE_FPSR_SIZE		sizeof(__u32)

#define SVE_PT_SVE_FPCR_SIZE		sizeof(__u32)



#define __SVE_SIG_TO_PT(offset) \

	((offset) - SVE_SIG_REGS_OFFSET + SVE_PT_REGS_OFFSET)



#define SVE_PT_SVE_OFFSET		SVE_PT_REGS_OFFSET



#define SVE_PT_SVE_ZREGS_OFFSET \

	__SVE_SIG_TO_PT(SVE_SIG_ZREGS_OFFSET)

	(SVE_PT_REGS_OFFSET + __SVE_ZREGS_OFFSET)

#define SVE_PT_SVE_ZREG_OFFSET(vq, n) \

	__SVE_SIG_TO_PT(SVE_SIG_ZREG_OFFSET(vq, n))

	(SVE_PT_REGS_OFFSET + __SVE_ZREG_OFFSET(vq, n))

#define SVE_PT_SVE_ZREGS_SIZE(vq) \

	(SVE_PT_SVE_ZREG_OFFSET(vq, SVE_NUM_ZREGS) - SVE_PT_SVE_ZREGS_OFFSET)

	(SVE_PT_SVE_ZREG_OFFSET(vq, __SVE_NUM_ZREGS) - SVE_PT_SVE_ZREGS_OFFSET)



#define SVE_PT_SVE_PREGS_OFFSET(vq) \

	__SVE_SIG_TO_PT(SVE_SIG_PREGS_OFFSET(vq))

	(SVE_PT_REGS_OFFSET + __SVE_PREGS_OFFSET(vq))

#define SVE_PT_SVE_PREG_OFFSET(vq, n) \

	__SVE_SIG_TO_PT(SVE_SIG_PREG_OFFSET(vq, n))

	(SVE_PT_REGS_OFFSET + __SVE_PREG_OFFSET(vq, n))

#define SVE_PT_SVE_PREGS_SIZE(vq) \

	(SVE_PT_SVE_PREG_OFFSET(vq, SVE_NUM_PREGS) - \

	(SVE_PT_SVE_PREG_OFFSET(vq, __SVE_NUM_PREGS) - \

		SVE_PT_SVE_PREGS_OFFSET(vq))



#define SVE_PT_SVE_FFR_OFFSET(vq) \

	__SVE_SIG_TO_PT(SVE_SIG_FFR_OFFSET(vq))

	(SVE_PT_REGS_OFFSET + __SVE_FFR_OFFSET(vq))



#define SVE_PT_SVE_FPSR_OFFSET(vq)				\

	((SVE_PT_SVE_FFR_OFFSET(vq) + SVE_PT_SVE_FFR_SIZE(vq) +	\

			(SVE_VQ_BYTES - 1))			\

		/ SVE_VQ_BYTES * SVE_VQ_BYTES)

			(__SVE_VQ_BYTES - 1))			\

		/ __SVE_VQ_BYTES * __SVE_VQ_BYTES)

#define SVE_PT_SVE_FPCR_OFFSET(vq) \

	(SVE_PT_SVE_FPSR_OFFSET(vq) + SVE_PT_SVE_FPSR_SIZE)
@@ -221,8 +218,8 @@ struct user_sve_header { 


#define SVE_PT_SVE_SIZE(vq, flags)					\

	((SVE_PT_SVE_FPCR_OFFSET(vq) + SVE_PT_SVE_FPCR_SIZE		\

			- SVE_PT_SVE_OFFSET + (SVE_VQ_BYTES - 1))	\

		/ SVE_VQ_BYTES * SVE_VQ_BYTES)

			- SVE_PT_SVE_OFFSET + (__SVE_VQ_BYTES - 1))	\

		/ __SVE_VQ_BYTES * __SVE_VQ_BYTES)



#define SVE_PT_SIZE(vq, flags)						\

	 (((flags) & SVE_PT_REGS_MASK) == SVE_PT_REGS_SVE ?		\

arch/arm64/include/uapi/asm/sigcontext.h

+28 −28
Original line number Diff line number Diff line
@@ -130,6 +130,8 @@ struct sve_context { 


#endif /* !__ASSEMBLY__ */



#include <asm/sve_context.h>



/*

 * The SVE architecture leaves space for future expansion of the

 * vector length beyond its initial architectural limit of 2048 bits
@@ -138,21 +140,20 @@ struct sve_context { 
 * See linux/Documentation/arm64/sve.txt for a description of the VL/VQ

 * terminology.

 */

#define SVE_VQ_BYTES		16	/* number of bytes per quadword */

#define SVE_VQ_BYTES		__SVE_VQ_BYTES	/* bytes per quadword */



#define SVE_VQ_MIN		1

#define SVE_VQ_MAX		512

#define SVE_VQ_MIN		__SVE_VQ_MIN

#define SVE_VQ_MAX		__SVE_VQ_MAX



#define SVE_VL_MIN		(SVE_VQ_MIN * SVE_VQ_BYTES)

#define SVE_VL_MAX		(SVE_VQ_MAX * SVE_VQ_BYTES)

#define SVE_VL_MIN		__SVE_VL_MIN

#define SVE_VL_MAX		__SVE_VL_MAX



#define SVE_NUM_ZREGS		32

#define SVE_NUM_PREGS		16

#define SVE_NUM_ZREGS		__SVE_NUM_ZREGS

#define SVE_NUM_PREGS		__SVE_NUM_PREGS



#define sve_vl_valid(vl) \

	((vl) % SVE_VQ_BYTES == 0 && (vl) >= SVE_VL_MIN && (vl) <= SVE_VL_MAX)

#define sve_vq_from_vl(vl)	((vl) / SVE_VQ_BYTES)

#define sve_vl_from_vq(vq)	((vq) * SVE_VQ_BYTES)

#define sve_vl_valid(vl)	__sve_vl_valid(vl)

#define sve_vq_from_vl(vl)	__sve_vq_from_vl(vl)

#define sve_vl_from_vq(vq)	__sve_vl_from_vq(vq)



/*

 * If the SVE registers are currently live for the thread at signal delivery,
@@ -205,34 +206,33 @@ struct sve_context { 
 * Additional data might be appended in the future.

 */



#define SVE_SIG_ZREG_SIZE(vq)	((__u32)(vq) * SVE_VQ_BYTES)

#define SVE_SIG_PREG_SIZE(vq)	((__u32)(vq) * (SVE_VQ_BYTES / 8))

#define SVE_SIG_FFR_SIZE(vq)	SVE_SIG_PREG_SIZE(vq)

#define SVE_SIG_ZREG_SIZE(vq)	__SVE_ZREG_SIZE(vq)

#define SVE_SIG_PREG_SIZE(vq)	__SVE_PREG_SIZE(vq)

#define SVE_SIG_FFR_SIZE(vq)	__SVE_FFR_SIZE(vq)



#define SVE_SIG_REGS_OFFSET					\

	((sizeof(struct sve_context) + (SVE_VQ_BYTES - 1))	\

		/ SVE_VQ_BYTES * SVE_VQ_BYTES)

	((sizeof(struct sve_context) + (__SVE_VQ_BYTES - 1))	\

		/ __SVE_VQ_BYTES * __SVE_VQ_BYTES)



#define SVE_SIG_ZREGS_OFFSET	SVE_SIG_REGS_OFFSET

#define SVE_SIG_ZREGS_OFFSET \

		(SVE_SIG_REGS_OFFSET + __SVE_ZREGS_OFFSET)

#define SVE_SIG_ZREG_OFFSET(vq, n) \

	(SVE_SIG_ZREGS_OFFSET + SVE_SIG_ZREG_SIZE(vq) * (n))

#define SVE_SIG_ZREGS_SIZE(vq) \

	(SVE_SIG_ZREG_OFFSET(vq, SVE_NUM_ZREGS) - SVE_SIG_ZREGS_OFFSET)

		(SVE_SIG_REGS_OFFSET + __SVE_ZREG_OFFSET(vq, n))

#define SVE_SIG_ZREGS_SIZE(vq) __SVE_ZREGS_SIZE(vq)



#define SVE_SIG_PREGS_OFFSET(vq) \

	(SVE_SIG_ZREGS_OFFSET + SVE_SIG_ZREGS_SIZE(vq))

		(SVE_SIG_REGS_OFFSET + __SVE_PREGS_OFFSET(vq))

#define SVE_SIG_PREG_OFFSET(vq, n) \

	(SVE_SIG_PREGS_OFFSET(vq) + SVE_SIG_PREG_SIZE(vq) * (n))

#define SVE_SIG_PREGS_SIZE(vq) \

	(SVE_SIG_PREG_OFFSET(vq, SVE_NUM_PREGS) - SVE_SIG_PREGS_OFFSET(vq))

		(SVE_SIG_REGS_OFFSET + __SVE_PREG_OFFSET(vq, n))

#define SVE_SIG_PREGS_SIZE(vq) __SVE_PREGS_SIZE(vq)



#define SVE_SIG_FFR_OFFSET(vq) \

	(SVE_SIG_PREGS_OFFSET(vq) + SVE_SIG_PREGS_SIZE(vq))

		(SVE_SIG_REGS_OFFSET + __SVE_FFR_OFFSET(vq))



#define SVE_SIG_REGS_SIZE(vq) \

	(SVE_SIG_FFR_OFFSET(vq) + SVE_SIG_FFR_SIZE(vq) - SVE_SIG_REGS_OFFSET)



#define SVE_SIG_CONTEXT_SIZE(vq) (SVE_SIG_REGS_OFFSET + SVE_SIG_REGS_SIZE(vq))

		(__SVE_FFR_OFFSET(vq) + __SVE_FFR_SIZE(vq))



#define SVE_SIG_CONTEXT_SIZE(vq) \

		(SVE_SIG_REGS_OFFSET + SVE_SIG_REGS_SIZE(vq))



#endif /* _UAPI__ASM_SIGCONTEXT_H */