Skip to contentSkip to conversation

tty: fixes on top of summer cleanup

PATCH In review Jiri Slaby (SUSE) 3 participants 16 messages Jun 24, 2025 – Jun 25, 2025

Subsystems (2)
lore
Share & tools
lore

Jiri Slaby (SUSE)

author maintainer
#0 lore raw

v2 cover tty: fixes on top of summer cleanup

These are fixes which were suggested or popped out of the summer cleanup series.

For v1..v2 diff, see the comments in respective patches.

Jiri Slaby (SUSE) (5):
serial: 8250: extract serial8250_init_mctrl()
serial: 8250: extract serial8250_iir_txen_test()
serial: 8250: rename lsr_TEMT, iir_NOINT to lowercase
serial: 8250: document doubled "type == PORT_8250_CIR" check
tty: fix tty_port_tty_*hangup() kernel-doc

 Documentation/driver-api/tty/tty_port.rst |  5 +-
 drivers/tty/serial/8250/8250_core.c       |  2 +
 drivers/tty/serial/8250/8250_port.c       | 60 ++++++++++++++---------
 drivers/tty/tty_port.c                    |  5 --
 include/linux/tty_port.h                  |  9 ++++
 5 files changed, 50 insertions(+), 31 deletions(-)
Signature · 1 line
2.50.0
author maintainer
#1 lore raw

PATCH v2 1/5 serial: 8250: extract serial8250_init_mctrl()

After commit 795158691cc0 ("serial: 8250: extract serial8250_initialize()"), split serial8250_initialize() even more -- the mctrl part of this code can be separated into serial8250_init_mctrl() -- done now.

---
[v2]
* use port-> directly.
* do not remove curly braces.
Both rebase errors -- noticed by Andy.

---
 drivers/tty/serial/8250/8250_port.c | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)
drivers/tty/serial/8250/8250_port.c +13 -8
index 48c30e158cb8..0f85a2f292fc 100644
@@ -2216,15 +2216,8 @@ static void serial8250_THRE_test(struct uart_port *port)
 		up->bugs |= UART_BUG_THRE;
 }
 
