linux-dey-6.6: stm32mp-rt-r2: fix stm32-usart context after DMA revert
Kernel commit b6ae6fee73eab568ba49a4a489fdac6bb5027997 removed the RTO-based flush logic in stm32-usart. As a result, the RT patch no longer applies cleanly because it modifies the receive_chars() call using the old context. Update the RT patch to match the new baseline while preserving the PREEMPT_RT locking changes. https://onedigi.atlassian.net/browse/DEL-10000 Signed-off-by: Isaac Hermida <isaac.hermida@digi.com>
This commit is contained in:
parent
fd54946eb0
commit
41ab14adb8
|
|
@ -442,7 +442,7 @@ index 1c949774f..b56d3b77c 100644
|
||||||
if (stm32_usart_rx_dma_started(stm32_port) && !stm32_port->throttled) {
|
if (stm32_usart_rx_dma_started(stm32_port) && !stm32_port->throttled) {
|
||||||
- spin_lock(&port->lock);
|
- spin_lock(&port->lock);
|
||||||
+ uart_port_lock(port);
|
+ uart_port_lock(port);
|
||||||
size = stm32_usart_receive_chars(port, (sr & USART_SR_RTOF));
|
size = stm32_usart_receive_chars(port, false);
|
||||||
uart_unlock_and_check_sysrq(port);
|
uart_unlock_and_check_sysrq(port);
|
||||||
if (size)
|
if (size)
|
||||||
@@ -1319,7 +1309,7 @@ static void stm32_usart_unthrottle(struct uart_port *port)
|
@@ -1319,7 +1309,7 @@ static void stm32_usart_unthrottle(struct uart_port *port)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue