Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e8cc38d authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by Reinette Chatre
Browse files

iwlwifi: change spin_lock to spin_lock_irqsave 



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: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Acked-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
parent 6c69d121

drivers/net/wireless/iwlwifi/iwl-agn-ict.c

+8 −6
Original line number Diff line number Diff line
@@ -141,13 +141,14 @@ static irqreturn_t iwl_isr(int irq, void *data) 
{

	struct iwl_priv *priv = data;

	u32 inta, inta_mask;

	unsigned long flags;

#ifdef CONFIG_IWLWIFI_DEBUG

	u32 inta_fh;

#endif

	if (!priv)

		return IRQ_NONE;



	spin_lock(&priv->lock);

	spin_lock_irqsave(&priv->lock, flags);



	/* Disable (but don't clear!) interrupts here to avoid

	 *    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);



 unplugged:

	spin_unlock(&priv->lock);

	spin_unlock_irqrestore(&priv->lock, flags);

	return IRQ_HANDLED;



 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)

		iwl_enable_interrupts(priv);



	spin_unlock(&priv->lock);

	spin_unlock_irqrestore(&priv->lock, flags);

	return IRQ_NONE;

}
@@ -216,6 +217,7 @@ irqreturn_t iwl_isr_ict(int irq, void *data) 
	struct iwl_priv *priv = data;

	u32 inta, inta_mask;

	u32 val = 0;

	unsigned long flags;



	if (!priv)

		return IRQ_NONE;
@@ -226,7 +228,7 @@ irqreturn_t iwl_isr_ict(int irq, void *data) 
	if (!priv->_agn.use_ict)

		return iwl_isr(irq, data);



	spin_lock(&priv->lock);

	spin_lock_irqsave(&priv->lock, flags);



	/* Disable (but don't clear!) interrupts here to avoid

	 * 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);

	}



	spin_unlock(&priv->lock);

	spin_unlock_irqrestore(&priv->lock, flags);

	return IRQ_HANDLED;



 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)

		iwl_enable_interrupts(priv);



	spin_unlock(&priv->lock);

	spin_unlock_irqrestore(&priv->lock, flags);

	return IRQ_NONE;

}

drivers/net/wireless/iwlwifi/iwl-core.c

+4 −3
Original line number Diff line number Diff line
@@ -1531,10 +1531,11 @@ irqreturn_t iwl_isr_legacy(int irq, void *data) 
	struct iwl_priv *priv = data;

	u32 inta, inta_mask;

	u32 inta_fh;

	unsigned long flags;

	if (!priv)

		return IRQ_NONE;



	spin_lock(&priv->lock);

	spin_lock_irqsave(&priv->lock, flags);



	/* Disable (but don't clear!) interrupts here to avoid

	 *    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);



 unplugged:

	spin_unlock(&priv->lock);

	spin_unlock_irqrestore(&priv->lock, flags);

	return IRQ_HANDLED;



 none:
@@ -1580,7 +1581,7 @@ irqreturn_t iwl_isr_legacy(int irq, void *data) 
	/* only Re-enable if diabled by irq */

	if (test_bit(STATUS_INT_ENABLED, &priv->status))

		iwl_enable_interrupts(priv);

	spin_unlock(&priv->lock);

	spin_unlock_irqrestore(&priv->lock, flags);

	return IRQ_NONE;

}

EXPORT_SYMBOL(iwl_isr_legacy);