diff options
Diffstat (limited to '')
| -rw-r--r-- | debian/patches-rt/0047-serial-8250-Switch-to-nbcon-console.patch (renamed from debian/patches-rt/0131-serial-8250-Switch-to-nbcon-console.patch) | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/debian/patches-rt/0131-serial-8250-Switch-to-nbcon-console.patch b/debian/patches-rt/0047-serial-8250-Switch-to-nbcon-console.patch index 7ba577d9c4..015a996d2c 100644 --- a/debian/patches-rt/0131-serial-8250-Switch-to-nbcon-console.patch +++ b/debian/patches-rt/0047-serial-8250-Switch-to-nbcon-console.patch @@ -1,7 +1,7 @@ From: John Ogness <john.ogness@linutronix.de> Date: Wed, 13 Sep 2023 15:30:36 +0000 -Subject: [PATCH 131/134] serial: 8250: Switch to nbcon console -Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.6/older/patches-6.6.7-rt18.tar.xz +Subject: [PATCH 47/50] serial: 8250: Switch to nbcon console +Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.7/older/patches-6.7-rt6.tar.xz Implement the necessary callbacks to switch the 8250 console driver to perform as an nbcon console. @@ -92,7 +92,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> }; --- a/drivers/tty/serial/8250/8250_port.c +++ b/drivers/tty/serial/8250/8250_port.c -@@ -557,6 +557,11 @@ static int serial8250_em485_init(struct +@@ -550,6 +550,11 @@ static int serial8250_em485_init(struct if (!p->em485) return -ENOMEM; @@ -104,7 +104,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> hrtimer_init(&p->em485->stop_tx_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); hrtimer_init(&p->em485->start_tx_timer, CLOCK_MONOTONIC, -@@ -709,7 +714,11 @@ static void serial8250_set_sleep(struct +@@ -702,7 +707,11 @@ static void serial8250_set_sleep(struct serial8250_rpm_put(p); } @@ -117,7 +117,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> { if (up->capabilities & UART_CAP_UUE) serial_out(up, UART_IER, UART_IER_UUE); -@@ -717,6 +726,11 @@ static void serial8250_clear_IER(struct +@@ -710,6 +719,11 @@ static void serial8250_clear_IER(struct serial_out(up, UART_IER, 0); } @@ -129,7 +129,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> #ifdef CONFIG_SERIAL_8250_RSA /* * Attempts to turn on the RSA FIFO. Returns zero on failure. -@@ -3328,6 +3342,11 @@ static void serial8250_console_putchar(s +@@ -3320,6 +3334,11 @@ static void serial8250_console_putchar(s wait_for_xmitr(up, UART_LSR_THRE); serial_port_out(port, UART_TX, ch); @@ -141,7 +141,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> } /* -@@ -3356,6 +3375,7 @@ static void serial8250_console_restore(s +@@ -3348,6 +3367,7 @@ static void serial8250_console_restore(s serial8250_out_MCR(up, up->mcr | UART_MCR_DTR | UART_MCR_RTS); } @@ -149,7 +149,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> /* * Print a string to the serial port using the device FIFO * -@@ -3414,7 +3434,7 @@ void serial8250_console_write(struct uar +@@ -3406,7 +3426,7 @@ void serial8250_console_write(struct uar * First save the IER then disable the interrupts */ ier = serial_port_in(port, UART_IER); @@ -158,7 +158,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> /* check scratch reg to see if port powered off during system sleep */ if (up->canary && (up->canary != serial_port_in(port, UART_SCR))) { -@@ -3480,6 +3500,135 @@ void serial8250_console_write(struct uar +@@ -3472,6 +3492,135 @@ void serial8250_console_write(struct uar if (locked) uart_port_unlock_irqrestore(port, flags); } @@ -294,7 +294,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> static unsigned int probe_baud(struct uart_port *port) { -@@ -3498,6 +3647,7 @@ static unsigned int probe_baud(struct ua +@@ -3490,6 +3639,7 @@ static unsigned int probe_baud(struct ua int serial8250_console_setup(struct uart_port *port, char *options, bool probe) { @@ -302,7 +302,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> int baud = 9600; int bits = 8; int parity = 'n'; -@@ -3507,6 +3657,8 @@ int serial8250_console_setup(struct uart +@@ -3499,6 +3649,8 @@ int serial8250_console_setup(struct uart if (!port->iobase && !port->membase) return -ENODEV; |