From: Martyn Welch <martyn.welch@collabora.co.uk>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Nandor Han <nandor.han@ge.com>,
Romain Perier <romain.perier@collabora.com>,
linux-serial@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, u.kleine-koenig@pengutronix.de,
Fabio Estevam <fabio.estevam@nxp.com>,
Martyn Welch <martyn.welch@collabora.co.uk>
Subject: [PATCH v3 4/6] serial: imx: unmap sg buffers when DMA channel is released
Date: Thu, 21 Sep 2017 17:18:15 +0100 [thread overview]
Message-ID: <1506010697-22114-5-git-send-email-martyn.welch@collabora.co.uk> (raw)
In-Reply-To: <1506010697-22114-1-git-send-email-martyn.welch@collabora.co.uk>
From: Nandor Han <nandor.han@ge.com>
This commits unmaps sg buffers when the DMA channel is released. It also
sets to zero `dma_is_rxing` and `dma_is_txing` to state that the
corresponding channels cannot transmit/receive data, as these are
disabled.
Signed-off-by: Nandor Han <nandor.han@ge.com>
Signed-off-by: Romain Perier <romain.perier@collabora.com>
Signed-off-by: Martyn Welch <martyn.welch@collabora.co.uk>
---
drivers/tty/serial/imx.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index 2fb3210..ed02783 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -357,6 +357,12 @@ static void imx_stop_tx_dma(struct imx_port *sport)
temp = readl(sport->port.membase + UCR1);
temp &= ~UCR1_TDMAEN;
writel(temp, sport->port.membase + UCR1);
+
+ if (sport->dma_is_txing) {
+ dma_unmap_sg(sport->port.dev, &sport->tx_sgl[0],
+ sport->dma_tx_nents, DMA_TO_DEVICE);
+ sport->dma_is_txing = 0;
+ }
}
static void imx_stop_rx_dma(struct imx_port *sport)
@@ -366,6 +372,12 @@ static void imx_stop_rx_dma(struct imx_port *sport)
temp = readl(sport->port.membase + UCR1);
temp &= ~(UCR1_RDMAEN | UCR1_ATDMAEN);
writel(temp, sport->port.membase + UCR1);
+
+ if (sport->dma_is_rxing) {
+ dma_unmap_sg(sport->port.dev, &sport->rx_sgl, 1,
+ DMA_FROM_DEVICE);
+ sport->dma_is_rxing = 0;
+ }
}
/*
--
1.8.3.1
next prev parent reply other threads:[~2017-09-21 16:19 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-21 16:18 [PATCH v3 0/6] serial: imx: various improvements Martyn Welch
2017-09-21 16:18 ` [PATCH v3 1/6] serial: imx: remove CTSC and CTS handling from imx_disable_dma Martyn Welch
2017-09-21 18:20 ` Uwe Kleine-König
2017-09-21 19:12 ` Martyn Welch
2017-09-21 16:18 ` [PATCH v3 2/6] serial: imx: only set dma_is_rxing when DMA starts Martyn Welch
2017-09-21 18:15 ` Uwe Kleine-König
2017-09-21 16:18 ` [PATCH v3 3/6] serial: imx: Simplify DMA disablement Martyn Welch
2017-09-21 16:18 ` Martyn Welch [this message]
2017-09-21 18:25 ` [PATCH v3 4/6] serial: imx: unmap sg buffers when DMA channel is released Uwe Kleine-König
2017-09-21 16:18 ` [PATCH v3 5/6] serial: imx: update the stop rx,tx procedures Martyn Welch
2017-09-21 18:28 ` Uwe Kleine-König
2017-09-21 16:18 ` [PATCH v3 6/6] serial: imx: Fix imx_shutdown procedure Martyn Welch
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=1506010697-22114-5-git-send-email-martyn.welch@collabora.co.uk \
--to=martyn.welch@collabora.co.uk \
--cc=fabio.estevam@nxp.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=nandor.han@ge.com \
--cc=romain.perier@collabora.com \
--cc=u.kleine-koenig@pengutronix.de \
/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®