Skip to contentSkip to conversation

tty: serial: qcom_geni_serial: Allow mctrl when flow control is disabled

PATCH In review Matthias Kaehlcke 3 participants 4 messages Jan 19, 2019 – Feb 12, 2019

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

PATCH 1/1 tty: serial: qcom_geni_serial: Allow mctrl when flow control is disabled

The geni set/get_mctrl() functions currently do nothing unless hardware flow control is enabled. Remove this arbitrary limitation.

Fixes 8a8a66a1a18a ("tty: serial: qcom_geni_serial: Add support for flow control")
---
 drivers/tty/serial/qcom_geni_serial.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/tty/serial/qcom_geni_serial.c +2 -2
index a72d6d9fb9834..38016609c7fa9 100644
@@ -225,7 +225,7 @@ static unsigned int qcom_geni_serial_get_mctrl(struct uart_port *uport)
 	unsigned int mctrl = TIOCM_DSR | TIOCM_CAR;
 	u32 geni_ios;
 
-	if (uart_console(uport) || !uart_cts_enabled(uport)) {
+	if (uart_console(uport)) {
 		mctrl |= TIOCM_CTS;
 	} else {
 		geni_ios = readl_relaxed(uport->membase + SE_GENI_IOS);
@@ -241,7 +241,7 @@ static void qcom_geni_serial_set_mctrl(struct uart_port *uport,
 {
 	u32 uart_manual_rfr = 0;
 
-	if (uart_console(uport) || !uart_cts_enabled(uport))
+	if (uart_console(uport))
 		return;
 
 	if (!(mctrl & TIOCM_RTS))
Signature · 1 line
2.20.1.321.g9e740568ce-goog
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · Matthias Kaehlcke

The geni set/get_mctrl() functions currently do nothing unless hardware flow control is enabled. Remove this arbitrary limitation.

Fixes 8a8a66a1a18a ("tty: serial: qcom_geni_serial: Add support for flow control")

Good to hear this was all that was needed. There don't happen to be any publicly available documentation of these registers?

Quoted 18 lines
---
 drivers/tty/serial/qcom_geni_serial.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/tty/serial/qcom_geni_serial.c +1 -1
index a72d6d9fb9834..38016609c7fa9 100644
@@ -225,7 +225,7 @@ static unsigned int qcom_geni_serial_get_mctrl(struct uart_port *uport)
 	unsigned int mctrl = TIOCM_DSR | TIOCM_CAR;
 	u32 geni_ios;
 
-	if (uart_console(uport) || !uart_cts_enabled(uport)) {
+	if (uart_console(uport)) {
 		mctrl |= TIOCM_CTS;
 	} else {
 		geni_ios = readl_relaxed(uport->membase + SE_GENI_IOS);

drivers/tty/serial/qcom_geni_serial.c static void qcom_geni_serial_set_mctrl(struct uart_port *uport, · line 247

Quoted 8 lines
drivers/tty/serial/qcom_geni_serial.c +1 -1
@@ -241,7 +241,7 @@ static void qcom_geni_serial_set_mctrl(struct uart_port *uport,
 {
 	u32 uart_manual_rfr = 0;
 
-	if (uart_console(uport) || !uart_cts_enabled(uport))
+	if (uart_console(uport))
 		return;
 
 	if (!(mctrl & TIOCM_RTS))

Ignoring mctrl when the port is a console looks broken too by the way. The driver parses and handles the flow control parameter, but these conditionals later overrides it.

Could be fixed in the same patch or in a follow-up patch.

Either way, you can add my

Johan

#2 lore raw
In reply to Matthias Kaehlcke
Quoted 35 lines · Matthias Kaehlcke

The geni set/get_mctrl() functions currently do nothing unless hardware flow control is enabled. Remove this arbitrary limitation.

Fixes 8a8a66a1a18a ("tty: serial: qcom_geni_serial: Add support for

flow control")

---
 drivers/tty/serial/qcom_geni_serial.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/tty/serial/qcom_geni_serial.c +1 -1
index a72d6d9fb9834..38016609c7fa9 100644
@@ -225,7 +225,7 @@ static unsigned int
 qcom_geni_serial_get_mctrl(struct uart_port *uport)
 	unsigned int mctrl = TIOCM_DSR | TIOCM_CAR;
 	u32 geni_ios;
 
-	if (uart_console(uport) || !uart_cts_enabled(uport)) {
+	if (uart_console(uport)) {
 		mctrl |= TIOCM_CTS;
 	} else {
drivers/tty/serial/qcom_geni_serial.c +1 -1
 		geni_ios = readl_relaxed(uport->membase + SE_GENI_IOS);
@@ -241,7 +241,7 @@ static void qcom_geni_serial_set_mctrl(struct
 uart_port *uport,
 {
 	u32 uart_manual_rfr = 0;
 
-	if (uart_console(uport) || !uart_cts_enabled(uport))
+	if (uart_console(uport))
 		return;
 
Quoted 1 line

if (!(mctrl & TIOCM_RTS))

Though late but wanted to check on why flow control is disabled in a BT case ?
If i understand, CRTSCTS at serial core is what makes flow as enabled with UPSTAT_CTS_ENABLE set and that in turn returned by uart_cts_enabled(uport). So is there any settings or configuration missing to enable flow control ?
There could be a case to have 2 wire UART without flow control enablement, In that case we may need check for uart_cts_enabled() right ? Please add/correct if i missed something.

#3 lore raw

Sorry for the late reply, your message got buried in my inbox :(

Quoted 32 lines · On Mon, Jan 21, 2019 at 08:05:10PM +0530, [email protected] wrote:
Quoted 31 lines · Matthias Kaehlcke

The geni set/get_mctrl() functions currently do nothing unless hardware flow control is enabled. Remove this arbitrary limitation.

Fixes 8a8a66a1a18a ("tty: serial: qcom_geni_serial: Add support for

flow control")

---
 drivers/tty/serial/qcom_geni_serial.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/tty/serial/qcom_geni_serial.c +1 -1
index a72d6d9fb9834..38016609c7fa9 100644
@@ -225,7 +225,7 @@ static unsigned int
 qcom_geni_serial_get_mctrl(struct uart_port *uport)
 	unsigned int mctrl = TIOCM_DSR | TIOCM_CAR;
 	u32 geni_ios;
 
-	if (uart_console(uport) || !uart_cts_enabled(uport)) {
+	if (uart_console(uport)) {
 		mctrl |= TIOCM_CTS;
 	} else {
drivers/tty/serial/qcom_geni_serial.c +0 -0
 		geni_ios = readl_relaxed(uport->membase + SE_GENI_IOS);
@@ -241,7 +241,7 @@ static void qcom_geni_serial_set_mctrl(struct
 uart_port *uport,
 {
 	u32 uart_manual_rfr = 0;
 
Quoted 8 lines
Quoted 5 lines
drivers/tty/serial/qcom_geni_serial.c +1 -1
-	if (uart_console(uport) || !uart_cts_enabled(uport))
+	if (uart_console(uport))
 		return;
 

if (!(mctrl & TIOCM_RTS))

Though late but wanted to check on why flow control is disabled in a BT case ?

Flow control is generally enabled, but for the QCA WNC3990 (and potentially others) it needs to be temporarily disabled during baudrate switches:

Bluetooth: hci_qca: Deassert RTS while baudrate change command

This patch will help to stop frame reassembly errors while changing the baudrate. This is because host send a change baudrate request command to the chip with 115200 bps, Whereas chip will change their UART clocks to the enable for new baudrate and sends the response for the change request command with newer baudrate, On host side we are still operating in 115200 bps which results of reading garbage data. Here we are pulling RTS line, so that chip we will wait to send data to host until host change its baudrate.

https://lore.kernel.org/patchwork/patch/1038502/

Quoted 4 lines

If i understand, CRTSCTS at serial core is what makes flow as enabled with UPSTAT_CTS_ENABLE set and that in turn returned by uart_cts_enabled(uport). So is there any settings or configuration missing to enable flow control ?

To my knowledge there is no problem with enabling flow control (for
the non-console case). The problem was that RTS was not cleared when
flow control was disabled (done here: https://elixir.bootlin.com/linux/v4.20.7/source/drivers/bluetooth/hci_ldisc.c#L325)

Quoted 3 lines

There could be a case to have 2 wire UART without flow control enablement, In that case we may need check for uart_cts_enabled() right ? Please add/correct if i missed something.

I'm no serial expert, but IIUC a UART driver doesn't know if the flow control signals are wired up and is not supposed to do any specific handling if flow control is enabled on a port without CTS/RTS wires. Folks with more serial expertise please correct me if I'm wrong.

Thanks

Matthias