mirror of
https://github.com/OpenVoiceOS/OpenVoiceOS
synced 2025-06-05 22:19:21 +02:00
Another big bump in packages and buildroot
This commit is contained in:
@ -1,7 +1,7 @@
|
||||
From acbbd819705ab82602bbf45a18a584abb4d83efc Mon Sep 17 00:00:00 2001
|
||||
From 62bae6347efa388fc68a191b955c9433e4dc3a6e Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Gleixner <tglx@linutronix.de>
|
||||
Date: Thu, 14 Sep 2023 20:44:21 +0206
|
||||
Subject: [PATCH 090/198] serial: stm32: Use port lock wrappers
|
||||
Subject: [PATCH 090/196] serial: stm32: Use port lock wrappers
|
||||
|
||||
When a serial port is used for kernel console output, then all
|
||||
modifications to the UART registers which are done from other contexts,
|
||||
@ -37,7 +37,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||
1 file changed, 19 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-usart.c
|
||||
index e5f933beb6c0..d8fe1ca75ac4 100644
|
||||
index 9ef90bb30a47..b963f9ccb070 100644
|
||||
--- a/drivers/tty/serial/stm32-usart.c
|
||||
+++ b/drivers/tty/serial/stm32-usart.c
|
||||
@@ -535,7 +535,7 @@ static void stm32_usart_rx_dma_complete(void *arg)
|
||||
@ -61,7 +61,7 @@ index e5f933beb6c0..d8fe1ca75ac4 100644
|
||||
}
|
||||
|
||||
static void stm32_usart_tx_interrupt_enable(struct uart_port *port)
|
||||
@@ -887,7 +887,7 @@ static irqreturn_t stm32_usart_interrupt(int irq, void *ptr)
|
||||
@@ -892,7 +892,7 @@ static irqreturn_t stm32_usart_interrupt(int irq, void *ptr)
|
||||
if (!stm32_port->throttled) {
|
||||
if (((sr & USART_SR_RXNE) && !stm32_usart_rx_dma_started(stm32_port)) ||
|
||||
((sr & USART_SR_ERR_MASK) && stm32_usart_rx_dma_started(stm32_port))) {
|
||||
@ -70,7 +70,7 @@ index e5f933beb6c0..d8fe1ca75ac4 100644
|
||||
size = stm32_usart_receive_chars(port, false);
|
||||
uart_unlock_and_check_sysrq(port);
|
||||
if (size)
|
||||
@@ -896,14 +896,14 @@ static irqreturn_t stm32_usart_interrupt(int irq, void *ptr)
|
||||
@@ -902,15 +902,15 @@ static irqreturn_t stm32_usart_interrupt(int irq, void *ptr)
|
||||
}
|
||||
|
||||
if ((sr & USART_SR_TXE) && !(stm32_port->tx_ch)) {
|
||||
@ -79,6 +79,7 @@ index e5f933beb6c0..d8fe1ca75ac4 100644
|
||||
stm32_usart_transmit_chars(port);
|
||||
- spin_unlock(&port->lock);
|
||||
+ uart_port_unlock(port);
|
||||
ret = IRQ_HANDLED;
|
||||
}
|
||||
|
||||
/* Receiver timeout irq for DMA RX */
|
||||
@ -88,7 +89,7 @@ index e5f933beb6c0..d8fe1ca75ac4 100644
|
||||
size = stm32_usart_receive_chars(port, false);
|
||||
uart_unlock_and_check_sysrq(port);
|
||||
if (size)
|
||||
@@ -991,7 +991,7 @@ static void stm32_usart_throttle(struct uart_port *port)
|
||||
@@ -999,7 +999,7 @@ static void stm32_usart_throttle(struct uart_port *port)
|
||||
const struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;
|
||||
unsigned long flags;
|
||||
|
||||
@ -97,7 +98,7 @@ index e5f933beb6c0..d8fe1ca75ac4 100644
|
||||
|
||||
/*
|
||||
* Pause DMA transfer, so the RX data gets queued into the FIFO.
|
||||
@@ -1004,7 +1004,7 @@ static void stm32_usart_throttle(struct uart_port *port)
|
||||
@@ -1012,7 +1012,7 @@ static void stm32_usart_throttle(struct uart_port *port)
|
||||
stm32_usart_clr_bits(port, ofs->cr3, stm32_port->cr3_irq);
|
||||
|
||||
stm32_port->throttled = true;
|
||||
@ -106,7 +107,7 @@ index e5f933beb6c0..d8fe1ca75ac4 100644
|
||||
}
|
||||
|
||||
/* Unthrottle the remote, the input buffer can now accept data. */
|
||||
@@ -1014,7 +1014,7 @@ static void stm32_usart_unthrottle(struct uart_port *port)
|
||||
@@ -1022,7 +1022,7 @@ static void stm32_usart_unthrottle(struct uart_port *port)
|
||||
const struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;
|
||||
unsigned long flags;
|
||||
|
||||
@ -115,7 +116,7 @@ index e5f933beb6c0..d8fe1ca75ac4 100644
|
||||
stm32_usart_set_bits(port, ofs->cr1, stm32_port->cr1_irq);
|
||||
if (stm32_port->cr3_irq)
|
||||
stm32_usart_set_bits(port, ofs->cr3, stm32_port->cr3_irq);
|
||||
@@ -1028,7 +1028,7 @@ static void stm32_usart_unthrottle(struct uart_port *port)
|
||||
@@ -1036,7 +1036,7 @@ static void stm32_usart_unthrottle(struct uart_port *port)
|
||||
if (stm32_port->rx_ch)
|
||||
stm32_usart_rx_dma_start_or_resume(port);
|
||||
|
||||
@ -124,7 +125,7 @@ index e5f933beb6c0..d8fe1ca75ac4 100644
|
||||
}
|
||||
|
||||
/* Receive stop */
|
||||
@@ -1156,7 +1156,7 @@ static void stm32_usart_set_termios(struct uart_port *port,
|
||||
@@ -1165,7 +1165,7 @@ static void stm32_usart_set_termios(struct uart_port *port,
|
||||
|
||||
baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk / 8);
|
||||
|
||||
@ -133,7 +134,7 @@ index e5f933beb6c0..d8fe1ca75ac4 100644
|
||||
|
||||
ret = readl_relaxed_poll_timeout_atomic(port->membase + ofs->isr,
|
||||
isr,
|
||||
@@ -1347,7 +1347,7 @@ static void stm32_usart_set_termios(struct uart_port *port,
|
||||
@@ -1356,7 +1356,7 @@ static void stm32_usart_set_termios(struct uart_port *port,
|
||||
writel_relaxed(cr1, port->membase + ofs->cr1);
|
||||
|
||||
stm32_usart_set_bits(port, ofs->cr1, BIT(cfg->uart_enable_bit));
|
||||
@ -142,7 +143,7 @@ index e5f933beb6c0..d8fe1ca75ac4 100644
|
||||
|
||||
/* Handle modem control interrupts */
|
||||
if (UART_ENABLE_MS(port, termios->c_cflag))
|
||||
@@ -1397,9 +1397,9 @@ static void stm32_usart_pm(struct uart_port *port, unsigned int state,
|
||||
@@ -1406,9 +1406,9 @@ static void stm32_usart_pm(struct uart_port *port, unsigned int state,
|
||||
pm_runtime_get_sync(port->dev);
|
||||
break;
|
||||
case UART_PM_STATE_OFF:
|
||||
@ -154,7 +155,7 @@ index e5f933beb6c0..d8fe1ca75ac4 100644
|
||||
pm_runtime_put_sync(port->dev);
|
||||
break;
|
||||
}
|
||||
@@ -1882,9 +1882,9 @@ static void stm32_usart_console_write(struct console *co, const char *s,
|
||||
@@ -1891,9 +1891,9 @@ static void stm32_usart_console_write(struct console *co, const char *s,
|
||||
int locked = 1;
|
||||
|
||||
if (oops_in_progress)
|
||||
@ -166,7 +167,7 @@ index e5f933beb6c0..d8fe1ca75ac4 100644
|
||||
|
||||
/* Save and disable interrupts, enable the transmitter */
|
||||
old_cr1 = readl_relaxed(port->membase + ofs->cr1);
|
||||
@@ -1898,7 +1898,7 @@ static void stm32_usart_console_write(struct console *co, const char *s,
|
||||
@@ -1907,7 +1907,7 @@ static void stm32_usart_console_write(struct console *co, const char *s,
|
||||
writel_relaxed(old_cr1, port->membase + ofs->cr1);
|
||||
|
||||
if (locked)
|
||||
@ -175,7 +176,7 @@ index e5f933beb6c0..d8fe1ca75ac4 100644
|
||||
}
|
||||
|
||||
static int stm32_usart_console_setup(struct console *co, char *options)
|
||||
@@ -2033,7 +2033,7 @@ static int __maybe_unused stm32_usart_serial_en_wakeup(struct uart_port *port,
|
||||
@@ -2042,7 +2042,7 @@ static int __maybe_unused stm32_usart_serial_en_wakeup(struct uart_port *port,
|
||||
* low-power mode.
|
||||
*/
|
||||
if (stm32_port->rx_ch) {
|
||||
@ -185,5 +186,5 @@ index e5f933beb6c0..d8fe1ca75ac4 100644
|
||||
if (!stm32_usart_rx_dma_pause(stm32_port))
|
||||
size += stm32_usart_receive_chars(port, true);
|
||||
--
|
||||
2.44.0
|
||||
2.45.1
|
||||
|
||||
|
Reference in New Issue
Block a user