Skip to contentSkip to conversation

tty: serial: fsl_lpuart: move dma_request_chan()

PATCH In review Michael Walle 4 participants 6 messages Mar 25, 2020 – Mar 26, 2020 TTY layer and serial drivers

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 tty: serial: fsl_lpuart: move dma_request_chan()

Move dma_request_chan() out of the atomic context. First this call should not be in the atomic context at all and second the dev_info_once() may cause a hang because because the console takes this spinlock, too.

Fixes 159381df1442f ("tty: serial: fsl_lpuart: fix DMA operation when using IOMMU")

---
changes since v1:
- instead of just moving the dev_info_once() out of the spinlock protected section, move the whole dma_request_chan(). Thanks Andy!

I've tested this on my board. Andy, Leonard, can you double check it? For all which are not aware, this deadlock happens only if you have the kernel console output on the lpuart, so if someone wants to test it, make sure you have something like console=ttyLP0,115200.

 drivers/tty/serial/fsl_lpuart.c | 36 +++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 13 deletions(-)
drivers/tty/serial/fsl_lpuart.c +23 -13
index 9c6a018b1390..131018979b77 100644
@@ -1510,20 +1510,33 @@ static void rx_dma_timer_init(struct lpuart_port *sport)
 	add_timer(&sport->lpuart_timer);
 }
 
