From: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
To: Greg Kroah-Hartman <gregkh@suse.de>,
Jesper Juhl <jj@chaosbits.net>, Jiri Kosina <jkosina@suse.cz>,
linux-kernel@vger.kernel.org
Cc: qi.wang@intel.com, yong.y.wang@intel.com, joel.clark@intel.com,
kok.howg.ewe@intel.com, toshiharu-linux@dsn.okisemi.com,
Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
Subject: [PATCH linux-next 7/8] pch_uart: fix exclusive access issue
Date: Wed, 23 Feb 2011 10:03:18 +0900 [thread overview]
Message-ID: <1298422999-4050-7-git-send-email-tomoya-linux@dsn.okisemi.com> (raw)
In-Reply-To: <1298422999-4050-1-git-send-email-tomoya-linux@dsn.okisemi.com>
Signed-off-by: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
---
drivers/tty/serial/pch_uart.c | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c
index d937157..c525178 100644
--- a/drivers/tty/serial/pch_uart.c
+++ b/drivers/tty/serial/pch_uart.c
@@ -635,8 +635,7 @@ static void pch_dma_tx_complete(void *arg)
priv->tx_dma_use = 0;
priv->nent = 0;
kfree(priv->sg_tx_p);
- if (uart_circ_chars_pending(xmit))
- pch_uart_hal_enable_interrupt(priv, PCH_UART_HAL_TX_INT);
+ pch_uart_hal_enable_interrupt(priv, PCH_UART_HAL_TX_INT);
}
static int pop_tx(struct eg20t_port *priv, int size)
@@ -792,6 +791,14 @@ static unsigned int dma_handle_tx(struct eg20t_port *priv)
return 0;
}
+ if (priv->tx_dma_use) {
+ dev_dbg(priv->port.dev, "%s:Tx is not completed. (%lu)\n",
+ __func__, jiffies);
+ pch_uart_hal_disable_interrupt(priv, PCH_UART_HAL_TX_INT);
+ priv->tx_empty = 1;
+ return 0;
+ }
+
fifo_size = max(priv->fifo_size, 1);
tx_empty = 1;
if (pop_tx_x(priv, xmit->buf)) {
--
1.7.3.4
next prev parent reply other threads:[~2011-02-23 1:05 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-23 1:03 [PATCH linux-next 1/8] pch_uart: add multi-scatter processing Tomoya MORINAGA
2011-02-23 1:03 ` [PATCH linux-next 2/8] pch_uart: add spin_lock_init Tomoya MORINAGA
2011-02-23 1:03 ` [PATCH linux-next 3/8] pch_uart : Reduce memcpy Tomoya MORINAGA
2011-02-23 1:03 ` [PATCH linux-next 4/8] pch_uart : Use dev_xxx not pr_xxx Tomoya MORINAGA
2011-02-23 1:03 ` [PATCH linux-next 5/8] pch_uart: fix uart clock setting issue Tomoya MORINAGA
2011-02-23 1:03 ` [PATCH linux-next 6/8] pch_uart: fix auto flow control miss-setting issue Tomoya MORINAGA
2011-02-23 1:03 ` Tomoya MORINAGA [this message]
2011-02-23 1:03 ` [PATCH linux-next 8/8] pch_uart: Fix DMA channel " Tomoya MORINAGA
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=1298422999-4050-7-git-send-email-tomoya-linux@dsn.okisemi.com \
--to=tomoya-linux@dsn.okisemi.com \
--cc=gregkh@suse.de \
--cc=jj@chaosbits.net \
--cc=jkosina@suse.cz \
--cc=joel.clark@intel.com \
--cc=kok.howg.ewe@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=qi.wang@intel.com \
--cc=toshiharu-linux@dsn.okisemi.com \
--cc=yong.y.wang@intel.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
all inboxes | Powered by JetHome®