iwlwifi: improve the reports in TX path

Also when things go wrong (queues don't get emtpy), try to
get some data from the HW.

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

1 files changed, 16 insertions, 12 deletions

diff --git a/drivers/net/wireless/iwlwifi/dvm/tx.c b/drivers/net/wireless/iwlwifi/dvm/tx.c
index df76881385ae..b0aad71c12a0 100644
--- a/drivers/net/wireless/iwlwifi/dvm/tx.c
+++ b/drivers/net/wireless/iwlwifi/dvm/tx.c
@@ -231,13 +231,11 @@ static void iwlagn_tx_cmd_build_hwcrypto(struct iwl_priv *priv,
                 memcpy(tx_cmd->key, keyconf->key, keyconf->keylen);
                 if (info->flags & IEEE80211_TX_CTL_AMPDU)
                         tx_cmd->tx_flags |= TX_CMD_FLG_AGG_CCMP_MSK;
-                IWL_DEBUG_TX(priv, "tx_cmd with AES hwcrypto\n");
                 break;
 
         case WLAN_CIPHER_SUITE_TKIP:
                 tx_cmd->sec_ctl = TX_CMD_SEC_TKIP;
                 ieee80211_get_tkip_p2k(keyconf, skb_frag, tx_cmd->key);
-                IWL_DEBUG_TX(priv, "tx_cmd with tkip hwcrypto\n");
                 break;
 
         case WLAN_CIPHER_SUITE_WEP104:
@@ -355,8 +353,6 @@ int iwlagn_tx_skb(struct iwl_priv *priv,
                 }
         }
 
-        IWL_DEBUG_TX(priv, "station Id %d\n", sta_id);
-
         if (sta)
                 sta_priv = (void *)sta->drv_priv;
 
@@ -472,6 +468,9 @@ int iwlagn_tx_skb(struct iwl_priv *priv,
         WARN_ON_ONCE(is_agg &&
                      priv->queue_to_mac80211[txq_id] != info->hw_queue);
 
+        IWL_DEBUG_TX(priv, "TX to [%d|%d] Q:%d - seq: 0x%x\n", sta_id, tid,
+                     txq_id, seq_number);
+
         if (iwl_trans_tx(priv->trans, skb, dev_cmd, txq_id))
                 goto drop_unlock_sta;
 
@@ -953,12 +952,6 @@ static void iwl_rx_reply_tx_agg(struct iwl_priv *priv,
                 if (status & (AGG_TX_STATE_FEW_BYTES_MSK |
                               AGG_TX_STATE_ABORT_MSK))
                         continue;
-
-                IWL_DEBUG_TX_REPLY(priv, "status %s (0x%08x), "
-                                   "try-count (0x%08x)\n",
-                                   iwl_get_agg_tx_fail_reason(fstatus),
-                                   fstatus & AGG_TX_STATUS_MSK,
-                                   fstatus & AGG_TX_TRY_MSK);
         }
 }
 
@@ -1212,16 +1205,27 @@ int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb,
                         freed++;
                 }
 
-                WARN_ON(!is_agg && freed != 1);
+                if (!is_agg && freed != 1)
+                        IWL_ERR(priv, "Q: %d, freed %d\n", txq_id, freed);
 
                 /*
                  * An offchannel frame can be send only on the AUX queue, where
                  * there is no aggregation (and reordering) so it only is single
                  * skb is expected to be processed.
                  */
-                WARN_ON(is_offchannel_skb && freed != 1);
+                if (is_offchannel_skb && freed != 1)
+                        IWL_ERR(priv, "OFFCHANNEL SKB freed %d\n", freed);
         }
 
+        IWL_DEBUG_TX_REPLY(priv, "TXQ %d status %s (0x%08x)\n", txq_id,
+                           iwl_get_tx_fail_reason(status), status);
+
+        IWL_DEBUG_TX_REPLY(priv,
+                           "\t\t\t\tinitial_rate 0x%x retries %d, idx=%d ssn=%d seq_ctl=0x%x\n",
+                           le32_to_cpu(tx_resp->rate_n_flags),
+                           tx_resp->failure_frame, SEQ_TO_INDEX(sequence), ssn,
+                           le16_to_cpu(tx_resp->seq_ctl));
+
         iwl_check_abort_status(priv, tx_resp->frame_count, status);
         spin_unlock(&priv->sta_lock);