From patchwork Sat Aug 5 20:52:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 9883385 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 6501C603B4 for ; Sat, 5 Aug 2017 20:54:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 570B5286CC for ; Sat, 5 Aug 2017 20:54:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4B7C6287BD; Sat, 5 Aug 2017 20:54:53 +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=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0A6E4287B9 for ; Sat, 5 Aug 2017 20:54:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752855AbdHEUyH (ORCPT ); Sat, 5 Aug 2017 16:54:07 -0400 Received: from mail-wm0-f53.google.com ([74.125.82.53]:38545 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752801AbdHEUxm (ORCPT ); Sat, 5 Aug 2017 16:53:42 -0400 Received: by mail-wm0-f53.google.com with SMTP id m85so42572131wma.1 for ; Sat, 05 Aug 2017 13:53:42 -0700 (PDT) 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=Vgtp4UZbkswXzgx2tTKUNNUmWB50/LXHnuSHBwwIUGaJ/gZSEkWQxGgm5Ilz6SUXre 6/uM+owxdBIUrQQxSnyVpongquNfhMLQ9u3a6mALIGDyEv5rF18PIJjLIhPfDkkOMS3o T8eaFGbFPqbE6nwwiwmXhVgETne25gHGMIiyw= 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=X4GxqcaEL5z+xa7cgMkmMe4EcN81fNYaJ+/2I6PX1Hr1XgvL9aBMxuYXqqyBIJGc7h cst+xPiiSvYO+a+i0LDK3y5FDqTz57b/vSQGjjovVvQrBpM73kkCWhF8jOis4a+mTXUP /6qg8T9vKmIGLdYj+f4vkqT/oxB4/SFfhZTgEvXQH3xAiGRPoqNL9FK6m4jfxekVatt0 +djnCl5XrWqGJVJZDKoijyFZ8Ic2fvProH8MkhuxYWdZlHaSisSfTP6fW0eXOYBCfugt 3WhpkFNUqg4tV5O4ndCMx609cuXsZeEFTE0zBLiqHzx5SM6/zMuMhxiCBhlIIpCY24Pb Tcbw== X-Gm-Message-State: AHYfb5iYV3WpYe+cT4wq8z1LHYrzsjl0HwxIJwCzHgC7rWqfVLiNkV4T ALmSCy3jW7K9yBue X-Received: by 10.28.71.206 with SMTP id m75mr4292742wmi.13.1501966421464; Sat, 05 Aug 2017 13:53:41 -0700 (PDT) Received: from localhost.localdomain ([160.77.147.147]) by smtp.gmail.com with ESMTPSA id v62sm2601775wmd.2.2017.08.05.13.53.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 05 Aug 2017 13:53:40 -0700 (PDT) From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org, linux-renesas-soc@vger.kernel.org, linux@armlinux.org.uk, linux-omap@vger.kernel.org, kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, krzk@kernel.org, jason@lakedaemon.net, arm@kernel.org, andrew@lunn.ch, gregory.clement@free-electrons.com, sebastian.hesselbarth@gmail.com, tony@atomide.com, baohua@kernel.org, horms@verge.net.au, magnus.damm@gmail.com, vireshk@kernel.org, shiraz.linux.kernel@gmail.com, patrice.chotard@st.com, nico@linaro.org, dave.martin@arm.com, marc.zyngier@arm.com Cc: Ard Biesheuvel Subject: [PATCH 10/15] arm-soc: exynos: replace open coded VA->PA conversions Date: Sat, 5 Aug 2017 21:52:17 +0100 Message-Id: <20170805205222.19868-11-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170805205222.19868-1-ard.biesheuvel@linaro.org> References: <20170805205222.19868-1-ard.biesheuvel@linaro.org> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org 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: