Skip to contentSkip to conversation

tty: serial: tegra: Handle RX transfer in PIO mode if DMA wasn't started

PATCH In review Dmitry Osipenko 3 participants 5 messages Feb 9, 2020 – Feb 21, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 tty: serial: tegra: Handle RX transfer in PIO mode if DMA wasn't started

It is possible to get an instant RX timeout or end-of-transfer interrupt before RX DMA was started, if transaction is less than 16 bytes. Transfer should be handled in PIO mode in this case because DMA can't handle it. This patch brings back the original behaviour of the driver that was changed by accident by a previous commit, it fixes occasional Bluetooth HW initialization failures which I started to notice recently.

Fixes d5e3fadb7012 ("tty: serial: tegra: Activate RX DMA transfer by request")

---

Changelog:

v2: - Corrected commit's title by adding the accidentally missed "tegra: "
to the prefix.

 drivers/tty/serial/serial-tegra.c | 35 ++++++++++++++-----------------
 1 file changed, 16 insertions(+), 19 deletions(-)
drivers/tty/serial/serial-tegra.c +16 -19
index 33034b852a51..8de8bac9c6c7 100644
@@ -692,11 +692,22 @@ static void tegra_uart_copy_rx_to_tty(struct tegra_uart_port *tup,
 				   count, DMA_TO_DEVICE);
 }
 
+static void do_handle_rx_pio(struct tegra_uart_port *tup)
+{
+	struct tty_struct *tty = tty_port_tty_get(&tup->uport.state->port);
+	struct tty_port *port = &tup->uport.state->port;
+
+	tegra_uart_handle_rx_pio(tup, port);
+	if (tty) {
+		tty_flip_buffer_push(port);
+		tty_kref_put(tty);
+	}
+}
+
 static void tegra_uart_rx_buffer_push(struct tegra_uart_port *tup,
 				      unsigned int residue)
 {
 	struct tty_port *port = &tup->uport.state->port;
-	struct tty_struct *tty = tty_port_tty_get(port);
 	unsigned int count;
 
 	async_tx_ack(tup->rx_dma_desc);
@@ -705,11 +716,7 @@ static void tegra_uart_rx_buffer_push(struct tegra_uart_port *tup,
 	/* If we are here, DMA is stopped */
 	tegra_uart_copy_rx_to_tty(tup, port, count);
 
-	tegra_uart_handle_rx_pio(tup, port);
-	if (tty) {
-		tty_flip_buffer_push(port);
-		tty_kref_put(tty);
-	}
+	do_handle_rx_pio(tup);
 }
 
 static void tegra_uart_rx_dma_complete(void *args)
@@ -749,8 +756,10 @@ static void tegra_uart_terminate_rx_dma(struct tegra_uart_port *tup)
 {
 	struct dma_tx_state state;
 
-	if (!tup->rx_dma_active)
+	if (!tup->rx_dma_active) {
+		do_handle_rx_pio(tup);
 		return;
+	}
 
 	dmaengine_terminate_all(tup->rx_dma_chan);
 	dmaengine_tx_status(tup->rx_dma_chan, tup->rx_cookie, &state);
@@ -816,18 +825,6 @@ static void tegra_uart_handle_modem_signal_change(struct uart_port *u)
 		uart_handle_cts_change(&tup->uport, msr & UART_MSR_CTS);
 }
 
-static void do_handle_rx_pio(struct tegra_uart_port *tup)
-{
-	struct tty_struct *tty = tty_port_tty_get(&tup->uport.state->port);
-	struct tty_port *port = &tup->uport.state->port;
-
-	tegra_uart_handle_rx_pio(tup, port);
-	if (tty) {
-		tty_flip_buffer_push(port);
-		tty_kref_put(tty);
-	}
-}
-
 static irqreturn_t tegra_uart_isr(int irq, void *data)
 {
 	struct tegra_uart_port *tup = data;
Signature · 1 line
2.24.0
#1 lore raw
Quoted 24 lines · Dmitry Osipenko

It is possible to get an instant RX timeout or end-of-transfer interrupt before RX DMA was started, if transaction is less than 16 bytes. Transfer should be handled in PIO mode in this case because DMA can't handle it. This patch brings back the original behaviour of the driver that was changed by accident by a previous commit, it fixes occasional Bluetooth HW initialization failures which I started to notice recently.

Fixes d5e3fadb7012 ("tty: serial: tegra: Activate RX DMA transfer by request")

---

Changelog:

v2: - Corrected commit's title by adding the accidentally missed "tegra: "
to the prefix.

 drivers/tty/serial/serial-tegra.c | 35 ++++++++++++++-----------------
 1 file changed, 16 insertions(+), 19 deletions(-)
drivers/tty/serial/serial-tegra.c +0 -0
index 33034b852a51..8de8bac9c6c7 100644

drivers/tty/serial/serial-tegra.c static void tegra_uart_copy_rx_to_tty(struct tegra_uart_port *tup, · line 701

Quoted 10 lines
drivers/tty/serial/serial-tegra.c +7 -0
@@ -692,11 +692,22 @@ static void tegra_uart_copy_rx_to_tty(struct tegra_uart_port *tup,
 				   count, DMA_TO_DEVICE);
 }
 
+static void do_handle_rx_pio(struct tegra_uart_port *tup)
+{
+	struct tty_struct *tty = tty_port_tty_get(&tup->uport.state->port);
+	struct tty_port *port = &tup->uport.state->port;
+
+	tegra_uart_handle_rx_pio(tup, port);
+	if (tty) {

What's the tty good for here, actually?

drivers/tty/serial/serial-tegra.c static void tegra_uart_copy_rx_to_tty(struct tegra_uart_port *tup, · line 705

Quoted 4 lines
drivers/tty/serial/serial-tegra.c +4 -0
+		tty_flip_buffer_push(port);
+		tty_kref_put(tty);
+	}
+}

thanks,

Signature · 2 lines
js
suse labs
#2 lore raw

17.02.2020 10:37, Jiri Slaby пишет:

Quoted 38 lines · Dmitry Osipenko
Quoted 24 lines

It is possible to get an instant RX timeout or end-of-transfer interrupt before RX DMA was started, if transaction is less than 16 bytes. Transfer should be handled in PIO mode in this case because DMA can't handle it. This patch brings back the original behaviour of the driver that was changed by accident by a previous commit, it fixes occasional Bluetooth HW initialization failures which I started to notice recently.

Fixes d5e3fadb7012 ("tty: serial: tegra: Activate RX DMA transfer by request")

---

Changelog:

v2: - Corrected commit's title by adding the accidentally missed "tegra: "
to the prefix.

 drivers/tty/serial/serial-tegra.c | 35 ++++++++++++++-----------------
 1 file changed, 16 insertions(+), 19 deletions(-)
drivers/tty/serial/serial-tegra.c +0 -0
index 33034b852a51..8de8bac9c6c7 100644

drivers/tty/serial/serial-tegra.c static void tegra_uart_copy_rx_to_tty(struct tegra_uart_port *tup, · line 701

Quoted 10 lines
drivers/tty/serial/serial-tegra.c +7 -0
@@ -692,11 +692,22 @@ static void tegra_uart_copy_rx_to_tty(struct tegra_uart_port *tup,
 				   count, DMA_TO_DEVICE);
 }
 
+static void do_handle_rx_pio(struct tegra_uart_port *tup)
+{
+	struct tty_struct *tty = tty_port_tty_get(&tup->uport.state->port);
+	struct tty_port *port = &tup->uport.state->port;
+
+	tegra_uart_handle_rx_pio(tup, port);
+	if (tty) {

What's the tty good for here, actually?

Quoted 4 lines

drivers/tty/serial/serial-tegra.c static void tegra_uart_copy_rx_to_tty(struct tegra_uart_port *tup, · line 705

Quoted 4 lines
drivers/tty/serial/serial-tegra.c +4 -0
+		tty_flip_buffer_push(port);
+		tty_kref_put(tty);
+	}
+}

I'm not really a TTY expert..

Jon, maybe you have any clue whether TTY could disappear while port is opened?

maintainer
#3 lore raw
Quoted 46 lines · Dmitry Osipenko

17.02.2020 10:37, Jiri Slaby пишет:

Quoted 38 lines · Dmitry Osipenko
Quoted 24 lines

It is possible to get an instant RX timeout or end-of-transfer interrupt before RX DMA was started, if transaction is less than 16 bytes. Transfer should be handled in PIO mode in this case because DMA can't handle it. This patch brings back the original behaviour of the driver that was changed by accident by a previous commit, it fixes occasional Bluetooth HW initialization failures which I started to notice recently.

Fixes d5e3fadb7012 ("tty: serial: tegra: Activate RX DMA transfer by request")

---

Changelog:

v2: - Corrected commit's title by adding the accidentally missed "tegra: "
to the prefix.

 drivers/tty/serial/serial-tegra.c | 35 ++++++++++++++-----------------
 1 file changed, 16 insertions(+), 19 deletions(-)
drivers/tty/serial/serial-tegra.c +0 -0
index 33034b852a51..8de8bac9c6c7 100644

drivers/tty/serial/serial-tegra.c static void tegra_uart_copy_rx_to_tty(struct tegra_uart_port *tup, · line 701

Quoted 10 lines
drivers/tty/serial/serial-tegra.c +7 -0
@@ -692,11 +692,22 @@ static void tegra_uart_copy_rx_to_tty(struct tegra_uart_port *tup,
 				   count, DMA_TO_DEVICE);
 }
 
+static void do_handle_rx_pio(struct tegra_uart_port *tup)
+{
+	struct tty_struct *tty = tty_port_tty_get(&tup->uport.state->port);
+	struct tty_port *port = &tup->uport.state->port;
+
+	tegra_uart_handle_rx_pio(tup, port);
+	if (tty) {

What's the tty good for here, actually?

Quoted 4 lines

drivers/tty/serial/serial-tegra.c static void tegra_uart_copy_rx_to_tty(struct tegra_uart_port *tup, · line 705

Quoted 4 lines
drivers/tty/serial/serial-tegra.c +4 -0
+		tty_flip_buffer_push(port);
+		tty_kref_put(tty);
+	}
+}

I'm not really a TTY expert..

Quoted 2 lines

Jon, maybe you have any clue whether TTY could disappear while port is opened?

Nothing specific that I am aware of. The function tty_kref_get() appears to check that the tty pointer is valid and so it would seem logical to check here as well. But happy to be corrected :-)

Jon

Signature · 1 line
nvpublic
#4 lore raw

19.02.2020 17:38, Jon Hunter пишет:

Quoted 48 lines · Dmitry Osipenko
Quoted 46 lines

17.02.2020 10:37, Jiri Slaby пишет:

Quoted 38 lines · Dmitry Osipenko
Quoted 24 lines

It is possible to get an instant RX timeout or end-of-transfer interrupt before RX DMA was started, if transaction is less than 16 bytes. Transfer should be handled in PIO mode in this case because DMA can't handle it. This patch brings back the original behaviour of the driver that was changed by accident by a previous commit, it fixes occasional Bluetooth HW initialization failures which I started to notice recently.

Fixes d5e3fadb7012 ("tty: serial: tegra: Activate RX DMA transfer by request")

---

Changelog:

v2: - Corrected commit's title by adding the accidentally missed "tegra: "
to the prefix.

 drivers/tty/serial/serial-tegra.c | 35 ++++++++++++++-----------------
 1 file changed, 16 insertions(+), 19 deletions(-)
drivers/tty/serial/serial-tegra.c +0 -0
index 33034b852a51..8de8bac9c6c7 100644

drivers/tty/serial/serial-tegra.c static void tegra_uart_copy_rx_to_tty(struct tegra_uart_port *tup, · line 701

Quoted 10 lines
drivers/tty/serial/serial-tegra.c +7 -0
@@ -692,11 +692,22 @@ static void tegra_uart_copy_rx_to_tty(struct tegra_uart_port *tup,
 				   count, DMA_TO_DEVICE);
 }
 
+static void do_handle_rx_pio(struct tegra_uart_port *tup)
+{
+	struct tty_struct *tty = tty_port_tty_get(&tup->uport.state->port);
+	struct tty_port *port = &tup->uport.state->port;
+
+	tegra_uart_handle_rx_pio(tup, port);
+	if (tty) {

What's the tty good for here, actually?

Quoted 4 lines

drivers/tty/serial/serial-tegra.c static void tegra_uart_copy_rx_to_tty(struct tegra_uart_port *tup, · line 705

Quoted 4 lines
drivers/tty/serial/serial-tegra.c +4 -0
+		tty_flip_buffer_push(port);
+		tty_kref_put(tty);
+	}
+}

I'm not really a TTY expert..

Quoted 6 lines
Quoted 2 lines

Jon, maybe you have any clue whether TTY could disappear while port is opened?

Nothing specific that I am aware of. The function tty_kref_get() appears to check that the tty pointer is valid and so it would seem logical to check here as well. But happy to be corrected :-)

Okay, thanks.