* - arm-imx-serial-fix-tx-buffer-overflows.patch removed from -mm tree
@ 2007-02-12 7:11 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2007-02-12 7:11 UTC (permalink / raw)
To: s.hauer, pisa, rmk, mm-commits
The patch titled
ARM i.MX serial: fix tx buffer overflows
has been removed from the -mm tree. Its filename was
arm-imx-serial-fix-tx-buffer-overflows.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: ARM i.MX serial: fix tx buffer overflows
From: Sascha Hauer <s.hauer@pengutronix.de>
Fix occasional tx buffer overflows in the i.MX serial driver which came
from the fact that space in the buffer was checked after sending the first
byte. Also, fifosize is 32 bytes, not 8.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de
Cc: Russell King <rmk@arm.linux.org.uk>
Acked-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
drivers/serial/imx.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff -puN drivers/serial/imx.c~arm-imx-serial-fix-tx-buffer-overflows drivers/serial/imx.c
--- a/drivers/serial/imx.c~arm-imx-serial-fix-tx-buffer-overflows
+++ a/drivers/serial/imx.c
@@ -154,7 +154,7 @@ static inline void imx_transmit_buffer(s
{
struct circ_buf *xmit = &sport->port.info->xmit;
- do {
+ while (!(UTS((u32)sport->port.membase) & UTS_TXFULL)) {
/* send xmit->buf[xmit->tail]
* out the port here */
URTX0((u32)sport->port.membase) = xmit->buf[xmit->tail];
@@ -163,7 +163,7 @@ static inline void imx_transmit_buffer(s
sport->port.icount.tx++;
if (uart_circ_empty(xmit))
break;
- } while (!(UTS((u32)sport->port.membase) & UTS_TXFULL));
+ }
if (uart_circ_empty(xmit))
imx_stop_tx(&sport->port);
@@ -178,8 +178,7 @@ static void imx_start_tx(struct uart_por
UCR1((u32)sport->port.membase) |= UCR1_TXMPTYEN;
- if(UTS((u32)sport->port.membase) & UTS_TXEMPTY)
- imx_transmit_buffer(sport);
+ imx_transmit_buffer(sport);
}
static irqreturn_t imx_rtsint(int irq, void *dev_id)
@@ -678,7 +677,7 @@ static struct imx_port imx_ports[] = {
.mapbase = IMX_UART1_BASE, /* FIXME */
.irq = UART1_MINT_RX,
.uartclk = 16000000,
- .fifosize = 8,
+ .fifosize = 32,
.flags = UPF_BOOT_AUTOCONF,
.ops = &imx_pops,
.line = 0,
@@ -694,7 +693,7 @@ static struct imx_port imx_ports[] = {
.mapbase = IMX_UART2_BASE, /* FIXME */
.irq = UART2_MINT_RX,
.uartclk = 16000000,
- .fifosize = 8,
+ .fifosize = 32,
.flags = UPF_BOOT_AUTOCONF,
.ops = &imx_pops,
.line = 1,
_
Patches currently in -mm which might be from s.hauer@pengutronix.de are
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2007-02-12 7:12 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-02-12 7:11 - arm-imx-serial-fix-tx-buffer-overflows.patch removed from -mm tree akpm
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.