late spinlock initialization in ieee1394/ohci
PATCH 1/1 late spinlock initialization in ieee1394/ohci
spinlock used in irq handler should be initialized before registering irq, even if we know that our device has interrupts disabled; handler is registered shared and taking spinlock is done unconditionally. As it is, we can and do get oopsen on boot for some configuration, depending on irq routing - I've got a reproducer.
----
drivers/ieee1394/ohci1394.c +7 -1
@@ -478,7 +478,6 @@int num_ports, i;spin_lock_init (&ohci->phy_reg_lock); -spin_lock_init (&ohci->event_lock);/* Put some defaults to these undefined bus options */ buf =reg_read (ohci, OHCI1394_BusOptions);
@@ -3402,7 +3401,14 @@/* We hopefully don't have to pre-allocate IT DMA like we did * for IR DMA above. Allocate it on-demand and mark inactive. */ ohci->it_legacy_context.ohci =NULL ; +spin_lock_init (&ohci->event_lock); +/* +* interrupts are disabled, all right, but... due to SA_SHIRQ we +* might get called anyway. We'll see no event, of course, but +* we need to get to that "no event", so enough should be initialized +* by that point. +*/ if (request_irq (dev->irq, ohci_irq_handler,SA_SHIRQ ,OHCI1394_DRIVER_NAME , ohci))FAIL (-ENOMEM ,"Failed to allocate shared interrupt %d" , dev->irq);
Thanks Al. I'll commit this to our tree. Linus, feel free to apply this to your tree.
Quoted 34 lines · Al Viro
spinlock used in irq handler should be initialized before registering irq, even if we know that our device has interrupts disabled; handler is registered shared and taking spinlock is done unconditionally. As it is, we can and do get oopsen on boot for some configuration, depending on irq routing - I've got a reproducer.
Signed-off-by Al Viro <[email protected]>----
diff -urNRC13-rc7-base/drivers/ieee1394/ohci1394.ccurrent/drivers/ieee1394/ohci1394.cdrivers/ieee1394/ohci1394.c +7
-1@@ -478,7 +478,6 @@int num_ports, i;spin_lock_init (&ohci->phy_reg_lock); -spin_lock_init (&ohci->event_lock);/* Put some defaults to these undefined bus options */ buf =reg_read (ohci, OHCI1394_BusOptions);@@ -3402,7 +3401,14 @@/* We hopefully don't have to pre-allocate IT DMA like we did * for IR DMA above. Allocate it on-demand and mark inactive. */ ohci->it_legacy_context.ohci =NULL ; +spin_lock_init (&ohci->event_lock); +/* +* interrupts are disabled, all right, but... due to SA_SHIRQ we +* might get called anyway. We'll see no event, of course, but +* we need to get to that "no event", so enough should be initialized +* by that point. +*/ if (request_irq (dev->irq, ohci_irq_handler,SA_SHIRQ ,OHCI1394_DRIVER_NAME , ohci))FAIL (-ENOMEM ,"Failed to allocate shared interrupt %d" , dev->irq);
Signature · 4 lines
Ubuntu - http://www.ubuntu.com/ Debian - http://www.debian.org/ Linux 1394 - http://www.linux1394.org/ SwissDisk - http://www.swissdisk.com/