Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1678748

[PATCH 5/7] serial: imx: umap sg buffers when DMA channel is released

Show all headers | View raw

From: Nandor Han <nandor.han@ge.com>

This commits unmaps sg buffers when the DMA channel is released

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 e8cf7cf..58d6b1c 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -1215,6 +1215,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)
@@ -1224,6 +1230,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;
+	}
 }
 
 static void imx_enable_dma(struct imx_port *sport)
-- 
1.8.3.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/7] serial: imx: various improvements Romain Perier <romain.perier@collabora.com> - 2017-06-30 14:10 +0200
  [PATCH 2/7] serial: imx: move log from error to debug type Romain Perier <romain.perier@collabora.com> - 2017-06-30 14:10 +0200
    Re: [PATCH 2/7] serial: imx: move log from error to debug type Uwe Kleine-König          <u.kleine-koenig@pengutronix.de> - 2017-07-03 09:00 +0200
  [PATCH 7/7] serial: imx: Fix imx_shutdown procedure Romain Perier <romain.perier@collabora.com> - 2017-06-30 14:10 +0200
    Re: [PATCH 7/7] serial: imx: Fix imx_shutdown procedure Uwe Kleine-König          <u.kleine-koenig@pengutronix.de> - 2017-07-03 09:10 +0200
  [PATCH 1/7] serial: imx: only set DMA rx-ing when DMA starts Romain Perier <romain.perier@collabora.com> - 2017-06-30 14:10 +0200
    Re: [PATCH 1/7] serial: imx: only set DMA rx-ing when DMA starts Uwe Kleine-König          <u.kleine-koenig@pengutronix.de> - 2017-07-03 08:50 +0200
  [PATCH 3/7] serial: imx: init dma_is_{rx|tx}ing variables Romain Perier <romain.perier@collabora.com> - 2017-06-30 14:10 +0200
    Re: [PATCH 3/7] serial: imx: init dma_is_{rx|tx}ing variables Lothar Waßmann <LW@KARO-electronics.de> - 2017-06-30 14:20 +0200
      Re: [PATCH 3/7] serial: imx: init dma_is_{rx|tx}ing variables Uwe Kleine-König          <u.kleine-koenig@pengutronix.de> - 2017-07-03 09:00 +0200
  [PATCH 5/7] serial: imx: umap sg buffers when DMA channel is released Romain Perier <romain.perier@collabora.com> - 2017-06-30 14:10 +0200
    Re: [PATCH 5/7] serial: imx: umap sg buffers when DMA channel is  released Uwe Kleine-König          <u.kleine-koenig@pengutronix.de> - 2017-07-03 09:10 +0200
  [PATCH 6/7] serial: imx: update the stop rx,tx procedures Romain Perier <romain.perier@collabora.com> - 2017-06-30 14:10 +0200
    Re: [PATCH 6/7] serial: imx: update the stop rx,tx procedures Uwe Kleine-König          <u.kleine-koenig@pengutronix.de> - 2017-07-03 09:10 +0200

csiph-web