提交 be6cdd34 编写于 作者: I Ilpo Järvinen 提交者: Zheng Zengkai

serial: 8250: Store to lsr_save_flags after lsr read

stable inclusion
from stable-v5.10.124
commit 33ba36351eecc111d955cffc746d5d735ef52ae0
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5L6E7

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=33ba36351eecc111d955cffc746d5d735ef52ae0

--------------------------------

commit be03b065 upstream.

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 f6f58610 ("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.

Link: https://lore.kernel.org/all/1d6c31d-d194-9e6a-ddf9-5f29af829f3@linux.intel.com/T/#m1737eef986bd20cf19593e344cebd7b0244945fc
Fixes: e490c914 ("tty: Add software emulated RS485 support for 8250")
Cc: stable <stable@kernel.org>
Acked-by: NUwe Kleine-König <u.kleine-koenig@penugtronix.de>
Signed-off-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: NIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/f4d774be-1437-a550-8334-19d8722ab98c@linux.intel.comSigned-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Reviewed-by: NWei Li <liwei391@huawei.com>
上级 f0f26b89
...@@ -1532,6 +1532,8 @@ static inline void __stop_tx(struct uart_8250_port *p) ...@@ -1532,6 +1532,8 @@ static inline void __stop_tx(struct uart_8250_port *p)
if (em485) { if (em485) {
unsigned char lsr = serial_in(p, UART_LSR); unsigned char lsr = serial_in(p, UART_LSR);
p->lsr_saved_flags |= lsr & LSR_SAVE_FLAGS;
/* /*
* To provide required timeing and allow FIFO transfer, * To provide required timeing and allow FIFO transfer,
* __stop_tx_rs485() must be called only when both FIFO and * __stop_tx_rs485() must be called only when both FIFO and
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册