From patchwork Wed Aug 17 11:46:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 660070 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sDnXs2Z3kz9t0m for ; Wed, 17 Aug 2016 21:47:57 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=S6USghsr; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type; q=dns; s=default; b=myzKH MCcZ4O6bLtGH/07tlXRfGhYW6CkrzhggsP09tO9QFsP2dN5ydrAL+MDmZEztDtXs KPnONjYS/kToEwv2f6eyXliL8ma1Klyz7poL+nhxSZIwpKHSLz9navtbCkVQSegG RqfVPFbQPS+3isqGfeJ6sEdZsAwvqe9okbtu/U= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type; s=default; bh=R04H1te29/A e8ozY56JXSoo7K7M=; b=S6USghsruiKdIryeYPkwRqB4jy4l0bVw8vjIv/os4rY Y00h0hhdhTTYwP+Wdq9P4y4IQOqTSpnfIkrLQ5O9jfPAAMxWSyleua+e56R3y5FV rMRBKhTIjkQCjxXB3F3ELOt98Oi5eKGK+gxuOsNYG19NDY/l0SXVub3tDZIp5X2g = Received: (qmail 103640 invoked by alias); 17 Aug 2016 11:47:49 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 103540 invoked by uid 89); 17 Aug 2016 11:47:48 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=0.0 required=5.0 tests=AWL, BAYES_40, KAM_MANYTO, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=no version=3.3.2 spammy=cap, Core, FORCE, array_size X-HELO: NAM02-SN1-obe.outbound.protection.outlook.com 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 04/18] arm64: rename COMPAT to AARCH32_EL0 in Kconfig Date: Wed, 17 Aug 2016 14:46:29 +0300 Message-ID: <1471434403-25291-5-git-send-email-ynorov@caviumnetworks.com> In-Reply-To: <1471434403-25291-1-git-send-email-ynorov@caviumnetworks.com> References: <1471434403-25291-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 X-ClientProxiedBy: AM4PR02CA0036.eurprd02.prod.outlook.com (10.165.239.174) To BN4PR07MB2241.namprd07.prod.outlook.com (10.164.63.147) X-MS-Office365-Filtering-Correlation-Id: e2ca778a-007e-45d4-919c-08d3c6944792 X-Microsoft-Exchange-Diagnostics: 1; BN4PR07MB2241; 2:QHQTx8fNV4IGBjKdZTVyLjc/+w+brNvpumEvQybgr1HAijWiofZQXkDmPlliUTncfUh3uXSqC6Z3uNi6kONaSeYCOuApu9ZkI/SxhpHMhm1EgqzCQG49+TB9tTAoEF5XMUCaxZ2vkbJTHO6DsdJlmx1QJ2YU4/qc0YmacGH2q7dKkGaMoxMOzp4NoG6kemxO; 3:O0gk2VFRC6qLuDCcwiCK75WE1LkF/BwuashUFNpHEpYKpIKJdgd41bu38zWb464MiyAaUhKEhGYUIKEvT3nGCyf1iGc81InPUodppkIAqpsE90THdgxU8gKJbjHR8siS X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN4PR07MB2241; X-Microsoft-Exchange-Diagnostics: 1; BN4PR07MB2241; 25:qtxox79jDx6uCeD7RvomrM/IqAY2tQRxeBTMEI5XboDba+uiepFJBjTaQ0MXnr3dQQtdXK3Rt7jmDZWYAKZrfG8tk7rr+Y2rI1ElHxWTbKYee7tksb9nX9m2xlT5QC3XRvpoKVvyORCdK32WcF6UmxeSrcE7d+GFM6dapr5FV3bPLpwW1d0ypKPDtkB8Hz4faOMF9Swj4eccMBPiH3d3I2p0PSGRdeNDUCYyTqZ10taK+drmcJlDMgc60hfZA2xDWfqdERDsHslkKZXb8SmJErW4WyeCQnFjWNZs1H8RE5bNv5cwWWhodqxwoDpWJHyNeVKMSScTLwJAz2YGHnplyS/oN6cWt4nOVwydxZhY2AZMlApGN7tHdZ1s8U3Oq5wN3o/4fVZa+smmO6jlrJLyV/drwNzrsIsIW5R8VjpWRqceTsd+n1oatqSBeS2Y4yUwg5G9c7vuQgVBN0m4HeS79ljLamPvqzdxe/0xnWAaiaAvSDRsKhw/Dp8Aeyh+TaUZF+5jC3zRd1KlLH9qmMzMNjHVm/KWkRucjcbQGj3lZLikClIVCirWnR6SW/XROk2vucPjcTUv0jeHCrhpGUunz49dvKB15FTuYGZbIxyRFu7Fmyqlsb/7xgjP/3nb1uCBayQlmEMIsBBmlX4xyQ30Ml+hWX90FhJ2Ht8y6iijnB1qzF2W++uYxYuUhLSrrNt1JaR9tMvDT/gz2R7M+x/nCfcddPTLKC+9OMqmAoohvx9qq2HHyvuMQ9+q1s+SdH4H9fqO6BvF8Uw/UxfOiNf8LxaamU14Wkscx+mrHLe1qFfgBGVerSp/8C/cAj6UG4AZ X-Microsoft-Exchange-Diagnostics: 1; BN4PR07MB2241; 31:sMKPGQgj92rpSV4gwJk+zdSMvAgNu1r7yloqV2EiroMyYCgHuhSWFP2fNnFNsy+rRjp5AvzBSubw9AhSQnD5kN6FMQd/v+qKHX+a9mqm6wTvx5VukZ8pLo/IHv/y4pDFWecP4ann6RRqXE/ArkUSdb1VKjwsmSuiRt0qu5MgEt4eLuYwcPgz44S46e/Grvxd+KCxsOtwxH6wALZF2DBZucXZYKk7yWu7eJ9yRcZPFe4=; 20:2T5Jc6B1vZrx9Q4RzT6ze96QPMU9sXB53X40P/OwBDy+wQAi74daj2zLRATdQxoeryZ/kDz0O4nr/bW8sniVxa5W01bVy5UDIPeW/oA94i5Fd8cOiXschYCu452v4N1Ck1mU4l5dHjxCAMBxE0i585kBBoa0leZ40q3m5lkCjOPpptxFuxxhe1oMPerG+J4lL9HlVFP+Tdr47RdYzw47NzN/G6e8oe4qZsPpoobF412dAnJiHHQwuDz+v7EBFuElMcL6MraY+XApsctuLME+x+qagvhFucZY1QMNhYsIBxg3ltd1jribIpWY33lY8lxNIJy0aEGAPET21ZvK+DzGKTUbwsHmFdz9yvUWOaDhEVQmfvpKgB6Koq8QOVvyUddzUD26vJSZFgEhtBt9kExwgdKN9qxfXup1Rl7KcahxBInTX+DkpmL9o58uqy55IIyf84AQuBjQHWH8reb69nT7zzEIkhXbV2+WgbGOhiw+HHqkPi5xD6Ultk4tX+4sY2kNpG++7lJgJYJHYqCiE+7bRFLYlg+bxw862KbwT6kK68pzRy7wOKaLySOxqAvVDlXf0f67luCdjblvKLIv4poZ71pqa8qbpz5bz902AFeB+pU= 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:BN4PR07MB2241; BCL:0; PCL:0; RULEID:; SRVR:BN4PR07MB2241; X-Microsoft-Exchange-Diagnostics: 1; BN4PR07MB2241; 4:K2oXmyX6MtBkLd0aytbGU4oEnMJgdPgdvSY7Y3HHY2DBbh8yxMJigG/FpLkoylanDHA9XgkctEYmHiPemoielymk4a/IxLGglwtCf+4nQe2x/1BOLO8R5Xui8X4ocKEz2CpxhZo5xQYfWKo8S8AT3QFmtwZB6idkko44dpr42LjaMioO/jMhQepz2PwUTncjFYqJY75nf5wSvEWN7EKoJnVJG+EJOwZONv0GoufHxTFkdrLstAebtqxOyv1+8kE9J9vanHU7XfXaAcy4kwnHn9I6xRDfg93idllBTRbtkBERWWZlCdM+LnqGqYeJxIcmewDP4IGBXIWuBSRZ5Ph64Rvpf4tuSnbPSiT104QeiJHyF2p0dZfjMYnWHZKy4SXBWTreBYUHphhqYEp0u9O4hj3R7+wXNmiGIuoLVM0CrThKHBQ7+Y/HPQgUEuwT+FU6fv9J5uUDWXNgALCbFnTZNA== X-Forefront-PRVS: 0037FD6480 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(6069001)(7916002)(199003)(189002)(2950100001)(68736007)(97736004)(76506005)(4326007)(5001770100001)(2906002)(7846002)(7736002)(92566002)(189998001)(19580405001)(7416002)(3846002)(36756003)(15975445007)(50466002)(77096005)(42186005)(101416001)(50226002)(66066001)(575784001)(106356001)(229853001)(305945005)(19580395003)(48376002)(586003)(81166006)(33646002)(81156014)(2201001)(47776003)(8676002)(76176999)(5003940100001)(6116002)(105586002)(50986999)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:BN4PR07MB2241; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: caviumnetworks.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN4PR07MB2241; 23:YzgPyyjLgr24MY80BcdRPZci4lOuS4bKflbta3fB7?= =?us-ascii?Q?/GHq9Mv9cYMrOU3ospc3OsS40kloMaqEk4itUqaVx5Y6+r0G1qmNMXG4amhP?= =?us-ascii?Q?0SrrRWDZ9VRvbDVHwnew/uOBfxYm6QTfquFD3oY8dmmB0Rycalm8KW8mRTy7?= =?us-ascii?Q?GzexAEyuJ+4iW0xRXye0vl26RiD0YQbnRr9UKRGH+g40f2FTDm8/xYo5WfZI?= =?us-ascii?Q?I7UgeePVd7xtrAZ3YMfUpJHC9xZBRj/oDMHwvO8G06yg1xVo6GlWnouwMiKO?= =?us-ascii?Q?UzyvWnkmaJ3M+gnUp29TVJHcVUmJWP9GZ4nOjfNX5OUXFR9/K85Gg7F1crWN?= =?us-ascii?Q?eW1AyVZgrJc4VGQdrUN6JOt7wORv7mkqMWslfERZhz5nAJ0XGYi6wYGHsNDL?= =?us-ascii?Q?QeyUJnQB8I6q7wnBg8eH1oD/zcBJjvgPKonyHIzfRf5qTohu4wS/A8Ai6uEC?= =?us-ascii?Q?JHZHLcwOsUqt6tLleuRydF2vLcLN5I3vf6fcXZmPMien39tWazUzvX8gcB7Q?= =?us-ascii?Q?sNYyXw/A+xkL58fkHhcZ2bMRbhD26Wa96LD8s0SxyS6J+cedQjG6C/raQvgt?= =?us-ascii?Q?zTahDpzUjQoDJ6k/XRZ5b0Kv8pj1313ZokuTo+AcNO6MyGFsg1P9XW4T9N9V?= =?us-ascii?Q?0pCLrC92l+3H6EmfAiv02ekoYCg/xq9MRiZ/bgYmRuY05GFWm8evlfidqPS8?= =?us-ascii?Q?Fbdy8BFDy8KZWMQxaeHdfk+GAapbE0Li0NtixA3qpkfk2JcE8xUVK6VGAAjF?= =?us-ascii?Q?y0s6RCLiN5tS+/VvEPcrYhvGLh9Sh+gVzgq2e3p3uiJu4USslqJi0iIbrZ0M?= =?us-ascii?Q?66QxIXO+HCk1peN0W8IQ2Kt1tPPJMWDPQL2qfKoVZLeNK3CY77xyL86VhEHN?= =?us-ascii?Q?Q8t1RMLbD2RPKW5t4enDGF6oVpQqiDqXLOz4n/wXrsp2NRibS+3o/0Z39ntM?= =?us-ascii?Q?FYWByKvar7dHyxwGalTH8IxFvw+dD3KBbZuSSYIusW7OJd7E3R/QdFntbxxP?= =?us-ascii?Q?e1wzSUPNVnSZJ0d1e//TO/dn4g1ndgoj0FocC6loWO2yeL84iip3cH8HfOM8?= =?us-ascii?Q?ciUpfM15/CVBumwKAbC35vdT9AZzNr6lpG7yJojYG1END2drUC1vb6al7Yc6?= =?us-ascii?Q?VfDIZlOTv+WYIXReEmYdYS35Wdbsio3htp725WbiSwybleEA1DLZ+aStHZVm?= =?us-ascii?Q?zfU11W6O6BISf8=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN4PR07MB2241; 6:rZOeY4noKH/0a/AtWWIR+HVUZKkBnTPFIRD2ZfFDHPx3FQw/qulX1oPhhQlBc7w27vRX04bPi8wcU5lUAPWbu5RAqdsA32dD5w4sfqrIrU6D1QVxzzX0SCnIhhQjOCUnsdjGbuPDjZB8JaGULEVF060ufVpkcg2XnGWc5hQAzkFunRzN9A+EGjWOaIeji8JfBtXc++T01U04P5j2/9dbJnAVTF5oj+bkUQMwzBJCWt8B67A9lbBd7ZQ+1SpZvb8vUlv9/ffD8+LDlmFfpMbcqot82b+/rieitNPQM1sAXaY=; 5:V85yztyWx+7/UfHTm0hV789hneQPNg2l22n1vtwbRK5WtcWVamM8yuzae0KNdAlcTvaFIba8KzZK2ivMpN1m07AwXV0AFKHB6domFLmd8iXvfOh0DFB3R6CC8iL43g8b1Z0tpVXj38I0hc9+N67Rog==; 24:eqONanKUfI5CQRkVmtTPzQTWVymTkkowwjzsr1o/wPl1u+Fbt/BKrxxZHWW7ZGmhomBBr34hYE2Smebl5439OvbFzrj6U0iwuP9Ibv0Ut2w=; 7:NkqT8W9RdDuCVpbUyWRSBdE2bHn/UkXSUfw7qPmiRGkGvmUdAp43oDHLXYHM2c67zP/9r3ty+Ymg0bhE3v+MScD/6I3HeFT4hyn4dTeGubojyX3yeSt3WgVm/D46AIbgzCY3CUcPS9YCpxKsxc/g6RfN3s8B5ASLga89+ajSVY1Qgm9rvKs39l6PzeXARja/4MmJ9TG20pu4L7ueHXA09noT3MhSpZBPIlpeDaxqwoIMoMJmLLhkFpYyqUAvv2QM SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Aug 2016 11:47:34.4806 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN4PR07MB2241 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: Philipp Tomsich Signed-off-by: Christoph Muellner Signed-off-by: Bamvor Jian Zhang Signed-off-by: Yury Norov --- 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/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 +- 17 files changed, 49 insertions(+), 39 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index bc3f00f..08ca1cb 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -394,7 +394,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 @@ -720,7 +720,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. @@ -990,8 +990,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 ace0a96..c489317 100644 --- a/arch/arm64/include/asm/processor.h +++ b/arch/arm64/include/asm/processor.h @@ -81,7 +81,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; @@ -90,7 +90,7 @@ struct thread_struct { struct debug_info debug; /* debugging */ }; -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 #define task_user_tls(t) \ ({ \ unsigned long *__tls; \ @@ -121,7 +121,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/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 14f7b65..4ec5886 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -25,7 +25,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 05070b7..19a6883 100644 --- a/arch/arm64/kernel/asm-offsets.c +++ b/arch/arm64/kernel/asm-offsets.c @@ -64,7 +64,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 6709a08..ad5a22c 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|\ @@ -854,7 +854,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), @@ -870,7 +870,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; @@ -893,7 +893,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 43d7fbc..14e6cf6 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 441420c..9e18747 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -277,7 +277,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 @@ -317,7 +317,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) @@ -485,7 +485,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 b77f583..396e74b 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -567,7 +567,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 e04f838..c8247c5 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c @@ -491,7 +491,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 076312b..0adc4fb 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]; diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 5770054..732f5d2 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -332,7 +332,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 }