xen/arm64: Use virtual address when setting up early_printk fixmap
authorChen Baozi <baozich@gmail.com>
Tue, 7 Apr 2015 11:24:44 +0000 (19:24 +0800)
committerIan Campbell <ian.campbell@citrix.com>
Tue, 5 May 2015 15:33:43 +0000 (16:33 +0100)
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 ]

xen/arch/arm/arm64/head.S

index 75b7ee160be5c8a79cc9a53594bcb42d4d80acc2..9ed9a93029dbcdfdfd2ebd10f82e14f05ac48b53 100644 (file)
@@ -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