From: Chen Baozi <baozich@gmail.com>
Date: Tue, 7 Apr 2015 11:24:44 +0000 (+0800)
Subject: xen/arm64: Use virtual address when setting up early_printk fixmap
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~3330
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b4c6f400893328d38d03f053d7edaacf9200658e;p=xen.git

xen/arm64: Use virtual address when setting up early_printk fixmap

We have already switched to the boot pagetable when reaching the point
of early_printk fixmap setup. Thus t is no longer necessary to
calculate physical address of xen_fixmap.

Signed-off-by: Chen Baozi <baozich@gmail.com>
Reviewed-by: Julien Grall <julien.grall@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
[ ijc -- fixed commit message typos ]
---

diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S
index 75b7ee160b..9ed9a93029 100644
--- a/xen/arch/arm/arm64/head.S
+++ b/xen/arch/arm/arm64/head.S
@@ -519,8 +519,7 @@ paging:
         cbnz  x22, 1f
 
         /* Add UART to the fixmap table */
-        ldr   x1, =xen_fixmap
-        add   x1, x1, x20            /* x1 := paddr (xen_fixmap) */
+        ldr   x1, =xen_fixmap        /* x1 := vaddr (xen_fixmap) */
         lsr   x2, x23, #THIRD_SHIFT
         lsl   x2, x2, #THIRD_SHIFT   /* 4K aligned paddr of UART */
         mov   x3, #PT_DEV_L3