Skip to contentSkip to conversation

serial: bfin_5xx: add missing spin_lock init

PATCH In review Mike Frysinger 2 participants 4 messages Jun 13, 2009 – Jun 22, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 serial: bfin_5xx: add missing spin_lock init

The Blackfin serial driver never initialized the spin_lock that is part of the serial core structure, but we never noticed because spin_lock's are rarely enabled on UP systems. Yeah lockdep and friends.

---
 drivers/serial/bfin_5xx.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/serial/bfin_5xx.c +1 -0
index e2f6b1b..d7fcca1 100644
@@ -1110,6 +1110,7 @@ static void __init bfin_serial_init_ports(void)
 	bfin_serial_hw_init();
 
 	for (i = 0; i < nr_active_ports; i++) {
+		spin_lock_init(&bfin_serial_ports[i].port.lock);
 		bfin_serial_ports[i].port.uartclk   = get_sclk();
 		bfin_serial_ports[i].port.fifosize  = BFIN_UART_TX_FIFO_SIZE;
 		bfin_serial_ports[i].port.ops       = &bfin_serial_pops;
Signature · 1 line
1.6.3.1
#1 lore raw

PATCH 2/2 serial: bfin_5xx: fix building as module when early printk is enabled

Since early printk only makes sense/works when the serial driver is built into the kernel, disable the option for this driver when it is going to be built as a module. Otherwise we get build failures due to the ifdef handling.

---
 drivers/serial/bfin_5xx.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
drivers/serial/bfin_5xx.c +4 -0
index d7fcca1..b4a7650 100644
@@ -38,6 +38,10 @@
 #include <asm/cacheflush.h>
 #endif
 
+#ifdef CONFIG_SERIAL_BFIN_MODULE
+# undef CONFIG_EARLY_PRINTK
+#endif
+
 /* UART name and device definitions */
 #define BFIN_SERIAL_NAME	"ttyBF"
 #define BFIN_SERIAL_MAJOR	204
Signature · 1 line
1.6.3.1
#2 lore raw

Re: [PATCH 2/2] serial: bfin_5xx: fix building as module when early printk is enabled

Quoted 15 lines · On Fri, 12 Jun 2009 20:48:13 -0400 Mike Frysinger <[email protected]> wrote:

Since early printk only makes sense/works when the serial driver is built into the kernel, disable the option for this driver when it is going to be built as a module. Otherwise we get build failures due to the ifdef handling.

---
 drivers/serial/bfin_5xx.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
drivers/serial/bfin_5xx.c +0 -0
index d7fcca1..b4a7650 100644

drivers/serial/bfin_5xx.c line 47

Quoted 10 lines
drivers/serial/bfin_5xx.c +4 -0
@@ -38,6 +38,10 @@
 #include <asm/cacheflush.h>
 #endif
 
+#ifdef CONFIG_SERIAL_BFIN_MODULE
+# undef CONFIG_EARLY_PRINTK
+#endif
+
 /* UART name and device definitions */
 #define BFIN_SERIAL_NAME	"ttyBF"
 #define BFIN_SERIAL_MAJOR	204

And that _does_ look like -stable material.

Alan, I queued both these as to-be-merged-by-you. So if you want me to stfu and merge them, please let me know.

#3 lore raw
In reply to Mike Frysinger
Quoted 4 lines · On Fri, 12 Jun 2009 20:48:12 -0400 Mike Frysinger <[email protected]> wrote:

The Blackfin serial driver never initialized the spin_lock that is part of the serial core structure, but we never noticed because spin_lock's are rarely enabled on UP systems. Yeah lockdep and friends.

I'm sitting here wondering if we need this in -stable, but the changlog failed to provide sufficient information to determine this.

Quoted 8 lines
 drivers/serial/bfin_5xx.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/serial/bfin_5xx.c +0 -0
index e2f6b1b..d7fcca1 100644

drivers/serial/bfin_5xx.c static void __init bfin_serial_init_ports(void) · line 1116

Quoted 7 lines
drivers/serial/bfin_5xx.c +1 -0
@@ -1110,6 +1110,7 @@ static void __init bfin_serial_init_ports(void)
 	bfin_serial_hw_init();
 
 	for (i = 0; i < nr_active_ports; i++) {
+		spin_lock_init(&bfin_serial_ports[i].port.lock);
 		bfin_serial_ports[i].port.uartclk   = get_sclk();
 		bfin_serial_ports[i].port.fifosize  = BFIN_UART_TX_FIFO_SIZE;
 		bfin_serial_ports[i].port.ops       = &bfin_serial_pops;

It _should_ be possible to do this initialisation at compile-time. But I expect it would be hard and/or ugly.