Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935149AbcJUVG5 (ORCPT ); Fri, 21 Oct 2016 17:06:57 -0400 Received: from mail-by2nam01on0085.outbound.protection.outlook.com ([104.47.34.85]:22696 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932372AbcJUVGy (ORCPT ); Fri, 21 Oct 2016 17:06:54 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Yuri.Norov@caviumnetworks.com; From: Yury Norov To: , , , , , CC: , , , , , , , , , , , , , , , , , , , , , , Andrew Pinski , Andrew Pinski , Bamvor Jian Zhang Subject: [PATCH 03/18] arm64: rename COMPAT to AARCH32_EL0 in Kconfig Date: Fri, 21 Oct 2016 23:33:02 +0300 Message-ID: <1477081997-4770-4-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477081997-4770-1-git-send-email-ynorov@caviumnetworks.com> References: <1477081997-4770-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [95.143.213.121] X-ClientProxiedBy: AM2PR03CA0003.eurprd03.prod.outlook.com (10.160.207.13) To DM3PR07MB2249.namprd07.prod.outlook.com (10.164.33.147) X-MS-Office365-Filtering-Correlation-Id: 164bf056-c49e-4f6d-7314-08d3f9f19792 X-Microsoft-Exchange-Diagnostics: 1;DM3PR07MB2249;2:g5G/hyiZwXqNZ9M9M+H10l97M8MloDcVPe1K/39+N7ZZHlMKiX/mRAvJ+/Uv5tA1y3dFrbKroTWJ1Pexe9mP2p2hoh9+EkkdQbRGDQdG8VIva8m5NOHghU8JRZkn+rjTl9DXp0vwjFeVkUy2F84rVW1jab30+3lcE/FsItZd6bp/pyg10CXUTLMtouqGhyAsMA/ItbTZhjVxmzGKwHjZ9w==;3:l4KPF3Ql2Nva7vd/prOITim/LAal1kqyOS8FKxc48G+Br4YR1dzyQGqNpfoP5jorP254XvAAwuL/SeAQFproF59TSGsDeVuuNaAIDTf15ZAjNj+NNO4XWx9nmar0ol/I0Bthz3wGx28hUCinmKJClQ==;25:uILf4o7iP2NISNILGrD9G+yhcT6lxZ4f0fUJye+PJ+N085mzo7kKQDnOz+GUHlT+13FSzc3ApdF3DdO/N3td0LI60+ntgIDlp50TLIRY03/rbZgU2FH/EHzGYPu9480GTe2djPFIFyoXsU8Sg6ZvKgjHEa+gYwqTWaGJJsDeY8Vr7oxQS6SeyF/BUxbA9nhtY2r414ktPwHQF9ROy2UDBRSbcUSHtM5MAMX7+2wsy4KTKYvCC0G+GeJ7X3WVPHCLfJ8zCRRziOlnNkcy5z8FEuTkvHcDgQt3w8plWJ8l+XkLC8JgnxHt4HXL/ushhQgGdUQljc3mEe9VTaN7KUB72xh0PpUnVeB4IwYudP4vpDsV3DULjZdIzUfs9A28YElNuknHdWZGXMAH7rbIR2LgD6mnWwFL0aJht1MF5l42aqo= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM3PR07MB2249; X-Microsoft-Exchange-Diagnostics: 1;DM3PR07MB2249;31:vJKBdGUuhz5Lh4bjDvBroMPWm7PHK/SuSDFFpxzO5CVcx39UoNokF+H9m3Ra7Ra4sY1DKot3W8VilQn5904GJO1tzmusT54iwEnHXQjcZmBZ6tSCqPk8SBpGEfahgeMV6XeYGc0tT2eX1972PAMJHILO+p0/JgJ3kJm4D6sWEpfB4kF3utiq67HRvoc/b0v6hPSbCe3puUzjNB89iODLH92BhUYIxPRCKLS/+1+yMEBSp+YopXIKU04FVcijL+BofqkMUGyuADtrvceu0dLB3Q==;20:QI/k12KkIv+3mhY6vw1NvbU+4ToLAyoEh1bCazrWlVXxVWiRYLeaSgkgGS+bGUL5xBGo2cdh+Nw3F1kEzLNLhGER3STysa3cYeFm9xXADAezKUMACKFqlbSHXKa2ZyHCwIG6VWOxNF3MqgqYtwyx13ItCKVol833+jZRh5RB5ricjE3frhC1oTuZsEpRnO/RCbK+2iTGtA3gQ+3YSo3Z1F+a/lO8DhEDMPMVNbqPBgaJXvMBY6I/zeZeHXxQCOouGThDu5Falg99RYKv1qy55BzYQJQsi1TPE1IUvdUgJxiDEB3t1vQMBI6xDoRcriU3M/94aR3ER1EQAnYHNqZ0jZwGI6B7YKSf5YSsoildZ8FYtOaP8LJztrqBQ7Gf6UkCVHhMuzxUExyrVtFIr3KByjKSKzR05hggtYnWthHYpd+olslxCPXWQ1gWyLrBtAdpRf4qLw4tExMGVFSS18zuKJ9yeV5z9kw/ZIN/Xev5nUOpRH4wXzjU7CpC3ZkJUorkT+8oTqqJdjtb4w+Zn2gSOthW2ey5NUGhLmhDHIj47Q/fvesPG3iOt0HwDftYwcKWUvzqw1bpE0W71LqNiAZZTRPBW3iWEeXE0KUEyW3xlZs= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(250305191791016)(22074186197030); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040176)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046);SRVR:DM3PR07MB2249;BCL:0;PCL:0;RULEID:;SRVR:DM3PR07MB2249; X-Microsoft-Exchange-Diagnostics: 1;DM3PR07MB2249;4:0P3SH2p6lCt2w8OdQsa7ppEUXuhY2T3xDrI0PeEgEOtU3rDKc9iKdJ6ITD3bo7HkuJDhL7wxAITUB6GKZmyviSxcmJv8cVgr7w6nCzdZDC9wVnQSWgDUGPNr8Ww04xIyzgvXrCqRSGsdDmOWlRDtxdW7DtxAC1abRbPkLpLSEE1J0GQzTeEa4y91jgWkmSnXGKYpFRGxV6ZoOlwWBonMUFjrkIWX5vubVHZCpbwcVxvppBGI23uTyb8oizkbosK5zOgHUJqw449ojqBag3s1fwywVvkpJTaVrocxGIc06L+NdILhdo4Ui1M5RV6b+tcXtFhs0iKLrSexCgR4nBViX2exv4HmGJDZyjP6mqHHgGA1SyVgjOQzYu6oCsDuTTdUM4WlcqP2yMzTW9b/9J86VtKyrRLpp3dJdDe475IBKNtneAIuZksUHvNJpmV/WPYPlXB79OoMNGmQ90Fa+pbCALP+KSzCLCf3cRb/xM+GT/M= X-Forefront-PRVS: 01026E1310 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6069001)(6009001)(7916002)(189002)(199003)(50466002)(68736007)(5001770100001)(5660300001)(106356001)(101416001)(2906002)(575784001)(7736002)(48376002)(305945005)(2201001)(4326007)(7846002)(47776003)(6116002)(77096005)(15975445007)(2950100002)(19580405001)(19580395003)(36756003)(97736004)(586003)(229853001)(5003940100001)(66066001)(76506005)(7416002)(189998001)(42186005)(3846002)(92566002)(81156014)(105586002)(33646002)(50226002)(8676002)(76176999)(50986999)(81166006)(2101003);DIR:OUT;SFP:1101;SCL:1;SRVR:DM3PR07MB2249;H:localhost;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM3PR07MB2249;23:RQmnvKx2Jmvvqx88OLFJTvh1rQnyWa23lJUptY9ve?= =?us-ascii?Q?BlxiDdWC8iSHSSe4wcbUcfqYfzfrJKcBUoKyR7/oa2MbPgKak/FBMCkeJo82?= =?us-ascii?Q?ociPv2cQ18AD6SWnw36xWzBghoUUHxaPJUv83fZHbNY89eplofm1w6B2t7wD?= =?us-ascii?Q?yNQfgiVGy7ZKVC2md73PQdHsDp7rl78fGMc9B9TtebF2PINNV5N68XGUvq2m?= =?us-ascii?Q?ToM8qamRINkAfGxJRGxr3d/AlQpA9VfdgKTYB7GNG3s4+IBqClX6vNRZaErl?= =?us-ascii?Q?mmbllkDFbGiiUrY2nBiq9Y7B8lPOhIH99Vt0C6oBi/O15CWSlAwqEAleDAsn?= =?us-ascii?Q?NJtkhxQewcTfgnyWca4/WZII7dLwRSIJaKP1GJBdIKKKmyOUBVFhL0d67G/5?= =?us-ascii?Q?Ft0VmFYl4q1dKBlR1Lxmj1Sr2CDPN6r5DE3QclgPCExgwt+mQL0sQ9K3Ma+6?= =?us-ascii?Q?SOJDioxU0gi6/hfaai+dScBAgWYBPGmPalow9JO8/+BI3AAQ8gXj4rPVVC4x?= =?us-ascii?Q?zDoAHQYcLs8GI6sKu/31hL8ZdY9A49Yhft+nCqRvew9guR5LVoxDBzWc4vWf?= =?us-ascii?Q?/uzjUpkZClS0AkG5Qf8j7kpoFiZrLFMiYBcXWMxXnIpkQpQZFqYy82oxp1rp?= =?us-ascii?Q?vVm/w30yNnFE8iaXO6nkuys1z/m4vXZgHnhcHrOFFLRVCpbaIjFoLTP/QGpQ?= =?us-ascii?Q?i7gO7MME/hHdZNQZYeHh9iiw+zAMezAIKB/PECfLaKfjfJ6RIdpAfN7bp2SR?= =?us-ascii?Q?GCqDWXFXmVigoggmszH2qIoDOkcj1zD7gG4Hry7V5rVbnpOrDjdkbQ0Lyvd3?= =?us-ascii?Q?d8lZ6tqZ589MQ82IG7GxIhIOf+Jxn2iYH1CFa/7Nz+jfu1ZqGsXCTzRnaQm9?= =?us-ascii?Q?Swat6BX9QpLbKvs5a7qaSEqTLqy5PW9+OYW5Te/htU4Thn/nF/KreWVmFhmt?= =?us-ascii?Q?Q/vx7MLSvcGQvzKr2esLtnze3psNZLKBJfQTlROgnGivgtO1F9wd0HbTA2k0?= =?us-ascii?Q?12kLV+Gr1cKYjYtzPdEj++0hhgMjoOosH6jecDKOFGWbR2LNj2FX4EAR8hRy?= =?us-ascii?Q?doG/xTcKeH7MNstL1of4UvAXwFjgja7XCJqgastc7MdniSR7zLTQpVb1Ng6l?= =?us-ascii?Q?QVK2c26KLozp345Im4Ng01F/iFhVrAtZJv3OpxoGjfnnIUpSocYSWCIVLc5r?= =?us-ascii?Q?7gURAa03qZgeE6tK+FDeom61W+aM9kg6vKe?= X-Microsoft-Exchange-Diagnostics: 1;DM3PR07MB2249;6:nnzts7ZGgQhwOk6Io6tU5GCipEUPrLfLvOZM2L+fTjecpEu7PPjEiEQDO9a3FMHfQzQss6oTMqDWCupnVuoa0CUtskdd4+Rq9MXLs9Mh/CjseO1phQx5C9cfHpe36yXIldxFdtedr86KSpPDWmgJm4hg2B3cSog4DO8NlxfIp2Xdbd8QIQTiZ5bBHKMIcK7CISMzPimUq7SJmft5PTR49S9/jJXfA0pr4YUudan3M5voUnq3UZn/rhggxk0u19Pjn8LNL91IpRXg8adOlGDwIAc1zy/21sWvW+IOc+bjP8dSxOEneDB14axndwk+kjzN;5:52EMEJgSxL9MxX6NRT7u9CcMr6rxpcTRXlZpkukIQFoXlASm0a+/jxQKEatBBKEcLK0NXNuQe51q6ceD0/L1HIjSuTJs8vtQXHyn+RgV1D44PBGH9OzIQMqV0ydK+qKiLmUQ2hyLWyuTYB53nD+7Q0MtPv0henix945fuBkNYvc=;24:x4R+bkVJm7mAY8TpcQ8/tK9xg89qphZGeqeC6Tfp4KXTHY3MIt/lT4cmcjG21pLPT2Esu+YPrA+NCzJ1pnD+aZ9jOI7Ri0VBbTG8/c8oTwI=;7:mjSPFQ8kILhfKFBQz2suAZ3iKFhZsSCia1IXlN1THjhGvwlINxnwslaawzpwmVzlw5UR0umx9bgDLusIRUmAwE5um4P3xXLrAi17Pu95igPKD+FtBugxHbhYx1FnvXdfgZHshe5Q7B0COQVkueCWAI/MQf6zLwrfdi0oOt4/905PzdMgFQfNaU75/wH5yDZro3TwpIyCZAaVkX338LYGtTMfg5bZ/Eu7I0grthr9f68LoTHQqxpRcEsuFbIbwenNYIKE4EVjD+H1AfIW8hjy1YXaUXwPg3PUPH5TFnRaWIb72R6hBhMSm8R8BKbvHuA2d012gstoyrkdHDojnNAfQNgPqQlS56mza7H1K1iLLUA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2016 20:34:01.1120 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR07MB2249 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 14609 Lines: 429 From: Andrew Pinski In this patchset ILP32 ABI support is added. Additionally to AARCH32, which is binary-compatible with ARM, ILP32 is (mostly) ABI-compatible. >From now, AARCH32_EL0 (former COMPAT) config option means the support of AARCH32 userspace, ARM64_ILP32 - support of ILP32 ABI (see next patches), and COMPAT indicates that one of them, or both, is enabled. Where needed, CONFIG_COMPAT is changed over to use CONFIG_AARCH32_EL0 instead Signed-off-by: Andrew Pinski Signed-off-by: Yury Norov Signed-off-by: Philipp Tomsich Signed-off-by: Christoph Muellner Signed-off-by: Bamvor Jian Zhang --- arch/arm64/Kconfig | 10 ++++++++-- arch/arm64/include/asm/fpsimd.h | 2 +- arch/arm64/include/asm/hwcap.h | 4 ++-- arch/arm64/include/asm/processor.h | 6 +++--- arch/arm64/include/asm/ptrace.h | 2 +- arch/arm64/include/asm/seccomp.h | 2 +- arch/arm64/include/asm/signal32.h | 6 ++++-- arch/arm64/include/asm/unistd.h | 2 +- arch/arm64/kernel/Makefile | 2 +- arch/arm64/kernel/asm-offsets.c | 2 +- arch/arm64/kernel/cpufeature.c | 8 ++++---- arch/arm64/kernel/cpuinfo.c | 20 +++++++++++--------- arch/arm64/kernel/entry.S | 6 +++--- arch/arm64/kernel/head.S | 2 +- arch/arm64/kernel/ptrace.c | 8 ++++---- arch/arm64/kernel/traps.c | 2 +- arch/arm64/kernel/vdso.c | 4 ++-- drivers/clocksource/arm_arch_timer.c | 2 +- 18 files changed, 50 insertions(+), 40 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 30398db..0cd786e 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -396,7 +396,7 @@ config ARM64_ERRATUM_834220 config ARM64_ERRATUM_845719 bool "Cortex-A53: 845719: a load might read incorrect data" - depends on COMPAT + depends on AARCH32_EL0 default y help This option adds an alternative code sequence to work around ARM @@ -725,7 +725,7 @@ config FORCE_MAX_ZONEORDER menuconfig ARMV8_DEPRECATED bool "Emulate deprecated/obsolete ARMv8 instructions" - depends on COMPAT + depends on AARCH32_EL0 help Legacy software support may require certain instructions that have been deprecated or obsoleted in the architecture. @@ -995,8 +995,14 @@ menu "Userspace binary formats" source "fs/Kconfig.binfmt" config COMPAT + bool + depends on AARCH32_EL0 + +config AARCH32_EL0 bool "Kernel support for 32-bit EL0" + def_bool y depends on ARM64_4K_PAGES || EXPERT + select COMPAT select COMPAT_BINFMT_ELF select HAVE_UID16 select OLD_SIGSUSPEND3 diff --git a/arch/arm64/include/asm/fpsimd.h b/arch/arm64/include/asm/fpsimd.h index 50f559f..63b19f1 100644 --- a/arch/arm64/include/asm/fpsimd.h +++ b/arch/arm64/include/asm/fpsimd.h @@ -52,7 +52,7 @@ struct fpsimd_partial_state { }; -#if defined(__KERNEL__) && defined(CONFIG_COMPAT) +#if defined(__KERNEL__) && defined(CONFIG_AARCH32_EL0) /* Masks for extracting the FPSR and FPCR from the FPSCR */ #define VFP_FPSCR_STAT_MASK 0xf800009f #define VFP_FPSCR_CTRL_MASK 0x07f79f00 diff --git a/arch/arm64/include/asm/hwcap.h b/arch/arm64/include/asm/hwcap.h index 400b80b..2c7fc5d 100644 --- a/arch/arm64/include/asm/hwcap.h +++ b/arch/arm64/include/asm/hwcap.h @@ -46,7 +46,7 @@ */ #define ELF_HWCAP (elf_hwcap) -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 #define COMPAT_ELF_HWCAP (compat_elf_hwcap) #define COMPAT_ELF_HWCAP2 (compat_elf_hwcap2) extern unsigned int compat_elf_hwcap, compat_elf_hwcap2; @@ -54,7 +54,7 @@ extern unsigned int compat_elf_hwcap, compat_elf_hwcap2; enum { CAP_HWCAP = 1, -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 CAP_COMPAT_HWCAP, CAP_COMPAT_HWCAP2, #endif diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h index df2e53d..6173a7b 100644 --- a/arch/arm64/include/asm/processor.h +++ b/arch/arm64/include/asm/processor.h @@ -79,7 +79,7 @@ struct cpu_context { struct thread_struct { struct cpu_context cpu_context; /* cpu context */ unsigned long tp_value; /* TLS register */ -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 unsigned long tp2_value; #endif struct fpsimd_state fpsimd_state; @@ -88,7 +88,7 @@ struct thread_struct { struct debug_info debug; /* debugging */ }; -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 #define task_user_tls(t) \ ({ \ unsigned long *__tls; \ @@ -119,7 +119,7 @@ static inline void start_thread(struct pt_regs *regs, unsigned long pc, regs->sp = sp; } -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 static inline void compat_start_thread(struct pt_regs *regs, unsigned long pc, unsigned long sp) { diff --git a/arch/arm64/include/asm/ptrace.h b/arch/arm64/include/asm/ptrace.h index ada08b5..f5ca5f5 100644 --- a/arch/arm64/include/asm/ptrace.h +++ b/arch/arm64/include/asm/ptrace.h @@ -125,7 +125,7 @@ struct pt_regs { #define arch_has_single_step() (1) -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 #define compat_thumb_mode(regs) \ (((regs)->pstate & COMPAT_PSR_T_BIT)) #else diff --git a/arch/arm64/include/asm/seccomp.h b/arch/arm64/include/asm/seccomp.h index c76fac9..00ef0bf 100644 --- a/arch/arm64/include/asm/seccomp.h +++ b/arch/arm64/include/asm/seccomp.h @@ -13,7 +13,7 @@ #include -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 #define __NR_seccomp_read_32 __NR_compat_read #define __NR_seccomp_write_32 __NR_compat_write #define __NR_seccomp_exit_32 __NR_compat_exit diff --git a/arch/arm64/include/asm/signal32.h b/arch/arm64/include/asm/signal32.h index eeaa975..e68fcce 100644 --- a/arch/arm64/include/asm/signal32.h +++ b/arch/arm64/include/asm/signal32.h @@ -17,7 +17,9 @@ #define __ASM_SIGNAL32_H #ifdef __KERNEL__ -#ifdef CONFIG_COMPAT + +#ifdef CONFIG_AARCH32_EL0 + #include #define AARCH32_KERN_SIGRET_CODE_OFFSET 0x500 @@ -47,6 +49,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_COMPAT */ +#endif /* CONFIG_AARCH32_EL0 */ #endif /* __KERNEL__ */ #endif /* __ASM_SIGNAL32_H */ diff --git a/arch/arm64/include/asm/unistd.h b/arch/arm64/include/asm/unistd.h index e78ac26..fe9d6c1 100644 --- a/arch/arm64/include/asm/unistd.h +++ b/arch/arm64/include/asm/unistd.h @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 #define __ARCH_WANT_COMPAT_SYS_GETDENTS64 #define __ARCH_WANT_COMPAT_STAT64 #define __ARCH_WANT_SYS_GETHOSTNAME diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index 7d66bba..8a19fda 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -27,7 +27,7 @@ OBJCOPYFLAGS := --prefix-symbols=__efistub_ $(obj)/%.stub.o: $(obj)/%.o FORCE $(call if_changed,objcopy) -arm64-obj-$(CONFIG_COMPAT) += sys32.o kuser32.o signal32.o \ +arm64-obj-$(CONFIG_AARCH32_EL0) += sys32.o kuser32.o signal32.o \ sys_compat.o entry32.o arm64-obj-$(CONFIG_FUNCTION_TRACER) += ftrace.o entry-ftrace.o arm64-obj-$(CONFIG_MODULES) += arm64ksyms.o module.o diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c index 4a2f0f0..d8d7086 100644 --- a/arch/arm64/kernel/asm-offsets.c +++ b/arch/arm64/kernel/asm-offsets.c @@ -65,7 +65,7 @@ int main(void) DEFINE(S_X28, offsetof(struct pt_regs, regs[28])); DEFINE(S_LR, offsetof(struct pt_regs, regs[30])); DEFINE(S_SP, offsetof(struct pt_regs, sp)); -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 DEFINE(S_COMPAT_SP, offsetof(struct pt_regs, compat_sp)); #endif DEFINE(S_PSTATE, offsetof(struct pt_regs, pstate)); diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index b3ac0c4..12805ee 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -32,7 +32,7 @@ unsigned long elf_hwcap __read_mostly; EXPORT_SYMBOL_GPL(elf_hwcap); -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 #define COMPAT_ELF_HWCAP_DEFAULT \ (COMPAT_HWCAP_HALF|COMPAT_HWCAP_THUMB|\ COMPAT_HWCAP_FAST_MULT|COMPAT_HWCAP_EDSP|\ @@ -859,7 +859,7 @@ static const struct arm64_cpu_capabilities arm64_elf_hwcaps[] = { }; static const struct arm64_cpu_capabilities compat_elf_hwcaps[] = { -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 HWCAP_CAP(SYS_ID_ISAR5_EL1, ID_ISAR5_AES_SHIFT, FTR_UNSIGNED, 2, CAP_COMPAT_HWCAP2, COMPAT_HWCAP2_PMULL), HWCAP_CAP(SYS_ID_ISAR5_EL1, ID_ISAR5_AES_SHIFT, FTR_UNSIGNED, 1, CAP_COMPAT_HWCAP2, COMPAT_HWCAP2_AES), HWCAP_CAP(SYS_ID_ISAR5_EL1, ID_ISAR5_SHA1_SHIFT, FTR_UNSIGNED, 1, CAP_COMPAT_HWCAP2, COMPAT_HWCAP2_SHA1), @@ -875,7 +875,7 @@ static void __init cap_set_elf_hwcap(const struct arm64_cpu_capabilities *cap) case CAP_HWCAP: elf_hwcap |= cap->hwcap; break; -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 case CAP_COMPAT_HWCAP: compat_elf_hwcap |= (u32)cap->hwcap; break; @@ -898,7 +898,7 @@ static bool cpus_have_elf_hwcap(const struct arm64_cpu_capabilities *cap) case CAP_HWCAP: rc = (elf_hwcap & cap->hwcap) != 0; break; -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 case CAP_COMPAT_HWCAP: rc = (compat_elf_hwcap & (u32)cap->hwcap) != 0; break; diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c index c742df5..b76c759 100644 --- a/arch/arm64/kernel/cpuinfo.c +++ b/arch/arm64/kernel/cpuinfo.c @@ -134,15 +134,17 @@ static int c_show(struct seq_file *m, void *v) */ seq_puts(m, "Features\t:"); if (compat) { -#ifdef CONFIG_COMPAT - for (j = 0; compat_hwcap_str[j]; j++) - if (compat_elf_hwcap & (1 << j)) - seq_printf(m, " %s", compat_hwcap_str[j]); - - for (j = 0; compat_hwcap2_str[j]; j++) - if (compat_elf_hwcap2 & (1 << j)) - seq_printf(m, " %s", compat_hwcap2_str[j]); -#endif /* CONFIG_COMPAT */ +#ifdef CONFIG_AARCH32_EL0 + if (personality(current->personality) == PER_LINUX32) { + for (j = 0; compat_hwcap_str[j]; j++) + if (compat_elf_hwcap & (1 << j)) + seq_printf(m, " %s", compat_hwcap_str[j]); + + for (j = 0; compat_hwcap2_str[j]; j++) + if (compat_elf_hwcap2 & (1 << j)) + seq_printf(m, " %s", compat_hwcap2_str[j]); + } +#endif /* CONFIG_AARCH32_EL0 */ } else { for (j = 0; hwcap_str[j]; j++) if (elf_hwcap & (1 << j)) diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 223d54a..b6fb14b 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -271,7 +271,7 @@ ENTRY(vectors) ventry el0_fiq_invalid // FIQ 64-bit EL0 ventry el0_error_invalid // Error 64-bit EL0 -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 ventry el0_sync_compat // Synchronous 32-bit EL0 ventry el0_irq_compat // IRQ 32-bit EL0 ventry el0_fiq_invalid_compat // FIQ 32-bit EL0 @@ -311,7 +311,7 @@ el0_error_invalid: inv_entry 0, BAD_ERROR ENDPROC(el0_error_invalid) -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 el0_fiq_invalid_compat: inv_entry 0, BAD_FIQ, 32 ENDPROC(el0_fiq_invalid_compat) @@ -479,7 +479,7 @@ el0_sync: b.ge el0_dbg b el0_inv -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 .align 6 el0_sync_compat: kernel_entry 0, 32 diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index 427f6d3..10cb017 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -575,7 +575,7 @@ CPU_LE( movk x0, #0x30d0, lsl #16 ) // Clear EE and E0E on LE systems msr cptr_el2, x0 // Disable copro. traps to EL2 1: -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 msr hstr_el2, xzr // Disable CP15 traps to EL2 #endif diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index e0c81da..1d6f43e 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -183,7 +183,7 @@ static void ptrace_hbptriggered(struct perf_event *bp, .si_addr = (void __user *)(bkpt->trigger), }; -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 int i; if (!is_compat_task()) @@ -758,7 +758,7 @@ static const struct user_regset_view user_aarch64_view = { .regsets = aarch64_regsets, .n = ARRAY_SIZE(aarch64_regsets) }; -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 #include enum compat_regset { @@ -1293,11 +1293,11 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, return ret; } -#endif /* CONFIG_COMPAT */ +#endif /* CONFIG_AARCH32_EL0 */ const struct user_regset_view *task_user_regset_view(struct task_struct *task) { -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 /* * Core dumping of 32-bit tasks or compat ptrace requests must use the * user_aarch32_view compatible with arm32. Native ptrace requests on diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c index 5ff020f..14a08a0 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c @@ -526,7 +526,7 @@ long compat_arm_syscall(struct pt_regs *regs); asmlinkage long do_ni_syscall(struct pt_regs *regs) { -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 long ret; if (is_compat_task()) { ret = compat_arm_syscall(regs); diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c index a2c2478..7f822cd 100644 --- a/arch/arm64/kernel/vdso.c +++ b/arch/arm64/kernel/vdso.c @@ -49,7 +49,7 @@ static union { } vdso_data_store __page_aligned_data; struct vdso_data *vdso_data = &vdso_data_store.data; -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 /* * Create and map the vectors page for AArch32 tasks. */ @@ -108,7 +108,7 @@ int aarch32_setup_vectors_page(struct linux_binprm *bprm, int uses_interp) return PTR_ERR_OR_ZERO(ret); } -#endif /* CONFIG_COMPAT */ +#endif /* CONFIG_AARCH32_EL0 */ static struct vm_special_mapping vdso_spec[2] __ro_after_init = { { diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 73c487d..0ed1b62 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -418,7 +418,7 @@ static void arch_timer_evtstrm_enable(int divider) | ARCH_TIMER_VIRT_EVT_EN; arch_timer_set_cntkctl(cntkctl); elf_hwcap |= HWCAP_EVTSTRM; -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 compat_elf_hwcap |= COMPAT_HWCAP_EVTSTRM; #endif } -- 2.7.4