leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iwlwifi: change spin_lock to spin_lock_irqsave

Browse Source 
Use spin_lock_irqsave() in interrupt handler to disable interrupts locally
and provide the spinlock on SMP. This covers both interrupt and SMP
concurrency.

With this changes, also fix the sparse warning issues.

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Acked-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
This commit is contained in:
Wey-Yi Guy 2010-03-19 10:36:09 -07:00 committed by Reinette Chatre
parent 6c69d12167
commit 6e8cc38d5b
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/wireless/iwlwifi/iwl-agn-ict.c
View File

@ -141,13 +141,14 @@ static irqreturn_t iwl_isr(int irq, void *data)
{ {
struct iwl_priv *priv = data; struct iwl_priv *priv = data;
u32 inta, inta_mask; u32 inta, inta_mask;
unsigned long flags;
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
u32 inta_fh; u32 inta_fh;
#endif #endif
if (!priv) if (!priv)
return IRQ_NONE; return IRQ_NONE;
spin_lock(&priv->lock); spin_lock_irqsave(&priv->lock, flags);
/* Disable (but don't clear!) interrupts here to avoid /* Disable (but don't clear!) interrupts here to avoid
* back-to-back ISRs and sporadic interrupts from our NIC. * back-to-back ISRs and sporadic interrupts from our NIC.
@ -190,7 +191,7 @@ static irqreturn_t iwl_isr(int irq, void *data)
iwl_enable_interrupts(priv); iwl_enable_interrupts(priv);
unplugged: unplugged:
spin_unlock(&priv->lock); spin_unlock_irqrestore(&priv->lock, flags);
return IRQ_HANDLED; return IRQ_HANDLED;
none: none:
@ -199,7 +200,7 @@ static irqreturn_t iwl_isr(int irq, void *data)
if (test_bit(STATUS_INT_ENABLED, &priv->status) && !priv->_agn.inta) if (test_bit(STATUS_INT_ENABLED, &priv->status) && !priv->_agn.inta)
iwl_enable_interrupts(priv); iwl_enable_interrupts(priv);
spin_unlock(&priv->lock); spin_unlock_irqrestore(&priv->lock, flags);
return IRQ_NONE; return IRQ_NONE;
} }
@ -216,6 +217,7 @@ irqreturn_t iwl_isr_ict(int irq, void *data)
struct iwl_priv *priv = data; struct iwl_priv *priv = data;
u32 inta, inta_mask; u32 inta, inta_mask;
u32 val = 0; u32 val = 0;
unsigned long flags;
if (!priv) if (!priv)
return IRQ_NONE; return IRQ_NONE;
@ -226,7 +228,7 @@ irqreturn_t iwl_isr_ict(int irq, void *data)
if (!priv->_agn.use_ict) if (!priv->_agn.use_ict)
return iwl_isr(irq, data); return iwl_isr(irq, data);
spin_lock(&priv->lock); spin_lock_irqsave(&priv->lock, flags);
/* Disable (but don't clear!) interrupts here to avoid /* Disable (but don't clear!) interrupts here to avoid
* back-to-back ISRs and sporadic interrupts from our NIC. * back-to-back ISRs and sporadic interrupts from our NIC.
@ -290,7 +292,7 @@ irqreturn_t iwl_isr_ict(int irq, void *data)
iwl_enable_interrupts(priv); iwl_enable_interrupts(priv);
} }
spin_unlock(&priv->lock); spin_unlock_irqrestore(&priv->lock, flags);
return IRQ_HANDLED; return IRQ_HANDLED;
none: none:
@ -300,6 +302,6 @@ irqreturn_t iwl_isr_ict(int irq, void *data)
if (test_bit(STATUS_INT_ENABLED, &priv->status) && !priv->_agn.inta) if (test_bit(STATUS_INT_ENABLED, &priv->status) && !priv->_agn.inta)
iwl_enable_interrupts(priv); iwl_enable_interrupts(priv);
spin_unlock(&priv->lock); spin_unlock_irqrestore(&priv->lock, flags);
return IRQ_NONE; return IRQ_NONE;
} }

7
drivers/net/wireless/iwlwifi/iwl-core.c
View File

@ -1531,10 +1531,11 @@ irqreturn_t iwl_isr_legacy(int irq, void *data)
struct iwl_priv *priv = data; struct iwl_priv *priv = data;
u32 inta, inta_mask; u32 inta, inta_mask;
u32 inta_fh; u32 inta_fh;
unsigned long flags;
if (!priv) if (!priv)
return IRQ_NONE; return IRQ_NONE;
spin_lock(&priv->lock); spin_lock_irqsave(&priv->lock, flags);
/* Disable (but don't clear!) interrupts here to avoid /* Disable (but don't clear!) interrupts here to avoid
* back-to-back ISRs and sporadic interrupts from our NIC. * back-to-back ISRs and sporadic interrupts from our NIC.
@ -1572,7 +1573,7 @@ irqreturn_t iwl_isr_legacy(int irq, void *data)
tasklet_schedule(&priv->irq_tasklet); tasklet_schedule(&priv->irq_tasklet);
unplugged: unplugged:
spin_unlock(&priv->lock); spin_unlock_irqrestore(&priv->lock, flags);
return IRQ_HANDLED; return IRQ_HANDLED;
none: none:
@ -1580,7 +1581,7 @@ irqreturn_t iwl_isr_legacy(int irq, void *data)
/* only Re-enable if diabled by irq */ /* only Re-enable if diabled by irq */
if (test_bit(STATUS_INT_ENABLED, &priv->status)) if (test_bit(STATUS_INT_ENABLED, &priv->status))
iwl_enable_interrupts(priv); iwl_enable_interrupts(priv);
spin_unlock(&priv->lock); spin_unlock_irqrestore(&priv->lock, flags);
return IRQ_NONE; return IRQ_NONE;
} }
EXPORT_SYMBOL(iwl_isr_legacy); EXPORT_SYMBOL(iwl_isr_legacy);