diff options
Diffstat (limited to '')
| -rw-r--r-- | debian/patches-rt/0047-serial-8250-Switch-to-nbcon-console.patch (renamed from debian/patches-rt/0042-serial-8250-Switch-to-nbcon-console.patch) | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/debian/patches-rt/0042-serial-8250-Switch-to-nbcon-console.patch b/debian/patches-rt/0047-serial-8250-Switch-to-nbcon-console.patch index 5f9d30af5d..ffefc3a024 100644 --- a/debian/patches-rt/0042-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 42/46] serial: 8250: Switch to nbcon console -Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.9/older/patches-6.9-rt5.tar.xz +Subject: [PATCH 47/48] serial: 8250: Switch to nbcon console +Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.10/older/patches-6.10.2-rt14.tar.xz Implement the necessary callbacks to switch the 8250 console driver to perform as an nbcon console. @@ -23,7 +23,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- a/drivers/tty/serial/8250/8250_core.c +++ b/drivers/tty/serial/8250/8250_core.c -@@ -592,6 +592,7 @@ serial8250_register_ports(struct uart_dr +@@ -589,6 +589,7 @@ serial8250_register_ports(struct uart_dr #ifdef CONFIG_SERIAL_8250_CONSOLE @@ -31,7 +31,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> static void univ8250_console_write(struct console *co, const char *s, unsigned int count) { -@@ -599,6 +600,37 @@ static void univ8250_console_write(struc +@@ -596,6 +597,37 @@ static void univ8250_console_write(struc serial8250_console_write(up, s, count); } @@ -69,7 +69,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> static int univ8250_console_setup(struct console *co, char *options) { -@@ -698,12 +730,20 @@ static int univ8250_console_match(struct +@@ -695,12 +727,20 @@ static int univ8250_console_match(struct static struct console univ8250_console = { .name = "ttyS", @@ -107,7 +107,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, -@@ -698,7 +705,11 @@ static void serial8250_set_sleep(struct +@@ -691,7 +698,11 @@ static void serial8250_set_sleep(struct serial8250_rpm_put(p); } @@ -120,7 +120,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> { if (up->capabilities & UART_CAP_UUE) serial_out(up, UART_IER, UART_IER_UUE); -@@ -706,6 +717,11 @@ static void serial8250_clear_IER(struct +@@ -699,6 +710,11 @@ static void serial8250_clear_IER(struct serial_out(up, UART_IER, 0); } @@ -132,7 +132,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. -@@ -3272,6 +3288,11 @@ static void serial8250_console_putchar(s +@@ -3269,6 +3285,11 @@ static void serial8250_console_putchar(s wait_for_xmitr(up, UART_LSR_THRE); serial_port_out(port, UART_TX, ch); @@ -144,7 +144,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> } /* -@@ -3300,6 +3321,7 @@ static void serial8250_console_restore(s +@@ -3297,6 +3318,7 @@ static void serial8250_console_restore(s serial8250_out_MCR(up, up->mcr | UART_MCR_DTR | UART_MCR_RTS); } @@ -152,7 +152,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> /* * Print a string to the serial port using the device FIFO * -@@ -3358,7 +3380,7 @@ void serial8250_console_write(struct uar +@@ -3355,7 +3377,7 @@ void serial8250_console_write(struct uar * First save the IER then disable the interrupts */ ier = serial_port_in(port, UART_IER); @@ -161,7 +161,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))) { -@@ -3424,6 +3446,131 @@ void serial8250_console_write(struct uar +@@ -3421,6 +3443,131 @@ void serial8250_console_write(struct uar if (locked) uart_port_unlock_irqrestore(port, flags); } @@ -293,7 +293,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> static unsigned int probe_baud(struct uart_port *port) { -@@ -3442,6 +3589,7 @@ static unsigned int probe_baud(struct ua +@@ -3439,6 +3586,7 @@ static unsigned int probe_baud(struct ua int serial8250_console_setup(struct uart_port *port, char *options, bool probe) { @@ -301,7 +301,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> int baud = 9600; int bits = 8; int parity = 'n'; -@@ -3451,6 +3599,8 @@ int serial8250_console_setup(struct uart +@@ -3448,6 +3596,8 @@ int serial8250_console_setup(struct uart if (!port->iobase && !port->membase) return -ENODEV; |