[Xen-devel] [PATCH] xen/arm: UART addresses are not always aligned to a page.

["Jon Fraser" <jfraser@xxxxxxxxxxxx>]

Add the page offset of the UART to the mapped address.

Signed-off-by: Jon Fraser <jfraser@xxxxxxxxxxxx>
---
 xen/arch/arm/arm32/debug.S | 5 +++--
 xen/arch/arm/arm32/head.S  | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/xen/arch/arm/arm32/debug.S b/xen/arch/arm/arm32/debug.S
index ec774cd..e095911 100644
--- a/xen/arch/arm/arm32/debug.S
+++ b/xen/arch/arm/arm32/debug.S
@@ -22,18 +22,19 @@
 #ifdef EARLY_PRINTK_INC
 #include EARLY_PRINTK_INC
 #endif
+#define UART_OFFSET (EARLY_UART_BASE_ADDRESS & ~PAGE_MASK)
 
 /* Print a character on the UART - this function is called by C
  * r0: character to print */
 GLOBAL(early_putch)
-        ldr   r1, =FIXMAP_ADDR(FIXMAP_CONSOLE)  /* r1 := VA UART base address 
*/
+        ldr   r1, =FIXMAP_ADDR(FIXMAP_CONSOLE) + UART_OFFSET  /* r1 := VA UART 
base address */
         early_uart_ready r1, r2
         early_uart_transmit r1, r0
         mov   pc, lr
 
 /* Flush the UART - this function is called by C */
 GLOBAL(early_flush)
-        ldr   r1, =FIXMAP_ADDR(FIXMAP_CONSOLE)  /* r1 := VA UART base address 
*/
+        ldr   r1, =FIXMAP_ADDR(FIXMAP_CONSOLE) + UART_OFFSET  /* r1 := VA UART 
base address */
         early_uart_ready r1, r2
         mov   pc, lr
 
diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S
index ce1d21a..aa8daec 100644
--- a/xen/arch/arm/arm32/head.S
+++ b/xen/arch/arm/arm32/head.S
@@ -355,8 +355,9 @@ paging:
         mov   r4, r4, lsr #18        /* r4 := Slot for FIXMAP(0) */
         strd  r2, r3, [r1, r4]       /* Map it in the fixmap's slot */
 
+#define UART_OFFSET (EARLY_UART_BASE_ADDRESS & ~PAGE_MASK)
         /* Use a virtual address to access the UART. */
-        ldr   r11, =FIXMAP_ADDR(FIXMAP_CONSOLE)
+        ldr   r11, =(FIXMAP_ADDR(FIXMAP_CONSOLE) + UART_OFFSET)
 #endif
         /* Map the DTB in the boot misc slot */
         teq   r12, #0                /* Only on boot CPU */
-- 
1.7.11.3



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel