Skip to contentSkip to conversation

serial: 8250: Store to lsr_save_flags after lsr read

PATCH In review Ilpo Järvinen 2 participants 2 messages Jun 20, 2022 Stable branch

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 serial: 8250: Store to lsr_save_flags after lsr read

[ Upstream commit be03b0651ffd8bab69dfd574c6818b446c0753ce ]

Not all LSR register flags are preserved across reads. Therefore, LSR readers must store the non-preserved bits into lsr_save_flags.

This fix was initially mixed into feature commit f6f586102add ("serial:
8250: Handle UART without interrupt on TEMT using em485"). However, that feature change had a flaw and it was reverted to make room for simpler approach providing the same feature. The embedded fix got reverted with the feature change.

Re-add the lsr_save_flags fix and properly mark it's a fix.

---

Here's the backport for 5.18. I think it applies fine to older kernel versions too.

 drivers/tty/serial/8250/8250_port.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/tty/serial/8250/8250_port.c +2 -0
index 1fbd5bf264be..7e295d2701b2 100644
@@ -1535,6 +1535,8 @@ static inline void __stop_tx(struct uart_8250_port *p)
 
 	if (em485) {
 		unsigned char lsr = serial_in(p, UART_LSR);
+		p->lsr_saved_flags |= lsr & LSR_SAVE_FLAGS;
+
 		/*
 		 * To provide required timeing and allow FIFO transfer,
 		 * __stop_tx_rs485() must be called only when both FIFO and
Signature · 1 line
2.30.2
#1 lore raw
Quoted 21 lines · Ilpo Järvinen

[ Upstream commit be03b0651ffd8bab69dfd574c6818b446c0753ce ]

Not all LSR register flags are preserved across reads. Therefore, LSR readers must store the non-preserved bits into lsr_save_flags.

This fix was initially mixed into feature commit f6f586102add ("serial:
8250: Handle UART without interrupt on TEMT using em485"). However, that feature change had a flaw and it was reverted to make room for simpler approach providing the same feature. The embedded fix got reverted with the feature change.

Re-add the lsr_save_flags fix and properly mark it's a fix.

Quoted 4 lines

---

Here's the backport for 5.18. I think it applies fine to older kernel versions too.

Thanks for the backport, now all queued up.

greg k-h