iwlwifi: use threaded interrupt handler

With new transports coming up, move to threaded
interrupt handling now. This has the advantage
that we can use the same locking scheme with all
different transports we may need to implement.

Note that the TX path obviously still runs in a
tasklet, so some spin_lock() calls need to change
to spin_lock_bh() calls to properly lock out the
TX path.

In my test on a Calpella platform this has no
impact on throughput or latency.

Also add lockdep annotations to avoid lockups due
to catch sending synchronous commands or using
locks that connect with them from the irq thread.

Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/net/wireless/iwlwifi/dvm/tx.c b/drivers/net/wireless/iwlwifi/dvm/tx.c
index 7b0550d35a91..4ece5ea81b86 100644
--- a/drivers/net/wireless/iwlwifi/dvm/tx.c
+++ b/drivers/net/wireless/iwlwifi/dvm/tx.c
@@ -1117,7 +1117,7 @@ int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb,
         sta_id = (tx_resp->ra_tid & IWLAGN_TX_RES_RA_MSK) >>
                 IWLAGN_TX_RES_RA_POS;
 
-        spin_lock(&priv->sta_lock);
+        spin_lock_bh(&priv->sta_lock);
 
         if (is_agg)
                 iwl_rx_reply_tx_agg(priv, tx_resp);
@@ -1239,11 +1239,11 @@ int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb,
                            le16_to_cpu(tx_resp->seq_ctl));
 
         iwl_check_abort_status(priv, tx_resp->frame_count, status);
-        spin_unlock(&priv->sta_lock);
+        spin_unlock_bh(&priv->sta_lock);
 
         while (!skb_queue_empty(&skbs)) {
                 skb = __skb_dequeue(&skbs);
-                ieee80211_tx_status(priv->hw, skb);
+                ieee80211_tx_status_ni(priv->hw, skb);
         }
 
         if (is_offchannel_skb)
@@ -1290,12 +1290,12 @@ int iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,
         tid = ba_resp->tid;
         agg = &priv->tid_data[sta_id][tid].agg;
 
-        spin_lock(&priv->sta_lock);
+        spin_lock_bh(&priv->sta_lock);
 
         if (unlikely(!agg->wait_for_ba)) {
                 if (unlikely(ba_resp->bitmap))
                         IWL_ERR(priv, "Received BA when not expected\n");
-                spin_unlock(&priv->sta_lock);
+                spin_unlock_bh(&priv->sta_lock);
                 return 0;
         }
 
@@ -1309,7 +1309,7 @@ int iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,
                 IWL_DEBUG_TX_QUEUES(priv,
                                     "Bad queue mapping txq_id=%d, agg_txq[sta:%d,tid:%d]=%d\n",
                                     scd_flow, sta_id, tid, agg->txq_id);
-                spin_unlock(&priv->sta_lock);
+                spin_unlock_bh(&priv->sta_lock);
                 return 0;
         }
 
@@ -1378,11 +1378,11 @@ int iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,
                 }
         }
 
-        spin_unlock(&priv->sta_lock);
+        spin_unlock_bh(&priv->sta_lock);
 
         while (!skb_queue_empty(&reclaimed_skbs)) {
                 skb = __skb_dequeue(&reclaimed_skbs);
-                ieee80211_tx_status(priv->hw, skb);
+                ieee80211_tx_status_ni(priv->hw, skb);
         }
 
         return 0;