public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "serial: sh-sci: Clean sci_ports[0] after at earlycon exit"

Browse source 
This reverts commit 3791ea69a4.

It was reported to cause boot-time issues, so revert it for now.

Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Fixes: 3791ea69a4 ("serial: sh-sci: Clean sci_ports[0] after at earlycon exit")
Cc: stable <stable@kernel.org>
Cc: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2024-11-30 16:55:56 +01:00
parent b5a23a60e8
commit 718632467d
1 changed files with 0 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
drivers/tty/serial/sh-sci.c
View file

@ -3535,32 +3535,6 @@ sh_early_platform_init_buffer("earlyprintk", &sci_driver,
#ifdef CONFIG_SERIAL_SH_SCI_EARLYCON #ifdef CONFIG_SERIAL_SH_SCI_EARLYCON
static struct plat_sci_port port_cfg __initdata; static struct plat_sci_port port_cfg __initdata;
static int early_console_exit(struct console *co)
{
struct sci_port *sci_port = &sci_ports[0];
struct uart_port *port = &sci_port->port;
unsigned long flags;
int locked = 1;
if (port->sysrq)
locked = 0;
else if (oops_in_progress)
locked = uart_port_trylock_irqsave(port, &flags);
else
uart_port_lock_irqsave(port, &flags);
/*
* Clean the slot used by earlycon. A new SCI device might
* map to this slot.
*/
memset(sci_ports, 0, sizeof(*sci_port));
if (locked)
uart_port_unlock_irqrestore(port, flags);
return 0;
}
static int __init early_console_setup(struct earlycon_device *device, static int __init early_console_setup(struct earlycon_device *device,
int type) int type)
{ {
@ -3577,8 +3551,6 @@ static int __init early_console_setup(struct earlycon_device *device,
SCSCR_RE | SCSCR_TE | port_cfg.scscr); SCSCR_RE | SCSCR_TE | port_cfg.scscr);
device->con->write = serial_console_write; device->con->write = serial_console_write;
device->con->exit = early_console_exit;
return 0; return 0;
} }
static int __init sci_early_console_setup(struct earlycon_device *device, static int __init sci_early_console_setup(struct earlycon_device *device,