From: Ian Campbell <ian.campbell@citrix.com>
To: xen-devel@lists.xen.org
Cc: julien.grall@linaro.org, tim@xen.org,
Ian Campbell <ian.campbell@citrix.com>,
stefano.stabellini@eu.citrix.com
Subject: [PATCH v2 7/9] xen: arm: use symbolic names for MPIDR bits.
Date: Thu, 26 Sep 2013 11:49:14 +0100 [thread overview]
Message-ID: <1380192556-30700-7-git-send-email-ian.campbell@citrix.com> (raw)
In-Reply-To: <1380192538.29483.63.camel@kazak.uk.xensource.com>
arm32 already uses MPIDR_HWID_MASK, use it on arm64 too. Add MPIDR_{SMP,UP}
(and bitwise equivalents) and use them.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
xen/arch/arm/arm32/head.S | 4 ++--
xen/arch/arm/arm64/head.S | 6 +++---
xen/include/asm-arm/processor.h | 6 ++++--
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S
index 1735f17..0e20bf1 100644
--- a/xen/arch/arm/arm32/head.S
+++ b/xen/arch/arm/arm32/head.S
@@ -127,9 +127,9 @@ common_start:
* find that multiprocessor extensions are
* present and the system is SMP */
mrc CP32(r1, MPIDR)
- tst r1, #(1<<31) /* Multiprocessor extension supported? */
+ tst r1, #MPIDR_SMP /* Multiprocessor extension supported? */
beq 1f
- tst r1, #(1<<30) /* Uniprocessor system? */
+ tst r1, #MPIDR_UP /* Uniprocessor system? */
bne 1f
bic r7, r1, #(~MPIDR_HWID_MASK) /* Mask out flags to get CPU ID */
1:
diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S
index acbaf15..0525720 100644
--- a/xen/arch/arm/arm64/head.S
+++ b/xen/arch/arm/arm64/head.S
@@ -145,10 +145,10 @@ common_start:
* find that multiprocessor extensions are
* present and the system is SMP */
mrs x0, mpidr_el1
- tbz x0, 31, 1f /* Multiprocessor extension not supported? */
- tbnz x0, 30, 1f /* Uniprocessor system? */
+ tbz x0, _MPIDR_SMP, 1f /* Multiprocessor extension not supported? */
+ tbnz x0, _MPIDR_UP, 1f /* Uniprocessor system? */
- mov x13, #(0xff << 24)
+ mov x13, #(~MPIDR_HWID_MASK)
bic x24, x0, x13 /* Mask out flags to get CPU ID */
1:
diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h
index 808567e..3534ada 100644
--- a/xen/include/asm-arm/processor.h
+++ b/xen/include/asm-arm/processor.h
@@ -8,8 +8,10 @@
#define MIDR_MASK 0xff0ffff0
/* MPIDR Multiprocessor Affinity Register */
-#define MPIDR_UP (1 << 30)
-#define MPIDR_SMP (1 << 31)
+#define _MPIDR_UP (30)
+#define MPIDR_UP (1 << _MPIDR_UP)
+#define _MPIDR_SMP (31)
+#define MPIDR_SMP (1 << _MPIDR_SMP)
#define MPIDR_AFF0_SHIFT (0)
#define MPIDR_AFF0_MASK (0xff << MPIDR_AFF0_SHIFT)
#define MPIDR_HWID_MASK 0xffffff
--
1.7.10.4
next prev parent reply other threads:[~2013-09-26 10:49 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-26 10:48 [PATCH v2 0/9] xen: arm: rework early bring up Ian Campbell
2013-09-26 10:49 ` [PATCH v2 1/9] xen: arm: Load xen under 4GB on 32-bit Ian Campbell
2013-09-26 10:49 ` [PATCH v2 2/9] xen: arm: Log the raw MIDR on boot Ian Campbell
2013-09-26 10:49 ` [PATCH v2 3/9] xen: arm: make sure we stay within the memory bank during mm setup Ian Campbell
2013-09-26 11:14 ` Julien Grall
2013-09-26 13:17 ` Tim Deegan
2013-09-26 10:49 ` [PATCH v2 4/9] xen: arm: add two new device tree helpers Ian Campbell
2013-09-26 10:49 ` [PATCH v2 5/9] xen: arm: implement arch/platform SMP and CPU initialisation framework Ian Campbell
2013-09-26 13:47 ` Tim Deegan
2013-09-26 14:06 ` Julien Grall
2013-09-26 14:12 ` Ian Campbell
2013-09-26 10:49 ` [PATCH v2 6/9] xen: arm: rewrite start of day page table and cpu bring up Ian Campbell
2013-09-26 12:59 ` Ian Campbell
2013-09-26 14:31 ` Tim Deegan
2013-09-26 10:49 ` Ian Campbell [this message]
2013-09-26 13:22 ` [PATCH v2 7/9] xen: arm: use symbolic names for MPIDR bits Tim Deegan
2013-09-26 13:35 ` Ian Campbell
2013-09-26 13:45 ` Tim Deegan
2013-09-26 10:49 ` [PATCH v2 8/9] xen: arm: configure TCR_EL2 for 40 bit physical address space Ian Campbell
2013-09-26 10:49 ` [PATCH v2 9/9] xen: arm: split cpu0's domheap mapping PTs out from xen_second Ian Campbell
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=1380192556-30700-7-git-send-email-ian.campbell@citrix.com \
--to=ian.campbell@citrix.com \
--cc=julien.grall@linaro.org \
--cc=stefano.stabellini@eu.citrix.com \
--cc=tim@xen.org \
--cc=xen-devel@lists.xen.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).