From: Soren Brinkmann <soren.brinkmann@xilinx.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jiri Slaby <jslaby@suse.com>
Cc: Michal Simek <michal.simek@xilinx.com>,
<linux-serial@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>,
"Soren Brinkmann" <soren.brinkmann@xilinx.com>
Subject: [PATCH v2 03/10] tty: xuartps: Always enable transmitter in start_tx
Date: Wed, 4 Nov 2015 23:21:12 -0800 [thread overview]
Message-ID: <1446708079-1105-4-git-send-email-soren.brinkmann@xilinx.com> (raw)
In-Reply-To: <1446708079-1105-1-git-send-email-soren.brinkmann@xilinx.com>
start_tx must start transmitting characters. Regardless of the state of
the circular buffer, always enable the transmitter hardware.
Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
---
drivers/tty/serial/xilinx_uartps.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
index 2c98c357d9a0..df6778d17949 100644
--- a/drivers/tty/serial/xilinx_uartps.c
+++ b/drivers/tty/serial/xilinx_uartps.c
@@ -512,9 +512,6 @@ static void cdns_uart_start_tx(struct uart_port *port)
{
unsigned int status, numbytes = port->fifosize;
- if (uart_circ_empty(&port->state->xmit) || uart_tx_stopped(port))
- return;
-
/*
* Set the TX enable bit and clear the TX disable bit to enable the
* transmitter.
@@ -524,6 +521,9 @@ static void cdns_uart_start_tx(struct uart_port *port)
status |= CDNS_UART_CR_TX_EN;
writel(status, port->membase + CDNS_UART_CR_OFFSET);
+ if (uart_circ_empty(&port->state->xmit) || uart_tx_stopped(port))
+ return;
+
while (numbytes-- && ((readl(port->membase + CDNS_UART_SR_OFFSET) &
CDNS_UART_SR_TXFULL)) != CDNS_UART_SR_TXFULL) {
/* Break if no more data available in the UART buffer */
--
2.6.2.3.ga463a5b
next prev parent reply other threads:[~2015-11-05 7:22 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-05 7:21 [PATCH v2 00/10] tty: xuartps: Fix lock ups Soren Brinkmann
2015-11-05 7:21 ` [PATCH v2 01/10] tty: xuartps: Beautify read-modify writes Soren Brinkmann
2015-11-05 7:21 ` [PATCH v2 02/10] tty: xuartps: Use spinlock to serialize HW access Soren Brinkmann
2015-11-05 7:21 ` Soren Brinkmann [this message]
2015-11-05 7:21 ` [PATCH v2 04/10] tty: xuartps: Clear interrupt status register in shutdown Soren Brinkmann
2015-11-05 7:21 ` [PATCH v2 05/10] tty: xuartps: Improve startup function Soren Brinkmann
2015-11-05 7:21 ` [PATCH v2 06/10] tty: xuartps: Keep lock for whole ISR Soren Brinkmann
2015-11-05 7:21 ` [PATCH v2 07/10] tty: xuartps: Acquire port lock for shutdown Soren Brinkmann
2015-11-05 7:21 ` [PATCH v2 08/10] tty: xuartps: Move RX path into helper function Soren Brinkmann
2015-11-05 7:21 ` [PATCH v2 09/10] tty: xuartps: Only handle RX IRQs when RX is enabled Soren Brinkmann
2015-11-05 7:21 ` [PATCH v2 10/10] tty: xuartps: Cleanup: Reformat if-else Soren Brinkmann
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:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1446708079-1105-4-git-send-email-soren.brinkmann@xilinx.com \
--to=soren.brinkmann@xilinx.com \
--cc=gregkh@linuxfoundation.org \
--cc=jslaby@suse.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=michal.simek@xilinx.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* 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).