From patchwork Sat Aug 5 20:52:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 9883363 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 E68436088A for ; Sat, 5 Aug 2017 20:54:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D6739287BE for ; Sat, 5 Aug 2017 20:54:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CB3A228807; Sat, 5 Aug 2017 20:54:51 +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 5D339287FD for ; Sat, 5 Aug 2017 20:54:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752761AbdHEUx7 (ORCPT ); Sat, 5 Aug 2017 16:53:59 -0400 Received: from mail-wr0-f178.google.com ([209.85.128.178]:33046 "EHLO mail-wr0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752778AbdHEUxt (ORCPT ); Sat, 5 Aug 2017 16:53:49 -0400 Received: by mail-wr0-f178.google.com with SMTP id v105so27165089wrb.0 for ; Sat, 05 Aug 2017 13:53:49 -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=LcPBJwZTGwIOAGGfdbSnNhARqc+C54x63A3k8Ade8N0=; b=P0pcxnHCsp1hdjPu3qzZL97BmyB7BlaMec93e54ZorFhkVuwHyUixhszZTzPR658Pv QI7UrdmRy+o5U/MLdNBULVFK8ypq73UEXP+b24dqpXyR5VRl9m1s/deOwSgbkMOaM4U7 2L+J6k5FMAGg6On/GAO8OuwpnT/gH8t3SwGCo= 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=LcPBJwZTGwIOAGGfdbSnNhARqc+C54x63A3k8Ade8N0=; b=Vc1DHTxX8nW7C9o4X5OL/rbur0x8abIhHTDC/SLVrQNF6oFbkF3pofDZMs+PssAW+J I7BjH5VV4plpPhIoNyehA2S/JgmefvDPQhoYhhrrFCjHwJLXfLekEURHrmjaqXEm2vPw /xCRufKguS4aDulunj1CSSb8BL4DtHO2/VdAl9e61kvxUyN7v6+PZBGIUMSfnrfcQxbS IB1/fZnqU/mW+OMZwsZxj2fTMwO/yW+aONIU+7fGZaRDmy3VqRSSieIvILo26iGp+DEG 7sQtcRByS3hAVN0EejTiA3GjHzuxl3hrHWP2Bsanu3T9Jqkc5z7GSCYGgyaQj6DuCXEZ e+QQ== X-Gm-Message-State: AIVw112pj/np5fc2xx2uy4Tl4PnFq4VVF33Vm2H7mhsYamGrPJQR5jwq ENX97hqxY3sAbdkv X-Received: by 10.223.143.68 with SMTP id p62mr5055104wrb.20.1501966428452; Sat, 05 Aug 2017 13:53:48 -0700 (PDT) Received: from localhost.localdomain ([160.77.147.147]) by smtp.gmail.com with ESMTPSA id v62sm2601775wmd.2.2017.08.05.13.53.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 05 Aug 2017 13:53:47 -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 12/15] arm-soc: omap: replace open coded VA->PA calculations Date: Sat, 5 Aug 2017 21:52:19 +0100 Message-Id: <20170805205222.19868-13-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-omap2/sleep34xx.S | 21 ++++---------------- arch/arm/mach-omap2/sleep44xx.S | 12 ++--------- 2 files changed, 6 insertions(+), 27 deletions(-) diff --git a/arch/arm/mach-omap2/sleep34xx.S b/arch/arm/mach-omap2/sleep34xx.S index 1b9f0520dea9..418a4478622d 100644 --- a/arch/arm/mach-omap2/sleep34xx.S +++ b/arch/arm/mach-omap2/sleep34xx.S @@ -86,9 +86,7 @@ ENTRY(enable_omap3630_toggle_l2_on_restore) stmfd sp!, {lr} @ save registers on stack /* Setup so that we will disable and enable l2 */ mov r1, #0x1 - adrl r3, l2dis_3630_offset @ may be too distant for plain adr - ldr r2, [r3] @ value for offset - str r1, [r2, r3] @ write to l2dis_3630 + str_l r1, l2dis_3630, r2 @ write to l2dis_3630 ldmfd sp!, {pc} @ restore regs and return ENDPROC(enable_omap3630_toggle_l2_on_restore) @@ -422,9 +420,7 @@ ENTRY(omap3_restore) cmp r2, #0x0 @ Check if target power state was OFF or RET bne logic_l1_restore - adr r1, l2dis_3630_offset @ address for offset - ldr r0, [r1] @ value for offset - ldr r0, [r1, r0] @ value at l2dis_3630 + ldr_l r0, l2dis_3630 @ value at l2dis_3630 cmp r0, #0x1 @ should we disable L2 on 3630? bne skipl2dis mrc p15, 0, r0, c1, c0, 1 @@ -436,9 +432,7 @@ skipl2dis: and r1, #0x700 cmp r1, #0x300 beq l2_inv_gp - adr r0, l2_inv_api_params_offset - ldr r3, [r0] - add r3, r3, r0 @ r3 points to dummy parameters + adr_l r3, l2_inv_api_params @ r3 points to dummy parameters mov r0, #40 @ set service ID for PPA mov r12, r0 @ copy secure Service ID in r12 mov r1, #0 @ set task id for ROM code in r1 @@ -476,9 +470,6 @@ skipl2dis: #endif b logic_l1_restore - .align -l2_inv_api_params_offset: - .long l2_inv_api_params - . l2_inv_gp: /* Execute smi to invalidate L2 cache */ mov r12, #0x1 @ set up to invalidate L2 @@ -495,9 +486,7 @@ l2_inv_gp: mov r12, #0x2 smc #0 @ Call SMI monitor (smieq) logic_l1_restore: - adr r0, l2dis_3630_offset @ adress for offset - ldr r1, [r0] @ value for offset - ldr r1, [r0, r1] @ value at l2dis_3630 + ldr_l r1, l2dis_3630 @ value at l2dis_3630 cmp r1, #0x1 @ Test if L2 re-enable needed on 3630 bne skipl2reen mrc p15, 0, r1, c1, c0, 1 @@ -526,8 +515,6 @@ control_stat: .word CONTROL_STAT control_mem_rta: .word CONTROL_MEM_RTA_CTRL -l2dis_3630_offset: - .long l2dis_3630 - . .data l2dis_3630: diff --git a/arch/arm/mach-omap2/sleep44xx.S b/arch/arm/mach-omap2/sleep44xx.S index c7a3b4aab4b5..274fbb91f08f 100644 --- a/arch/arm/mach-omap2/sleep44xx.S +++ b/arch/arm/mach-omap2/sleep44xx.S @@ -260,9 +260,7 @@ ENTRY(omap4_cpu_resume) beq skip_ns_smp_enable ppa_actrl_retry: mov r0, #OMAP4_PPA_CPU_ACTRL_SMP_INDEX - adr r1, ppa_zero_params_offset - ldr r3, [r1] - add r3, r3, r1 @ Pointer to ppa_zero_params + adr_l r3, ppa_zero_params @ Pointer to ppa_zero_params mov r1, #0x0 @ Process ID mov r2, #0x4 @ Flag mov r6, #0xff @@ -299,9 +297,7 @@ skip_ns_smp_enable: ldr r0, =OMAP4_PPA_L2_POR_INDEX ldr r1, =OMAP44XX_SAR_RAM_BASE ldr r4, [r1, #L2X0_PREFETCH_CTRL_OFFSET] - adr r1, ppa_por_params_offset - ldr r3, [r1] - add r3, r3, r1 @ Pointer to ppa_por_params + adr_l r3, ppa_por_params @ Pointer to ppa_por_params str r4, [r3, #0x04] mov r1, #0x0 @ Process ID mov r2, #0x4 @ Flag @@ -326,8 +322,6 @@ skip_l2en: #endif b cpu_resume @ Jump to generic resume -ppa_por_params_offset: - .long ppa_por_params - . ENDPROC(omap4_cpu_resume) #endif /* CONFIG_ARCH_OMAP4 */ @@ -380,8 +374,6 @@ ENTRY(omap_do_wfi) nop ldmfd sp!, {pc} -ppa_zero_params_offset: - .long ppa_zero_params - . ENDPROC(omap_do_wfi) .data