From: daniel@caiaq.de (Daniel Mack)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: imx serial driver: fix resume
Date: Wed, 6 Oct 2010 18:57:16 +0200 [thread overview]
Message-ID: <1286384236-4241-1-git-send-email-daniel@caiaq.de> (raw)
From: Volker Ernst <volker.ernst@txtr.com>
I just came across a bug in the IMX31 serial driver which is still
present in the newest kernels and which prevents successful
resume-operation for the IMX31 serial ports.
What happens is that in "drivers/serial/imx.c" on resume function
"serial_imx_resume" gets called. This function in turn calls
"uart_resume_port" (in the generic serial driver "serial_core.c"),
which in turn calls "imx_start_tx" in "imx.c" (in case the SIO-port
was really suspended) which in turn calls "imx_transmit_buffer".
However calling "imx_transmit_buffer" with an empty TX-fifo (as is
usually the case) will result in the serial port starting to transmit
(actually the old [already sent] tx-buffer), as there is no check if
the tx-buffer is empty before starting to feed tx-fifo-data to the
serial port hardware.
Signed-off-by: Volker Ernst <volker.ernst@txtr.com>
Cc: Daniel Mack <daniel@caiaq.de>
Cc: Andy Green <andy@warmcat.com>
---
Volker did all the work on this, he just doesn't want to push his great
contributions upstream, so I do it for him :)
drivers/serial/imx.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index 66ecc7a..0170119 100644
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -328,13 +328,13 @@ static inline void imx_transmit_buffer(struct imx_port *sport)
struct circ_buf *xmit = &sport->port.state->xmit;
while (!(readl(sport->port.membase + UTS) & UTS_TXFULL)) {
+ if (uart_circ_empty(xmit))
+ break;
/* send xmit->buf[xmit->tail]
* out the port here */
writel(xmit->buf[xmit->tail], sport->port.membase + URTX0);
xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
sport->port.icount.tx++;
- if (uart_circ_empty(xmit))
- break;
}
if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
--
1.7.0.4
next reply other threads:[~2010-10-06 16:57 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-06 16:57 Daniel Mack [this message]
2010-10-07 22:56 ` [PATCH] ARM: imx serial driver: fix resume Andrew Morton
2010-10-08 9:16 ` Uwe Kleine-König
2010-10-13 9:03 ` [PATCH] serial/imx: check that the buffer is non-empty before sending it out Uwe Kleine-König
2010-10-14 11:27 ` Daniel Mack
2010-10-14 18:47 ` Greg KH
2010-10-12 17:56 ` [PATCH] ARM: imx serial driver: fix resume Uwe Kleine-König
2010-10-12 18:32 ` Daniel Mack
2010-10-13 8:46 ` Uwe Kleine-König
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=1286384236-4241-1-git-send-email-daniel@caiaq.de \
--to=daniel@caiaq.de \
--cc=linux-arm-kernel@lists.infradead.org \
/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 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.