From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
To: peter@hurleysoftware.com
Cc: linux-kernel@vger.kernel.org, nsekhar@ti.com,
linux-omap@vger.kernel.org, linux-serial@vger.kernel.org,
john.ogness@linutronix.de,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: [PATCH 2/3] serial: 8250_omap: check how many bytes were injected
Date: Fri, 14 Aug 2015 18:01:03 +0200 [thread overview]
Message-ID: <1439568064-7907-2-git-send-email-bigeasy@linutronix.de> (raw)
In-Reply-To: <1439568064-7907-1-git-send-email-bigeasy@linutronix.de>
The function tty_insert_flip_string() returns an int and as such it
might fail. So the result is that I kindly asked to insert 48 bytes and
the function only insterted 32.
I have no idea what to do with the remaining 16 so I think dropping them
is the only option. I also increase the buf_overrun counter so userpace
has a clue that we lost bytes.
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
drivers/tty/serial/8250/8250_omap.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_omap.c b/drivers/tty/serial/8250/8250_omap.c
index 2ac63c8bd946..933f7ef2c004 100644
--- a/drivers/tty/serial/8250/8250_omap.c
+++ b/drivers/tty/serial/8250/8250_omap.c
@@ -738,6 +738,7 @@ static void __dma_rx_do_complete(struct uart_8250_port *p, bool error)
struct dma_tx_state state;
int count;
unsigned long flags;
+ int ret;
dma_sync_single_for_cpu(dma->rxchan->device->dev, dma->rx_addr,
dma->rx_size, DMA_FROM_DEVICE);
@@ -753,8 +754,10 @@ static void __dma_rx_do_complete(struct uart_8250_port *p, bool error)
count = dma->rx_size - state.residue;
- tty_insert_flip_string(tty_port, dma->rx_buf, count);
- p->port.icount.rx += count;
+ ret = tty_insert_flip_string(tty_port, dma->rx_buf, count);
+
+ p->port.icount.rx += ret;
+ p->port.icount.buf_overrun += count - ret;
unlock:
spin_unlock_irqrestore(&priv->rx_dma_lock, flags);
--
2.5.0
next prev parent reply other threads:[~2015-08-14 16:01 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-14 16:01 [PATCH 1/3] serial: 8250: move rx_running out of the bitfield Sebastian Andrzej Siewior
2015-08-14 16:01 ` Sebastian Andrzej Siewior [this message]
2015-08-26 9:38 ` [PATCH 2/3] serial: 8250_omap: check how many bytes were injected Sekhar Nori
2015-08-26 12:44 ` Peter Hurley
2015-08-26 13:01 ` Sekhar Nori
2015-08-14 16:01 ` [RFC 3/3] serial: 8250_omap: try to avoid IER_RDI with DMA Sebastian Andrzej Siewior
2015-08-26 9:12 ` Sekhar Nori
2015-08-26 9:37 ` [PATCH 1/3] serial: 8250: move rx_running out of the bitfield Sekhar Nori
2015-08-26 12:43 ` Peter Hurley
2015-08-26 12:58 ` Sekhar Nori
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=1439568064-7907-2-git-send-email-bigeasy@linutronix.de \
--to=bigeasy@linutronix.de \
--cc=gregkh@linuxfoundation.org \
--cc=john.ogness@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=nsekhar@ti.com \
--cc=peter@hurleysoftware.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).