Merge branch 'base/hikey' into hikey

Author: ldts

Documentation/arm64/ilp32.txt

@@ -422,13 +422,9 @@ menu "Userspace binary formats"
 source "fs/Kconfig.binfmt"
 
 config COMPAT
-	def_bool y
-	depends on AARCH32_EL0 || ARM64_ILP32
-	select COMPAT_BINFMT_ELF
-
-config AARCH32_EL0
 	bool "Kernel support for 32-bit EL0"
 	depends on !ARM64_64K_PAGES
+	select COMPAT_BINFMT_ELF
 	select HAVE_UID16
 	select OLD_SIGSUSPEND3
 	select COMPAT_OLD_SIGACTION
@@ -440,16 +436,9 @@ config AARCH32_EL0
 
 	  If you want to execute 32-bit userspace applications, say Y.
 
-config ARM64_ILP32
-	bool "Kernel support for ILP32"
-	help
-	  This option enables support for AArch64 ILP32 user space.  ILP32
-	  is an ABI where long and pointers are 32bits but it uses the AARCH64
-	  instruction set.
-
 config SYSVIPC_COMPAT
 	def_bool y
-	depends on AARCH32_EL0 && SYSVIPC
+	depends on COMPAT && SYSVIPC
 
 endmenu
 

arch/arm64/Kconfig

@@ -18,18 +18,14 @@ GZFLAGS		:=-9
 KBUILD_DEFCONFIG := defconfig
 
 KBUILD_CFLAGS	+= -mgeneral-regs-only
-KBUILD_CFLAGS	+= $(call cc-option,-mabi=lp64)
-KBUILD_AFLAGS	+= $(call cc-option,-mabi=lp64)
 ifeq ($(CONFIG_CPU_BIG_ENDIAN), y)
 KBUILD_CPPFLAGS	+= -mbig-endian
 AS		+= -EB
 LD		+= -EB
-LDFLAGS		+= -maarch64linuxb
 else
 KBUILD_CPPFLAGS	+= -mlittle-endian
 AS		+= -EL
 LD		+= -EL
-LDFLAGS		+= -maarch64linux
 endif
 
 CHECKFLAGS	+= -D__aarch64__

arch/arm64/Makefile

@@ -76,9 +76,6 @@ struct compat_timeval {
 	s32		tv_usec;
 };
 
-/* ILP32 uses 64bit time_t and not the above compat structures */
-#define COMPAT_USE_64BIT_TIME (!is_a32_compat_task())
-
 struct compat_stat {
 #ifdef __AARCH64EB__
 	short		st_dev;
@@ -211,9 +208,6 @@ typedef struct compat_siginfo {
 	} _sifields;
 } compat_siginfo_t;
 
-/* ILP32 uses the native siginfo and not the compat struct */
-#define COMPAT_USE_NATIVE_SIGINFO	(!is_a32_compat_task())
-
 #define COMPAT_OFF_T_MAX	0x7fffffff
 #define COMPAT_LOFF_T_MAX	0x7fffffffffffffffL
 
@@ -299,16 +293,6 @@ struct compat_shmid64_ds {
 	compat_ulong_t __unused5;
 };
 
-#define COMPAT_ELF_HWCAP	\
-	(is_a32_compat_task()	\
-	  ? compat_elf_hwcap	\
-	  : elf_hwcap)
-
-#define COMPAT_ELF_HWCAP2	\
-	(is_a32_compat_task()	\
-	  ? compat_elf_hwcap2	\
-	  : 0)
-
 static inline int is_compat_task(void)
 {
 	return test_thread_flag(TIF_32BIT);
@@ -327,48 +311,5 @@ static inline int is_compat_thread(struct thread_info *thread)
 }
 
 #endif /* CONFIG_COMPAT */
-
-#ifdef CONFIG_AARCH32_EL0
-static inline int is_a32_compat_task(void)
-{
-	return test_thread_flag(TIF_AARCH32);
-}
-static inline int is_a32_compat_thread(struct thread_info *thread)
-{
-	return test_ti_thread_flag(thread, TIF_AARCH32);
-}
-#else
-static inline int is_a32_compat_task(void)
-{
-	return 0;
-}
-static inline int is_a32_compat_thread(struct thread_info *thread)
-{
-	return 0;
-}
-#endif
-
-#ifdef CONFIG_ARM64_ILP32
-static inline int is_ilp32_compat_task(void)
-{
-	return test_thread_flag(TIF_32BIT) && !is_a32_compat_task();
-}
-static inline int is_ilp32_compat_thread(struct thread_info *thread)
-{
-	return test_ti_thread_flag(thread, TIF_32BIT) &&
-	       !is_a32_compat_thread(thread);
-}
-#else
-static inline int is_ilp32_compat_task(void)
-{
-	return 0;
-}
-static inline int is_ilp32_compat_thread(struct thread_info *thread)
-{
-	return 0;
-}
-#endif
-
-
 #endif /* __KERNEL__ */
 #endif /* __ASM_COMPAT_H */

