提交 125c97d8 编写于 作者: H Helge Deller 提交者: Linus Torvalds

fix early_serial_setup() regression

Commit b430428a ("8250: Don't clobber
spinlocks.") introduced a regression on the parisc architecture, which
broke the handover to the serial port at boottime.

early_serial_setup() was changed to only copy a subset of the uart_port
fields, and sadly the "type" and "line" fields were forgotten and thus
the serial port was not initialized and could not be used for a
handover.  This patch fixes this by copying the missing fields.

As this change to early_serial_setup() doesn't need an initialized
spinlock in the uart_port struct any longer, we can drop the spinlock
initialization in the superio driver.

Cc: David Daney <ddaney@caviumnetworks.com>
Cc: Tomaso Paoletti <tpaoletti@caviumnetworks.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Acked-by: NKyle McMartin <kyle@mcmartin.ca>
Cc: linux-parisc@vger.kernel.org
Signed-off-by: NHelge Deller <deller@gmx.de>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 e0b325d3
...@@ -405,7 +405,6 @@ static void __init superio_serial_init(void) ...@@ -405,7 +405,6 @@ static void __init superio_serial_init(void)
serial_port.type = PORT_16550A; serial_port.type = PORT_16550A;
serial_port.uartclk = 115200*16; serial_port.uartclk = 115200*16;
serial_port.fifosize = 16; serial_port.fifosize = 16;
spin_lock_init(&serial_port.lock);
/* serial port #1 */ /* serial port #1 */
serial_port.iobase = sio_dev.sp1_base; serial_port.iobase = sio_dev.sp1_base;
......
...@@ -2839,6 +2839,8 @@ int __init early_serial_setup(struct uart_port *port) ...@@ -2839,6 +2839,8 @@ int __init early_serial_setup(struct uart_port *port)
p->flags = port->flags; p->flags = port->flags;
p->mapbase = port->mapbase; p->mapbase = port->mapbase;
p->private_data = port->private_data; p->private_data = port->private_data;
p->type = port->type;
p->line = port->line;
set_io_from_upio(p); set_io_from_upio(p);
if (port->serial_in) if (port->serial_in)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册