From: ard.biesheuvel@linaro.org (Ard Biesheuvel)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 5/5] arm64: use PC-relative reference for secondary_holding_pen_release
Date: Tue, 10 Mar 2015 16:39:42 +0100 [thread overview]
Message-ID: <1426001982-20047-6-git-send-email-ard.biesheuvel@linaro.org> (raw)
In-Reply-To: <1426001982-20047-1-git-send-email-ard.biesheuvel@linaro.org>
Replace the confusing virtual/physical address arithmetic with a simple
PC-relative reference.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
arch/arm64/kernel/head.S | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S
index cd3b94cb597f..69f2029a883c 100644
--- a/arch/arm64/kernel/head.S
+++ b/arch/arm64/kernel/head.S
@@ -576,10 +576,6 @@ ENTRY(__boot_cpu_mode)
.popsection
#ifdef CONFIG_SMP
- .align 3
-1: .quad .
- .quad secondary_holding_pen_release
-
/*
* This provides a "holding pen" for platforms to hold all secondary
* cores are held until we're ready for them to initialise.
@@ -591,10 +587,7 @@ ENTRY(secondary_holding_pen)
mrs x0, mpidr_el1
ldr x1, =MPIDR_HWID_BITMASK
and x0, x0, x1
- adr x1, 1b
- ldp x2, x3, [x1]
- sub x1, x1, x2
- add x3, x3, x1
+ adr_l x3, secondary_holding_pen_release
pen: ldr x4, [x3]
cmp x4, x0
b.eq secondary_startup
--
1.8.3.2
prev parent reply other threads:[~2015-03-10 15:39 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-10 15:39 [PATCH v4 0/5] arm64: head.S cleanup Ard Biesheuvel
2015-03-10 15:39 ` [PATCH v4 1/5] arm64: add macros for common adrp usages Ard Biesheuvel
2015-03-10 15:39 ` [PATCH v4 2/5] arm64: remove processor_id Ard Biesheuvel
2015-03-10 15:39 ` [PATCH v4 3/5] arm64: remove __switch_data object from head.S Ard Biesheuvel
2015-03-10 15:39 ` [PATCH v4 4/5] arm64: remove __lookup_processor_type_data " Ard Biesheuvel
2015-03-10 15:39 ` Ard Biesheuvel [this message]
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=1426001982-20047-6-git-send-email-ard.biesheuvel@linaro.org \
--to=ard.biesheuvel@linaro.org \
--cc=linux-arm-kernel@lists.infradead.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).