From patchwork Thu Aug 1 16:09:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 18724 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f70.google.com (mail-yh0-f70.google.com [209.85.213.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 083A5246CC for ; Thu, 1 Aug 2013 16:09:49 +0000 (UTC) Received: by mail-yh0-f70.google.com with SMTP id l109sf2860187yhq.1 for ; Thu, 01 Aug 2013 09:09:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-removed-original-auth :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:x-google-group-id:list-post:list-help :list-archive:list-unsubscribe; bh=lH++wr54CY7NRw/aOPyWgtX3ap1QVbbwi7YnNtdZwM8=; b=CacAslqjAJeK+2T/9NJhhxzVja6zv7EpU6UaULfAcLBdKoYX4n59GSZ4CugP/AuOxX VRxsb48hE4KsotlYa8Xr9dPZUGH+q01CAEY3ytHOoO9T3tmMxqubou8Y9/emUD7iCvKt Ge2VFwJFd5f0tgLVsziF/pdyUG5NJXhhYCgC8GczUr8IWiTXt0Q+903Sn8vjSz6vu4oE 2cxefa0THAWJJC0F1MQ3Yo2zYl40loxtlDMKCQMENT2neRf+nf1/ivgKaiFMLq8RWBu0 HQBhDsjFXjHTaVqHSOn2dW4lZVwVUsLQLGseX+Dogks7e4zW4xT8dl1l0SWeJRMavgIl 1q8w== X-Received: by 10.236.32.229 with SMTP id o65mr895683yha.19.1375373388799; Thu, 01 Aug 2013 09:09:48 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.4.200 with SMTP id m8ls1285607qem.70.gmail; Thu, 01 Aug 2013 09:09:48 -0700 (PDT) X-Received: by 10.220.191.5 with SMTP id dk5mr693006vcb.47.1375373388612; Thu, 01 Aug 2013 09:09:48 -0700 (PDT) Received: from mail-ve0-f174.google.com (mail-ve0-f174.google.com [209.85.128.174]) by mx.google.com with ESMTPS id tf3si773004vec.106.2013.08.01.09.09.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 01 Aug 2013 09:09:48 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.174 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.174; Received: by mail-ve0-f174.google.com with SMTP id d10so2521537vea.19 for ; Thu, 01 Aug 2013 09:09:48 -0700 (PDT) X-Received: by 10.58.128.71 with SMTP id nm7mr694422veb.51.1375373388354; Thu, 01 Aug 2013 09:09:48 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.11.8 with SMTP id pc8csp307254vcb; Thu, 1 Aug 2013 09:09:47 -0700 (PDT) X-Received: by 10.194.77.167 with SMTP id t7mr1884598wjw.27.1375373387289; Thu, 01 Aug 2013 09:09:47 -0700 (PDT) Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by mx.google.com with ESMTPS id oy3si1853578wjb.127.2013.08.01.09.09.46 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 01 Aug 2013 09:09:47 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.50 is neither permitted nor denied by best guess record for domain of julien.grall@linaro.org) client-ip=74.125.82.50; Received: by mail-wg0-f50.google.com with SMTP id m15so1869453wgh.5 for ; Thu, 01 Aug 2013 09:09:46 -0700 (PDT) X-Received: by 10.180.10.99 with SMTP id h3mr7796265wib.0.1375373386803; Thu, 01 Aug 2013 09:09:46 -0700 (PDT) Received: from belegaer.uk.xensource.com. (firewall.ctxuk.citrix.com. [46.33.159.2]) by mx.google.com with ESMTPSA id a8sm4594556wie.6.2013.08.01.09.09.44 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 01 Aug 2013 09:09:46 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Cc: stefano.stabellini@eu.citrix.com, ian.campbell@citrix.com, patches@linaro.org, tim@xen.org, Julien Grall Subject: [PATCH v3 2/7] xen/arm: Use define instead of hardcoded value in debug-pl011 Date: Thu, 1 Aug 2013 17:09:27 +0100 Message-Id: <1375373372-15009-3-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1375373372-15009-1-git-send-email-julien.grall@linaro.org> References: <1375373372-15009-1-git-send-email-julien.grall@linaro.org> X-Gm-Message-State: ALoCoQl5cyXMCLfgv+p6f0gCvaK1D7iWDTvwlhU1puiy5dBs4zsMIt9fH0GRml9on5WaTi3eTIYJ X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: julien.grall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.174 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Signed-off-by: Julien Grall Reviewed-by: Tim Deegan --- xen/arch/arm/arm32/debug-pl011.inc | 18 ++++++++++-------- xen/include/asm-arm/pl011-uart.h | 1 + 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/arm32/debug-pl011.inc b/xen/arch/arm/arm32/debug-pl011.inc index 8b085b8..6a64dbf 100644 --- a/xen/arch/arm/arm32/debug-pl011.inc +++ b/xen/arch/arm/arm32/debug-pl011.inc @@ -16,19 +16,21 @@ * GNU General Public License for more details. */ +#include + /* PL011 UART initialization * rb: register which contains the UART base address * rc: scratch register 1 * rd: scratch register 2 (unused here) */ .macro early_uart_init rb, rc, rd mov \rc, #(7372800 / EARLY_PRINTK_BAUD % 16) - str \rc, [\rb, #0x28] /* -> UARTFBRD (Baud divisor fraction) */ + str \rc, [\rb, #FBRD] /* -> UARTFBRD (Baud divisor fraction) */ mov \rc, #(7372800 / EARLY_PRINTK_BAUD / 16) - str \rc, [\rb, #0x24] /* -> UARTIBRD (Baud divisor integer) */ + str \rc, [\rb, #IBRD] /* -> UARTIBRD (Baud divisor integer) */ mov \rc, #0x60 /* 8n1 */ - str \rc, [\rb, #0x2C] /* -> UARTLCR_H (Line control) */ - ldr \rc, =0x00000301 /* RXE | TXE | UARTEN */ - str \rc, [\rb, #0x30] /* -> UARTCR (Control Register) */ + str \rc, [\rb, #LCR_H] /* -> UARTLCR_H (Line control) */ + ldr \rc, =(RXE | TXE | UARTEN) /* RXE | TXE | UARTEN */ + str \rc, [\rb, #CR] /* -> UARTCR (Control Register) */ .endm /* PL011 UART wait UART to be ready to transmit @@ -36,8 +38,8 @@ * rc: scratch register */ .macro early_uart_ready rb, rc 1: - ldr \rc, [\rb, #0x18] /* <- UARTFR (Flag register) */ - tst \rc, #0x8 /* Check BUSY bit */ + ldr \rc, [\rb, #FR] /* <- UARTFR (Flag register) */ + tst \rc, #BUSY /* Check BUSY bit */ bne 1b /* Wait for the UART to be ready */ .endm @@ -45,7 +47,7 @@ * rb: register which contains the UART base address * rt: register which contains the character to transmit */ .macro early_uart_transmit rb, rt - str \rt, [\rb] /* -> UARTDR (Data Register) */ + str \rt, [\rb, #DR] /* -> UARTDR (Data Register) */ .endm /* diff --git a/xen/include/asm-arm/pl011-uart.h b/xen/include/asm-arm/pl011-uart.h index 8c4edd4..3332c51 100644 --- a/xen/include/asm-arm/pl011-uart.h +++ b/xen/include/asm-arm/pl011-uart.h @@ -45,6 +45,7 @@ /* FR bits */ #define TXFE (1<<7) /* TX FIFO empty */ #define RXFE (1<<4) /* RX FIFO empty */ +#define BUSY (1<<3) /* Transmit is not complete */ /* LCR_H bits */ #define SPS (1<<7) /* Stick parity select */