xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Shanker Donthineni <shankerd@codeaurora.org>
To: xen-devel <xen-devel@lists.xensource.com>,
	Julien Grall <julien.grall@arm.com>,
	Stefano Stabellini <sstabellini@kernel.org>
Cc: Andre Przywara <andre.przywara@arm.com>,
	Philip Elcan <pelcan@codeaurora.org>,
	Shanker Donthineni <shankerd@codeaurora.org>,
	Vikram Sethi <vikrams@codeaurora.org>,
	Wei Chen <wei.chen@linaro.org>
Subject: [PATCH V7 2/3] drivers/pl011: Use combination of UARTRIS and UARTMSC instead of UARTMIS
Date: Tue,  7 Jun 2016 14:04:03 -0500	[thread overview]
Message-ID: <1465326244-10802-2-git-send-email-shankerd@codeaurora.org> (raw)
In-Reply-To: <1465326244-10802-1-git-send-email-shankerd@codeaurora.org>

The Masked interrupt status register (UARTMIS) is not described in ARM
SBSA 2.x document. Anding of two registers UARTMSC and UARTRIS values
gives the same information as register UARTMIS.

UARTRIS, UARTMSC and UARTMIS definitions are found in PrimeCell UART
PL011 (Revision: r1p4).
 - 3.3.10 Interrupt mask set/clear register, UARTIMSC
 - 3.3.11 Raw interrupt status register, UARTRIS
 - 3.3.12 Masked interrupt status register, UARTMIS

This change is necessary for driver to be SBSA compliant v2.x without
affecting the current driver functionality.

Signed-off-by: Shanker Donthineni <shankerd@codeaurora.org>
Changes since v1:
 Added a new function to return an interrupt status.

 xen/drivers/char/pl011.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/xen/drivers/char/pl011.c b/xen/drivers/char/pl011.c
index 6a3c21b..86fc463 100644
--- a/xen/drivers/char/pl011.c
+++ b/xen/drivers/char/pl011.c
@@ -50,14 +50,21 @@ static struct pl011 {
+/* To compatible with SBSA v2.x document, all accesses should be 32-bit */
 #define pl011_read(uart, off)           readl((uart)->regs + (off))
 #define pl011_write(uart, off,val)      writel((val), (uart)->regs + (off))
+static unsigned int pl011_intr_status(struct pl011 *uart)
+    /* UARTMIS is not documented in SBSA v2.x, so using UARTRIS/UARTIMSC */
+    return ( pl011_read(uart, RIS) & pl011_read(uart, IMSC) );
 static void pl011_interrupt(int irq, void *data, struct cpu_user_regs *regs)
     struct serial_port *port = data;
     struct pl011 *uart = port->uart;
-    unsigned int status = pl011_read(uart, MIS);
+    unsigned int status = pl011_intr_status(uart);
     if ( status )
@@ -76,7 +83,7 @@ static void pl011_interrupt(int irq, void *data, struct cpu_user_regs *regs)
             if ( status & (TXI) )
                 serial_tx_interrupt(port, regs);
-            status = pl011_read(uart, MIS);
+            status = pl011_intr_status(uart);
         } while (status != 0);
Qualcomm Technologies, Inc. on behalf of Qualcomm Innovation Center, Inc. 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, 
a Linux Foundation Collaborative Project

Xen-devel mailing list

  reply	other threads:[~2016-06-07 19:04 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-07 19:04 [PATCH V7 1/3] drivers/pl011: Don't configure baudrate Shanker Donthineni
2016-06-07 19:04 ` Shanker Donthineni [this message]
2016-06-08  9:06   ` [PATCH V7 2/3] drivers/pl011: Use combination of UARTRIS and UARTMSC instead of UARTMIS Julien Grall
2016-06-07 19:04 ` [PATCH V7 3/3] arm/acpi: Add Server Base System Architecture UART support Shanker Donthineni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1465326244-10802-2-git-send-email-shankerd@codeaurora.org \
    --to=shankerd@codeaurora.org \
    --cc=andre.przywara@arm.com \
    --cc=julien.grall@arm.com \
    --cc=pelcan@codeaurora.org \
    --cc=sstabellini@kernel.org \
    --cc=vikrams@codeaurora.org \
    --cc=wei.chen@linaro.org \
    --cc=xen-devel@lists.xensource.com \


* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).