From patchwork Mon Aug 14 12:53:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 9898839 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D7E42602BA for ; Mon, 14 Aug 2017 12:58:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CAAB6285E3 for ; Mon, 14 Aug 2017 12:58:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BF64B285FD; Mon, 14 Aug 2017 12:58:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from mother.openwall.net (mother.openwall.net [195.42.179.200]) by mail.wl.linuxfoundation.org (Postfix) with SMTP id F3DDF285E3 for ; Mon, 14 Aug 2017 12:58:22 +0000 (UTC) Received: (qmail 26546 invoked by uid 550); 14 Aug 2017 12:55:48 -0000 Mailing-List: contact kernel-hardening-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Delivered-To: mailing list kernel-hardening@lists.openwall.com Received: (qmail 22481 invoked from network); 14 Aug 2017 12:55:18 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8t6IV4bmNjAgcv5Be09tvxPF5UJpUqInMAYOh79BmGQ=; b=h4gkfW9mUKAlOJ0RGLbUsaSaWJUoKCdBH0aYhGEPCv4JGPDiw1u+68/ImBETfczGqN AvEEJE7p86VioQ1a49Z/TDCmZJOJjx2q4g+EbyHYAOcnAHhtPZpKu6laUcdIAqKXNJ75 iIvUm3/gdPhKiepYTu1J/+ReVBTxI/AfHWT1Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8t6IV4bmNjAgcv5Be09tvxPF5UJpUqInMAYOh79BmGQ=; b=shRa0WmZ4J3wQqIM8p8E/KN2mYevBSttyJMbxP05RVSwKTKBXhWRSGLDFPvXsqU8Gq gkew0WT1Kg8CAJkuCQoz7o2lR2S8MqPuevfQtr0H7to0DVDp8eR5uKTzdr2/21PV01ND itQuqURdMdVc/WB3grVBDc3pu2RwIjRSrH23j5q7GxTmtTU6IqzlFJCRKqCnWaGGvsku Mnki/AVeh4LP5qlrZUDEADrAbYZjeClKwCVulNVN/SaV/cjqLooz0zwCHhOudqEIFze5 0HT6ltxKdmVqSszh6MpTcsjjWP3Z6W6eY+OnEasiyWqsrsMuTgpFpMxw1VTIm8ZX77Kb qOng== X-Gm-Message-State: AHYfb5iw/vvHue3KYHHQxk2Pkof2hcg22d29gDj5CdGXtNshE1OhXmSO ewQSTPkmQiFraoOB9DDOvg== X-Received: by 10.223.180.66 with SMTP id v2mr15004462wrd.210.1502715306349; Mon, 14 Aug 2017 05:55:06 -0700 (PDT) From: Ard Biesheuvel To: kernel-hardening@lists.openwall.com Cc: linux-arm-kernel@lists.infradead.org, Ard Biesheuvel , Arnd Bergmann , Nicolas Pitre , Russell King , Kees Cook , Thomas Garnier , Marc Zyngier , Mark Rutland , Tony Lindgren , Matt Fleming , Dave Martin Date: Mon, 14 Aug 2017 13:53:53 +0100 Message-Id: <20170814125411.22604-13-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170814125411.22604-1-ard.biesheuvel@linaro.org> References: <20170814125411.22604-1-ard.biesheuvel@linaro.org> Subject: [kernel-hardening] [PATCH 12/30] arm-soc: exynos: replace open coded VA->PA conversions X-Virus-Scanned: ClamAV using ClamSMTP This replaces a couple of open coded calculations to obtain the physical address of a far symbol with calls to the new adr_l etc macros. Signed-off-by: Ard Biesheuvel --- arch/arm/mach-exynos/headsmp.S | 9 +------ arch/arm/mach-exynos/sleep.S | 26 ++++---------------- 2 files changed, 6 insertions(+), 29 deletions(-) diff --git a/arch/arm/mach-exynos/headsmp.S b/arch/arm/mach-exynos/headsmp.S index d3d24ab351ae..25de5aff1c41 100644 --- a/arch/arm/mach-exynos/headsmp.S +++ b/arch/arm/mach-exynos/headsmp.S @@ -23,10 +23,7 @@ ENTRY(exynos4_secondary_startup) ARM_BE8(setend be) mrc p15, 0, r0, c0, c0, 5 and r0, r0, #15 - adr r4, 1f - ldmia r4, {r5, r6} - sub r4, r4, r5 - add r6, r6, r4 + adr_l r6, pen_release pen: ldr r7, [r6] cmp r7, r0 bne pen @@ -37,7 +34,3 @@ pen: ldr r7, [r6] */ b secondary_startup ENDPROC(exynos4_secondary_startup) - - .align 2 -1: .long . - .long pen_release diff --git a/arch/arm/mach-exynos/sleep.S b/arch/arm/mach-exynos/sleep.S index cf950790fbdc..003465699263 100644 --- a/arch/arm/mach-exynos/sleep.S +++ b/arch/arm/mach-exynos/sleep.S @@ -17,6 +17,7 @@ #include #include +#include #include #include "smc.h" @@ -62,19 +63,13 @@ ENTRY(exynos_cpu_resume_ns) cmp r0, r1 bne skip_cp15 - adr r0, _cp15_save_power - ldr r1, [r0] - ldr r1, [r0, r1] - adr r0, _cp15_save_diag - ldr r2, [r0] - ldr r2, [r0, r2] + ldr_l r1, cp15_save_power + ldr_l r2, cp15_save_diag mov r0, #SMC_CMD_C15RESUME dsb smc #0 #ifdef CONFIG_CACHE_L2X0 - adr r0, 1f - ldr r2, [r0] - add r0, r2, r0 + adr_l r0, l2x0_saved_regs /* Check that the address has been initialised. */ ldr r1, [r0, #L2X0_R_PHY_BASE] @@ -93,9 +88,7 @@ ENTRY(exynos_cpu_resume_ns) smc #0 /* Reload saved regs pointer because smc corrupts registers. */ - adr r0, 1f - ldr r2, [r0] - add r0, r2, r0 + adr_l r0, l2x0_saved_regs ldr r1, [r0, #L2X0_R_PWR_CTRL] ldr r2, [r0, #L2X0_R_AUX_CTRL] @@ -114,15 +107,6 @@ skip_cp15: b cpu_resume ENDPROC(exynos_cpu_resume_ns) - .align -_cp15_save_power: - .long cp15_save_power - . -_cp15_save_diag: - .long cp15_save_diag - . -#ifdef CONFIG_CACHE_L2X0 -1: .long l2x0_saved_regs - . -#endif /* CONFIG_CACHE_L2X0 */ - .data .globl cp15_save_diag cp15_save_diag: