From: Ian Campbell <ian.campbell@citrix.com>
Date: Fri, 22 Feb 2013 08:58:18 +0000 (+0000)
Subject: xen: arm: guest stage 1 walks on 64-bit hypervisor
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~7187
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1f2d966a61e0f47ebe7034847f710f1722996283;p=xen.git

xen: arm: guest stage 1 walks on 64-bit hypervisor

Still only supports non-LPAE 32-bit guests.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Tim Deegan <tim@xen.org>
---

diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
index d1cf0e6ce4..6f249207b1 100644
--- a/xen/arch/arm/traps.c
+++ b/xen/arch/arm/traps.c
@@ -780,8 +780,8 @@ static void do_cp15_64(struct cpu_user_regs *regs,
 
 void dump_guest_s1_walk(struct domain *d, vaddr_t addr)
 {
-    uint32_t ttbcr = READ_CP32(TTBCR);
-    uint64_t ttbr0 = READ_CP64(TTBR0);
+    uint32_t ttbcr = READ_SYSREG32(TCR_EL1);
+    uint64_t ttbr0 = READ_SYSREG64(TTBR0_EL1);
     paddr_t paddr;
     uint32_t offset;
     uint32_t *first = NULL, *second = NULL;