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 08/15] ARM: head.S: use PC relative insn sequence to calculate PHYS_OFFSET
Date: Sat, 5 Aug 2017 21:52:15 +0100 [thread overview]
Message-ID: <20170805205222.19868-9-ard.biesheuvel@linaro.org> (raw)
In-Reply-To: <20170805205222.19868-1-ard.biesheuvel@linaro.org>
Replace the open coded arithmetic with a simple adr_l/sub pair.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
arch/arm/kernel/head.S | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index 939543e73874..e08a4623a980 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -106,10 +106,8 @@ ENTRY(stext)
#endif
#ifndef CONFIG_XIP_KERNEL
- adr r3, 2f
- ldmia r3, {r4, r8}
- sub r4, r3, r4 @ (PHYS_OFFSET - PAGE_OFFSET)
- add r8, r8, r4 @ PHYS_OFFSET
+ adr_l r8, _text @ __pa(_text)
+ sub r8, r8, #TEXT_OFFSET @ PHYS_OFFSET
#else
ldr r8, =PLAT_PHYS_OFFSET @ always constant in this case
#endif
@@ -161,10 +159,6 @@ ENTRY(stext)
1: b __enable_mmu
ENDPROC(stext)
.ltorg
-#ifndef CONFIG_XIP_KERNEL
-2: .long .
- .long PAGE_OFFSET
-#endif
/*
* Setup the initial page tables. We only setup the barest
--
2.11.0
next prev parent reply other threads:[~2017-08-05 20:52 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-05 20:52 [PATCH 00/15] ARM: add and use convenience macros for PC relative references Ard Biesheuvel
2017-08-05 20:52 ` [PATCH 01/15] ARM: assembler: introduce adr_l, ldr_l and str_l macros Ard Biesheuvel
2017-08-08 15:10 ` Nicolas Pitre
2017-08-08 15:19 ` Ard Biesheuvel
2017-08-08 15:39 ` Nicolas Pitre
2017-08-05 20:52 ` [PATCH 02/15] ARM: head-common.S: use PC-relative insn sequence for __proc_info Ard Biesheuvel
2017-08-05 20:52 ` [PATCH 03/15] ARM: head-common.S: use PC-relative insn sequence for __turn_mmu_on Ard Biesheuvel
2017-08-05 20:52 ` [PATCH 04/15] ARM: head.S: use PC-relative insn sequence for secondary_data Ard Biesheuvel
2017-08-05 20:52 ` [PATCH 05/15] ARM: head: use PC-relative insn sequence for __smp_alt Ard Biesheuvel
2017-08-11 15:13 ` Tony Lindgren
2017-08-11 19:37 ` Ard Biesheuvel
2017-08-11 19:58 ` Nicolas Pitre
2017-08-11 20:01 ` Ard Biesheuvel
2017-08-11 20:06 ` Nicolas Pitre
2017-08-11 20:07 ` Ard Biesheuvel
2017-08-11 20:12 ` Nicolas Pitre
2017-08-14 16:19 ` Tony Lindgren
2017-08-14 16:20 ` Ard Biesheuvel
2017-08-05 20:52 ` [PATCH 06/15] ARM: sleep.S: use PC-relative insn sequence for sleep_save_sp/mpidr_hash Ard Biesheuvel
2017-08-05 20:52 ` [PATCH 07/15] ARM: head.S: use PC-relative insn sequences for __fixup_pv_table Ard Biesheuvel
2017-08-05 20:52 ` Ard Biesheuvel [this message]
2017-08-05 20:52 ` [PATCH 09/15] ARM: kvm: replace open coded VA->PA calculations with adr_l call Ard Biesheuvel
2017-08-05 20:52 ` [PATCH 10/15] arm-soc: exynos: replace open coded VA->PA conversions Ard Biesheuvel
2017-08-05 20:52 ` [PATCH 11/15] arm-soc: mvebu: replace open coded VA->PA conversion Ard Biesheuvel
2017-08-05 20:52 ` [PATCH 12/15] arm-soc: omap: replace open coded VA->PA calculations Ard Biesheuvel
2017-08-09 19:05 ` Tony Lindgren
2017-08-09 19:22 ` Ard Biesheuvel
2017-08-09 21:05 ` Tony Lindgren
2017-08-10 9:22 ` Ard Biesheuvel
2017-08-10 14:03 ` Tony Lindgren
2017-08-11 13:48 ` Ard Biesheuvel
2017-08-11 15:00 ` Tony Lindgren
2017-08-05 20:52 ` [PATCH 13/15] arm-soc: various: replace open coded VA->PA calculation of pen_release Ard Biesheuvel
2017-08-05 20:52 ` [PATCH 14/15] arm-soc: shmobile: replace open coded VA->PA calculation Ard Biesheuvel
2017-08-05 20:52 ` [PATCH 15/15] ARM: l2c: " Ard Biesheuvel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170805205222.19868-9-ard.biesheuvel@linaro.org \
--to=ard.biesheuvel@linaro.org \
--cc=andrew@lunn.ch \
--cc=arm@kernel.org \
--cc=baohua@kernel.org \
--cc=dave.martin@arm.com \
--cc=gregory.clement@free-electrons.com \
--cc=horms@verge.net.au \
--cc=jason@lakedaemon.net \
--cc=krzk@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=magnus.damm@gmail.com \
--cc=marc.zyngier@arm.com \
--cc=nico@linaro.org \
--cc=patrice.chotard@st.com \
--cc=sebastian.hesselbarth@gmail.com \
--cc=shiraz.linux.kernel@gmail.com \
--cc=tony@atomide.com \
--cc=vireshk@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).