From: "Jon Fraser" Subject: [PATCH V3] xen/arm: UART addresses are not always aligned to a page. Date: Thu, 31 Oct 2013 15:37:38 -0400 Message-ID: <1383248258-1965-1-git-send-email-jfraser@broadcom.com> References: <1383236842.25018.130.camel@dagon.hellion.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1383236842.25018.130.camel@dagon.hellion.org.uk> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: andrew.cooper3@citrix.com, julien.grall@linaro.org, ian.campbell@citrix.com, Jon Fraser List-Id: xen-devel@lists.xenproject.org When calculating the virtual address of the UART, add the page offset of the UART to the mapped address. Create define EARLY_UART_VIRTUAL_ADDRESS and use instead of FIXMAP_ADDR(FIXMAP_CONSOLE) Signed-off-by: Jon Fraser --- xen/arch/arm/arm32/debug.S | 5 +++-- xen/arch/arm/arm32/head.S | 3 ++- xen/arch/arm/arm64/debug.S | 5 +++-- xen/arch/arm/arm64/head.S | 3 ++- xen/include/asm-arm/early_printk.h | 12 ++++++++++++ 5 files changed, 22 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/arm32/debug.S b/xen/arch/arm/arm32/debug.S index ec774cd..a95d9da 100644 --- a/xen/arch/arm/arm32/debug.S +++ b/xen/arch/arm/arm32/debug.S @@ -18,6 +18,7 @@ */ #include +#include #ifdef EARLY_PRINTK_INC #include EARLY_PRINTK_INC @@ -26,14 +27,14 @@ /* 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, =EARLY_UART_VIRTUAL_ADDRESS /* 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, =EARLY_UART_VIRTUAL_ADDRESS /* 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..96230ac 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -22,6 +22,7 @@ #include #include #include +#include #define ZIMAGE_MAGIC_NUMBER 0x016f2818 @@ -356,7 +357,7 @@ paging: strd r2, r3, [r1, r4] /* Map it in the fixmap's slot */ /* Use a virtual address to access the UART. */ - ldr r11, =FIXMAP_ADDR(FIXMAP_CONSOLE) + ldr r11, =EARLY_UART_VIRTUAL_ADDRESS #endif /* Map the DTB in the boot misc slot */ teq r12, #0 /* Only on boot CPU */ diff --git a/xen/arch/arm/arm64/debug.S b/xen/arch/arm/arm64/debug.S index 472c157..a855358 100644 --- a/xen/arch/arm/arm64/debug.S +++ b/xen/arch/arm/arm64/debug.S @@ -18,6 +18,7 @@ */ #include +#include #ifdef EARLY_PRINTK_INC #include EARLY_PRINTK_INC @@ -26,14 +27,14 @@ /* Print a character on the UART - this function is called by C * x0: character to print */ GLOBAL(early_putch) - ldr x15, =FIXMAP_ADDR(FIXMAP_CONSOLE) + ldr x15, =EARLY_UART_VIRTUAL_ADDRESS early_uart_ready x15, 1 early_uart_transmit x15, w0 ret /* Flush the UART - this function is called by C */ GLOBAL(early_flush) - ldr x15, =FIXMAP_ADDR(FIXMAP_CONSOLE) /* x15 := VA UART base address */ + ldr x15, =EARLY_UART_VIRTUAL_ADDRESS /* x15 := VA UART base address */ early_uart_ready x15, 1 ret diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index b8b5902..31afdd0 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -23,6 +23,7 @@ #include #include #include +#include #define PT_PT 0xe7f /* nG=1 AF=1 SH=10 AP=01 NS=1 ATTR=111 T=1 P=1 */ #define PT_MEM 0xe7d /* nG=1 AF=1 SH=10 AP=01 NS=1 ATTR=111 T=0 P=1 */ @@ -368,7 +369,7 @@ paging: str x2, [x4, x1] /* Map it in the fixmap's slot */ /* Use a virtual address to access the UART. */ - ldr x23, =FIXMAP_ADDR(FIXMAP_CONSOLE) + ldr x23, =EARLY_UART_VIRTUAL_ADDRESS #endif /* Map the DTB in the boot misc slot */ diff --git a/xen/include/asm-arm/early_printk.h b/xen/include/asm-arm/early_printk.h index 5f7c529..707bbf7 100644 --- a/xen/include/asm-arm/early_printk.h +++ b/xen/include/asm-arm/early_printk.h @@ -14,6 +14,16 @@ #ifdef EARLY_PRINTK +/* need to add the uart address offset in page to the fixmap address */ +#define EARLY_UART_VIRTUAL_ADDRESS \ + (FIXMAP_ADDR(FIXMAP_CONSOLE) +(EARLY_UART_BASE_ADDRESS & ~PAGE_MASK)) + +#endif + +#ifndef __ASSEMBLY__ + +#ifdef EARLY_PRINTK + void early_printk(const char *fmt, ...) __attribute__((format (printf, 1, 2))); void early_panic(const char *fmt, ...) __attribute__((noreturn)) @@ -31,4 +41,6 @@ __attribute__((format (printf, 1, 2))) early_panic(const char *fmt, ...) #endif +#endif /* __ASSEMBLY__ */ + #endif -- 1.7.11.3