Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753976AbdCBBCG (ORCPT ); Wed, 1 Mar 2017 20:02:06 -0500 Received: from mail-by2nam01on0051.outbound.protection.outlook.com ([104.47.34.51]:59136 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753486AbdCBBBh (ORCPT ); Wed, 1 Mar 2017 20:01:37 -0500 Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none;lists.infradead.org; dmarc=none action=none header.from=caviumnetworks.com; From: Yury Norov To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Arnd Bergmann , Catalin Marinas Cc: Yury Norov , Andrew Pinski , Andrew Pinski , Adam Borowski , Chris Metcalf , Steve Ellcey , Maxim Kuvyrkov , Ramana Radhakrishnan , Florian Weimer , Bamvor Zhangjian , Andreas Schwab , Chris Metcalf , Heiko Carstens , schwidefsky@de.ibm.com, broonie@kernel.org, Joseph Myers , christoph.muellner@theobroma-systems.com, szabolcs.nagy@arm.com, klimov.linux@gmail.com, Nathan_Lynch@mentor.com, agraf@suse.de, Prasun.Kapoor@caviumnetworks.com, geert@linux-m68k.org, philipp.tomsich@theobroma-systems.com, manuel.montezelo@gmail.com, linyongting@huawei.com, davem@davemloft.net, zhouchengming1@huawei.com, Andrew Pinski , Bamvor Jian Zhang Subject: [PATCH 05/20] arm64: rename COMPAT to AARCH32_EL0 in Kconfig Date: Thu, 2 Mar 2017 00:49:13 +0530 Message-Id: <1488395968-14313-6-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> References: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [27.97.135.110] X-ClientProxiedBy: VI1PR07CA0050.eurprd07.prod.outlook.com (10.164.94.146) To DM3PR07MB2250.namprd07.prod.outlook.com (10.164.33.148) X-MS-Office365-Filtering-Correlation-Id: 7d8bbbf1-0203-4c6c-490b-08d460d80df3 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:DM3PR07MB2250; X-Microsoft-Exchange-Diagnostics: 1;DM3PR07MB2250;3:SIKDTglwZsUSqaLJgg7DNdlxbcBmKuL4xbYQp6EUQ6jn/mxzQ4MyIVtYMEguhMrxXO3ORVuspREfXVcCICcoHFJXJ1P9UC9yen/I9xvOQzydcKFkscTKAQ1MnE6dYwVZRZqGEMgJ+UMnX/Ljf95V0FK9Y5F4rMb7GtgXN07EstAYXyC6WGKgSu0QHMTFjOB1Nu9mGtmUDaDN0jhZ1OA1J00sYxxyMYPC9Cian4BZP83GN8bl4Lk36TeeQJibQIAJiYbkOnNCjwkuZXxA+73EZw==;25:QrOOdNJbzJE1YO6mT6uFMR2gEDeJFcv5nKrAGLdOC2mfKmpTfo5o2bsOUIzvCLXtT6eXV1MbdxfoH3GHVEWwgl8ZaKhhO6w3f7kShV+4Ry3EEKeVDShwQ10BXCo0Y9hvmnet7wHI5WWcNwv37Uaci+tbev+M+509OG1S8hgPpYMXvCse/h9AiTjhA66jXdV5fyjpgKNkYTD08B01HJOG667zNRHTYvv3sW0YbrIhWML8nSsJxS3GjRQ50u6P21u2aCkX7FzCV6VqbPQvQJWMQ/XUGN1ntyUHNp/JRKhibzf81bUK/wFGcUQf1WHy/u4DptzmjugY45g8doVaTnJb+W9M5knxSwXK0YAi9umN2oRzrSZdHNi+8/fwBhV3FzLUHxj0uwvO1+NmfB/L5fCh6DOACBxWliZyx0nDN2tDekXD4TUC03U8TZGJ4jbErnhYR9FLvnxDR+KL54ms7g5bvg== X-Microsoft-Exchange-Diagnostics: 1;DM3PR07MB2250;31:6Qkpze11mLv4s4ysDKhvMn1mlIM0KFvc3sdT+uE8eZU/l8tB76VXWg5fpOvLhUhyq6tajDTAjNTPXnSE6+YtvTeguyDlA8hMOI6nEtju1p92lVIqGK4WSPBUDGXt92AuYyoRi1Z9OdH0E840axddIxAmPLSGHgrQ2vOdR+mDQvDBTcA8AAurYqebNACq0xSuQfdtNN8jxbvcA7JJbP+Qe3NvpfyWruJN2Ormbb8q7FQ=;20:Jp+GFF/aCvSErePG91iFm8HKjF9+V/0K3BWSF8E0xtg3E5zDRVEc/ccaTndQMUbz18MTIHSlXmbLEnBz5kAagt4UuO2I80TPvrcgnAqIS3R2rmEijvjO/Cg8fwtD2v0443Eg5ksoIbVZPzJlBMzQdbZbl4CDlPVloTMRzMQhxPUBFb+L2xNfO1H07G4L0lV4Sl7RcQGixqYmNF34z2Vmdby2/kMkQZRUsskNVItbLWr6E9oohg2D9yZYM+7mV37nbC4SimweLPgAREe39Cmuhc2MdU0kkrINot1bx08sV8CzYaD++CZ1sSCi2ISpb5Vbf7vzQvcNh12uYyO7t26qqnO5KHgzwSxtlSqZOwsQNxxaYvCM3dPerx2hwVwkTHbkd+d3kkrDq39phfegscetGdmtF1DxAUp4r2jzW0MkASkCcPkjxHdgTXxhWhKPlWRL/V0J/qMKjTwzBh1x5Sez/7noBplf3SN8xjNUbJWTanR847mKKsRmVMNKaCccFt4tJepm/NOgsnttxD9Q5QhHgkrCYbA58buYaLAnx0hKgx7CJZ7hkH8HJen7H52bXlZrAIIR09lZLz3JOVo2mJuVb6/JCibUbdEGX/KVaOx5kh8= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(250305191791016)(22074186197030); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6041248)(20161123560025)(20161123558025)(20161123564025)(20161123562025)(20161123555025)(6072148);SRVR:DM3PR07MB2250;BCL:0;PCL:0;RULEID:;SRVR:DM3PR07MB2250; X-Microsoft-Exchange-Diagnostics: 1;DM3PR07MB2250;4:PlRrBNs0DTTtju/eSG6SqtTkL/OWxbu5ObwsRIlu0XddNg2Is2B+9csE41oP0mKSsl5uOlFlOphttcLoUB3MuSKMC/IjNpmmxw1hiVeAtnnhCYlVEwgqOZNrXzTEb6MIrR3Xz+aQ76fyLFVVKLqLsGahfNQONsiw058LwMdkL2yVaHyB0WXVnupD6VAx+YowIz+esgUPw2gg3Ir/PzIscMCviO/MXXhP9ubrEqwqJO18vbTmidpFUENrE8C1XFkxBv+0ez/yKNBOtAOPzh3tcnCUa5zI6Jw+3JcyaKJE6Xby86KUSQprpHAFAGltaBDxDL5BsIfar6KnpGdlmLt9c6OTd1oBKcazbBnJHVv+Gt4J0FkmK8304JPdJX+M4wCt1giEZvuGZDTMIAWMc/jXT4KMX0GUNafMumZPtabokBcervMKOPyplI22mP2X++CPjG/BuTVUeIOvgwzSi9qkSeol9IFP9NHCe8YvF+5DkiIMCRc4SvSjHELYB8BdVKnzhSa5pT+OOlIFKldybo135yS418MH4gKKEoARz5LEJzdOjIithOHYx7E4HP6tsv6g7ErzDqYRzwg1X12tw0evqSNsY1khZqt8+poGF/nLiOXo/LoyXINqZCDPj/NWRzylsyfd6FDK61t9Sx80AcfeBjFmbvwR8Rh7XhA06SqjSDf6At288P3u596HX53lEFAy X-Forefront-PRVS: 0233768B38 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(6069001)(7916002)(39450400003)(3846002)(5660300001)(6486002)(6116002)(33646002)(2906002)(50226002)(42186005)(2950100002)(25786008)(6666003)(54906002)(6306002)(5009440100003)(50466002)(48376002)(7736002)(53936002)(66066001)(305945005)(5003940100001)(47776003)(189998001)(575784001)(92566002)(81166006)(76176999)(36756003)(8676002)(7416002)(50986999)(4326008)(76506005)(38730400002)(6496005);DIR:OUT;SFP:1101;SCL:1;SRVR:DM3PR07MB2250;H:localhost;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM3PR07MB2250;23:UvsnQYS82zKWoVzEEp85O8Pht+N/asRkktJ/qULA3?= =?us-ascii?Q?F8v7jJbN+rznoYrMDIIb6ohswali2CSmormy3kI3lGClS1J4xS9j4FigDNeF?= =?us-ascii?Q?NXoNUXKqLlKahIToNdSBFgxHsFcXuCB0nZL/0He8jYHrDCOa6myh3D90Vzj2?= =?us-ascii?Q?rBO5GuOdu+lItbKId6uFOKy1pMZf9AxlV+kpEaLidtoH7GUhuBtWUij6xW3d?= =?us-ascii?Q?tdu2c9AZwPCZV4GYtq6WySi/P1JNMUnyw1esfzULS0tyeUehIZkP6ubtQ/jg?= =?us-ascii?Q?Zre2d2MlJXZq3za5oMZ7Bh3q+wJWnj/xnNzlyo+Jr0pq24JMoUmEeBFfM0el?= =?us-ascii?Q?Ky1vO2F5eLoD43DyLMbHwUQMFCWAVaLJYikm0kIOrlo10SSRLFGyo/FO2KG1?= =?us-ascii?Q?v6BhwCNuovy1nrbLzvKP2ifSmcJBPKxGrmMDtazo4HWZCu1BKoWufJnleVEg?= =?us-ascii?Q?GFM16mwgsSGaCk+bmDfK1s0BfajbgqeJCgKxGZvNaYaI/WdPXsovng61jH8D?= =?us-ascii?Q?1Y+TYACe3HdWvA871QpX1awwKPYxy3aFCNbOu1hsNRiTxMXiCa0/DPZ19iaZ?= =?us-ascii?Q?y545HtORHjFFfJgIDe6IS3VWo+AAo6cy686GzpB4sf7LsoNV5Qq2j/+EhItH?= =?us-ascii?Q?Wm6xDuSpkKz1ACqxeRaa5vBaPLczSXjvQ7okQGu3KxDDG11NdIOZ3qhDBQmb?= =?us-ascii?Q?ONN0SlK2/4LPLamJNPkdvrJw3G8jp8vwnrWjTMy7ZINcEce1Wrd7czme69Y9?= =?us-ascii?Q?W70oLO6v9vDTQM90QG1tzqp0Fu7jgkZNWG8ohZ1j3CXJa6gj2GsGIFDfM5qV?= =?us-ascii?Q?A7hVG+NOfJnv7sO3To2dlz0fp9cXhzWYdIvt+GNf3YJBrYgk0AsgHIS/f3g6?= =?us-ascii?Q?UxmcBWtEQKcGPcTlxrk0gSYQMh7ugYSitzu2rGpgN1NTLDOmXyCUQuUS1TNT?= =?us-ascii?Q?PF/thysXXpdkhIDEzQsxfpyEZLsJKYnPNpKQ5NGYELIbxy7kPG0+w+4wEIoG?= =?us-ascii?Q?tHsqhrXCow1JeH8M6qqfbAY?= X-Microsoft-Exchange-Diagnostics: 1;DM3PR07MB2250;6:u+VBod6uAMc12X5q4FcBkES5n7Ky2Ahykbxz10QaI75zu/N4iHEARwgGXvASp8rMQiH0X4n1vGF1ZZq08Mb4e0kuhGEHcELxXNvgWX2t9Bwdjcq0nff3koBgWCtWj1cNTxc4sMJ5SoicqZRZRErm7dxCZJDag9ktNH50XvakKKMxwZWTXs7iK8nV9sr98dT45CP8Y8IBWbkiBVnhNb9238FsBrB2EWP0dZ6wjNbqJarwKARi/JzasdfQesGRmFRZD76/Ukmma0PTs/VWxcDC5mkCXt7O0tbuF/8/8rRNslsbD+Odnf240JwQiCTb1DJMDWSd2FIIw5BVOxPjwy2ZOxsMpWCSGiOpK02zntUJA3RmUhFg3GvJMBGG7oltT0DPKwuO2uoN1j1NGZBdQat7OA==;5:NfJZwUJ8mdEQTEJWFDBP9m2Jf19xhEWZjQY2cmjiHk6FDwm0H1xSOyB7msp90Vb+YUqI0ccMOQHSTD8Tp/kzb4oHm1ET/+ShaKwOAaOWtlNlylQ9xMkEA76McIi9Y8ogWOlC72bBdjHohM4H0bMWw14GdnHD4yKuwSvdIVelVc8=;24:b63M0LFuUzta55SUIuSx+hQoK/b6O6DUenY/RsW2dnK02O3bCsmc09qthyt5PkuopmZUvTbiFiWPZJkoi+/8VU1ZJYT1Q9rLJQ1HwUUdcNM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DM3PR07MB2250;7:6Z9yZnJRPmibZOMcY1SqbUi/BxyJulqjTHEAFc4oQ2NnFQ0EvUeh3QbRQyg1IQelLD+gNKhLJX7i/NAEwTYFH06CCXHVg2do5jnWg2jKNwSJpxMqQ9hhFfOzpQM+0g+BDF9qxf0F8qyIpDYUSl2lZfEedIvoQ+p5rRYgWwuu1j8xvv+F/I3uawBdLewRqo6jdUKy4hm3q6KFB5aJg1Eob6lRRNdB4TBDVOVlaaokN4VzJlqhm/y/2XyPTz2M/3Ii+iqGQtcNIS50ARlJbpV5nPvyXuZIsnnTdm0Ul2i+iIfzH7fZ6DPs2ElBGWqCBvIK+Ju5zeKZHhzQIYgd3b2W4w== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2017 19:20:41.9957 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR07MB2250 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 14708 Lines: 431 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 Reviewed-by: David Daney 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 896eba6..d35cea4 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -403,7 +403,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 @@ -764,7 +764,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. @@ -1042,9 +1042,15 @@ 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_BINFMT_ELF if BINFMT_ELF + select COMPAT select HAVE_UID16 select OLD_SIGSUSPEND3 select COMPAT_OLD_SIGACTION 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 c97b8bd..f3f3599 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 11403fd..d668b39 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 1606c6b..b688bcd 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 b3bb7ef..aec5b6c 100644 --- a/arch/arm64/kernel/asm-offsets.c +++ b/arch/arm64/kernel/asm-offsets.c @@ -67,7 +67,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 abda8e8..37d500c 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -36,7 +36,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|\ @@ -892,7 +892,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), @@ -908,7 +908,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; @@ -931,7 +931,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 5b22c68..51b61b3 100644 --- a/arch/arm64/kernel/cpuinfo.c +++ b/arch/arm64/kernel/cpuinfo.c @@ -136,15 +136,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 43512d4..a143d00 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -330,7 +330,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 @@ -370,7 +370,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) @@ -538,7 +538,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 4fb6ccd..62663ee 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -632,7 +632,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 a22161c..d924ac4 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()) @@ -765,7 +765,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 { @@ -1300,11 +1300,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 7d47c2c..010c110 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c @@ -545,7 +545,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 41b6e31..9d44902 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 93aa136..5d904b9 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -485,7 +485,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