-static void serial8250_initialize(struct uart_port *port)
+static void serial8250_init_mctrl(struct uart_port *port)
 {
-	struct uart_8250_port *up = up_to_u8250p(port);
-	unsigned long flags;
-	bool lsr_TEMT, iir_NOINT;
-
-	serial_port_out(port, UART_LCR, UART_LCR_WLEN8);
-
-	uart_port_lock_irqsave(port, &flags);
 	if (port->flags & UPF_FOURPORT) {
 		if (!port->irq)
 			port->mctrl |= TIOCM_OUT1;
@@ -2235,6 +2228,18 @@ static void serial8250_initialize(struct uart_port *port)
 	}
 
 	serial8250_set_mctrl(port, port->mctrl);
+}
+
+static void serial8250_initialize(struct uart_port *port)
+{
+	struct uart_8250_port *up = up_to_u8250p(port);
+	unsigned long flags;
+	bool lsr_TEMT, iir_NOINT;
+
+	serial_port_out(port, UART_LCR, UART_LCR_WLEN8);
+
+	uart_port_lock_irqsave(port, &flags);
+	serial8250_init_mctrl(port);
 
 	/*
 	 * Serial over Lan (SoL) hack:
Signature · 1 line
2.50.0
Reviewed-by on v2 1/5
#2 lore raw

Re: [PATCH v2 1/5] serial: 8250: extract serial8250_init_mctrl()

Quoted 7 lines · Jiri Slaby (SUSE)

After commit 795158691cc0 ("serial: 8250: extract serial8250_initialize()"), split serial8250_initialize() even more -- the mctrl part of this code can be separated into serial8250_init_mctrl() -- done now.

Heh, I didn't even realize I was suggesting this :-D but it's good nonetheless.

Quoted 51 lines
Cc Andy Shevchenko <[email protected]>

---
[v2]
* use port-> directly.
* do not remove curly braces.
Both rebase errors -- noticed by Andy.

---
 drivers/tty/serial/8250/8250_port.c | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)
drivers/tty/serial/8250/8250_port.c +13 -8
index 48c30e158cb8..0f85a2f292fc 100644
@@ -2216,15 +2216,8 @@ static void serial8250_THRE_test(struct uart_port *port)
 		up->bugs |= UART_BUG_THRE;
 }
 
-static void serial8250_initialize(struct uart_port *port)
+static void serial8250_init_mctrl(struct uart_port *port)
 {
-	struct uart_8250_port *up = up_to_u8250p(port);
-	unsigned long flags;
-	bool lsr_TEMT, iir_NOINT;
-
-	serial_port_out(port, UART_LCR, UART_LCR_WLEN8);
-
-	uart_port_lock_irqsave(port, &flags);
 	if (port->flags & UPF_FOURPORT) {
 		if (!port->irq)
 			port->mctrl |= TIOCM_OUT1;
@@ -2235,6 +2228,18 @@ static void serial8250_initialize(struct uart_port *port)
 	}
 
 	serial8250_set_mctrl(port, port->mctrl);
+}
+
+static void serial8250_initialize(struct uart_port *port)
+{
+	struct uart_8250_port *up = up_to_u8250p(port);
+	unsigned long flags;
+	bool lsr_TEMT, iir_NOINT;
+
+	serial_port_out(port, UART_LCR, UART_LCR_WLEN8);
+
+	uart_port_lock_irqsave(port, &flags);
+	serial8250_init_mctrl(port);
 
 	/*
 	 * Serial over Lan (SoL) hack:
Signature · 1 line
 i.
#3 lore raw

Re: [PATCH v2 1/5] serial: 8250: extract serial8250_init_mctrl()

Quoted 33 lines · Ilpo Järvinen
Quoted 7 lines · Jiri Slaby (SUSE)

After commit 795158691cc0 ("serial: 8250: extract serial8250_initialize()"), split serial8250_initialize() even more -- the mctrl part of this code can be separated into serial8250_init_mctrl() -- done now.

Heh, I didn't even realize I was suggesting this :-D but it's good nonetheless.

Quoted 18 lines
Cc Andy Shevchenko <[email protected]>

---
[v2]
* use port-> directly.
* do not remove curly braces.
Both rebase errors -- noticed by Andy.

---
 drivers/tty/serial/8250/8250_port.c | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)
drivers/tty/serial/8250/8250_port.c +0 -0
index 48c30e158cb8..0f85a2f292fc 100644
@@ -2216,15 +2216,8 @@ static void serial8250_THRE_test(struct uart_port *port)
 		up->bugs |= UART_BUG_THRE;
 }
 
Quoted 11 lines

drivers/tty/serial/8250/8250_port.c static void serial8250_THRE_test(struct uart_port *port) · line 2221

Quoted 11 lines
drivers/tty/serial/8250/8250_port.c +1 -8
-static void serial8250_initialize(struct uart_port *port)
+static void serial8250_init_mctrl(struct uart_port *port)
 {
-	struct uart_8250_port *up = up_to_u8250p(port);
-	unsigned long flags;
-	bool lsr_TEMT, iir_NOINT;
-
-	serial_port_out(port, UART_LCR, UART_LCR_WLEN8);
-
-	uart_port_lock_irqsave(port, &flags);
 	if (port->flags & UPF_FOURPORT) {

I should have also added what I meant with my earlier suggestion. AFAICT, this UPF_FOURPORT thing can only occur if SERIAL_8250_FOURPORT is enabled.

The challenge obviously are the if/else constructs but there are a few places that do port->flags & UPF_FOURPORT specific thing and something else otherwise. That hw-specific code could be placed into the hw-specific 8250_fourport.c file if the hw-specific function is made to return true if it did match, and the generic code runs otherwise.

I also have no idea why serial/sunsu.c checks UPF_FOURPORT, perhaps that's copy-paste in action. :-)

Quoted 24 lines
Quoted 22 lines
drivers/tty/serial/8250/8250_port.c +12 -0
 		if (!port->irq)
 			port->mctrl |= TIOCM_OUT1;
@@ -2235,6 +2228,18 @@ static void serial8250_initialize(struct uart_port *port)
 	}
 
 	serial8250_set_mctrl(port, port->mctrl);
+}
+
+static void serial8250_initialize(struct uart_port *port)
+{
+	struct uart_8250_port *up = up_to_u8250p(port);
+	unsigned long flags;
+	bool lsr_TEMT, iir_NOINT;
+
+	serial_port_out(port, UART_LCR, UART_LCR_WLEN8);
+
+	uart_port_lock_irqsave(port, &flags);
+	serial8250_init_mctrl(port);
 
 	/*
 	 * Serial over Lan (SoL) hack:
Signature · 1 line
 i.
author maintainer
#4 lore raw

Re: [PATCH v2 1/5] serial: 8250: extract serial8250_init_mctrl()

Quoted 50 lines · Ilpo Järvinen
Quoted 33 lines · Ilpo Järvinen
Quoted 7 lines · Jiri Slaby (SUSE)

After commit 795158691cc0 ("serial: 8250: extract serial8250_initialize()"), split serial8250_initialize() even more -- the mctrl part of this code can be separated into serial8250_init_mctrl() -- done now.

Heh, I didn't even realize I was suggesting this :-D but it's good nonetheless.

Quoted 18 lines
Cc Andy Shevchenko <[email protected]>

---
[v2]
* use port-> directly.
* do not remove curly braces.
Both rebase errors -- noticed by Andy.

---
  drivers/tty/serial/8250/8250_port.c | 21 +++++++++++++--------
  1 file changed, 13 insertions(+), 8 deletions(-)
drivers/tty/serial/8250/8250_port.c +0 -0
index 48c30e158cb8..0f85a2f292fc 100644
@@ -2216,15 +2216,8 @@ static void serial8250_THRE_test(struct uart_port *port)
  		up->bugs |= UART_BUG_THRE;
  }
 
Quoted 11 lines

drivers/tty/serial/8250/8250_port.c static void serial8250_THRE_test(struct uart_port *port) · line 2221

Quoted 11 lines
drivers/tty/serial/8250/8250_port.c +1 -8
-static void serial8250_initialize(struct uart_port *port)
+static void serial8250_init_mctrl(struct uart_port *port)
  {
-	struct uart_8250_port *up = up_to_u8250p(port);
-	unsigned long flags;
-	bool lsr_TEMT, iir_NOINT;
-
-	serial_port_out(port, UART_LCR, UART_LCR_WLEN8);
-
-	uart_port_lock_irqsave(port, &flags);
  	if (port->flags & UPF_FOURPORT) {

I should have also added what I meant with my earlier suggestion. AFAICT, this UPF_FOURPORT thing can only occur if SERIAL_8250_FOURPORT is enabled.

Quoted 5 lines

The challenge obviously are the if/else constructs but there are a few places that do port->flags & UPF_FOURPORT specific thing and something else otherwise. That hw-specific code could be placed into the hw-specific 8250_fourport.c file if the hw-specific function is made to return true if it did match, and the generic code runs otherwise.

So you can brew a patch for this, right :)? Every time I read some code the same you describe, I end up with 10+ patches. I don't want for now :P.

Quoted 2 lines

I also have no idea why serial/sunsu.c checks UPF_FOURPORT, perhaps that's copy-paste in action. :-)

Yes, AFAI looked, it was during the switch of sunsu to serial driver. If you feel confident (it really appears apparent), drop that too ;).

thanks,

Signature · 2 lines
js
suse labs
Reviewed-by on v2 1/5
#5 lore raw

Re: [PATCH v2 1/5] serial: 8250: extract serial8250_init_mctrl()

In reply to Jiri Slaby (SUSE)
Quoted 4 lines · Jiri Slaby (SUSE)

After commit 795158691cc0 ("serial: 8250: extract serial8250_initialize()"), split serial8250_initialize() even more -- the mctrl part of this code can be separated into serial8250_init_mctrl() -- done now.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
author maintainer
#6 lore raw

PATCH v2 2/5 serial: 8250: extract serial8250_iir_txen_test()

In reply to Jiri Slaby (SUSE)

After commit 795158691cc0 ("serial: 8250: extract serial8250_initialize()"), split serial8250_initialize() even more -- the TX enable test part of this code can be separated into serial8250_iir_txen_test().

---
 drivers/tty/serial/8250/8250_port.c | 49 ++++++++++++++++-------------
 1 file changed, 28 insertions(+), 21 deletions(-)
drivers/tty/serial/8250/8250_port.c +28 -21
index 0f85a2f292fc..5bb0ca04da55 100644
@@ -2230,16 +2230,19 @@ static void serial8250_init_mctrl(struct uart_port *port)
 	serial8250_set_mctrl(port, port->mctrl);
 }
 
-static void serial8250_initialize(struct uart_port *port)
+static void serial8250_iir_txen_test(struct uart_port *port)
 {
 	struct uart_8250_port *up = up_to_u8250p(port);
-	unsigned long flags;
 	bool lsr_TEMT, iir_NOINT;
 
-	serial_port_out(port, UART_LCR, UART_LCR_WLEN8);
+	if (port->quirks & UPQ_NO_TXEN_TEST)
+		return;
 
-	uart_port_lock_irqsave(port, &flags);
-	serial8250_init_mctrl(port);
+	/* Do a quick test to see if we receive an interrupt when we enable the TX irq. */
+	serial_port_out(port, UART_IER, UART_IER_THRI);
+	lsr_TEMT = serial_port_in(port, UART_LSR) & UART_LSR_TEMT;
+	iir_NOINT = serial_port_in(port, UART_IIR) & UART_IIR_NO_INT;
+	serial_port_out(port, UART_IER, 0);
 
 	/*
 	 * Serial over Lan (SoL) hack:
@@ -2247,26 +2250,30 @@ static void serial8250_initialize(struct uart_port *port)
 	 * Lan.  Those chips take a longer time than a normal serial device to signalize that a
 	 * transmission data was queued. Due to that, the above test generally fails. One solution
 	 * would be to delay the reading of iir. However, this is not reliable, since the timeout is
-	 * variable. So, let's just don't test if we receive TX irq.  This way, we'll never enable
-	 * UART_BUG_TXEN.
+	 * variable. So, in case of UPQ_NO_TXEN_TEST, let's just don't test if we receive TX irq.
+	 * This way, we'll never enable UART_BUG_TXEN.
 	 */
-	if (!(port->quirks & UPQ_NO_TXEN_TEST)) {
-		/* Do a quick test to see if we receive an interrupt when we enable the TX irq. */
-		serial_port_out(port, UART_IER, UART_IER_THRI);
-		lsr_TEMT = serial_port_in(port, UART_LSR) & UART_LSR_TEMT;
-		iir_NOINT = serial_port_in(port, UART_IIR) & UART_IIR_NO_INT;
-		serial_port_out(port, UART_IER, 0);
-
-		if (lsr_TEMT && iir_NOINT) {
-			if (!(up->bugs & UART_BUG_TXEN)) {
-				up->bugs |= UART_BUG_TXEN;
-				dev_dbg(port->dev, "enabling bad tx status workarounds\n");
-			}
-		} else {
-			up->bugs &= ~UART_BUG_TXEN;
+	if (lsr_TEMT && iir_NOINT) {
+		if (!(up->bugs & UART_BUG_TXEN)) {
+			up->bugs |= UART_BUG_TXEN;
+			dev_dbg(port->dev, "enabling bad tx status workarounds\n");
 		}
+		return;
 	}
 
+	/* FIXME: why is this needed? */
+	up->bugs &= ~UART_BUG_TXEN;
+}
+
+static void serial8250_initialize(struct uart_port *port)
+{
+	unsigned long flags;
+
+	serial_port_out(port, UART_LCR, UART_LCR_WLEN8);
+
+	uart_port_lock_irqsave(port, &flags);
+	serial8250_init_mctrl(port);
+	serial8250_iir_txen_test(port);
 	uart_port_unlock_irqrestore(port, flags);
 }
 
Signature · 1 line
2.50.0
Reviewed-by on v2 2/5
#7 lore raw

Re: [PATCH v2 2/5] serial: 8250: extract serial8250_iir_txen_test()

Quoted 78 lines · Jiri Slaby (SUSE)

After commit 795158691cc0 ("serial: 8250: extract serial8250_initialize()"), split serial8250_initialize() even more -- the TX enable test part of this code can be separated into serial8250_iir_txen_test().

---
 drivers/tty/serial/8250/8250_port.c | 49 ++++++++++++++++-------------
 1 file changed, 28 insertions(+), 21 deletions(-)
drivers/tty/serial/8250/8250_port.c +21 -21
index 0f85a2f292fc..5bb0ca04da55 100644
@@ -2230,16 +2230,19 @@ static void serial8250_init_mctrl(struct uart_port *port)
 	serial8250_set_mctrl(port, port->mctrl);
 }
 
-static void serial8250_initialize(struct uart_port *port)
+static void serial8250_iir_txen_test(struct uart_port *port)
 {
 	struct uart_8250_port *up = up_to_u8250p(port);
-	unsigned long flags;
 	bool lsr_TEMT, iir_NOINT;
 
-	serial_port_out(port, UART_LCR, UART_LCR_WLEN8);
+	if (port->quirks & UPQ_NO_TXEN_TEST)
+		return;
 
-	uart_port_lock_irqsave(port, &flags);
-	serial8250_init_mctrl(port);
+	/* Do a quick test to see if we receive an interrupt when we enable the TX irq. */
+	serial_port_out(port, UART_IER, UART_IER_THRI);
+	lsr_TEMT = serial_port_in(port, UART_LSR) & UART_LSR_TEMT;
+	iir_NOINT = serial_port_in(port, UART_IIR) & UART_IIR_NO_INT;
+	serial_port_out(port, UART_IER, 0);
 
 	/*
 	 * Serial over Lan (SoL) hack:
@@ -2247,26 +2250,30 @@ static void serial8250_initialize(struct uart_port *port)
 	 * Lan.  Those chips take a longer time than a normal serial device to signalize that a
 	 * transmission data was queued. Due to that, the above test generally fails. One solution
 	 * would be to delay the reading of iir. However, this is not reliable, since the timeout is
-	 * variable. So, let's just don't test if we receive TX irq.  This way, we'll never enable
-	 * UART_BUG_TXEN.
+	 * variable. So, in case of UPQ_NO_TXEN_TEST, let's just don't test if we receive TX irq.
+	 * This way, we'll never enable UART_BUG_TXEN.
 	 */
-	if (!(port->quirks & UPQ_NO_TXEN_TEST)) {
-		/* Do a quick test to see if we receive an interrupt when we enable the TX irq. */
-		serial_port_out(port, UART_IER, UART_IER_THRI);
-		lsr_TEMT = serial_port_in(port, UART_LSR) & UART_LSR_TEMT;
-		iir_NOINT = serial_port_in(port, UART_IIR) & UART_IIR_NO_INT;
-		serial_port_out(port, UART_IER, 0);
-
-		if (lsr_TEMT && iir_NOINT) {
-			if (!(up->bugs & UART_BUG_TXEN)) {
-				up->bugs |= UART_BUG_TXEN;
-				dev_dbg(port->dev, "enabling bad tx status workarounds\n");
-			}
-		} else {
-			up->bugs &= ~UART_BUG_TXEN;
+	if (lsr_TEMT && iir_NOINT) {
+		if (!(up->bugs & UART_BUG_TXEN)) {
+			up->bugs |= UART_BUG_TXEN;
+			dev_dbg(port->dev, "enabling bad tx status workarounds\n");
 		}
+		return;
 	}
 
+	/* FIXME: why is this needed? */
+	up->bugs &= ~UART_BUG_TXEN;
+}
+
+static void serial8250_initialize(struct uart_port *port)
+{

drivers/tty/serial/8250/8250_port.c static void serial8250_initialize(struct uart_port *port) · line 2279

Quoted 10 lines
drivers/tty/serial/8250/8250_port.c +7 -0
+	unsigned long flags;
+
+	serial_port_out(port, UART_LCR, UART_LCR_WLEN8);
+
+	uart_port_lock_irqsave(port, &flags);
+	serial8250_init_mctrl(port);
+	serial8250_iir_txen_test(port);
 	uart_port_unlock_irqrestore(port, flags);
 }
 
Signature · 1 line
 i.
Reviewed-by on v2 2/5
#8 lore raw

Re: [PATCH v2 2/5] serial: 8250: extract serial8250_iir_txen_test()

In reply to Jiri Slaby (SUSE)
Quoted 4 lines · Jiri Slaby (SUSE)

After commit 795158691cc0 ("serial: 8250: extract serial8250_initialize()"), split serial8250_initialize() even more -- the TX enable test part of this code can be separated into serial8250_iir_txen_test().

Signature · 2 lines
With Best Regards,
Andy Shevchenko
author maintainer
#9 lore raw

PATCH v2 3/5 serial: 8250: rename lsr_TEMT, iir_NOINT to lowercase

In reply to Jiri Slaby (SUSE)

There are already variables like 'iir_noint1' and 'iir_noint2'. Follow the preexisting lowercase naming of variables. So s/lsr_TEMT/lsr_temt/ and 'iir_NOINT' likewise.

---
 drivers/tty/serial/8250/8250_port.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/tty/serial/8250/8250_port.c +4 -4
index 5bb0ca04da55..7eddcab318b4 100644
@@ -2233,15 +2233,15 @@ static void serial8250_init_mctrl(struct uart_port *port)
 static void serial8250_iir_txen_test(struct uart_port *port)
 {
 	struct uart_8250_port *up = up_to_u8250p(port);
-	bool lsr_TEMT, iir_NOINT;
+	bool lsr_temt, iir_noint;
 
 	if (port->quirks & UPQ_NO_TXEN_TEST)
 		return;
 
 	/* Do a quick test to see if we receive an interrupt when we enable the TX irq. */
 	serial_port_out(port, UART_IER, UART_IER_THRI);
-	lsr_TEMT = serial_port_in(port, UART_LSR) & UART_LSR_TEMT;
-	iir_NOINT = serial_port_in(port, UART_IIR) & UART_IIR_NO_INT;
+	lsr_temt = serial_port_in(port, UART_LSR) & UART_LSR_TEMT;
+	iir_noint = serial_port_in(port, UART_IIR) & UART_IIR_NO_INT;
 	serial_port_out(port, UART_IER, 0);
 
 	/*
@@ -2253,7 +2253,7 @@ static void serial8250_iir_txen_test(struct uart_port *port)
 	 * variable. So, in case of UPQ_NO_TXEN_TEST, let's just don't test if we receive TX irq.
 	 * This way, we'll never enable UART_BUG_TXEN.
 	 */
-	if (lsr_TEMT && iir_NOINT) {
+	if (lsr_temt && iir_noint) {
 		if (!(up->bugs & UART_BUG_TXEN)) {
 			up->bugs |= UART_BUG_TXEN;
 			dev_dbg(port->dev, "enabling bad tx status workarounds\n");
Signature · 1 line
2.50.0
Reviewed-by on v2 3/5
#10 lore raw

Re: [PATCH v2 3/5] serial: 8250: rename lsr_TEMT, iir_NOINT to lowercase

Quoted 35 lines · Jiri Slaby (SUSE)

There are already variables like 'iir_noint1' and 'iir_noint2'. Follow the preexisting lowercase naming of variables. So s/lsr_TEMT/lsr_temt/ and 'iir_NOINT' likewise.

---
 drivers/tty/serial/8250/8250_port.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/tty/serial/8250/8250_port.c +3 -3
index 5bb0ca04da55..7eddcab318b4 100644
@@ -2233,15 +2233,15 @@ static void serial8250_init_mctrl(struct uart_port *port)
 static void serial8250_iir_txen_test(struct uart_port *port)
 {
 	struct uart_8250_port *up = up_to_u8250p(port);
-	bool lsr_TEMT, iir_NOINT;
+	bool lsr_temt, iir_noint;
 
 	if (port->quirks & UPQ_NO_TXEN_TEST)
 		return;
 
 	/* Do a quick test to see if we receive an interrupt when we enable the TX irq. */
 	serial_port_out(port, UART_IER, UART_IER_THRI);
-	lsr_TEMT = serial_port_in(port, UART_LSR) & UART_LSR_TEMT;
-	iir_NOINT = serial_port_in(port, UART_IIR) & UART_IIR_NO_INT;
+	lsr_temt = serial_port_in(port, UART_LSR) & UART_LSR_TEMT;
+	iir_noint = serial_port_in(port, UART_IIR) & UART_IIR_NO_INT;
 	serial_port_out(port, UART_IER, 0);
 
 	/*

drivers/tty/serial/8250/8250_port.c static void serial8250_iir_txen_test(struct uart_port *port) · line 2259

Quoted 8 lines
drivers/tty/serial/8250/8250_port.c +1 -1
@@ -2253,7 +2253,7 @@ static void serial8250_iir_txen_test(struct uart_port *port)
 	 * variable. So, in case of UPQ_NO_TXEN_TEST, let's just don't test if we receive TX irq.
 	 * This way, we'll never enable UART_BUG_TXEN.
 	 */
-	if (lsr_TEMT && iir_NOINT) {
+	if (lsr_temt && iir_noint) {
 		if (!(up->bugs & UART_BUG_TXEN)) {
 			up->bugs |= UART_BUG_TXEN;
 			dev_dbg(port->dev, "enabling bad tx status workarounds\n");
Signature · 1 line
 i.
Reviewed-by on v2 3/5
#11 lore raw

Re: [PATCH v2 3/5] serial: 8250: rename lsr_TEMT, iir_NOINT to lowercase

In reply to Jiri Slaby (SUSE)
Quoted 3 lines · Jiri Slaby (SUSE)

There are already variables like 'iir_noint1' and 'iir_noint2'. Follow the preexisting lowercase naming of variables. So s/lsr_TEMT/lsr_temt/ and 'iir_NOINT' likewise.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
author maintainer
#12 lore raw

PATCH v2 4/5 serial: 8250: document doubled "type == PORT_8250_CIR" check

In reply to Jiri Slaby (SUSE)

The check for "port.type == PORT_8250_CIR" is present twice in serial8250_register_8250_port(). The latter was already tried to be dropped by 1104321a7b3b ("serial: Delete dead code for CIR serial ports") and then reverted by 9527b82ae3af ("Revert "serial: Delete dead code for CIR serial ports"").

Document this weirdness with a reason.

---
 drivers/tty/serial/8250/8250_core.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/tty/serial/8250/8250_core.c +2 -0
index a6ecb8575da4..feb920c5b2e8 100644
@@ -717,6 +717,7 @@ int serial8250_register_8250_port(const struct uart_8250_port *up)
 		nr_uarts++;
 	}
 
+	/* Check if it is CIR already. We check this below again, see there why. */
 	if (uart->port.type == PORT_8250_CIR) {
 		ret = -ENODEV;
 		goto unlock;
@@ -815,6 +816,7 @@ int serial8250_register_8250_port(const struct uart_8250_port *up)
 	if (up->dl_write)
 		uart->dl_write = up->dl_write;
 
+	/* Check the type (again)! It might have changed by the port.type assignment above. */
 	if (uart->port.type != PORT_8250_CIR) {
 		if (uart_console_registered(&uart->port))
 			pm_runtime_get_sync(uart->port.dev);
Signature · 1 line
2.50.0
Reviewed-by on v2 4/5
#13 lore raw

Re: [PATCH v2 4/5] serial: 8250: document doubled "type == PORT_8250_CIR" check

Quoted 31 lines · Jiri Slaby (SUSE)

The check for "port.type == PORT_8250_CIR" is present twice in serial8250_register_8250_port(). The latter was already tried to be dropped by 1104321a7b3b ("serial: Delete dead code for CIR serial ports") and then reverted by 9527b82ae3af ("Revert "serial: Delete dead code for CIR serial ports"").

Document this weirdness with a reason.

---
 drivers/tty/serial/8250/8250_core.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/tty/serial/8250/8250_core.c +1 -0
index a6ecb8575da4..feb920c5b2e8 100644
@@ -717,6 +717,7 @@ int serial8250_register_8250_port(const struct uart_8250_port *up)
 		nr_uarts++;
 	}
 
+	/* Check if it is CIR already. We check this below again, see there why. */
 	if (uart->port.type == PORT_8250_CIR) {
 		ret = -ENODEV;
 		goto unlock;

drivers/tty/serial/8250/8250_core.c int serial8250_register_8250_port(const struct uart_8250_port *up) · line 822

Quoted 7 lines
drivers/tty/serial/8250/8250_core.c +1 -0
@@ -815,6 +816,7 @@ int serial8250_register_8250_port(const struct uart_8250_port *up)
 	if (up->dl_write)
 		uart->dl_write = up->dl_write;
 
+	/* Check the type (again)! It might have changed by the port.type assignment above. */
 	if (uart->port.type != PORT_8250_CIR) {
 		if (uart_console_registered(&uart->port))
 			pm_runtime_get_sync(uart->port.dev);
Signature · 1 line
 i.
author maintainer
#14 lore raw

PATCH v2 5/5 tty: fix tty_port_tty_*hangup() kernel-doc

In reply to Jiri Slaby (SUSE)

The commit below added a new helper, but omitted to move (and add) the corressponding kernel-doc. Do it now.

Fixes 2b5eac0f8c6e ("tty: introduce and use tty_port_tty_vhangup() helper")
Cc Jonathan Corbet <[email protected]>
---
 Documentation/driver-api/tty/tty_port.rst | 5 +++--
 drivers/tty/tty_port.c                    | 5 -----
 include/linux/tty_port.h                  | 9 +++++++++
 3 files changed, 12 insertions(+), 7 deletions(-)
Documentation/driver-api/tty/tty_port.rst +3 -2
index 5cb90e954fcf..504a353f2682 100644
@@ -42,9 +42,10 @@ TTY Refcounting
 TTY Helpers
 -----------
 
+.. kernel-doc::  include/linux/tty_port.h
+   :identifiers: tty_port_tty_hangup tty_port_tty_vhangup
 .. kernel-doc::  drivers/tty/tty_port.c
-   :identifiers: tty_port_tty_hangup tty_port_tty_wakeup
-
+   :identifiers: tty_port_tty_wakeup
 
 Modem Signals
 -------------
drivers/tty/tty_port.c +0 -5
index 903eebdbe12d..5b4d5fb99a59 100644
@@ -391,11 +391,6 @@ void tty_port_hangup(struct tty_port *port)
 }
 EXPORT_SYMBOL(tty_port_hangup);
 
-/**
- * tty_port_tty_hangup - helper to hang up a tty
- * @port: tty port
- * @check_clocal: hang only ttys with %CLOCAL unset?
- */
 void __tty_port_tty_hangup(struct tty_port *port, bool check_clocal, bool async)
 {
 	struct tty_struct *tty = tty_port_tty_get(port);
include/linux/tty_port.h +9 -0
index 021f9a8415c0..332ddb93603e 100644
@@ -251,11 +251,20 @@ static inline int tty_port_users(struct tty_port *port)
 	return port->count + port->blocked_open;
 }
 
+/**
+ * tty_port_tty_hangup - helper to hang up a tty asynchronously
+ * @port: tty port
+ * @check_clocal: hang only ttys with %CLOCAL unset?
+ */
 static inline void tty_port_tty_hangup(struct tty_port *port, bool check_clocal)
 {
 	__tty_port_tty_hangup(port, check_clocal, true);
 }
 
+/**
+ * tty_port_tty_vhangup - helper to hang up a tty synchronously
+ * @port: tty port
+ */
 static inline void tty_port_tty_vhangup(struct tty_port *port)
 {
 	__tty_port_tty_hangup(port, false, false);
Signature · 1 line
2.50.0
#15 lore raw

Re: [PATCH v2 5/5] tty: fix tty_port_tty_*hangup() kernel-doc

Quoted 2 lines · Jiri Slaby (SUSE)

The commit below added a new helper, but omitted to move (and add) the corressponding kernel-doc. Do it now.

corresponding

With that fixed, Reviewed-by: Ilpo Järvinen <[email protected]>

Signature · 1 line
 i.
Quoted 71 lines
Fixes 2b5eac0f8c6e ("tty: introduce and use tty_port_tty_vhangup() helper")
Cc Jonathan Corbet <[email protected]>
---
 Documentation/driver-api/tty/tty_port.rst | 5 +++--
 drivers/tty/tty_port.c                    | 5 -----
 include/linux/tty_port.h                  | 9 +++++++++
 3 files changed, 12 insertions(+), 7 deletions(-)
Documentation/driver-api/tty/tty_port.rst +3 -2
index 5cb90e954fcf..504a353f2682 100644
@@ -42,9 +42,10 @@ TTY Refcounting
 TTY Helpers
 -----------
 
+.. kernel-doc::  include/linux/tty_port.h
+   :identifiers: tty_port_tty_hangup tty_port_tty_vhangup
 .. kernel-doc::  drivers/tty/tty_port.c
-   :identifiers: tty_port_tty_hangup tty_port_tty_wakeup
-
+   :identifiers: tty_port_tty_wakeup
 
 Modem Signals
 -------------
drivers/tty/tty_port.c +0 -5
index 903eebdbe12d..5b4d5fb99a59 100644
@@ -391,11 +391,6 @@ void tty_port_hangup(struct tty_port *port)
 }
 EXPORT_SYMBOL(tty_port_hangup);
 
-/**
- * tty_port_tty_hangup - helper to hang up a tty
- * @port: tty port
- * @check_clocal: hang only ttys with %CLOCAL unset?
- */
 void __tty_port_tty_hangup(struct tty_port *port, bool check_clocal, bool async)
 {
 	struct tty_struct *tty = tty_port_tty_get(port);
include/linux/tty_port.h +9 -0
index 021f9a8415c0..332ddb93603e 100644
@@ -251,11 +251,20 @@ static inline int tty_port_users(struct tty_port *port)
 	return port->count + port->blocked_open;
 }
 
+/**
+ * tty_port_tty_hangup - helper to hang up a tty asynchronously
+ * @port: tty port
+ * @check_clocal: hang only ttys with %CLOCAL unset?
+ */
 static inline void tty_port_tty_hangup(struct tty_port *port, bool check_clocal)
 {
 	__tty_port_tty_hangup(port, check_clocal, true);
 }
 
+/**
+ * tty_port_tty_vhangup - helper to hang up a tty synchronously
+ * @port: tty port
+ */
 static inline void tty_port_tty_vhangup(struct tty_port *port)
 {
 	__tty_port_tty_hangup(port, false, false);