Commit 2dac4fb9 authored by Ben Greear's avatar Ben Greear Committed by John W. Linville

ath9k: Add more information to debugfs xmit file.

Should help debug strange tx lockup type issues.
Signed-off-by: default avatarBen Greear <greearb@candelatech.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 233536e1
...@@ -599,13 +599,25 @@ do { \ ...@@ -599,13 +599,25 @@ do { \
(unsigned int)(sc->tx.txq[WME_AC_VO].elem)); \ (unsigned int)(sc->tx.txq[WME_AC_VO].elem)); \
} while(0) } while(0)
#define PRQLE(str, elem) \
do { \
len += snprintf(buf + len, size - len, \
"%s%13i%11i%10i%10i\n", str, \
list_empty(&sc->tx.txq[WME_AC_BE].elem), \
list_empty(&sc->tx.txq[WME_AC_BK].elem), \
list_empty(&sc->tx.txq[WME_AC_VI].elem), \
list_empty(&sc->tx.txq[WME_AC_VO].elem)); \
} while (0)
static ssize_t read_file_xmit(struct file *file, char __user *user_buf, static ssize_t read_file_xmit(struct file *file, char __user *user_buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
struct ath_softc *sc = file->private_data; struct ath_softc *sc = file->private_data;
char *buf; char *buf;
unsigned int len = 0, size = 2048; unsigned int len = 0, size = 4000;
int i;
ssize_t retval = 0; ssize_t retval = 0;
char tmp[32];
buf = kzalloc(size, GFP_KERNEL); buf = kzalloc(size, GFP_KERNEL);
if (buf == NULL) if (buf == NULL)
...@@ -628,13 +640,26 @@ static ssize_t read_file_xmit(struct file *file, char __user *user_buf, ...@@ -628,13 +640,26 @@ static ssize_t read_file_xmit(struct file *file, char __user *user_buf,
PR("DELIM Underrun: ", delim_underrun); PR("DELIM Underrun: ", delim_underrun);
PR("TX-Pkts-All: ", tx_pkts_all); PR("TX-Pkts-All: ", tx_pkts_all);
PR("TX-Bytes-All: ", tx_bytes_all); PR("TX-Bytes-All: ", tx_bytes_all);
PR("hw-put-tx-buf: ", puttxbuf);
PR("hw-tx-start: ", txstart);
PR("hw-tx-proc-desc: ", txprocdesc);
PRX("axq-qnum: ", axq_qnum); PRX("axq-qnum: ", axq_qnum);
PRX("axq-depth: ", axq_depth); PRX("axq-depth: ", axq_depth);
PRX("axq-ampdu_depth: ", axq_ampdu_depth);
PRX("axq-stopped ", stopped); PRX("axq-stopped ", stopped);
PRX("tx-in-progress ", axq_tx_inprogress); PRX("tx-in-progress ", axq_tx_inprogress);
PRX("pending-frames ", pending_frames); PRX("pending-frames ", pending_frames);
PRX("txq_headidx: ", txq_headidx);
PRX("txq_tailidx: ", txq_headidx);
PRQLE("axq_q empty: ", axq_q);
PRQLE("axq_acq empty: ", axq_acq);
PRQLE("txq_fifo_pending: ", txq_fifo_pending);
for (i = 0; i < ATH_TXFIFO_DEPTH; i++) {
snprintf(tmp, sizeof(tmp) - 1, "txq_fifo[%i] empty: ", i);
PRQLE(tmp, txq_fifo[i]);
}
if (len > size) if (len > size)
len = size; len = size;
......
...@@ -102,6 +102,9 @@ struct ath_interrupt_stats { ...@@ -102,6 +102,9 @@ struct ath_interrupt_stats {
* @desc_cfg_err: Descriptor configuration errors * @desc_cfg_err: Descriptor configuration errors
* @data_urn: TX data underrun errors * @data_urn: TX data underrun errors
* @delim_urn: TX delimiter underrun errors * @delim_urn: TX delimiter underrun errors
* @puttxbuf: Number of times hardware was given txbuf to write.
* @txstart: Number of times hardware was told to start tx.
* @txprocdesc: Number of times tx descriptor was processed
*/ */
struct ath_tx_stats { struct ath_tx_stats {
u32 tx_pkts_all; u32 tx_pkts_all;
...@@ -119,6 +122,9 @@ struct ath_tx_stats { ...@@ -119,6 +122,9 @@ struct ath_tx_stats {
u32 desc_cfg_err; u32 desc_cfg_err;
u32 data_underrun; u32 data_underrun;
u32 delim_underrun; u32 delim_underrun;
u32 puttxbuf;
u32 txstart;
u32 txprocdesc;
}; };
/** /**
......
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
#include "hw.h" #include "hw.h"
#include "hw-ops.h" #include "hw-ops.h"
#include "debug.h"
#include "ath9k.h"
static void ath9k_hw_set_txq_interrupts(struct ath_hw *ah, static void ath9k_hw_set_txq_interrupts(struct ath_hw *ah,
struct ath9k_tx_queue_info *qi) struct ath9k_tx_queue_info *qi)
...@@ -50,12 +52,18 @@ EXPORT_SYMBOL(ath9k_hw_gettxbuf); ...@@ -50,12 +52,18 @@ EXPORT_SYMBOL(ath9k_hw_gettxbuf);
void ath9k_hw_puttxbuf(struct ath_hw *ah, u32 q, u32 txdp) void ath9k_hw_puttxbuf(struct ath_hw *ah, u32 q, u32 txdp)
{ {
struct ath_wiphy *aphy = ah->hw->priv;
struct ath_softc *sc = aphy->sc;
TX_STAT_INC(q, puttxbuf);
REG_WRITE(ah, AR_QTXDP(q), txdp); REG_WRITE(ah, AR_QTXDP(q), txdp);
} }
EXPORT_SYMBOL(ath9k_hw_puttxbuf); EXPORT_SYMBOL(ath9k_hw_puttxbuf);
void ath9k_hw_txstart(struct ath_hw *ah, u32 q) void ath9k_hw_txstart(struct ath_hw *ah, u32 q)
{ {
struct ath_wiphy *aphy = ah->hw->priv;
struct ath_softc *sc = aphy->sc;
TX_STAT_INC(q, txstart);
ath_dbg(ath9k_hw_common(ah), ATH_DBG_QUEUE, ath_dbg(ath9k_hw_common(ah), ATH_DBG_QUEUE,
"Enable TXE on queue: %u\n", q); "Enable TXE on queue: %u\n", q);
REG_WRITE(ah, AR_Q_TXE, 1 << q); REG_WRITE(ah, AR_Q_TXE, 1 << q);
......
...@@ -2039,6 +2039,7 @@ static void ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq) ...@@ -2039,6 +2039,7 @@ static void ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq)
spin_unlock_bh(&txq->axq_lock); spin_unlock_bh(&txq->axq_lock);
break; break;
} }
TX_STAT_INC(txq->axq_qnum, txprocdesc);
/* /*
* Remove ath_buf's of the same transmit unit from txq, * Remove ath_buf's of the same transmit unit from txq,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment