Skip to content

L
linux
Commit 631bee25 authored by Arend van Spriel's avatar Arend van Spriel Committed by Greg Kroah-Hartman
Browse files
Options

ath: use seq_file api for ath9k debugfs files 

The debugfs files that are defined in debug.c which are read-only
and using a simple_open as .open file operation have been modified
to use the single_open seq_file API. This simplifies the read
functions defining the file contents.
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 98210b7f
Show whitespace changes
Inline Side-by-side
Showing with 192 additions and 274 deletions
drivers/net/wireless/ath/ath9k/debug.c
View file @ 631bee25
...@@ -401,22 +401,14 @@ static const struct file_operations fops_antenna_diversity = { ...@@ -401,22 +401,14 @@ static const struct file_operations fops_antenna_diversity = {
.llseek = default_llseek, .llseek = default_llseek,
}; };
static ssize_t read_file_dma(struct file *file, char __user *user_buf, static int read_file_dma(struct seq_file *file, void *data)
size_t count, loff_t *ppos)
{ {
struct ath_softc *sc = file->private_data; struct ath_softc *sc = file->private;
struct ath_hw *ah = sc->sc_ah; struct ath_hw *ah = sc->sc_ah;
char *buf;
int retval;
unsigned int len = 0;
u32 val[ATH9K_NUM_DMA_DEBUG_REGS]; u32 val[ATH9K_NUM_DMA_DEBUG_REGS];
int i, qcuOffset = 0, dcuOffset = 0; int i, qcuOffset = 0, dcuOffset = 0;
u32 *qcuBase = &val[0], *dcuBase = &val[4]; u32 *qcuBase = &val[0], *dcuBase = &val[4];
buf = kmalloc(DMA_BUF_LEN, GFP_KERNEL);
if (!buf)
return -ENOMEM;
ath9k_ps_wakeup(sc); ath9k_ps_wakeup(sc);
REG_WRITE_D(ah, AR_MACMISC, REG_WRITE_D(ah, AR_MACMISC,
...@@ -424,21 +416,18 @@ static ssize_t read_file_dma(struct file *file, char __user *user_buf, ...@@ -424,21 +416,18 @@ static ssize_t read_file_dma(struct file *file, char __user *user_buf,
(AR_MACMISC_MISC_OBS_BUS_1 << (AR_MACMISC_MISC_OBS_BUS_1 <<
AR_MACMISC_MISC_OBS_BUS_MSB_S))); AR_MACMISC_MISC_OBS_BUS_MSB_S)));
len += scnprintf(buf + len, DMA_BUF_LEN - len, seq_puts(file, "Raw DMA Debug values:\n");
"Raw DMA Debug values:\n");
for (i = 0; i < ATH9K_NUM_DMA_DEBUG_REGS; i++) { for (i = 0; i < ATH9K_NUM_DMA_DEBUG_REGS; i++) {
if (i % 4 == 0) if (i % 4 == 0)
len += scnprintf(buf + len, DMA_BUF_LEN - len, "\n"); seq_puts(file, "\n");
val[i] = REG_READ_D(ah, AR_DMADBG_0 + (i * sizeof(u32))); val[i] = REG_READ_D(ah, AR_DMADBG_0 + (i * sizeof(u32)));
len += scnprintf(buf + len, DMA_BUF_LEN - len, "%d: %08x ", seq_printf(file, "%d: %08x ", i, val[i]);
i, val[i]);
} }
len += scnprintf(buf + len, DMA_BUF_LEN - len, "\n\n"); seq_puts(file, "\n\n");
len += scnprintf(buf + len, DMA_BUF_LEN - len, seq_puts(file, "Num QCU: chain_st fsp_ok fsp_st DCU: chain_st\n");
"Num QCU: chain_st fsp_ok fsp_st DCU: chain_st\n");
for (i = 0; i < ATH9K_NUM_QUEUES; i++, qcuOffset += 4, dcuOffset += 5) { for (i = 0; i < ATH9K_NUM_QUEUES; i++, qcuOffset += 4, dcuOffset += 5) {
if (i == 8) { if (i == 8) {
...@@ -451,55 +440,47 @@ static ssize_t read_file_dma(struct file *file, char __user *user_buf, ...@@ -451,55 +440,47 @@ static ssize_t read_file_dma(struct file *file, char __user *user_buf,
dcuBase++; dcuBase++;
} }
len += scnprintf(buf + len, DMA_BUF_LEN - len, seq_printf(file, "%2d %2x %1x %2x %2x\n",
"%2d %2x %1x %2x %2x\n",
i, (*qcuBase & (0x7 << qcuOffset)) >> qcuOffset, i, (*qcuBase & (0x7 << qcuOffset)) >> qcuOffset,
(*qcuBase & (0x8 << qcuOffset)) >> (qcuOffset + 3), (*qcuBase & (0x8 << qcuOffset)) >> (qcuOffset + 3),
(val[2] & (0x7 << (i * 3))) >> (i * 3), (val[2] & (0x7 << (i * 3))) >> (i * 3),
(*dcuBase & (0x1f << dcuOffset)) >> dcuOffset); (*dcuBase & (0x1f << dcuOffset)) >> dcuOffset);
} }
len += scnprintf(buf + len, DMA_BUF_LEN - len, "\n"); seq_puts(file, "\n");
len += scnprintf(buf + len, DMA_BUF_LEN - len, seq_printf(file, "qcu_stitch state: %2x qcu_fetch state: %2x\n",
"qcu_stitch state: %2x qcu_fetch state: %2x\n",
(val[3] & 0x003c0000) >> 18, (val[3] & 0x03c00000) >> 22); (val[3] & 0x003c0000) >> 18, (val[3] & 0x03c00000) >> 22);
len += scnprintf(buf + len, DMA_BUF_LEN - len, seq_printf(file, "qcu_complete state: %2x dcu_complete state: %2x\n",
"qcu_complete state: %2x dcu_complete state: %2x\n",
(val[3] & 0x1c000000) >> 26, (val[6] & 0x3)); (val[3] & 0x1c000000) >> 26, (val[6] & 0x3));
len += scnprintf(buf + len, DMA_BUF_LEN - len, seq_printf(file, "dcu_arb state: %2x dcu_fp state: %2x\n",
"dcu_arb state: %2x dcu_fp state: %2x\n",
(val[5] & 0x06000000) >> 25, (val[5] & 0x38000000) >> 27); (val[5] & 0x06000000) >> 25, (val[5] & 0x38000000) >> 27);
len += scnprintf(buf + len, DMA_BUF_LEN - len, seq_printf(file, "chan_idle_dur: %3d chan_idle_dur_valid: %1d\n",
"chan_idle_dur: %3d chan_idle_dur_valid: %1d\n",
(val[6] & 0x000003fc) >> 2, (val[6] & 0x00000400) >> 10); (val[6] & 0x000003fc) >> 2, (val[6] & 0x00000400) >> 10);
len += scnprintf(buf + len, DMA_BUF_LEN - len, seq_printf(file, "txfifo_valid_0: %1d txfifo_valid_1: %1d\n",
"txfifo_valid_0: %1d txfifo_valid_1: %1d\n",
(val[6] & 0x00000800) >> 11, (val[6] & 0x00001000) >> 12); (val[6] & 0x00000800) >> 11, (val[6] & 0x00001000) >> 12);
len += scnprintf(buf + len, DMA_BUF_LEN - len, seq_printf(file, "txfifo_dcu_num_0: %2d txfifo_dcu_num_1: %2d\n",
"txfifo_dcu_num_0: %2d txfifo_dcu_num_1: %2d\n",
(val[6] & 0x0001e000) >> 13, (val[6] & 0x001e0000) >> 17); (val[6] & 0x0001e000) >> 13, (val[6] & 0x001e0000) >> 17);
len += scnprintf(buf + len, DMA_BUF_LEN - len, "pcu observe: 0x%x\n", seq_printf(file, "pcu observe: 0x%x\n", REG_READ_D(ah, AR_OBS_BUS_1));
REG_READ_D(ah, AR_OBS_BUS_1)); seq_printf(file, "AR_CR: 0x%x\n", REG_READ_D(ah, AR_CR));
len += scnprintf(buf + len, DMA_BUF_LEN - len,
"AR_CR: 0x%x\n", REG_READ_D(ah, AR_CR));
ath9k_ps_restore(sc); ath9k_ps_restore(sc);
if (len > DMA_BUF_LEN) return 0;
len = DMA_BUF_LEN; }
retval = simple_read_from_buffer(user_buf, count, ppos, buf, len); static int open_file_dma(struct inode *inode, struct file *f)
kfree(buf); {
return retval; return single_open(f, read_file_dma, inode->i_private);
} }
static const struct file_operations fops_dma = { static const struct file_operations fops_dma = {
.read = read_file_dma, .open = open_file_dma,
.open = simple_open, .read = seq_read,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.llseek = default_llseek, .llseek = seq_lseek,
.release = single_release,
}; };
...@@ -556,21 +537,13 @@ void ath_debug_stat_interrupt(struct ath_softc *sc, enum ath9k_int status) ...@@ -556,21 +537,13 @@ void ath_debug_stat_interrupt(struct ath_softc *sc, enum ath9k_int status)
sc->debug.stats.istats.gen_timer++; sc->debug.stats.istats.gen_timer++;
} }
static ssize_t read_file_interrupt(struct file *file, char __user *user_buf, static int read_file_interrupt(struct seq_file *file, void *data)
size_t count, loff_t *ppos)
{ {
struct ath_softc *sc = file->private_data; struct ath_softc *sc = file->private;
unsigned int len = 0;
int rv;
int mxlen = 4000;
char *buf = kmalloc(mxlen, GFP_KERNEL);
if (!buf)
return -ENOMEM;
#define PR_IS(a, s) \ #define PR_IS(a, s) \
do { \ do { \
len += scnprintf(buf + len, mxlen - len, \ seq_printf(file, "%21s: %10u\n", a, \
"%21s: %10u\n", a, \
sc->debug.stats.istats.s); \ sc->debug.stats.istats.s); \
} while (0) } while (0)
...@@ -602,8 +575,7 @@ static ssize_t read_file_interrupt(struct file *file, char __user *user_buf, ...@@ -602,8 +575,7 @@ static ssize_t read_file_interrupt(struct file *file, char __user *user_buf,
PR_IS("GENTIMER", gen_timer); PR_IS("GENTIMER", gen_timer);
PR_IS("TOTAL", total); PR_IS("TOTAL", total);
len += scnprintf(buf + len, mxlen - len, seq_puts(file, "SYNC_CAUSE stats:\n");
"SYNC_CAUSE stats:\n");
PR_IS("Sync-All", sync_cause_all); PR_IS("Sync-All", sync_cause_all);
PR_IS("RTC-IRQ", sync_rtc_irq); PR_IS("RTC-IRQ", sync_rtc_irq);
...@@ -625,35 +597,27 @@ static ssize_t read_file_interrupt(struct file *file, char __user *user_buf, ...@@ -625,35 +597,27 @@ static ssize_t read_file_interrupt(struct file *file, char __user *user_buf,
PR_IS("MAC-Asleep", mac_asleep); PR_IS("MAC-Asleep", mac_asleep);
PR_IS("MAC-Sleep-Access", mac_sleep_access); PR_IS("MAC-Sleep-Access", mac_sleep_access);
if (len > mxlen) return 0;
len = mxlen; }
rv = simple_read_from_buffer(user_buf, count, ppos, buf, len); static int open_file_interrupt(struct inode *inode, struct file *f)
kfree(buf); {
return rv; return single_open(f, read_file_interrupt, inode->i_private);
} }
static const struct file_operations fops_interrupt = { static const struct file_operations fops_interrupt = {
.read = read_file_interrupt, .read = seq_read,
.open = simple_open, .open = open_file_interrupt,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.llseek = default_llseek, .llseek = seq_lseek,
.release = single_release,
}; };
static ssize_t read_file_xmit(struct file *file, char __user *user_buf, static int read_file_xmit(struct seq_file *file, void *data)
size_t count, loff_t *ppos)
{ {
struct ath_softc *sc = file->private_data; struct ath_softc *sc = file->private;
char *buf;
unsigned int len = 0, size = 2048;
ssize_t retval = 0;
buf = kzalloc(size, GFP_KERNEL);
if (buf == NULL)
return -ENOMEM;
len += sprintf(buf, "%30s %10s%10s%10s\n\n", seq_printf(file, "%30s %10s%10s%10s\n\n", "BE", "BK", "VI", "VO");
"BE", "BK", "VI", "VO");
PR("MPDUs Queued: ", queued); PR("MPDUs Queued: ", queued);
PR("MPDUs Completed: ", completed); PR("MPDUs Completed: ", completed);
...@@ -678,153 +642,115 @@ static ssize_t read_file_xmit(struct file *file, char __user *user_buf, ...@@ -678,153 +642,115 @@ static ssize_t read_file_xmit(struct file *file, char __user *user_buf,
PR("HW-tx-proc-desc: ", txprocdesc); PR("HW-tx-proc-desc: ", txprocdesc);
PR("TX-Failed: ", txfailed); PR("TX-Failed: ", txfailed);
if (len > size) return 0;
len = size;
retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);
kfree(buf);
return retval;
} }
static ssize_t print_queue(struct ath_softc *sc, struct ath_txq *txq, static void print_queue(struct ath_softc *sc, struct ath_txq *txq,
char *buf, ssize_t size) struct seq_file *file)
{ {
ssize_t len = 0;
ath_txq_lock(sc, txq); ath_txq_lock(sc, txq);
len += scnprintf(buf + len, size - len, "%s: %d ", seq_printf(file, "%s: %d ", "qnum", txq->axq_qnum);
"qnum", txq->axq_qnum); seq_printf(file, "%s: %2d ", "qdepth", txq->axq_depth);
len += scnprintf(buf + len, size - len, "%s: %2d ", seq_printf(file, "%s: %2d ", "ampdu-depth", txq->axq_ampdu_depth);
"qdepth", txq->axq_depth); seq_printf(file, "%s: %3d ", "pending", txq->pending_frames);
len += scnprintf(buf + len, size - len, "%s: %2d ", seq_printf(file, "%s: %d\n", "stopped", txq->stopped);
"ampdu-depth", txq->axq_ampdu_depth);
len += scnprintf(buf + len, size - len, "%s: %3d ",
"pending", txq->pending_frames);
len += scnprintf(buf + len, size - len, "%s: %d\n",
"stopped", txq->stopped);
ath_txq_unlock(sc, txq); ath_txq_unlock(sc, txq);
return len;
} }
static ssize_t read_file_queues(struct file *file, char __user *user_buf, static int read_file_queues(struct seq_file *file, void *data)
size_t count, loff_t *ppos)
{ {
struct ath_softc *sc = file->private_data; struct ath_softc *sc = file->private;
struct ath_txq *txq; struct ath_txq *txq;
char *buf;
unsigned int len = 0;
const unsigned int size = 1024;
ssize_t retval = 0;
int i; int i;
static const char *qname[4] = { static const char *qname[4] = {
"VO", "VI", "BE", "BK" "VO", "VI", "BE", "BK"
}; };
buf = kzalloc(size, GFP_KERNEL);
if (buf == NULL)
return -ENOMEM;
for (i = 0; i < IEEE80211_NUM_ACS; i++) { for (i = 0; i < IEEE80211_NUM_ACS; i++) {
txq = sc->tx.txq_map[i]; txq = sc->tx.txq_map[i];
len += scnprintf(buf + len, size - len, "(%s): ", qname[i]); seq_printf(file, "(%s): ", qname[i]);
len += print_queue(sc, txq, buf + len, size - len); print_queue(sc, txq, file);
} }
len += scnprintf(buf + len, size - len, "(CAB): "); seq_puts(file, "(CAB): ");
len += print_queue(sc, sc->beacon.cabq, buf + len, size - len); print_queue(sc, sc->beacon.cabq, file);
if (len > size) return 0;
len = size;
retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);
kfree(buf);
return retval;
} }
static ssize_t read_file_misc(struct file *file, char __user *user_buf, static int read_file_misc(struct seq_file *file, void *data)
size_t count, loff_t *ppos)
{ {
struct ath_softc *sc = file->private_data; struct ath_softc *sc = file->private;
struct ath_common *common = ath9k_hw_common(sc->sc_ah); struct ath_common *common = ath9k_hw_common(sc->sc_ah);
struct ath9k_vif_iter_data iter_data; struct ath9k_vif_iter_data iter_data;
struct ath_chanctx *ctx; struct ath_chanctx *ctx;
char buf[512];
unsigned int len = 0;
ssize_t retval = 0;
unsigned int reg; unsigned int reg;
u32 rxfilter, i; u32 rxfilter, i;
len += scnprintf(buf + len, sizeof(buf) - len, seq_printf(file, "BSSID: %pM\n", common->curbssid);
"BSSID: %pM\n", common->curbssid); seq_printf(file, "BSSID-MASK: %pM\n", common->bssidmask);
len += scnprintf(buf + len, sizeof(buf) - len, seq_printf(file, "OPMODE: %s\n",
"BSSID-MASK: %pM\n", common->bssidmask);
len += scnprintf(buf + len, sizeof(buf) - len,
"OPMODE: %s\n",
ath_opmode_to_string(sc->sc_ah->opmode)); ath_opmode_to_string(sc->sc_ah->opmode));
ath9k_ps_wakeup(sc); ath9k_ps_wakeup(sc);
rxfilter = ath9k_hw_getrxfilter(sc->sc_ah); rxfilter = ath9k_hw_getrxfilter(sc->sc_ah);
ath9k_ps_restore(sc); ath9k_ps_restore(sc);
len += scnprintf(buf + len, sizeof(buf) - len, seq_printf(file, "RXFILTER: 0x%x", rxfilter);
"RXFILTER: 0x%x", rxfilter);
if (rxfilter & ATH9K_RX_FILTER_UCAST) if (rxfilter & ATH9K_RX_FILTER_UCAST)
len += scnprintf(buf + len, sizeof(buf) - len, " UCAST"); seq_puts(file, " UCAST");
if (rxfilter & ATH9K_RX_FILTER_MCAST) if (rxfilter & ATH9K_RX_FILTER_MCAST)
len += scnprintf(buf + len, sizeof(buf) - len, " MCAST"); seq_puts(file, " MCAST");
if (rxfilter & ATH9K_RX_FILTER_BCAST) if (rxfilter & ATH9K_RX_FILTER_BCAST)
len += scnprintf(buf + len, sizeof(buf) - len, " BCAST"); seq_puts(file, " BCAST");
if (rxfilter & ATH9K_RX_FILTER_CONTROL) if (rxfilter & ATH9K_RX_FILTER_CONTROL)
len += scnprintf(buf + len, sizeof(buf) - len, " CONTROL"); seq_puts(file, " CONTROL");
if (rxfilter & ATH9K_RX_FILTER_BEACON) if (rxfilter & ATH9K_RX_FILTER_BEACON)
len += scnprintf(buf + len, sizeof(buf) - len, " BEACON"); seq_puts(file, " BEACON");
if (rxfilter & ATH9K_RX_FILTER_PROM) if (rxfilter & ATH9K_RX_FILTER_PROM)
len += scnprintf(buf + len, sizeof(buf) - len, " PROM"); seq_puts(file, " PROM");
if (rxfilter & ATH9K_RX_FILTER_PROBEREQ) if (rxfilter & ATH9K_RX_FILTER_PROBEREQ)
len += scnprintf(buf + len, sizeof(buf) - len, " PROBEREQ"); seq_puts(file, " PROBEREQ");
if (rxfilter & ATH9K_RX_FILTER_PHYERR) if (rxfilter & ATH9K_RX_FILTER_PHYERR)
len += scnprintf(buf + len, sizeof(buf) - len, " PHYERR"); seq_puts(file, " PHYERR");
if (rxfilter & ATH9K_RX_FILTER_MYBEACON) if (rxfilter & ATH9K_RX_FILTER_MYBEACON)
len += scnprintf(buf + len, sizeof(buf) - len, " MYBEACON"); seq_puts(file, " MYBEACON");
if (rxfilter & ATH9K_RX_FILTER_COMP_BAR) if (rxfilter & ATH9K_RX_FILTER_COMP_BAR)
len += scnprintf(buf + len, sizeof(buf) - len, " COMP_BAR"); seq_puts(file, " COMP_BAR");
if (rxfilter & ATH9K_RX_FILTER_PSPOLL) if (rxfilter & ATH9K_RX_FILTER_PSPOLL)
len += scnprintf(buf + len, sizeof(buf) - len, " PSPOLL"); seq_puts(file, " PSPOLL");
if (rxfilter & ATH9K_RX_FILTER_PHYRADAR) if (rxfilter & ATH9K_RX_FILTER_PHYRADAR)
len += scnprintf(buf + len, sizeof(buf) - len, " PHYRADAR"); seq_puts(file, " PHYRADAR");
if (rxfilter & ATH9K_RX_FILTER_MCAST_BCAST_ALL) if (rxfilter & ATH9K_RX_FILTER_MCAST_BCAST_ALL)
len += scnprintf(buf + len, sizeof(buf) - len, " MCAST_BCAST_ALL"); seq_puts(file, " MCAST_BCAST_ALL");
if (rxfilter & ATH9K_RX_FILTER_CONTROL_WRAPPER) if (rxfilter & ATH9K_RX_FILTER_CONTROL_WRAPPER)
len += scnprintf(buf + len, sizeof(buf) - len, " CONTROL_WRAPPER"); seq_puts(file, " CONTROL_WRAPPER");
len += scnprintf(buf + len, sizeof(buf) - len, "\n"); seq_puts(file, "\n");
reg = sc->sc_ah->imask; reg = sc->sc_ah->imask;
len += scnprintf(buf + len, sizeof(buf) - len, seq_printf(file, "INTERRUPT-MASK: 0x%x", reg);
"INTERRUPT-MASK: 0x%x", reg);
if (reg & ATH9K_INT_SWBA) if (reg & ATH9K_INT_SWBA)
len += scnprintf(buf + len, sizeof(buf) - len, " SWBA"); seq_puts(file, " SWBA");
if (reg & ATH9K_INT_BMISS) if (reg & ATH9K_INT_BMISS)
len += scnprintf(buf + len, sizeof(buf) - len, " BMISS"); seq_puts(file, " BMISS");
if (reg & ATH9K_INT_CST) if (reg & ATH9K_INT_CST)
len += scnprintf(buf + len, sizeof(buf) - len, " CST"); seq_puts(file, " CST");
if (reg & ATH9K_INT_RX) if (reg & ATH9K_INT_RX)
len += scnprintf(buf + len, sizeof(buf) - len, " RX"); seq_puts(file, " RX");
if (reg & ATH9K_INT_RXHP) if (reg & ATH9K_INT_RXHP)
len += scnprintf(buf + len, sizeof(buf) - len, " RXHP"); seq_puts(file, " RXHP");
if (reg & ATH9K_INT_RXLP) if (reg & ATH9K_INT_RXLP)
len += scnprintf(buf + len, sizeof(buf) - len, " RXLP"); seq_puts(file, " RXLP");
if (reg & ATH9K_INT_BB_WATCHDOG) if (reg & ATH9K_INT_BB_WATCHDOG)
len += scnprintf(buf + len, sizeof(buf) - len, " BB_WATCHDOG"); seq_puts(file, " BB_WATCHDOG");
len += scnprintf(buf + len, sizeof(buf) - len, "\n"); seq_puts(file, "\n");
i = 0; i = 0;
ath_for_each_chanctx(sc, ctx) { ath_for_each_chanctx(sc, ctx) {
...@@ -832,61 +758,42 @@ static ssize_t read_file_misc(struct file *file, char __user *user_buf, ...@@ -832,61 +758,42 @@ static ssize_t read_file_misc(struct file *file, char __user *user_buf,
continue; continue;
ath9k_calculate_iter_data(sc, ctx, &iter_data); ath9k_calculate_iter_data(sc, ctx, &iter_data);
len += scnprintf(buf + len, sizeof(buf) - len, seq_printf(file,
"VIF-COUNTS: CTX %i AP: %i STA: %i MESH: %i WDS: %i", "VIF-COUNTS: CTX %i AP: %i STA: %i MESH: %i WDS: %i",
i++, iter_data.naps, iter_data.nstations, i++, iter_data.naps, iter_data.nstations,
iter_data.nmeshes, iter_data.nwds); iter_data.nmeshes, iter_data.nwds);
len += scnprintf(buf + len, sizeof(buf) - len, seq_printf(file, " ADHOC: %i TOTAL: %hi BEACON-VIF: %hi\n",
" ADHOC: %i TOTAL: %hi BEACON-VIF: %hi\n", iter_data.nadhocs, sc->cur_chan->nvifs,
iter_data.nadhocs, sc->cur_chan->nvifs, sc->nbcnvifs); sc->nbcnvifs);
} }
if (len > sizeof(buf)) return 0;
len = sizeof(buf);
retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);
return retval;
} }
static ssize_t read_file_reset(struct file *file, char __user *user_buf, static int read_file_reset(struct seq_file *file, void *data)
size_t count, loff_t *ppos)
{ {
struct ath_softc *sc = file->private_data; struct ath_softc *sc = file->private;
char buf[512];
unsigned int len = 0;
len += scnprintf(buf + len, sizeof(buf) - len, seq_printf(file, "%17s: %2d\n", "Baseband Hang",
"%17s: %2d\n", "Baseband Hang",
sc->debug.stats.reset[RESET_TYPE_BB_HANG]); sc->debug.stats.reset[RESET_TYPE_BB_HANG]);
len += scnprintf(buf + len, sizeof(buf) - len, seq_printf(file, "%17s: %2d\n", "Baseband Watchdog",
"%17s: %2d\n", "Baseband Watchdog",
sc->debug.stats.reset[RESET_TYPE_BB_WATCHDOG]); sc->debug.stats.reset[RESET_TYPE_BB_WATCHDOG]);
len += scnprintf(buf + len, sizeof(buf) - len, seq_printf(file, "%17s: %2d\n", "Fatal HW Error",
"%17s: %2d\n", "Fatal HW Error",
sc->debug.stats.reset[RESET_TYPE_FATAL_INT]); sc->debug.stats.reset[RESET_TYPE_FATAL_INT]);
len += scnprintf(buf + len, sizeof(buf) - len, seq_printf(file, "%17s: %2d\n", "TX HW error",
"%17s: %2d\n", "TX HW error",
sc->debug.stats.reset[RESET_TYPE_TX_ERROR]); sc->debug.stats.reset[RESET_TYPE_TX_ERROR]);
len += scnprintf(buf + len, sizeof(buf) - len, seq_printf(file, "%17s: %2d\n", "TX Path Hang",
"%17s: %2d\n", "TX Path Hang",
sc->debug.stats.reset[RESET_TYPE_TX_HANG]); sc->debug.stats.reset[RESET_TYPE_TX_HANG]);
len += scnprintf(buf + len, sizeof(buf) - len, seq_printf(file, "%17s: %2d\n", "PLL RX Hang",
"%17s: %2d\n", "PLL RX Hang",
sc->debug.stats.reset[RESET_TYPE_PLL_HANG]); sc->debug.stats.reset[RESET_TYPE_PLL_HANG]);
len += scnprintf(buf + len, sizeof(buf) - len, seq_printf(file, "%17s: %2d\n", "MAC Hang",
"%17s: %2d\n", "MAC Hang",
sc->debug.stats.reset[RESET_TYPE_MAC_HANG]); sc->debug.stats.reset[RESET_TYPE_MAC_HANG]);
len += scnprintf(buf + len, sizeof(buf) - len, seq_printf(file, "%17s: %2d\n", "Stuck Beacon",
"%17s: %2d\n", "Stuck Beacon",
sc->debug.stats.reset[RESET_TYPE_BEACON_STUCK]); sc->debug.stats.reset[RESET_TYPE_BEACON_STUCK]);
len += scnprintf(buf + len, sizeof(buf) - len, seq_printf(file, "%17s: %2d\n", "MCI Reset",
"%17s: %2d\n", "MCI Reset",
sc->debug.stats.reset[RESET_TYPE_MCI]); sc->debug.stats.reset[RESET_TYPE_MCI]);
if (len > sizeof(buf)) return 0;
len = sizeof(buf);
return simple_read_from_buffer(user_buf, count, ppos, buf, len);
} }
void ath_debug_stat_tx(struct ath_softc *sc, struct ath_buf *bf, void ath_debug_stat_tx(struct ath_softc *sc, struct ath_buf *bf,
...@@ -926,32 +833,56 @@ void ath_debug_stat_tx(struct ath_softc *sc, struct ath_buf *bf, ...@@ -926,32 +833,56 @@ void ath_debug_stat_tx(struct ath_softc *sc, struct ath_buf *bf,
TX_STAT_INC(qnum, delim_underrun); TX_STAT_INC(qnum, delim_underrun);
} }
static int open_file_xmit(struct inode *inode, struct file *f)
{
return single_open(f, read_file_xmit, inode->i_private);
}
static const struct file_operations fops_xmit = { static const struct file_operations fops_xmit = {
.read = read_file_xmit, .read = seq_read,
.open = simple_open, .open = open_file_xmit,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.llseek = default_llseek, .llseek = seq_lseek,
.release = single_release,
}; };
static int open_file_queues(struct inode *inode, struct file *f)
{
return single_open(f, read_file_queues, inode->i_private);
}
static const struct file_operations fops_queues = { static const struct file_operations fops_queues = {
.read = read_file_queues, .read = seq_read,
.open = simple_open, .open = open_file_queues,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.llseek = default_llseek, .llseek = seq_lseek,
.release = single_release,
}; };
static int open_file_misc(struct inode *inode, struct file *f)
{
return single_open(f, read_file_misc, inode->i_private);
}
static const struct file_operations fops_misc = { static const struct file_operations fops_misc = {
.read = read_file_misc, .read = seq_read,
.open = simple_open, .open = open_file_misc,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.llseek = default_llseek, .llseek = seq_lseek,
.release = single_release,
}; };
static int open_file_reset(struct inode *inode, struct file *f)
{
return single_open(f, read_file_reset, inode->i_private);
}
static const struct file_operations fops_reset = { static const struct file_operations fops_reset = {
.read = read_file_reset, .read = seq_read,
.open = simple_open, .open = open_file_reset,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.llseek = default_llseek, .llseek = seq_lseek,
.release = single_release,
}; };
void ath_debug_stat_rx(struct ath_softc *sc, struct ath_rx_status *rs) void ath_debug_stat_rx(struct ath_softc *sc, struct ath_rx_status *rs)
...@@ -1081,57 +1012,45 @@ static const struct file_operations fops_regdump = { ...@@ -1081,57 +1012,45 @@ static const struct file_operations fops_regdump = {
.llseek = default_llseek,/* read accesses f_pos */ .llseek = default_llseek,/* read accesses f_pos */
}; };
static ssize_t read_file_dump_nfcal(struct file *file, char __user *user_buf, static int read_file_dump_nfcal(struct seq_file *file, void *data)
size_t count, loff_t *ppos)
{ {
struct ath_softc *sc = file->private_data; struct ath_softc *sc = file->private;
struct ath_hw *ah = sc->sc_ah; struct ath_hw *ah = sc->sc_ah;
struct ath9k_nfcal_hist *h = sc->cur_chan->caldata.nfCalHist; struct ath9k_nfcal_hist *h = sc->cur_chan->caldata.nfCalHist;
struct ath_common *common = ath9k_hw_common(ah); struct ath_common *common = ath9k_hw_common(ah);
struct ieee80211_conf *conf = &common->hw->conf; struct ieee80211_conf *conf = &common->hw->conf;
u32 len = 0, size = 1500;
u32 i, j; u32 i, j;
ssize_t retval = 0;
char *buf;
u8 chainmask = (ah->rxchainmask << 3) | ah->rxchainmask; u8 chainmask = (ah->rxchainmask << 3) | ah->rxchainmask;
u8 nread; u8 nread;
buf = kzalloc(size, GFP_KERNEL); seq_printf(file, "Channel Noise Floor : %d\n", ah->noise);
if (!buf) seq_puts(file, "Chain | privNF | # Readings | NF Readings\n");
return -ENOMEM;
len += scnprintf(buf + len, size - len,
"Channel Noise Floor : %d\n", ah->noise);
len += scnprintf(buf + len, size - len,
"Chain | privNF | # Readings | NF Readings\n");
for (i = 0; i < NUM_NF_READINGS; i++) { for (i = 0; i < NUM_NF_READINGS; i++) {
if (!(chainmask & (1 << i)) || if (!(chainmask & (1 << i)) ||
((i >= AR5416_MAX_CHAINS) && !conf_is_ht40(conf))) ((i >= AR5416_MAX_CHAINS) && !conf_is_ht40(conf)))
continue; continue;
nread = AR_PHY_CCA_FILTERWINDOW_LENGTH - h[i].invalidNFcount; nread = AR_PHY_CCA_FILTERWINDOW_LENGTH - h[i].invalidNFcount;
len += scnprintf(buf + len, size - len, " %d\t %d\t %d\t\t", seq_printf(file, " %d\t %d\t %d\t\t", i, h[i].privNF, nread);
i, h[i].privNF, nread);
for (j = 0; j < nread; j++) for (j = 0; j < nread; j++)
len += scnprintf(buf + len, size - len, seq_printf(file, " %d", h[i].nfCalBuffer[j]);
" %d", h[i].nfCalBuffer[j]); seq_puts(file, "\n");
len += scnprintf(buf + len, size - len, "\n");
} }
if (len > size) return 0;
len = size; }
retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);
kfree(buf);
return retval; static int open_file_dump_nfcal(struct inode *inode, struct file *f)
{
return single_open(f, read_file_dump_nfcal, inode->i_private);
} }
static const struct file_operations fops_dump_nfcal = { static const struct file_operations fops_dump_nfcal = {
.read = read_file_dump_nfcal, .read = seq_read,
.open = simple_open, .open = open_file_dump_nfcal,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.llseek = default_llseek, .llseek = seq_lseek,
.release = single_release,
}; };
#ifdef CONFIG_ATH9K_BTCOEX_SUPPORT #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
......
drivers/net/wireless/ath/ath9k/debug.h
View file @ 631bee25
...@@ -195,8 +195,7 @@ struct ath_tx_stats { ...@@ -195,8 +195,7 @@ struct ath_tx_stats {
#define TXSTATS sc->debug.stats.txstats #define TXSTATS sc->debug.stats.txstats
#define PR(str, elem) \ #define PR(str, elem) \
do { \ do { \
len += scnprintf(buf + len, size - len, \ seq_printf(file, "%s%13u%11u%10u%10u\n", str, \
"%s%13u%11u%10u%10u\n", str, \
TXSTATS[PR_QNUM(IEEE80211_AC_BE)].elem,\ TXSTATS[PR_QNUM(IEEE80211_AC_BE)].elem,\
TXSTATS[PR_QNUM(IEEE80211_AC_BK)].elem,\ TXSTATS[PR_QNUM(IEEE80211_AC_BK)].elem,\
TXSTATS[PR_QNUM(IEEE80211_AC_VI)].elem,\ TXSTATS[PR_QNUM(IEEE80211_AC_VI)].elem,\
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7