[15/15] ARM: l2c: replace open coded VA->PA calculation

Message ID	20170805205222.19868-16-ard.biesheuvel@linaro.org
State	New
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; From: Ard Biesheuvel <ard.biesheuvel@linaro.org> 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 <ard.biesheuvel@linaro.org> Subject: [PATCH 15/15] ARM: l2c: replace open coded VA->PA calculation Date: Sat, 5 Aug 2017 21:52:22 +0100 Message-Id: <20170805205222.19868-16-ard.biesheuvel@linaro.org> In-Reply-To: <20170805205222.19868-1-ard.biesheuvel@linaro.org> References: <20170805205222.19868-1-ard.biesheuvel@linaro.org> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk
Series	ARM: add and use convenience macros for PC relative references \| expand [00/15] ARM: add and use convenience macros for PC relative references [01/15] ARM: assembler: introduce adr_l, ldr_l and str_l macros [02/15] ARM: head-common.S: use PC-relative insn sequence for __proc_info [03/15] ARM: head-common.S: use PC-relative insn sequence for __turn_mmu_on [04/15] ARM: head.S: use PC-relative insn sequence for secondary_data [05/15] ARM: head: use PC-relative insn sequence for __smp_alt [06/15] ARM: sleep.S: use PC-relative insn sequence for sleep_save_sp/mpidr_hash [07/15] ARM: head.S: use PC-relative insn sequences for __fixup_pv_table [08/15] ARM: head.S: use PC relative insn sequence to calculate PHYS_OFFSET [09/15] ARM: kvm: replace open coded VA->PA calculations with adr_l call [10/15] arm-soc: exynos: replace open coded VA->PA conversions [11/15] arm-soc: mvebu: replace open coded VA->PA conversion [12/15] arm-soc: omap: replace open coded VA->PA calculations [13/15] arm-soc: various: replace open coded VA->PA calculation of pen_release [14/15] arm-soc: shmobile: replace open coded VA->PA calculation [15/15] ARM: l2c: replace open coded VA->PA calculation

Message ID

20170805205222.19868-16-ard.biesheuvel@linaro.org

State

New

Headers

Received-SPF: pass (google.com: best guess record for domain of
	linux-omap-owner@vger.kernel.org designates 209.132.180.67 as
	permitted sender) client-ip=209.132.180.67; 
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
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 <ard.biesheuvel@linaro.org>
Subject: [PATCH 15/15] ARM: l2c: replace open coded VA->PA calculation
Date: Sat,  5 Aug 2017 21:52:22 +0100
Message-Id: <20170805205222.19868-16-ard.biesheuvel@linaro.org>
In-Reply-To: <20170805205222.19868-1-ard.biesheuvel@linaro.org>
References: <20170805205222.19868-1-ard.biesheuvel@linaro.org>
Sender: linux-omap-owner@vger.kernel.org
Precedence: bulk

Series

ARM: add and use convenience macros for PC relative references | expand

Commit Message

Ard Biesheuvel Aug. 5, 2017, 8:52 p.m. UTC

This replaces an open coded calculation to obtain the physical
address of a far symbol with a call to the new adr_l macro.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

---
 arch/arm/mm/l2c-l2x0-resume.S | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

-- 
2.11.0

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

diff --git a/arch/arm/mm/l2c-l2x0-resume.S b/arch/arm/mm/l2c-l2x0-resume.S
index fda415e4ca8f..3e75aa8c1aff 100644
--- a/arch/arm/mm/l2c-l2x0-resume.S
+++ b/arch/arm/mm/l2c-l2x0-resume.S
@@ -12,9 +12,7 @@ 
 	.text
 
 ENTRY(l2c310_early_resume)
-	adr	r0, 1f
-	ldr	r2, [r0]
-	add	r0, r2, r0
+	adr_l	r0, l2x0_saved_regs
 
 	ldmia	r0, {r1, r2, r3, r4, r5, r6, r7, r8}
 	@ r1 = phys address of L2C-310 controller
@@ -54,6 +52,3 @@  ENTRY(l2c310_early_resume)
 	str	r9, [r1, #L2X0_CTRL]
 	ret	lr
 ENDPROC(l2c310_early_resume)
-
-	.align
-1:	.long	l2x0_saved_regs - .

[15/15] ARM: l2c: replace open coded VA->PA calculation

Commit Message

Patch