Commit 78ff56a0 authored by Michael Buesch's avatar Michael Buesch Committed by John W. Linville

[PATCH] bcm43xx: redesign locking

Redesign the bcm43xx locking.
This is pre-work to get a preemptible periodic work handler.
Signed-off-by: default avatarMichael Buesch <mb@bu3sch.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 74f49033
...@@ -636,6 +636,17 @@ struct bcm43xx_key { ...@@ -636,6 +636,17 @@ struct bcm43xx_key {
u8 algorithm; u8 algorithm;
}; };
/* Driver initialization status. */
enum {
BCM43xx_STAT_UNINIT, /* Uninitialized. */
BCM43xx_STAT_INITIALIZING, /* init_board() in progress. */
BCM43xx_STAT_INITIALIZED, /* Fully operational. */
BCM43xx_STAT_SHUTTINGDOWN, /* free_board() in progress. */
BCM43xx_STAT_RESTARTING, /* controller_restart() called. */
};
#define bcm43xx_status(bcm) atomic_read(&(bcm)->init_status)
#define bcm43xx_set_status(bcm, stat) atomic_set(&(bcm)->init_status, (stat))
struct bcm43xx_private { struct bcm43xx_private {
struct ieee80211_device *ieee; struct ieee80211_device *ieee;
struct ieee80211softmac_device *softmac; struct ieee80211softmac_device *softmac;
...@@ -646,18 +657,17 @@ struct bcm43xx_private { ...@@ -646,18 +657,17 @@ struct bcm43xx_private {
void __iomem *mmio_addr; void __iomem *mmio_addr;
/* Do not use the lock directly. Use the bcm43xx_lock* helper /* Locking, see "theory of locking" text below. */
* functions, to be MMIO-safe. */ spinlock_t irq_lock;
spinlock_t _lock; struct mutex mutex;
/* Driver status flags. */ /* Driver initialization status BCM43xx_STAT_*** */
u32 initialized:1, /* init_board() succeed */ atomic_t init_status;
was_initialized:1, /* for PCI suspend/resume. */
shutting_down:1, /* free_board() in progress */ u16 was_initialized:1, /* for PCI suspend/resume. */
__using_pio:1, /* Internal, use bcm43xx_using_pio(). */ __using_pio:1, /* Internal, use bcm43xx_using_pio(). */
bad_frames_preempt:1, /* Use "Bad Frames Preemption" (default off) */ bad_frames_preempt:1, /* Use "Bad Frames Preemption" (default off) */
reg124_set_0x4:1, /* Some variable to keep track of IRQ stuff. */ reg124_set_0x4:1, /* Some variable to keep track of IRQ stuff. */
powersaving:1, /* TRUE if we are in PowerSaving mode. FALSE otherwise. */
short_preamble:1, /* TRUE, if short preamble is enabled. */ short_preamble:1, /* TRUE, if short preamble is enabled. */
firmware_norelease:1; /* Do not release the firmware. Used on suspend. */ firmware_norelease:1; /* Do not release the firmware. Used on suspend. */
...@@ -721,7 +731,7 @@ struct bcm43xx_private { ...@@ -721,7 +731,7 @@ struct bcm43xx_private {
struct tasklet_struct isr_tasklet; struct tasklet_struct isr_tasklet;
/* Periodic tasks */ /* Periodic tasks */
struct timer_list periodic_tasks; struct work_struct periodic_work;
unsigned int periodic_state; unsigned int periodic_state;
struct work_struct restart_work; struct work_struct restart_work;
...@@ -746,21 +756,55 @@ struct bcm43xx_private { ...@@ -746,21 +756,55 @@ struct bcm43xx_private {
#endif #endif
}; };
/* bcm43xx_(un)lock() protect struct bcm43xx_private.
* Note that _NO_ MMIO writes are allowed. If you want to /* *** THEORY OF LOCKING ***
* write to the device through MMIO in the critical section, use *
* the *_mmio lock functions. * We have two different locks in the bcm43xx driver.
* MMIO read-access is allowed, though. * => bcm->mutex: General sleeping mutex. Protects struct bcm43xx_private
*/ * and the device registers.
#define bcm43xx_lock(bcm, flags) spin_lock_irqsave(&(bcm)->_lock, flags) * => bcm->irq_lock: IRQ spinlock. Protects against IRQ handler concurrency.
#define bcm43xx_unlock(bcm, flags) spin_unlock_irqrestore(&(bcm)->_lock, flags) *
/* bcm43xx_(un)lock_mmio() protect struct bcm43xx_private and MMIO. * We have three types of helper function pairs to utilize these locks.
* MMIO write-access to the device is allowed. * (Always use the helper functions.)
* All MMIO writes are flushed on unlock, so it is guaranteed to not * 1) bcm43xx_{un}lock_noirq():
* interfere with other threads writing MMIO registers. * Takes bcm->mutex. Does _not_ protect against IRQ concurrency,
* so it is almost always unsafe, if device IRQs are enabled.
* So only use this, if device IRQs are masked.
* Locking may sleep.
* You can sleep within the critical section.
* 2) bcm43xx_{un}lock_irqonly():
* Takes bcm->irq_lock. Does _not_ protect against
* bcm43xx_lock_noirq() critical sections.
* Does only protect against the IRQ handler path and other
* irqonly() critical sections.
* Locking does not sleep.
* You must not sleep within the critical section.
* 3) bcm43xx_{un}lock_irqsafe():
* This is the cummulative lock and takes both, mutex and irq_lock.
* Protects against noirq() and irqonly() critical sections (and
* the IRQ handler path).
* Locking may sleep.
* You must not sleep within the critical section.
*/ */
#define bcm43xx_lock_mmio(bcm, flags) bcm43xx_lock(bcm, flags)
#define bcm43xx_unlock_mmio(bcm, flags) do { mmiowb(); bcm43xx_unlock(bcm, flags); } while (0) /* Lock type 1 */
#define bcm43xx_lock_noirq(bcm) mutex_lock(&(bcm)->mutex)
#define bcm43xx_unlock_noirq(bcm) mutex_unlock(&(bcm)->mutex)
/* Lock type 2 */
#define bcm43xx_lock_irqonly(bcm, flags) \
spin_lock_irqsave(&(bcm)->irq_lock, flags)
#define bcm43xx_unlock_irqonly(bcm, flags) \
spin_unlock_irqrestore(&(bcm)->irq_lock, flags)
/* Lock type 3 */
#define bcm43xx_lock_irqsafe(bcm, flags) do { \
bcm43xx_lock_noirq(bcm); \
bcm43xx_lock_irqonly(bcm, flags); \
} while (0)
#define bcm43xx_unlock_irqsafe(bcm, flags) do { \
bcm43xx_unlock_irqonly(bcm, flags); \
bcm43xx_unlock_noirq(bcm); \
} while (0)
static inline static inline
struct bcm43xx_private * bcm43xx_priv(struct net_device *dev) struct bcm43xx_private * bcm43xx_priv(struct net_device *dev)
...@@ -843,16 +887,6 @@ struct bcm43xx_radioinfo * bcm43xx_current_radio(struct bcm43xx_private *bcm) ...@@ -843,16 +887,6 @@ struct bcm43xx_radioinfo * bcm43xx_current_radio(struct bcm43xx_private *bcm)
return &(bcm->core_80211_ext[bcm->current_80211_core_idx].radio); return &(bcm->core_80211_ext[bcm->current_80211_core_idx].radio);
} }
/* Are we running in init_board() context? */
static inline
int bcm43xx_is_initializing(struct bcm43xx_private *bcm)
{
if (bcm->initialized)
return 0;
if (bcm->shutting_down)
return 0;
return 1;
}
static inline static inline
struct bcm43xx_lopair * bcm43xx_get_lopair(struct bcm43xx_phyinfo *phy, struct bcm43xx_lopair * bcm43xx_get_lopair(struct bcm43xx_phyinfo *phy,
......
...@@ -77,8 +77,8 @@ static ssize_t devinfo_read_file(struct file *file, char __user *userbuf, ...@@ -77,8 +77,8 @@ static ssize_t devinfo_read_file(struct file *file, char __user *userbuf,
down(&big_buffer_sem); down(&big_buffer_sem);
bcm43xx_lock_mmio(bcm, flags); bcm43xx_lock_irqsafe(bcm, flags);
if (!bcm->initialized) { if (bcm43xx_status(bcm) != BCM43xx_STAT_INITIALIZED) {
fappend("Board not initialized.\n"); fappend("Board not initialized.\n");
goto out; goto out;
} }
...@@ -121,7 +121,7 @@ static ssize_t devinfo_read_file(struct file *file, char __user *userbuf, ...@@ -121,7 +121,7 @@ static ssize_t devinfo_read_file(struct file *file, char __user *userbuf,
fappend("\n"); fappend("\n");
out: out:
bcm43xx_unlock_mmio(bcm, flags); bcm43xx_unlock_irqsafe(bcm, flags);
res = simple_read_from_buffer(userbuf, count, ppos, buf, pos); res = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
up(&big_buffer_sem); up(&big_buffer_sem);
return res; return res;
...@@ -159,8 +159,8 @@ static ssize_t spromdump_read_file(struct file *file, char __user *userbuf, ...@@ -159,8 +159,8 @@ static ssize_t spromdump_read_file(struct file *file, char __user *userbuf,
unsigned long flags; unsigned long flags;
down(&big_buffer_sem); down(&big_buffer_sem);
bcm43xx_lock_mmio(bcm, flags); bcm43xx_lock_irqsafe(bcm, flags);
if (!bcm->initialized) { if (bcm43xx_status(bcm) != BCM43xx_STAT_INITIALIZED) {
fappend("Board not initialized.\n"); fappend("Board not initialized.\n");
goto out; goto out;
} }
...@@ -169,7 +169,7 @@ static ssize_t spromdump_read_file(struct file *file, char __user *userbuf, ...@@ -169,7 +169,7 @@ static ssize_t spromdump_read_file(struct file *file, char __user *userbuf,
fappend("boardflags: 0x%04x\n", bcm->sprom.boardflags); fappend("boardflags: 0x%04x\n", bcm->sprom.boardflags);
out: out:
bcm43xx_unlock_mmio(bcm, flags); bcm43xx_unlock_irqsafe(bcm, flags);
res = simple_read_from_buffer(userbuf, count, ppos, buf, pos); res = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
up(&big_buffer_sem); up(&big_buffer_sem);
return res; return res;
...@@ -188,8 +188,8 @@ static ssize_t tsf_read_file(struct file *file, char __user *userbuf, ...@@ -188,8 +188,8 @@ static ssize_t tsf_read_file(struct file *file, char __user *userbuf,
u64 tsf; u64 tsf;
down(&big_buffer_sem); down(&big_buffer_sem);
bcm43xx_lock_mmio(bcm, flags); bcm43xx_lock_irqsafe(bcm, flags);
if (!bcm->initialized) { if (bcm43xx_status(bcm) != BCM43xx_STAT_INITIALIZED) {
fappend("Board not initialized.\n"); fappend("Board not initialized.\n");
goto out; goto out;
} }
...@@ -199,7 +199,7 @@ static ssize_t tsf_read_file(struct file *file, char __user *userbuf, ...@@ -199,7 +199,7 @@ static ssize_t tsf_read_file(struct file *file, char __user *userbuf,
(unsigned int)(tsf & 0xFFFFFFFFULL)); (unsigned int)(tsf & 0xFFFFFFFFULL));
out: out:
bcm43xx_unlock_mmio(bcm, flags); bcm43xx_unlock_irqsafe(bcm, flags);
res = simple_read_from_buffer(userbuf, count, ppos, buf, pos); res = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
up(&big_buffer_sem); up(&big_buffer_sem);
return res; return res;
...@@ -221,8 +221,8 @@ static ssize_t tsf_write_file(struct file *file, const char __user *user_buf, ...@@ -221,8 +221,8 @@ static ssize_t tsf_write_file(struct file *file, const char __user *user_buf,
res = -EFAULT; res = -EFAULT;
goto out_up; goto out_up;
} }
bcm43xx_lock_mmio(bcm, flags); bcm43xx_lock_irqsafe(bcm, flags);
if (!bcm->initialized) { if (bcm43xx_status(bcm) != BCM43xx_STAT_INITIALIZED) {
printk(KERN_INFO PFX "debugfs: Board not initialized.\n"); printk(KERN_INFO PFX "debugfs: Board not initialized.\n");
res = -EFAULT; res = -EFAULT;
goto out_unlock; goto out_unlock;
...@@ -233,10 +233,11 @@ static ssize_t tsf_write_file(struct file *file, const char __user *user_buf, ...@@ -233,10 +233,11 @@ static ssize_t tsf_write_file(struct file *file, const char __user *user_buf,
goto out_unlock; goto out_unlock;
} }
bcm43xx_tsf_write(bcm, tsf); bcm43xx_tsf_write(bcm, tsf);
mmiowb();
res = buf_size; res = buf_size;
out_unlock: out_unlock:
bcm43xx_unlock_mmio(bcm, flags); bcm43xx_unlock_irqsafe(bcm, flags);
out_up: out_up:
up(&big_buffer_sem); up(&big_buffer_sem);
return res; return res;
...@@ -257,7 +258,7 @@ static ssize_t txstat_read_file(struct file *file, char __user *userbuf, ...@@ -257,7 +258,7 @@ static ssize_t txstat_read_file(struct file *file, char __user *userbuf,
int i, cnt, j = 0; int i, cnt, j = 0;
down(&big_buffer_sem); down(&big_buffer_sem);
bcm43xx_lock(bcm, flags); bcm43xx_lock_irqsafe(bcm, flags);
fappend("Last %d logged xmitstatus blobs (Latest first):\n\n", fappend("Last %d logged xmitstatus blobs (Latest first):\n\n",
BCM43xx_NR_LOGGED_XMITSTATUS); BCM43xx_NR_LOGGED_XMITSTATUS);
...@@ -293,14 +294,14 @@ static ssize_t txstat_read_file(struct file *file, char __user *userbuf, ...@@ -293,14 +294,14 @@ static ssize_t txstat_read_file(struct file *file, char __user *userbuf,
i = BCM43xx_NR_LOGGED_XMITSTATUS - 1; i = BCM43xx_NR_LOGGED_XMITSTATUS - 1;
} }
bcm43xx_unlock(bcm, flags); bcm43xx_unlock_irqsafe(bcm, flags);
res = simple_read_from_buffer(userbuf, count, ppos, buf, pos); res = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
bcm43xx_lock(bcm, flags); bcm43xx_lock_irqsafe(bcm, flags);
if (*ppos == pos) { if (*ppos == pos) {
/* Done. Drop the copied data. */ /* Done. Drop the copied data. */
e->xmitstatus_printing = 0; e->xmitstatus_printing = 0;
} }
bcm43xx_unlock(bcm, flags); bcm43xx_unlock_irqsafe(bcm, flags);
up(&big_buffer_sem); up(&big_buffer_sem);
return res; return res;
} }
......
...@@ -51,12 +51,12 @@ static void bcm43xx_led_blink(unsigned long d) ...@@ -51,12 +51,12 @@ static void bcm43xx_led_blink(unsigned long d)
struct bcm43xx_private *bcm = led->bcm; struct bcm43xx_private *bcm = led->bcm;
unsigned long flags; unsigned long flags;
bcm43xx_lock_mmio(bcm, flags); bcm43xx_lock_irqonly(bcm, flags);
if (led->blink_interval) { if (led->blink_interval) {
bcm43xx_led_changestate(led); bcm43xx_led_changestate(led);
mod_timer(&led->blink_timer, jiffies + led->blink_interval); mod_timer(&led->blink_timer, jiffies + led->blink_interval);
} }
bcm43xx_unlock_mmio(bcm, flags); bcm43xx_unlock_irqonly(bcm, flags);
} }
static void bcm43xx_led_blink_start(struct bcm43xx_led *led, static void bcm43xx_led_blink_start(struct bcm43xx_led *led,
......
...@@ -504,14 +504,14 @@ static int bcm43xx_disable_interrupts_sync(struct bcm43xx_private *bcm, u32 *old ...@@ -504,14 +504,14 @@ static int bcm43xx_disable_interrupts_sync(struct bcm43xx_private *bcm, u32 *old
u32 old; u32 old;
unsigned long flags; unsigned long flags;
bcm43xx_lock_mmio(bcm, flags); bcm43xx_lock_irqonly(bcm, flags);
if (bcm43xx_is_initializing(bcm) || bcm->shutting_down) { if (unlikely(bcm43xx_status(bcm) != BCM43xx_STAT_INITIALIZED)) {
bcm43xx_unlock_mmio(bcm, flags); bcm43xx_unlock_irqonly(bcm, flags);
return -EBUSY; return -EBUSY;
} }
old = bcm43xx_interrupt_disable(bcm, BCM43xx_IRQ_ALL); old = bcm43xx_interrupt_disable(bcm, BCM43xx_IRQ_ALL);
tasklet_disable(&bcm->isr_tasklet); tasklet_disable(&bcm->isr_tasklet);
bcm43xx_unlock_mmio(bcm, flags); bcm43xx_unlock_irqonly(bcm, flags);
if (oldstate) if (oldstate)
*oldstate = old; *oldstate = old;
...@@ -1389,7 +1389,7 @@ void bcm43xx_wireless_core_reset(struct bcm43xx_private *bcm, int connect_phy) ...@@ -1389,7 +1389,7 @@ void bcm43xx_wireless_core_reset(struct bcm43xx_private *bcm, int connect_phy)
bcm43xx_dmacontroller_rx_reset(bcm, BCM43xx_MMIO_DMA4_BASE); bcm43xx_dmacontroller_rx_reset(bcm, BCM43xx_MMIO_DMA4_BASE);
#endif #endif
} }
if (bcm->shutting_down) { if (bcm43xx_status(bcm) == BCM43xx_STAT_SHUTTINGDOWN) {
bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD, bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD,
bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD) bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD)
& ~(BCM43xx_SBF_MAC_ENABLED | 0x00000002)); & ~(BCM43xx_SBF_MAC_ENABLED | 0x00000002));
...@@ -1709,7 +1709,7 @@ static void bcm43xx_interrupt_tasklet(struct bcm43xx_private *bcm) ...@@ -1709,7 +1709,7 @@ static void bcm43xx_interrupt_tasklet(struct bcm43xx_private *bcm)
# define bcmirq_handled(irq) do { /* nothing */ } while (0) # define bcmirq_handled(irq) do { /* nothing */ } while (0)
#endif /* CONFIG_BCM43XX_DEBUG*/ #endif /* CONFIG_BCM43XX_DEBUG*/
bcm43xx_lock_mmio(bcm, flags); bcm43xx_lock_irqonly(bcm, flags);
reason = bcm->irq_reason; reason = bcm->irq_reason;
dma_reason[0] = bcm->dma_reason[0]; dma_reason[0] = bcm->dma_reason[0];
dma_reason[1] = bcm->dma_reason[1]; dma_reason[1] = bcm->dma_reason[1];
...@@ -1734,7 +1734,8 @@ static void bcm43xx_interrupt_tasklet(struct bcm43xx_private *bcm) ...@@ -1734,7 +1734,8 @@ static void bcm43xx_interrupt_tasklet(struct bcm43xx_private *bcm)
dma_reason[0], dma_reason[1], dma_reason[0], dma_reason[1],
dma_reason[2], dma_reason[3]); dma_reason[2], dma_reason[3]);
bcm43xx_controller_restart(bcm, "DMA error"); bcm43xx_controller_restart(bcm, "DMA error");
bcm43xx_unlock_mmio(bcm, flags); mmiowb();
bcm43xx_unlock_irqonly(bcm, flags);
return; return;
} }
if (unlikely((dma_reason[0] & BCM43xx_DMAIRQ_NONFATALMASK) | if (unlikely((dma_reason[0] & BCM43xx_DMAIRQ_NONFATALMASK) |
...@@ -1821,7 +1822,8 @@ static void bcm43xx_interrupt_tasklet(struct bcm43xx_private *bcm) ...@@ -1821,7 +1822,8 @@ static void bcm43xx_interrupt_tasklet(struct bcm43xx_private *bcm)
if (!modparam_noleds) if (!modparam_noleds)
bcm43xx_leds_update(bcm, activity); bcm43xx_leds_update(bcm, activity);
bcm43xx_interrupt_enable(bcm, bcm->irq_savedstate); bcm43xx_interrupt_enable(bcm, bcm->irq_savedstate);
bcm43xx_unlock_mmio(bcm, flags); mmiowb();
bcm43xx_unlock_irqonly(bcm, flags);
} }
static void pio_irq_workaround(struct bcm43xx_private *bcm, static void pio_irq_workaround(struct bcm43xx_private *bcm,
...@@ -1870,7 +1872,7 @@ static irqreturn_t bcm43xx_interrupt_handler(int irq, void *dev_id, struct pt_re ...@@ -1870,7 +1872,7 @@ static irqreturn_t bcm43xx_interrupt_handler(int irq, void *dev_id, struct pt_re
if (!bcm) if (!bcm)
return IRQ_NONE; return IRQ_NONE;
spin_lock(&bcm->_lock); spin_lock(&bcm->irq_lock);
reason = bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON); reason = bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON);
if (reason == 0xffffffff) { if (reason == 0xffffffff) {
...@@ -1899,7 +1901,7 @@ static irqreturn_t bcm43xx_interrupt_handler(int irq, void *dev_id, struct pt_re ...@@ -1899,7 +1901,7 @@ static irqreturn_t bcm43xx_interrupt_handler(int irq, void *dev_id, struct pt_re
* completely, but some careful work is needed to fix this. I think it * completely, but some careful work is needed to fix this. I think it
* is best to stay with this cheap workaround for now... . * is best to stay with this cheap workaround for now... .
*/ */
if (likely(bcm->initialized)) { if (likely(bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED)) {
/* disable all IRQs. They are enabled again in the bottom half. */ /* disable all IRQs. They are enabled again in the bottom half. */
bcm->irq_savedstate = bcm43xx_interrupt_disable(bcm, BCM43xx_IRQ_ALL); bcm->irq_savedstate = bcm43xx_interrupt_disable(bcm, BCM43xx_IRQ_ALL);
/* save the reason code and call our bottom half. */ /* save the reason code and call our bottom half. */
...@@ -1909,7 +1911,7 @@ static irqreturn_t bcm43xx_interrupt_handler(int irq, void *dev_id, struct pt_re ...@@ -1909,7 +1911,7 @@ static irqreturn_t bcm43xx_interrupt_handler(int irq, void *dev_id, struct pt_re
out: out:
mmiowb(); mmiowb();
spin_unlock(&bcm->_lock); spin_unlock(&bcm->irq_lock);
return ret; return ret;
} }
...@@ -3106,15 +3108,14 @@ static void bcm43xx_periodic_every15sec(struct bcm43xx_private *bcm) ...@@ -3106,15 +3108,14 @@ static void bcm43xx_periodic_every15sec(struct bcm43xx_private *bcm)
//TODO for APHY (temperature?) //TODO for APHY (temperature?)
} }
static void bcm43xx_periodic_task_handler(unsigned long d) static void bcm43xx_periodic_work_handler(void *d)
{ {
struct bcm43xx_private *bcm = (struct bcm43xx_private *)d; struct bcm43xx_private *bcm = d;
unsigned long flags; unsigned long flags;
unsigned int state; unsigned int state;
bcm43xx_lock_mmio(bcm, flags); bcm43xx_lock_irqsafe(bcm, flags);
assert(bcm->initialized);
state = bcm->periodic_state; state = bcm->periodic_state;
if (state % 8 == 0) if (state % 8 == 0)
bcm43xx_periodic_every120sec(bcm); bcm43xx_periodic_every120sec(bcm);
...@@ -3125,26 +3126,24 @@ static void bcm43xx_periodic_task_handler(unsigned long d) ...@@ -3125,26 +3126,24 @@ static void bcm43xx_periodic_task_handler(unsigned long d)
bcm43xx_periodic_every15sec(bcm); bcm43xx_periodic_every15sec(bcm);
bcm->periodic_state = state + 1; bcm->periodic_state = state + 1;
mod_timer(&bcm->periodic_tasks, jiffies + (HZ * 15)); schedule_delayed_work(&bcm->periodic_work, HZ * 15);
bcm43xx_unlock_mmio(bcm, flags); mmiowb();
bcm43xx_unlock_irqsafe(bcm, flags);
} }
static void bcm43xx_periodic_tasks_delete(struct bcm43xx_private *bcm) static void bcm43xx_periodic_tasks_delete(struct bcm43xx_private *bcm)
{ {
del_timer_sync(&bcm->periodic_tasks); cancel_rearming_delayed_work(&bcm->periodic_work);
} }
static void bcm43xx_periodic_tasks_setup(struct bcm43xx_private *bcm) static void bcm43xx_periodic_tasks_setup(struct bcm43xx_private *bcm)
{ {
struct timer_list *timer = &(bcm->periodic_tasks); struct work_struct *work = &(bcm->periodic_work);
assert(bcm->initialized); assert(bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED);
setup_timer(timer, INIT_WORK(work, bcm43xx_periodic_work_handler, bcm);
bcm43xx_periodic_task_handler, schedule_work(work);
(unsigned long)bcm);
timer->expires = jiffies;
add_timer(timer);
} }
static void bcm43xx_security_init(struct bcm43xx_private *bcm) static void bcm43xx_security_init(struct bcm43xx_private *bcm)
...@@ -3158,16 +3157,12 @@ static void bcm43xx_security_init(struct bcm43xx_private *bcm) ...@@ -3158,16 +3157,12 @@ static void bcm43xx_security_init(struct bcm43xx_private *bcm)
static void bcm43xx_free_board(struct bcm43xx_private *bcm) static void bcm43xx_free_board(struct bcm43xx_private *bcm)
{ {
int i, err; int i, err;
unsigned long flags;
bcm43xx_lock_noirq(bcm);
bcm43xx_sysfs_unregister(bcm); bcm43xx_sysfs_unregister(bcm);
bcm43xx_periodic_tasks_delete(bcm); bcm43xx_periodic_tasks_delete(bcm);
bcm43xx_lock(bcm, flags); bcm43xx_set_status(bcm, BCM43xx_STAT_SHUTTINGDOWN);
bcm->initialized = 0;
bcm->shutting_down = 1;
bcm43xx_unlock(bcm, flags);
for (i = 0; i < BCM43xx_MAX_80211_CORES; i++) { for (i = 0; i < BCM43xx_MAX_80211_CORES; i++) {
if (!bcm->core_80211[i].available) if (!bcm->core_80211[i].available)
...@@ -3182,23 +3177,19 @@ static void bcm43xx_free_board(struct bcm43xx_private *bcm) ...@@ -3182,23 +3177,19 @@ static void bcm43xx_free_board(struct bcm43xx_private *bcm)
bcm43xx_pctl_set_crystal(bcm, 0); bcm43xx_pctl_set_crystal(bcm, 0);
bcm43xx_lock(bcm, flags); bcm43xx_set_status(bcm, BCM43xx_STAT_UNINIT);
bcm->shutting_down = 0; bcm43xx_unlock_noirq(bcm);
bcm43xx_unlock(bcm, flags);
} }
static int bcm43xx_init_board(struct bcm43xx_private *bcm) static int bcm43xx_init_board(struct bcm43xx_private *bcm)
{ {
int i, err; int i, err;
int connect_phy; int connect_phy;
unsigned long flags;
might_sleep(); might_sleep();
bcm43xx_lock(bcm, flags); bcm43xx_lock_noirq(bcm);
bcm->initialized = 0; bcm43xx_set_status(bcm, BCM43xx_STAT_INITIALIZING);
bcm->shutting_down = 0;
bcm43xx_unlock(bcm, flags);
err = bcm43xx_pctl_set_crystal(bcm, 1); err = bcm43xx_pctl_set_crystal(bcm, 1);
if (err) if (err)
...@@ -3265,9 +3256,7 @@ static int bcm43xx_init_board(struct bcm43xx_private *bcm) ...@@ -3265,9 +3256,7 @@ static int bcm43xx_init_board(struct bcm43xx_private *bcm)
} }
/* Initialization of the board is done. Flag it as such. */ /* Initialization of the board is done. Flag it as such. */
bcm43xx_lock(bcm, flags); bcm43xx_set_status(bcm, BCM43xx_STAT_INITIALIZED);
bcm->initialized = 1;
bcm43xx_unlock(bcm, flags);
bcm43xx_periodic_tasks_setup(bcm); bcm43xx_periodic_tasks_setup(bcm);
bcm43xx_sysfs_register(bcm); bcm43xx_sysfs_register(bcm);
...@@ -3278,6 +3267,8 @@ static int bcm43xx_init_board(struct bcm43xx_private *bcm) ...@@ -3278,6 +3267,8 @@ static int bcm43xx_init_board(struct bcm43xx_private *bcm)
assert(err == 0); assert(err == 0);
out: out:
bcm43xx_unlock_noirq(bcm);