ath9k: Add pktlog support

chromeos/compat-wireless/drivers/net/wireless/ath/ath9k/xmit.c

 /*
  * Copyright (c) 2008-2009 Atheros Communications Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
@@ skipping 421 matching lines @@
                          * not a holding desc.
                          */
                         if (!bf_last->bf_stale)
                                 list_move_tail(&bf->list, &bf_head);
                         else
                                 INIT_LIST_HEAD(&bf_head);
                 } else {
                         BUG_ON(list_empty(bf_q));
                         list_move_tail(&bf->list, &bf_head);
                 }
+ 
+                ath9k_pktlog_txcomplete(sc, &bf_head, bf, bf_last);
 
                 if (!txpending || (tid->state & AGGR_CLEANUP)) {
                         /*
                          * complete the acked-ones/xretried ones; update
                          * block-ack window
                          */
                         spin_lock_bh(&txq->axq_lock);
                         ath_tx_update_baw(sc, tid, bf->bf_seqno);
                         spin_unlock_bh(&txq->axq_lock);
 
@@ skipping 1630 matching lines @@
                         } else {
                                 bf = list_entry(bf_held->list.next,
                                                 struct ath_buf, list);
                         }
                 }
 
                 lastbf = bf->bf_lastbf;
                 ds = lastbf->bf_desc;
 
                 memset(&ts, 0, sizeof(ts));
-                status = ath9k_hw_txprocdesc(ah, ds, &ts);
+                status = ath9k_hw_txprocdesc(ah, ds, &ts, NULL);
                 if (status == -EINPROGRESS) {
                         spin_unlock_bh(&txq->axq_lock);
                         break;
                 }
 
                 /*
                  * We now know the nullfunc frame has been ACKed so we
                  * can disable RX.
                  */
                 if (bf->bf_isnullfunc &&
@@ skipping 30 matching lines @@
                          * This frame is sent out as a single frame.
                          * Use hardware retry status for this frame.
                          */
                         if (ts.ts_status & ATH9K_TXERR_XRETRY)
                                 bf->bf_state.bf_type |= BUF_XRETRY;
                         ath_tx_rc_status(bf, &ts, txok ? 0 : 1, txok, true);
                 }
 
                 qnum = skb_get_queue_mapping(bf->bf_mpdu);
 
-                if (bf_isampdu(bf))
+                if (bf_isampdu(bf)) {
                         ath_tx_complete_aggr(sc, txq, bf, &bf_head, &ts, txok);
-                else
+                } else {
+                        ath9k_pktlog_txctrl(sc, &bf_head, lastbf);
                         ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, txok, 0);
+                }
+
+                ath_pktlog_txstatus(sc, lastbf->bf_desc);
 
                 if (txq == sc->tx.txq_map[qnum])
                         ath_wake_mac80211_queue(sc, qnum);
 
                 spin_lock_bh(&txq->axq_lock);
                 if (sc->sc_flags & SC_OP_TXAGGR)
                         ath_txq_schedule(sc, txq);
                 spin_unlock_bh(&txq->axq_lock);
         }
 }
@@ skipping 53 matching lines @@
 {
         struct ath_tx_status txs;
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
         struct ath_hw *ah = sc->sc_ah;
         struct ath_txq *txq;
         struct ath_buf *bf, *lastbf;
         struct list_head bf_head;
         int status;
         int txok;
         int qnum;
+        u32 txs_desc[9];
 
         for (;;) {
-                status = ath9k_hw_txprocdesc(ah, NULL, (void *)&txs);
+                status = ath9k_hw_txprocdesc(ah, NULL, (void *)&txs,
+                                             (void *) txs_desc);
                 if (status == -EINPROGRESS)
                         break;
                 if (status == -EIO) {
                         ath_print(common, ATH_DBG_XMIT,
                                   "Error processing tx status\n");
                         break;
                 }
 
                 /* Skip beacon completions */
                 if (txs.qid == sc->beacon.beaconq)
@@ skipping 33 matching lines @@
                 }
 
                 if (!bf_isampdu(bf)) {
                         if (txs.ts_status & ATH9K_TXERR_XRETRY)
                                 bf->bf_state.bf_type |= BUF_XRETRY;
                         ath_tx_rc_status(bf, &txs, txok ? 0 : 1, txok, true);
                 }
 
                 qnum = skb_get_queue_mapping(bf->bf_mpdu);
 
-                if (bf_isampdu(bf))
+                if (bf_isampdu(bf)) {
                         ath_tx_complete_aggr(sc, txq, bf, &bf_head, &txs, txok);
-                else
+                } else {
+                        ath9k_pktlog_txctrl(sc, &bf_head, lastbf);
                         ath_tx_complete_buf(sc, bf, txq, &bf_head,
                                             &txs, txok, 0);
+                }
 
                 if (txq == sc->tx.txq_map[qnum])
                         ath_wake_mac80211_queue(sc, qnum);
 
+                ath_pktlog_txstatus(sc, txs_desc);
+
                 spin_lock_bh(&txq->axq_lock);
                 if (!list_empty(&txq->txq_fifo_pending)) {
                         INIT_LIST_HEAD(&bf_head);
                         bf = list_first_entry(&txq->txq_fifo_pending,
                                 struct ath_buf, list);
                         list_cut_position(&bf_head, &txq->txq_fifo_pending,
                                 &bf->bf_lastbf->list);
                         ath_tx_txqaddbuf(sc, txq, &bf_head);
                 } else if (sc->sc_flags & SC_OP_TXAGGR)
                         ath_txq_schedule(sc, txq);
@@ skipping 147 matching lines @@
                         tid->ac->sched = false;
                 }
 
                 ath_tid_drain(sc, txq, tid);
                 tid->state &= ~AGGR_ADDBA_COMPLETE;
                 tid->state &= ~AGGR_CLEANUP;
 
                 spin_unlock_bh(&txq->axq_lock);
         }
 }