From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Grall Subject: Re: [PATCH] xen/arm: UART addresses are not always aligned to a page. Date: Fri, 25 Oct 2013 12:28:34 +0100 Message-ID: <526A55E2.10204@linaro.org> References: <1382639749-27826-1-git-send-email-jfraser@broadcom.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1382639749-27826-1-git-send-email-jfraser@broadcom.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Jon Fraser , xen-devel@lists.xen.org, Ian Campbell , Stefano Stabellini , Tim Deegan List-Id: xen-devel@lists.xenproject.org (+Adding ARM maintainers) Hi, On 10/24/2013 07:35 PM, Jon Fraser wrote: > Add the page offset of the UART to the mapped address. Thanks for the patch, can you also modify arm64 code? > Signed-off-by: Jon Fraser > --- > 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 */ You use FIXMAP_ADDR(FIXMAP_CONSOLE) + UART_OFFSET in different files. How about creating a define EARLY_UART_VIRTUAL_ADDRESS in asm-arm/early_printk.h? -- Julien Grall