-static void lpuart_tx_dma_startup(struct lpuart_port *sport)
+static void lpuart_request_dma(struct lpuart_port *sport)
 {
-	u32 uartbaud;
-	int ret;
-
 	sport->dma_tx_chan = dma_request_chan(sport->port.dev, "tx");
 	if (IS_ERR(sport->dma_tx_chan)) {
 		dev_info_once(sport->port.dev,
 			      "DMA tx channel request failed, operating without tx DMA (%ld)\n",
 			      PTR_ERR(sport->dma_tx_chan));
 		sport->dma_tx_chan = NULL;
-		goto err;
 	}
 
+	sport->dma_rx_chan = dma_request_chan(sport->port.dev, "rx");
+	if (IS_ERR(sport->dma_rx_chan)) {
+		dev_info_once(sport->port.dev,
+			      "DMA rx channel request failed, operating without rx DMA (%ld)\n",
+			      PTR_ERR(sport->dma_rx_chan));
+		sport->dma_rx_chan = NULL;
+	}
+}
+
+static void lpuart_tx_dma_startup(struct lpuart_port *sport)
+{
+	u32 uartbaud;
+	int ret;
+
+	if (!sport->dma_tx_chan)
+		goto err;
+
 	ret = lpuart_dma_tx_request(&sport->port);
 	if (!ret)
 		goto err;
@@ -1549,14 +1562,8 @@ static void lpuart_rx_dma_startup(struct lpuart_port *sport)
 {
 	int ret;
 
-	sport->dma_rx_chan = dma_request_chan(sport->port.dev, "rx");
-	if (IS_ERR(sport->dma_rx_chan)) {
-		dev_info_once(sport->port.dev,
-			      "DMA rx channel request failed, operating without rx DMA (%ld)\n",
-			      PTR_ERR(sport->dma_rx_chan));
-		sport->dma_rx_chan = NULL;
+	if (!sport->dma_rx_chan)
 		goto err;
-	}
 
 	ret = lpuart_start_rx_dma(sport);
 	if (ret)
@@ -1592,6 +1599,8 @@ static int lpuart_startup(struct uart_port *port)
 	sport->rxfifo_size = UARTFIFO_DEPTH((temp >> UARTPFIFO_RXSIZE_OFF) &
 					    UARTPFIFO_FIFOSIZE_MASK);
 
+	lpuart_request_dma(sport);
+
 	spin_lock_irqsave(&sport->port.lock, flags);
 
 	lpuart_setup_watermark_enable(sport);
@@ -1649,11 +1658,12 @@ static int lpuart32_startup(struct uart_port *port)
 		sport->port.fifosize = sport->txfifo_size;
 	}
 
+	lpuart_request_dma(sport);
+
 	spin_lock_irqsave(&sport->port.lock, flags);
 
 	lpuart32_setup_watermark_enable(sport);
 
-
 	lpuart_rx_dma_startup(sport);
 	lpuart_tx_dma_startup(sport);
 
Signature · 1 line
2.20.1
#1 lore raw

PATCH v2 2/2 tty: serial: fsl_lpuart: fix return value checking

The return value of lpuart_dma_tx_request() is an negative errno on failure and zero on success.

Fixes 159381df1442f ("tty: serial: fsl_lpuart: fix DMA operation when using IOMMU")

---
changes since v1:
- none

 drivers/tty/serial/fsl_lpuart.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/serial/fsl_lpuart.c +1 -1
index 131018979b77..5d41075964f2 100644
@@ -1538,7 +1538,7 @@ static void lpuart_tx_dma_startup(struct lpuart_port *sport)
 		goto err;
 
 	ret = lpuart_dma_tx_request(&sport->port);
-	if (!ret)
+	if (ret)
 		goto err;
 
 	init_waitqueue_head(&sport->dma_wait);
Signature · 1 line
2.20.1
Reviewed-by on v2 2/2
#2 lore raw

RE: [EXT] [PATCH v2 2/2] tty: serial: fsl_lpuart: fix return value checking

From: Michael Walle <[email protected]> Sent: Wednesday, March 25, 2020 5:07 PM

Quoted 7 lines

The return value of lpuart_dma_tx_request() is an negative errno on failure and zero on success.

Fixes 159381df1442f ("tty: serial: fsl_lpuart: fix DMA operation when using

IOMMU")

Quoted 23 lines

---
changes since v1:
- none

 drivers/tty/serial/fsl_lpuart.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/serial/fsl_lpuart.c index renamed from drivers/tty/serial/fsl_lpuart.c +0 -0

131018979b77..5d41075964f2 100644

drivers/tty/serial/fsl_lpuart.c +1 -1
@@ -1538,7 +1538,7 @@ static void lpuart_tx_dma_startup(struct
 lpuart_port *sport)
                goto err;
 
        ret = lpuart_dma_tx_request(&sport->port);
-       if (!ret)
+       if (ret)
                goto err;
 
        init_waitqueue_head(&sport->dma_wait);

--
2.20.1

Reviewed-by on v2 1/2
#3 lore raw
In reply to Michael Walle

From: Michael Walle <[email protected]> Sent: Wednesday, March 25, 2020 5:07 PM

Quoted 9 lines

Move dma_request_chan() out of the atomic context. First this call should not be in the atomic context at all and second the
dev_info_once() may cause a hang because because the console takes this spinlock, too.

Fixes 159381df1442f ("tty: serial: fsl_lpuart: fix DMA operation when using

IOMMU")

Quoted 102 lines

---
changes since v1:
- instead of just moving the dev_info_once() out of the spinlock protected section, move the whole dma_request_chan(). Thanks Andy!

I've tested this on my board. Andy, Leonard, can you double check it? For all which are not aware, this deadlock happens only if you have the kernel console output on the lpuart, so if someone wants to test it, make sure you have something like console=ttyLP0,115200.

 drivers/tty/serial/fsl_lpuart.c | 36 +++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 13 deletions(-)
drivers/tty/serial/fsl_lpuart.c index renamed from drivers/tty/serial/fsl_lpuart.c +0 -0

9c6a018b1390..131018979b77 100644

drivers/tty/serial/fsl_lpuart.c +18 -12
@@ -1510,20 +1510,33 @@ static void rx_dma_timer_init(struct lpuart_port
 *sport)
        add_timer(&sport->lpuart_timer);  }
 
-static void lpuart_tx_dma_startup(struct lpuart_port *sport)
+static void lpuart_request_dma(struct lpuart_port *sport)
 {
-       u32 uartbaud;
-       int ret;
-
        sport->dma_tx_chan = dma_request_chan(sport->port.dev, "tx");
        if (IS_ERR(sport->dma_tx_chan)) {
                dev_info_once(sport->port.dev,
                              "DMA tx channel request failed,
 operating without tx DMA (%ld)\n",
                              PTR_ERR(sport->dma_tx_chan));
                sport->dma_tx_chan = NULL;
-               goto err;
        }
 
+       sport->dma_rx_chan = dma_request_chan(sport->port.dev, "rx");
+       if (IS_ERR(sport->dma_rx_chan)) {
+               dev_info_once(sport->port.dev,
+                             "DMA rx channel request failed,
 operating without rx DMA (%ld)\n",
+                             PTR_ERR(sport->dma_rx_chan));
+               sport->dma_rx_chan = NULL;
+       }
+}
+
+static void lpuart_tx_dma_startup(struct lpuart_port *sport) {
+       u32 uartbaud;
+       int ret;
+
+       if (!sport->dma_tx_chan)
+               goto err;
+
        ret = lpuart_dma_tx_request(&sport->port);
        if (!ret)
                goto err;
@@ -1549,14 +1562,8 @@ static void lpuart_rx_dma_startup(struct
 lpuart_port *sport)  {
        int ret;
 
-       sport->dma_rx_chan = dma_request_chan(sport->port.dev, "rx");
-       if (IS_ERR(sport->dma_rx_chan)) {
-               dev_info_once(sport->port.dev,
-                             "DMA rx channel request failed,
 operating without rx DMA (%ld)\n",
-                             PTR_ERR(sport->dma_rx_chan));
-               sport->dma_rx_chan = NULL;
+       if (!sport->dma_rx_chan)
                goto err;
-       }
 
        ret = lpuart_start_rx_dma(sport);

if (ret)

drivers/tty/serial/fsl_lpuart.c +0 -0
@@ -1592,6 +1599,8 @@ static int lpuart_startup(struct uart_port *port)
        sport->rxfifo_size = UARTFIFO_DEPTH((temp >>

UARTPFIFO_RXSIZE_OFF) &

UARTPFIFO_FIFOSIZE_MASK);

drivers/tty/serial/fsl_lpuart.c +4 -2
+       lpuart_request_dma(sport);
+
        spin_lock_irqsave(&sport->port.lock, flags);
 
        lpuart_setup_watermark_enable(sport);
@@ -1649,11 +1658,12 @@ static int lpuart32_startup(struct uart_port
 *port)
                sport->port.fifosize = sport->txfifo_size;
        }
 
+       lpuart_request_dma(sport);
+
        spin_lock_irqsave(&sport->port.lock, flags);
 
        lpuart32_setup_watermark_enable(sport);
 
-
        lpuart_rx_dma_startup(sport);
        lpuart_tx_dma_startup(sport);
 
--

2.20.1

Tested-by on v2 1/2
#4 lore raw
In reply to Michael Walle
Quoted 13 lines · Michael Walle

Move dma_request_chan() out of the atomic context. First this call should not be in the atomic context at all and second the dev_info_once() may cause a hang because because the console takes this spinlock, too.

Fixes 159381df1442f ("tty: serial: fsl_lpuart: fix DMA operation when using IOMMU")

---
changes since v1:
- instead of just moving the dev_info_once() out of the spinlock protected section, move the whole dma_request_chan(). Thanks Andy!

Quoted 7 lines

I've tested this on my board. Andy, Leonard, can you double check it? For all which are not aware, this deadlock happens only if you have the kernel console output on the lpuart, so if someone wants to test it, make sure you have something like console=ttyLP0,115200.

  drivers/tty/serial/fsl_lpuart.c | 36 +++++++++++++++++++++------------
  1 file changed, 23 insertions(+), 13 deletions(-)

Since the original commit only made it into next it might make sense to squash the commits in the tty tree.

This way future bisections won't get stuck on a boot failure.

Quoted 84 lines
drivers/tty/serial/fsl_lpuart.c +23 -13
index 9c6a018b1390..131018979b77 100644
@@ -1510,20 +1510,33 @@ static void rx_dma_timer_init(struct lpuart_port *sport)
  	add_timer(&sport->lpuart_timer);
  }
 
-static void lpuart_tx_dma_startup(struct lpuart_port *sport)
+static void lpuart_request_dma(struct lpuart_port *sport)
  {
-	u32 uartbaud;
-	int ret;
-
  	sport->dma_tx_chan = dma_request_chan(sport->port.dev, "tx");
  	if (IS_ERR(sport->dma_tx_chan)) {
  		dev_info_once(sport->port.dev,
  			      "DMA tx channel request failed, operating without tx DMA (%ld)\n",
  			      PTR_ERR(sport->dma_tx_chan));
  		sport->dma_tx_chan = NULL;
-		goto err;
  	}
 
+	sport->dma_rx_chan = dma_request_chan(sport->port.dev, "rx");
+	if (IS_ERR(sport->dma_rx_chan)) {
+		dev_info_once(sport->port.dev,
+			      "DMA rx channel request failed, operating without rx DMA (%ld)\n",
+			      PTR_ERR(sport->dma_rx_chan));
+		sport->dma_rx_chan = NULL;
+	}
+}
+
+static void lpuart_tx_dma_startup(struct lpuart_port *sport)
+{
+	u32 uartbaud;
+	int ret;
+
+	if (!sport->dma_tx_chan)
+		goto err;
+
  	ret = lpuart_dma_tx_request(&sport->port);
  	if (!ret)
  		goto err;
@@ -1549,14 +1562,8 @@ static void lpuart_rx_dma_startup(struct lpuart_port *sport)
  {
  	int ret;
 
-	sport->dma_rx_chan = dma_request_chan(sport->port.dev, "rx");
-	if (IS_ERR(sport->dma_rx_chan)) {
-		dev_info_once(sport->port.dev,
-			      "DMA rx channel request failed, operating without rx DMA (%ld)\n",
-			      PTR_ERR(sport->dma_rx_chan));
-		sport->dma_rx_chan = NULL;
+	if (!sport->dma_rx_chan)
  		goto err;
-	}
 
  	ret = lpuart_start_rx_dma(sport);
  	if (ret)
@@ -1592,6 +1599,8 @@ static int lpuart_startup(struct uart_port *port)
  	sport->rxfifo_size = UARTFIFO_DEPTH((temp >> UARTPFIFO_RXSIZE_OFF) &
  					    UARTPFIFO_FIFOSIZE_MASK);
 
+	lpuart_request_dma(sport);
+
  	spin_lock_irqsave(&sport->port.lock, flags);
 
  	lpuart_setup_watermark_enable(sport);
@@ -1649,11 +1658,12 @@ static int lpuart32_startup(struct uart_port *port)
  		sport->port.fifosize = sport->txfifo_size;
  	}
 
+	lpuart_request_dma(sport);
+
  	spin_lock_irqsave(&sport->port.lock, flags);
 
  	lpuart32_setup_watermark_enable(sport);
 
-
  	lpuart_rx_dma_startup(sport);
  	lpuart_tx_dma_startup(sport);
 
#5 lore raw
Quoted 22 lines · Leonard Crestez
Quoted 13 lines · Michael Walle

Move dma_request_chan() out of the atomic context. First this call should not be in the atomic context at all and second the dev_info_once() may cause a hang because because the console takes this spinlock, too.

Fixes 159381df1442f ("tty: serial: fsl_lpuart: fix DMA operation when using IOMMU")

---
changes since v1:
- instead of just moving the dev_info_once() out of the spinlock protected section, move the whole dma_request_chan(). Thanks Andy!

Quoted 7 lines

I've tested this on my board. Andy, Leonard, can you double check it? For all which are not aware, this deadlock happens only if you have the kernel console output on the lpuart, so if someone wants to test it, make sure you have something like console=ttyLP0,115200.

  drivers/tty/serial/fsl_lpuart.c | 36 +++++++++++++++++++++------------
  1 file changed, 23 insertions(+), 13 deletions(-)
Quoted 6 lines

Since the original commit only made it into next it might make sense to squash the commits in the tty tree.

This way future bisections won't get stuck on a boot failure.

My tree does not rebase, sorry. And neither should any other public git tree without really really good reasons.

thanks,

greg k-h