mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Romain Perier <romain.perier@collabora.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-serial@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, Nandor Han <nandor.han@ge.com>,
	Romain Perier <romain.perier@collabora.com>
Subject: [PATCH v2 4/6] serial: imx: unmap sg buffers when DMA channel is released
Date: Wed,  5 Jul 2017 15:07:04 +0200	[thread overview]
Message-ID: <20170705130706.10388-5-romain.perier@collabora.com> (raw)
In-Reply-To: <20170705130706.10388-1-romain.perier@collabora.com>

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>
---
 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 dd3ebb4..3112d88 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -367,6 +367,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)
@@ -376,6 +382,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

  parent reply	other threads:[~2017-07-05 13:07 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-05 13:07 [PATCH v2 0/6] serial: imx: various improvements Romain Perier
2017-07-05 13:07 ` [PATCH v2 1/6] serial: imx: only set DMA rx-ing when DMA starts Romain Perier
2017-07-05 13:29   ` Uwe Kleine-König
2017-07-06  8:31     ` Romain Perier
2017-07-06 10:02       ` Uwe Kleine-König
2017-07-05 13:07 ` [PATCH v2 2/6] serial: imx: Simplify DMA disablement Romain Perier
2017-07-07  1:45   ` kbuild test robot
2017-07-05 13:07 ` [PATCH v2 3/6] serial: imx: remove CTSC and CTS handling Romain Perier
2017-07-05 13:38   ` Uwe Kleine-König
2017-07-05 14:42     ` Clemens Gruber
2017-09-15 20:57     ` Martyn Welch
2017-07-05 13:07 ` Romain Perier [this message]
2017-07-05 13:07 ` [PATCH v2 5/6] serial: imx: update the stop rx,tx procedures Romain Perier
2017-07-05 13:07 ` [PATCH v2 6/6] serial: imx: Fix imx_shutdown procedure Romain Perier

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=20170705130706.10388-5-romain.perier@collabora.com \
    --to=romain.perier@collabora.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 \
    /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®