[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <48F51114.2010105@caviumnetworks.com>
Date: Tue, 14 Oct 2008 14:37:24 -0700
From: David Daney <ddaney@...iumnetworks.com>
To: linux-serial@...r.kernel.org, linux-kernel@...r.kernel.org
CC: linux-mips@...ux-mips.org,
"Paoletti, Tomaso" <Tomaso.Paoletti@...iumnetworks.com>
Subject: [PATCH] serial: Initialize spinlocks in 8250 and don't clobber them.
Initialize spinlocks in 8250 and don't clobber them.
Spinlock debugging fails in 8250.c because the lock fields in
irq_lists are not initialized. Initialize them.
In serial8250_isa_init_ports(), the port's lock is initialized. We
should not overwrite it. Only copy in the fields we need.
Signed-off-by: David Daney <ddaney@...iumnetworks.com>
Signed-off-by: Tomaso Paoletti <tpaoletti@...iumnetworks.com>
---
drivers/serial/8250.c | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index d4104a3..0688799 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -2494,6 +2494,9 @@ static void __init serial8250_isa_init_ports(void)
return;
first = 0;
+ for (i = 0; i < ARRAY_SIZE(irq_lists); i++)
+ spin_lock_init(&irq_lists[i].lock);
+
for (i = 0; i < nr_uarts; i++) {
struct uart_8250_port *up = &serial8250_ports[i];
@@ -2699,12 +2702,24 @@ static struct uart_driver serial8250_reg = {
*/
int __init early_serial_setup(struct uart_port *port)
{
+ struct uart_port *p;
+
if (port->line >= ARRAY_SIZE(serial8250_ports))
return -ENODEV;
serial8250_isa_init_ports();
- serial8250_ports[port->line].port = *port;
- serial8250_ports[port->line].port.ops = &serial8250_pops;
+ p = &serial8250_ports[port->line].port;
+ p->iobase = port->iobase;
+ p->membase = port->membase;
+ p->irq = port->irq;
+ p->uartclk = port->uartclk;
+ p->fifosize = port->fifosize;
+ p->regshift = port->regshift;
+ p->iotype = port->iotype;
+ p->flags = port->flags;
+ p->mapbase = port->mapbase;
+ p->private_data = port->private_data;
+ p->ops = &serial8250_pops;
return 0;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists