b43legacy: fix shared IRQ race condition
PATCH 1/1 b43legacy: fix shared IRQ race condition
Fix an IRQ race condition in b43legacy. If we call b43legacy_wireless_core_stop(), it will set the status of the device to INITIALIZED and the IRQ handler won't care any longer about IRQs, thus the kernel will disable the IRQ if it's shared (unless we boot it with the 'irqpoll' option). So we must disable IRQs before changing the device status.
Signed-off-by Stefano Brivio <[email protected]>
---
drivers/net/wireless/b43legacy/main.c renamed from drivers/net/wireless/b43legacy/main.c.orig +11 -8
@@ -2682,6 +2682,17 @@if (b43legacy_status (dev) < B43legacy_STAT_STARTED)return ; + +/* Disable and sync interrupts. We must do this before than +* setting the status to INITIALIZED, as the interrupt handler +* won't care about IRQs then. */ +spin_lock_irqsave (&wl->irq_lock, flags); + dev->irq_savedstate =b43legacy_interrupt_disable (dev, + B43legacy_IRQ_ALL); +b43legacy_read32 (dev, B43legacy_MMIO_GEN_IRQ_MASK);/* flush */ +spin_unlock_irqrestore (&wl->irq_lock, flags); +b43legacy_synchronize_irq (dev); +b43legacy_set_status (dev, B43legacy_STAT_INITIALIZED);mutex_unlock (&wl->mutex);
@@ -2692,14 +2703,6 @@ieee80211_stop_queues (wl->hw);/* FIXME this could cause a deadlock */ -/* Disable and sync interrupts. */ -spin_lock_irqsave (&wl->irq_lock, flags); - dev->irq_savedstate =b43legacy_interrupt_disable (dev, - B43legacy_IRQ_ALL); -b43legacy_read32 (dev, B43legacy_MMIO_GEN_IRQ_MASK);/* flush */ -spin_unlock_irqrestore (&wl->irq_lock, flags); -b43legacy_synchronize_irq (dev); -b43legacy_mac_suspend (dev);free_irq (dev->dev->irq, dev);b43legacydbg (wl,"Wireless interface stopped\n" );
Signature · 2 lines
Ciao Stefano