Skip to content

Commit

Permalink
fix early_serial_setup() regression
Browse files Browse the repository at this point in the history
Commit b430428 ("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 <[email protected]>
Cc: Tomaso Paoletti <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Alan Cox <[email protected]>
Acked-by: Kyle McMartin <[email protected]>
Cc: [email protected]
Signed-off-by: Helge Deller <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
hdeller authored and torvalds committed Jan 13, 2009
1 parent e0b325d commit 125c97d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 0 additions & 1 deletion drivers/parisc/superio.c
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,6 @@ static void __init superio_serial_init(void)
serial_port.type = PORT_16550A;
serial_port.uartclk = 115200*16;
serial_port.fifosize = 16;
spin_lock_init(&serial_port.lock);

/* serial port #1 */
serial_port.iobase = sio_dev.sp1_base;
Expand Down
2 changes: 2 additions & 0 deletions drivers/serial/8250.c
Original file line number Diff line number Diff line change
Expand Up @@ -2839,6 +2839,8 @@ int __init early_serial_setup(struct uart_port *port)
p->flags = port->flags;
p->mapbase = port->mapbase;
p->private_data = port->private_data;
p->type = port->type;
p->line = port->line;

set_io_from_upio(p);
if (port->serial_in)
Expand Down

0 comments on commit 125c97d

Please sign in to comment.