arch/arm64/include/asm/compat.h

@@ -16,7 +16,6 @@
 #ifndef __ASM_ELF_H
 #define __ASM_ELF_H
 
-#include <asm/errno.h>
 #include <asm/hwcap.h>
 
 /*
@@ -136,11 +135,7 @@ extern unsigned long randomize_et_dyn(unsigned long base);
  */
 #define ELF_PLAT_INIT(_r, load_addr)	(_r)->regs[0] = 0
 
-#define SET_PERSONALITY(ex)			\
-do {						\
-	clear_thread_flag(TIF_AARCH32);		\
-	clear_thread_flag(TIF_32BIT);		\
-} while (0)
+#define SET_PERSONALITY(ex)		clear_thread_flag(TIF_32BIT);
 
 #define ARCH_DLINFO							\
 do {									\
@@ -176,100 +171,23 @@ extern unsigned long arch_randomize_brk(struct mm_struct *mm);
 
 #define COMPAT_ELF_ET_DYN_BASE		(2 * TASK_SIZE_32 / 3)
 
-#ifdef CONFIG_AARCH32_EL0
-
 /* AArch32 registers. */
-#define COMPAT_A32_ELF_NGREG		18
-typedef unsigned int			compat_a32_elf_greg_t;
-typedef compat_a32_elf_greg_t		compat_a32_elf_gregset_t[COMPAT_A32_ELF_NGREG];
+#define COMPAT_ELF_NGREG		18
+typedef unsigned int			compat_elf_greg_t;
+typedef compat_elf_greg_t		compat_elf_gregset_t[COMPAT_ELF_NGREG];
 
 /* AArch32 EABI. */
 #define EF_ARM_EABI_MASK		0xff000000
-#define compat_a32_elf_check_arch(x)	(((x)->e_machine == EM_ARM) && \
+#define compat_elf_check_arch(x)	(((x)->e_machine == EM_ARM) && \
 					 ((x)->e_flags & EF_ARM_EABI_MASK))
 
 #define compat_start_thread		compat_start_thread
-#define COMPAT_A32_SET_PERSONALITY(ex)		\
-do {						\
-	set_thread_flag(TIF_AARCH32);		\
-	set_thread_flag(TIF_32BIT);		\
-} while (0)
-#define COMPAT_A32_ARCH_DLINFO		do {} while (0)
+#define COMPAT_SET_PERSONALITY(ex)	set_thread_flag(TIF_32BIT);
+#define COMPAT_ARCH_DLINFO
 extern int aarch32_setup_vectors_page(struct linux_binprm *bprm,
 				      int uses_interp);
-
-#else
-typedef elf_greg_t			compat_elf_greg_t;
-typedef elf_gregset_t			compat_elf_gregset_t;
-#define compat_a32_elf_check_arch(x)	0
-#define COMPAT_A32_SET_PERSONALITY(ex)	do {} while (0)
-#define COMPAT_A32_ARCH_DLINFO		do {} while (0)
-static inline int aarch32_setup_vectors_page(struct linux_binprm *bprm,
-					     int uses_interp)
-{
-	return -EINVAL;
-}
-#endif
-
-/*
- * If ILP32 is turned on, we want to define the compat_elf_greg_t to the non compat
- * one and define PR_REG_SIZE/PRSTATUS_SIZE/SET_PR_FPVALID so we pick up the correct
- * ones for AARCH32.
- */
-#ifdef CONFIG_ARM64_ILP32
-typedef elf_greg_t			compat_elf_greg_t;
-typedef elf_gregset_t			compat_elf_gregset_t;
-#define COMPAT_PR_REG_SIZE(S)		(is_a32_compat_task() ? 72 : 272)
-#define COMPAT_PRSTATUS_SIZE(S)		(is_a32_compat_task() ? 124 : 352)
-#define COMPAT_SET_PR_FPVALID(S, V)							\
-do {										\
-	*(int *) (((void *) &((S)->pr_reg)) + PR_REG_SIZE((S)->pr_reg)) = (V);	\
-} while (0)
-#else
-typedef compat_a32_elf_greg_t compat_elf_greg_t;
-typedef compat_a32_elf_gregset_t compat_elf_gregset_t;
-#endif
-
-#ifdef CONFIG_ARM64_ILP32
-#define compat_ilp32_elf_check_arch(x) ((x)->e_machine == EM_AARCH64)
-#define COMPAT_ILP32_SET_PERSONALITY(ex)	\
-do {						\
-	clear_thread_flag(TIF_AARCH32);		\
-	set_thread_flag(TIF_32BIT);		\
-} while (0)
-#define COMPAT_ILP32_ARCH_DLINFO					\
-do {									\
-	NEW_AUX_ENT(AT_SYSINFO_EHDR,					\
-		    (elf_addr_t)(long)current->mm->context.vdso);	\
-} while (0)
-#else
-#define compat_ilp32_elf_check_arch(x) 0
-#define COMPAT_ILP32_SET_PERSONALITY(ex)	do {} while (0)
-#define COMPAT_ILP32_ARCH_DLINFO		do {} while (0)
-#endif
-
-#define compat_elf_check_arch(x)	(compat_a32_elf_check_arch(x) || compat_ilp32_elf_check_arch(x))
-#define COMPAT_SET_PERSONALITY(ex)			\
-do {							\
-	if (compat_a32_elf_check_arch(&ex))		\
-		COMPAT_A32_SET_PERSONALITY(ex);		\
-	else						\
-		COMPAT_ILP32_SET_PERSONALITY(ex);	\
-} while (0)
-
-/* ILP32 uses the "LP64-like" vdso pages */
-#define compat_arch_setup_additional_pages	\
-	(is_a32_compat_task()			\
-	 ? &aarch32_setup_vectors_page		\
-	 : &(arch_setup_additional_pages))
-
-#define COMPAT_ARCH_DLINFO			\
-do {						\
-	if (is_a32_compat_task())		\
-		COMPAT_A32_ARCH_DLINFO;		\
-	else					\
-		COMPAT_ILP32_ARCH_DLINFO;	\
-} while (0)
+#define compat_arch_setup_additional_pages \
+					aarch32_setup_vectors_page
 
 #endif /* CONFIG_COMPAT */
 

