lkml.org 
[lkml]   [2009]   [Jan]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] fix early_serial_setup() regression
commit b430428a188e8a434325e251d0704af4b88b4711,
"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>
CC: Linus Torvalds <torvalds@linux-foundation.org>
CC: Kyle McMartin <kyle@mcmartin.ca>
CC: linux-parisc@vger.kernel.org

Signed-off-by: Helge Deller <deller@gmx.de>


diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 1889a63..0d934bf 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -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)
diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c
index 1e93c83..4fa3bb2 100644
--- a/drivers/parisc/superio.c
+++ b/drivers/parisc/superio.c
@@ -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;


\
 
 \ /
  Last update: 2009-01-13 22:55    [W:0.508 / U:0.464 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site