From: Ian Campbell <ian.campbell@citrix.com>
To: xen-devel@lists.xen.org
Cc: tim@xen.org, stefano.stabellini@citrix.com,
Ian Campbell <ian.campbell@citrix.com>
Subject: [PATCH 3/5] xen: arm: head.S PT_DEV is unused, drop and rename PT_DEV_L3
Date: Tue, 18 Dec 2012 16:49:34 +0000 [thread overview]
Message-ID: <1355849376-26652-3-git-send-email-ian.campbell@citrix.com> (raw)
In-Reply-To: <1355849351.14620.274.camel@zakaz.uk.xensource.com>
This shortens an overly long line.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
xen/arch/arm/head.S | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/xen/arch/arm/head.S b/xen/arch/arm/head.S
index 0d9a799..eb54925 100644
--- a/xen/arch/arm/head.S
+++ b/xen/arch/arm/head.S
@@ -25,9 +25,12 @@
#define ZIMAGE_MAGIC_NUMBER 0x016f2818
#define PT_PT 0xe7f /* nG=1, AF=1, SH=10, AP=01, NS=1, ATTR=111, T=1, P=1 */
+
+/* Second Level */
#define PT_MEM 0xe7d /* nG=1, AF=1, SH=10, AP=01, NS=1, ATTR=111, T=0, P=1 */
-#define PT_DEV 0xe71 /* nG=1, AF=1, SH=10, AP=01, NS=1, ATTR=100, T=0, P=1 */
-#define PT_DEV_L3 0xe73 /* lev3: nG=1, AF=1, SH=10, AP=01, NS=1, ATTR=100, T=1, P=1 */
+
+/* Third Level */
+#define PT_DEV 0xe73 /* nG=1, AF=1, SH=10, AP=01, NS=1, ATTR=100, T=1, P=1 */
#define PT_UPPER(x) (PT_##x & 0xf00)
#define PT_LOWER(x) (PT_##x & 0x0ff)
@@ -222,8 +225,8 @@ skip_bss:
mov r3, #0
lsr r2, r11, #12
lsl r2, r2, #12 /* 4K aligned paddr of UART */
- orr r2, r2, #PT_UPPER(DEV_L3)
- orr r2, r2, #PT_LOWER(DEV_L3) /* r2:r3 := 4K dev map including UART */
+ orr r2, r2, #PT_UPPER(DEV)
+ orr r2, r2, #PT_LOWER(DEV) /* r2:r3 := 4K dev map including UART */
strd r2, r3, [r1, #(FIXMAP_CONSOLE*8)] /* Map it in the first fixmap's slot */
#endif
--
1.7.2.5
next prev parent reply other threads:[~2012-12-18 16:49 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-18 16:49 [PATCH 0/5] xen: arm: fix guest register access bug Ian Campbell
2012-12-18 16:49 ` [PATCH 1/5] xen: arm: fix long lines in entry.S Ian Campbell
2012-12-18 18:17 ` Stefano Stabellini
2012-12-19 10:16 ` Ian Campbell
2012-12-18 16:49 ` [PATCH 2/5] xen: arm: remove hard tabs from asm code Ian Campbell
2012-12-18 18:18 ` Stefano Stabellini
2012-12-18 16:49 ` Ian Campbell [this message]
2012-12-18 18:33 ` [PATCH 3/5] xen: arm: head.S PT_DEV is unused, drop and rename PT_DEV_L3 Stefano Stabellini
2012-12-19 10:20 ` Ian Campbell
2012-12-19 10:49 ` Tim Deegan
2012-12-19 11:22 ` Ian Campbell
2012-12-19 14:54 ` Ian Campbell
2012-12-20 11:21 ` Tim Deegan
2012-12-20 11:24 ` Ian Campbell
2012-12-20 11:54 ` Ian Campbell
2013-01-04 15:59 ` Ian Campbell
2012-12-18 16:49 ` [PATCH 4/5] xen: arm: reorder registers in struct cpu_user_regs Ian Campbell
2012-12-18 18:35 ` Stefano Stabellini
2012-12-18 16:49 ` [PATCH 5/5] xen: arm: fix guest register access Ian Campbell
2012-12-18 18:40 ` Stefano Stabellini
2012-12-18 20:52 ` Ian Campbell
2012-12-19 14:07 ` [PATCH 0/5] xen: arm: fix guest register access bug 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=1355849376-26652-3-git-send-email-ian.campbell@citrix.com \
--to=ian.campbell@citrix.com \
--cc=stefano.stabellini@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).