arch/arm64/include/asm/elf.h

@@ -52,7 +52,7 @@ struct fpsimd_partial_state {
 };
 
 
-#if defined(__KERNEL__) && defined(CONFIG_AARCH32_EL0)
+#if defined(__KERNEL__) && defined(CONFIG_COMPAT)
 /* Masks for extracting the FPSR and FPCR from the FPSCR */
 #define VFP_FPSCR_STAT_MASK	0xf800009f
 #define VFP_FPSCR_CTRL_MASK	0x07f79f00

arch/arm64/include/asm/fpsimd.h

@@ -46,6 +46,8 @@
 #define ELF_HWCAP		(elf_hwcap)
 
 #ifdef CONFIG_COMPAT
+#define COMPAT_ELF_HWCAP	(compat_elf_hwcap)
+#define COMPAT_ELF_HWCAP2	(compat_elf_hwcap2)
 extern unsigned int compat_elf_hwcap, compat_elf_hwcap2;
 #endif
 

arch/arm64/include/asm/hwcap.h

@@ -104,17 +104,6 @@ static inline void start_thread(struct pt_regs *regs, unsigned long pc,
 static inline void compat_start_thread(struct pt_regs *regs, unsigned long pc,
 				       unsigned long sp)
 {
-#ifdef CONFIG_ARM64_ILP32
-	/*
-	 * ILP32 thread are started the same way as LP64 threads.
-	 * Note we cannot use is_ilp32_compat_task here as that
-	 * would introduce a header depency issue.
-	 */
-	if (!test_thread_flag(TIF_AARCH32)) {
-		start_thread(regs, pc, sp);
-		return;
-	}
-#endif
 	start_thread_common(regs, pc);
 	regs->pstate = COMPAT_PSR_MODE_USR;
 	if (pc & 1)

arch/arm64/include/asm/processor.h

@@ -113,7 +113,7 @@ struct pt_regs {
 
 #define arch_has_single_step()	(1)
 
-#ifdef CONFIG_AARCH32_EL0
+#ifdef CONFIG_COMPAT
 #define compat_thumb_mode(regs) \
 	(((regs)->pstate & COMPAT_PSR_T_BIT))
 #else

arch/arm64/include/asm/ptrace.h

@@ -17,7 +17,7 @@
 #define __ASM_SIGNAL32_H
 
 #ifdef __KERNEL__
-#ifdef CONFIG_AARCH32_EL0
+#ifdef CONFIG_COMPAT
 #include <linux/compat.h>
 
 #define AARCH32_KERN_SIGRET_CODE_OFFSET	0x500
@@ -47,6 +47,6 @@ static inline int compat_setup_rt_frame(int usig, struct ksignal *ksig, sigset_t
 static inline void compat_setup_restart_syscall(struct pt_regs *regs)
 {
 }
-#endif /* CONFIG_AARCH32_EL0 */
+#endif /* CONFIG_COMPAT */
 #endif /* __KERNEL__ */
 #endif /* __ASM_SIGNAL32_H */