]> git.karo-electronics.de Git - karo-tx-linux.git/blobdiff - drivers/net/wireless/ath/ath9k/debug.c
Merge branch 'next/dt' of git://git.linaro.org/people/arnd/arm-soc
[karo-tx-linux.git] / drivers / net / wireless / ath / ath9k / debug.c
index d1eb89611ff7982f5e1434685672d1591036368c..327aa28f60307a6609d6a8d8030ba9d3203c3322 100644 (file)
@@ -95,11 +95,11 @@ static ssize_t read_file_tx_chainmask(struct file *file, char __user *user_buf,
                             size_t count, loff_t *ppos)
 {
        struct ath_softc *sc = file->private_data;
-       struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+       struct ath_hw *ah = sc->sc_ah;
        char buf[32];
        unsigned int len;
 
-       len = sprintf(buf, "0x%08x\n", common->tx_chainmask);
+       len = sprintf(buf, "0x%08x\n", ah->txchainmask);
        return simple_read_from_buffer(user_buf, count, ppos, buf, len);
 }
 
@@ -107,7 +107,7 @@ static ssize_t write_file_tx_chainmask(struct file *file, const char __user *use
                             size_t count, loff_t *ppos)
 {
        struct ath_softc *sc = file->private_data;
-       struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+       struct ath_hw *ah = sc->sc_ah;
        unsigned long mask;
        char buf[32];
        ssize_t len;
@@ -120,8 +120,8 @@ static ssize_t write_file_tx_chainmask(struct file *file, const char __user *use
        if (strict_strtoul(buf, 0, &mask))
                return -EINVAL;
 
-       common->tx_chainmask = mask;
-       sc->sc_ah->caps.tx_chainmask = mask;
+       ah->txchainmask = mask;
+       ah->caps.tx_chainmask = mask;
        return count;
 }
 
@@ -138,11 +138,11 @@ static ssize_t read_file_rx_chainmask(struct file *file, char __user *user_buf,
                             size_t count, loff_t *ppos)
 {
        struct ath_softc *sc = file->private_data;
-       struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+       struct ath_hw *ah = sc->sc_ah;
        char buf[32];
        unsigned int len;
 
-       len = sprintf(buf, "0x%08x\n", common->rx_chainmask);
+       len = sprintf(buf, "0x%08x\n", ah->rxchainmask);
        return simple_read_from_buffer(user_buf, count, ppos, buf, len);
 }
 
@@ -150,7 +150,7 @@ static ssize_t write_file_rx_chainmask(struct file *file, const char __user *use
                             size_t count, loff_t *ppos)
 {
        struct ath_softc *sc = file->private_data;
-       struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+       struct ath_hw *ah = sc->sc_ah;
        unsigned long mask;
        char buf[32];
        ssize_t len;
@@ -163,8 +163,8 @@ static ssize_t write_file_rx_chainmask(struct file *file, const char __user *use
        if (strict_strtoul(buf, 0, &mask))
                return -EINVAL;
 
-       common->rx_chainmask = mask;
-       sc->sc_ah->caps.rx_chainmask = mask;
+       ah->rxchainmask = mask;
+       ah->caps.rx_chainmask = mask;
        return count;
 }
 
@@ -523,9 +523,22 @@ static ssize_t read_file_wiphy(struct file *file, char __user *user_buf,
        if (tmp & ATH9K_RX_FILTER_PHYRADAR)
                len += snprintf(buf + len, sizeof(buf) - len, " PHYRADAR");
        if (tmp & ATH9K_RX_FILTER_MCAST_BCAST_ALL)
-               len += snprintf(buf + len, sizeof(buf) - len, " MCAST_BCAST_ALL\n");
-       else
-               len += snprintf(buf + len, sizeof(buf) - len, "\n");
+               len += snprintf(buf + len, sizeof(buf) - len, " MCAST_BCAST_ALL");
+
+       len += snprintf(buf + len, sizeof(buf) - len,
+                      "\n\nReset causes:\n"
+                      "  baseband hang: %d\n"
+                      "  baseband watchdog: %d\n"
+                      "  fatal hardware error interrupt: %d\n"
+                      "  tx hardware error: %d\n"
+                      "  tx path hang: %d\n"
+                      "  pll rx hang: %d\n",
+                      sc->debug.stats.reset[RESET_TYPE_BB_HANG],
+                      sc->debug.stats.reset[RESET_TYPE_BB_WATCHDOG],
+                      sc->debug.stats.reset[RESET_TYPE_FATAL_INT],
+                      sc->debug.stats.reset[RESET_TYPE_TX_ERROR],
+                      sc->debug.stats.reset[RESET_TYPE_TX_HANG],
+                      sc->debug.stats.reset[RESET_TYPE_PLL_HANG]);
 
        if (len > sizeof(buf))
                len = sizeof(buf);
@@ -711,7 +724,7 @@ static ssize_t read_file_stations(struct file *file, char __user *user_buf,
                                        " tid: %p %s %s %i %p %p\n",
                                        tid, tid->sched ? "sched" : "idle",
                                        tid->paused ? "paused" : "running",
-                                       list_empty(&tid->buf_q),
+                                       skb_queue_empty(&tid->buf_q),
                                        tid->an, tid->ac);
                        if (len >= size)
                                goto done;
@@ -826,20 +839,23 @@ static ssize_t read_file_misc(struct file *file, char __user *user_buf,
 }
 
 void ath_debug_stat_tx(struct ath_softc *sc, struct ath_buf *bf,
-                      struct ath_tx_status *ts, struct ath_txq *txq)
+                      struct ath_tx_status *ts, struct ath_txq *txq,
+                      unsigned int flags)
 {
+#define TX_SAMP_DBG(c) (sc->debug.bb_mac_samp[sc->debug.sampidx].ts\
+                       [sc->debug.tsidx].c)
        int qnum = txq->axq_qnum;
 
        TX_STAT_INC(qnum, tx_pkts_all);
        sc->debug.stats.txstats[qnum].tx_bytes_all += bf->bf_mpdu->len;
 
        if (bf_isampdu(bf)) {
-               if (bf_isxretried(bf))
+               if (flags & ATH_TX_BAR)
                        TX_STAT_INC(qnum, a_xretries);
                else
                        TX_STAT_INC(qnum, a_completed);
        } else {
-               if (bf_isxretried(bf))
+               if (ts->ts_status & ATH9K_TXERR_XRETRY)
                        TX_STAT_INC(qnum, xretries);
                else
                        TX_STAT_INC(qnum, completed);
@@ -857,6 +873,35 @@ void ath_debug_stat_tx(struct ath_softc *sc, struct ath_buf *bf,
                TX_STAT_INC(qnum, data_underrun);
        if (ts->ts_flags & ATH9K_TX_DELIM_UNDERRUN)
                TX_STAT_INC(qnum, delim_underrun);
+
+       spin_lock(&sc->debug.samp_lock);
+       TX_SAMP_DBG(jiffies) = jiffies;
+       TX_SAMP_DBG(rssi_ctl0) = ts->ts_rssi_ctl0;
+       TX_SAMP_DBG(rssi_ctl1) = ts->ts_rssi_ctl1;
+       TX_SAMP_DBG(rssi_ctl2) = ts->ts_rssi_ctl2;
+       TX_SAMP_DBG(rssi_ext0) = ts->ts_rssi_ext0;
+       TX_SAMP_DBG(rssi_ext1) = ts->ts_rssi_ext1;
+       TX_SAMP_DBG(rssi_ext2) = ts->ts_rssi_ext2;
+       TX_SAMP_DBG(rateindex) = ts->ts_rateindex;
+       TX_SAMP_DBG(isok) = !!(ts->ts_status & ATH9K_TXERR_MASK);
+       TX_SAMP_DBG(rts_fail_cnt) = ts->ts_shortretry;
+       TX_SAMP_DBG(data_fail_cnt) = ts->ts_longretry;
+       TX_SAMP_DBG(rssi) = ts->ts_rssi;
+       TX_SAMP_DBG(tid) = ts->tid;
+       TX_SAMP_DBG(qid) = ts->qid;
+
+       if (ts->ts_flags & ATH9K_TX_BA) {
+               TX_SAMP_DBG(ba_low) = ts->ba_low;
+               TX_SAMP_DBG(ba_high) = ts->ba_high;
+       } else {
+               TX_SAMP_DBG(ba_low) = 0;
+               TX_SAMP_DBG(ba_high) = 0;
+       }
+
+       sc->debug.tsidx = (sc->debug.tsidx + 1) % ATH_DBG_MAX_SAMPLES;
+       spin_unlock(&sc->debug.samp_lock);
+
+#undef TX_SAMP_DBG
 }
 
 static const struct file_operations fops_xmit = {
@@ -995,6 +1040,8 @@ void ath_debug_stat_rx(struct ath_softc *sc, struct ath_rx_status *rs)
 {
 #define RX_STAT_INC(c) sc->debug.stats.rxstats.c++
 #define RX_PHY_ERR_INC(c) sc->debug.stats.rxstats.phy_err_stats[c]++
+#define RX_SAMP_DBG(c) (sc->debug.bb_mac_samp[sc->debug.sampidx].rs\
+                       [sc->debug.rsidx].c)
 
        u32 phyerr;
 
@@ -1030,8 +1077,25 @@ void ath_debug_stat_rx(struct ath_softc *sc, struct ath_rx_status *rs)
 
        sc->debug.stats.rxstats.rs_antenna = rs->rs_antenna;
 
+       spin_lock(&sc->debug.samp_lock);
+       RX_SAMP_DBG(jiffies) = jiffies;
+       RX_SAMP_DBG(rssi_ctl0) = rs->rs_rssi_ctl0;
+       RX_SAMP_DBG(rssi_ctl1) = rs->rs_rssi_ctl1;
+       RX_SAMP_DBG(rssi_ctl2) = rs->rs_rssi_ctl2;
+       RX_SAMP_DBG(rssi_ext0) = rs->rs_rssi_ext0;
+       RX_SAMP_DBG(rssi_ext1) = rs->rs_rssi_ext1;
+       RX_SAMP_DBG(rssi_ext2) = rs->rs_rssi_ext2;
+       RX_SAMP_DBG(antenna) = rs->rs_antenna;
+       RX_SAMP_DBG(rssi) = rs->rs_rssi;
+       RX_SAMP_DBG(rate) = rs->rs_rate;
+       RX_SAMP_DBG(is_mybeacon) = rs->is_mybeacon;
+
+       sc->debug.rsidx = (sc->debug.rsidx + 1) % ATH_DBG_MAX_SAMPLES;
+       spin_unlock(&sc->debug.samp_lock);
+
 #undef RX_STAT_INC
 #undef RX_PHY_ERR_INC
+#undef RX_SAMP_DBG
 }
 
 static const struct file_operations fops_recv = {
@@ -1163,6 +1227,389 @@ static const struct file_operations fops_regdump = {
        .llseek = default_llseek,/* read accesses f_pos */
 };
 
+static ssize_t read_file_dump_nfcal(struct file *file, char __user *user_buf,
+                                   size_t count, loff_t *ppos)
+{
+       struct ath_softc *sc = file->private_data;
+       struct ath_hw *ah = sc->sc_ah;
+       struct ath9k_nfcal_hist *h = sc->caldata.nfCalHist;
+       struct ath_common *common = ath9k_hw_common(ah);
+       struct ieee80211_conf *conf = &common->hw->conf;
+       u32 len = 0, size = 1500;
+       u32 i, j;
+       ssize_t retval = 0;
+       char *buf;
+       u8 chainmask = (ah->rxchainmask << 3) | ah->rxchainmask;
+       u8 nread;
+
+       buf = kzalloc(size, GFP_KERNEL);
+       if (!buf)
+               return -ENOMEM;
+
+       len += snprintf(buf + len, size - len,
+                       "Channel Noise Floor : %d\n", ah->noise);
+       len += snprintf(buf + len, size - len,
+                       "Chain | privNF | # Readings | NF Readings\n");
+       for (i = 0; i < NUM_NF_READINGS; i++) {
+               if (!(chainmask & (1 << i)) ||
+                   ((i >= AR5416_MAX_CHAINS) && !conf_is_ht40(conf)))
+                       continue;
+
+               nread = AR_PHY_CCA_FILTERWINDOW_LENGTH - h[i].invalidNFcount;
+               len += snprintf(buf + len, size - len, " %d\t %d\t %d\t\t",
+                               i, h[i].privNF, nread);
+               for (j = 0; j < nread; j++)
+                       len += snprintf(buf + len, size - len,
+                                       " %d", h[i].nfCalBuffer[j]);
+               len += snprintf(buf + len, size - len, "\n");
+       }
+
+       if (len > size)
+               len = size;
+
+       retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);
+       kfree(buf);
+
+       return retval;
+}
+
+static const struct file_operations fops_dump_nfcal = {
+       .read = read_file_dump_nfcal,
+       .open = ath9k_debugfs_open,
+       .owner = THIS_MODULE,
+       .llseek = default_llseek,
+};
+
+static ssize_t read_file_base_eeprom(struct file *file, char __user *user_buf,
+                                    size_t count, loff_t *ppos)
+{
+       struct ath_softc *sc = file->private_data;
+       struct ath_hw *ah = sc->sc_ah;
+       u32 len = 0, size = 1500;
+       ssize_t retval = 0;
+       char *buf;
+
+       buf = kzalloc(size, GFP_KERNEL);
+       if (!buf)
+               return -ENOMEM;
+
+       len = ah->eep_ops->dump_eeprom(ah, true, buf, len, size);
+
+       retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);
+       kfree(buf);
+
+       return retval;
+}
+
+static const struct file_operations fops_base_eeprom = {
+       .read = read_file_base_eeprom,
+       .open = ath9k_debugfs_open,
+       .owner = THIS_MODULE,
+       .llseek = default_llseek,
+};
+
+static ssize_t read_file_modal_eeprom(struct file *file, char __user *user_buf,
+                                     size_t count, loff_t *ppos)
+{
+       struct ath_softc *sc = file->private_data;
+       struct ath_hw *ah = sc->sc_ah;
+       u32 len = 0, size = 6000;
+       char *buf;
+       size_t retval;
+
+       buf = kzalloc(size, GFP_KERNEL);
+       if (buf == NULL)
+               return -ENOMEM;
+
+       len = ah->eep_ops->dump_eeprom(ah, false, buf, len, size);
+
+       retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);
+       kfree(buf);
+
+       return retval;
+}
+
+static const struct file_operations fops_modal_eeprom = {
+       .read = read_file_modal_eeprom,
+       .open = ath9k_debugfs_open,
+       .owner = THIS_MODULE,
+       .llseek = default_llseek,
+};
+
+void ath9k_debug_samp_bb_mac(struct ath_softc *sc)
+{
+#define ATH_SAMP_DBG(c) (sc->debug.bb_mac_samp[sc->debug.sampidx].c)
+       struct ath_hw *ah = sc->sc_ah;
+       struct ath_common *common = ath9k_hw_common(ah);
+       unsigned long flags;
+       int i;
+
+       ath9k_ps_wakeup(sc);
+
+       spin_lock_bh(&sc->debug.samp_lock);
+
+       spin_lock_irqsave(&common->cc_lock, flags);
+       ath_hw_cycle_counters_update(common);
+
+       ATH_SAMP_DBG(cc.cycles) = common->cc_ani.cycles;
+       ATH_SAMP_DBG(cc.rx_busy) = common->cc_ani.rx_busy;
+       ATH_SAMP_DBG(cc.rx_frame) = common->cc_ani.rx_frame;
+       ATH_SAMP_DBG(cc.tx_frame) = common->cc_ani.tx_frame;
+       spin_unlock_irqrestore(&common->cc_lock, flags);
+
+       ATH_SAMP_DBG(noise) = ah->noise;
+
+       REG_WRITE_D(ah, AR_MACMISC,
+                 ((AR_MACMISC_DMA_OBS_LINE_8 << AR_MACMISC_DMA_OBS_S) |
+                  (AR_MACMISC_MISC_OBS_BUS_1 <<
+                   AR_MACMISC_MISC_OBS_BUS_MSB_S)));
+
+       for (i = 0; i < ATH9K_NUM_DMA_DEBUG_REGS; i++)
+               ATH_SAMP_DBG(dma_dbg_reg_vals[i]) = REG_READ_D(ah,
+                               AR_DMADBG_0 + (i * sizeof(u32)));
+
+       ATH_SAMP_DBG(pcu_obs) = REG_READ_D(ah, AR_OBS_BUS_1);
+       ATH_SAMP_DBG(pcu_cr) = REG_READ_D(ah, AR_CR);
+
+       memcpy(ATH_SAMP_DBG(nfCalHist), sc->caldata.nfCalHist,
+                       sizeof(ATH_SAMP_DBG(nfCalHist)));
+
+       sc->debug.sampidx = (sc->debug.sampidx + 1) % ATH_DBG_MAX_SAMPLES;
+       spin_unlock_bh(&sc->debug.samp_lock);
+       ath9k_ps_restore(sc);
+
+#undef ATH_SAMP_DBG
+}
+
+static int open_file_bb_mac_samps(struct inode *inode, struct file *file)
+{
+#define ATH_SAMP_DBG(c) bb_mac_samp[sampidx].c
+       struct ath_softc *sc = inode->i_private;
+       struct ath_hw *ah = sc->sc_ah;
+       struct ath_common *common = ath9k_hw_common(ah);
+       struct ieee80211_conf *conf = &common->hw->conf;
+       struct ath_dbg_bb_mac_samp *bb_mac_samp;
+       struct ath9k_nfcal_hist *h;
+       int i, j, qcuOffset = 0, dcuOffset = 0;
+       u32 *qcuBase, *dcuBase, size = 30000, len = 0;
+       u32 sampidx = 0;
+       u8 *buf;
+       u8 chainmask = (ah->rxchainmask << 3) | ah->rxchainmask;
+       u8 nread;
+
+       if (sc->sc_flags & SC_OP_INVALID)
+               return -EAGAIN;
+
+       buf = vmalloc(size);
+       if (!buf)
+               return -ENOMEM;
+       bb_mac_samp = vmalloc(sizeof(*bb_mac_samp) * ATH_DBG_MAX_SAMPLES);
+       if (!bb_mac_samp) {
+               vfree(buf);
+               return -ENOMEM;
+       }
+       /* Account the current state too */
+       ath9k_debug_samp_bb_mac(sc);
+
+       spin_lock_bh(&sc->debug.samp_lock);
+       memcpy(bb_mac_samp, sc->debug.bb_mac_samp,
+                       sizeof(*bb_mac_samp) * ATH_DBG_MAX_SAMPLES);
+       len += snprintf(buf + len, size - len,
+                       "Current Sample Index: %d\n", sc->debug.sampidx);
+       spin_unlock_bh(&sc->debug.samp_lock);
+
+       len += snprintf(buf + len, size - len,
+                       "Raw DMA Debug Dump:\n");
+       len += snprintf(buf + len, size - len, "Sample |\t");
+       for (i = 0; i < ATH9K_NUM_DMA_DEBUG_REGS; i++)
+               len += snprintf(buf + len, size - len, " DMA Reg%d |\t", i);
+       len += snprintf(buf + len, size - len, "\n");
+
+       for (sampidx = 0; sampidx < ATH_DBG_MAX_SAMPLES; sampidx++) {
+               len += snprintf(buf + len, size - len, "%d\t", sampidx);
+
+               for (i = 0; i < ATH9K_NUM_DMA_DEBUG_REGS; i++)
+                       len += snprintf(buf + len, size - len, " %08x\t",
+                                       ATH_SAMP_DBG(dma_dbg_reg_vals[i]));
+               len += snprintf(buf + len, size - len, "\n");
+       }
+       len += snprintf(buf + len, size - len, "\n");
+
+       len += snprintf(buf + len, size - len,
+                       "Sample Num QCU: chain_st fsp_ok fsp_st DCU: chain_st\n");
+       for (sampidx = 0; sampidx < ATH_DBG_MAX_SAMPLES; sampidx++) {
+               qcuBase = &ATH_SAMP_DBG(dma_dbg_reg_vals[0]);
+               dcuBase = &ATH_SAMP_DBG(dma_dbg_reg_vals[4]);
+
+               for (i = 0; i < ATH9K_NUM_QUEUES; i++,
+                               qcuOffset += 4, dcuOffset += 5) {
+                       if (i == 8) {
+                               qcuOffset = 0;
+                               qcuBase++;
+                       }
+
+                       if (i == 6) {
+                               dcuOffset = 0;
+                               dcuBase++;
+                       }
+                       if (!sc->debug.stats.txstats[i].queued)
+                               continue;
+
+                       len += snprintf(buf + len, size - len,
+                               "%4d %7d    %2x      %1x     %2x         %2x\n",
+                               sampidx, i,
+                               (*qcuBase & (0x7 << qcuOffset)) >> qcuOffset,
+                               (*qcuBase & (0x8 << qcuOffset)) >>
+                               (qcuOffset + 3),
+                               ATH_SAMP_DBG(dma_dbg_reg_vals[2]) &
+                               (0x7 << (i * 3)) >> (i * 3),
+                               (*dcuBase & (0x1f << dcuOffset)) >> dcuOffset);
+               }
+               len += snprintf(buf + len, size - len, "\n");
+       }
+       len += snprintf(buf + len, size - len,
+                       "samp qcu_sh qcu_fh qcu_comp dcu_comp dcu_arb dcu_fp "
+                       "ch_idle_dur ch_idle_dur_val txfifo_val0 txfifo_val1 "
+                       "txfifo_dcu0 txfifo_dcu1 pcu_obs AR_CR\n");
+
+       for (sampidx = 0; sampidx < ATH_DBG_MAX_SAMPLES; sampidx++) {
+               qcuBase = &ATH_SAMP_DBG(dma_dbg_reg_vals[0]);
+               dcuBase = &ATH_SAMP_DBG(dma_dbg_reg_vals[4]);
+
+               len += snprintf(buf + len, size - len, "%4d %5x %5x ", sampidx,
+                       (ATH_SAMP_DBG(dma_dbg_reg_vals[3]) & 0x003c0000) >> 18,
+                       (ATH_SAMP_DBG(dma_dbg_reg_vals[3]) & 0x03c00000) >> 22);
+               len += snprintf(buf + len, size - len, "%7x %8x ",
+                       (ATH_SAMP_DBG(dma_dbg_reg_vals[3]) & 0x1c000000) >> 26,
+                       (ATH_SAMP_DBG(dma_dbg_reg_vals[6]) & 0x3));
+               len += snprintf(buf + len, size - len, "%7x %7x ",
+                       (ATH_SAMP_DBG(dma_dbg_reg_vals[5]) & 0x06000000) >> 25,
+                       (ATH_SAMP_DBG(dma_dbg_reg_vals[5]) & 0x38000000) >> 27);
+               len += snprintf(buf + len, size - len, "%7d %12d ",
+                       (ATH_SAMP_DBG(dma_dbg_reg_vals[6]) & 0x000003fc) >> 2,
+                       (ATH_SAMP_DBG(dma_dbg_reg_vals[6]) & 0x00000400) >> 10);
+               len += snprintf(buf + len, size - len, "%12d %12d ",
+                       (ATH_SAMP_DBG(dma_dbg_reg_vals[6]) & 0x00000800) >> 11,
+                       (ATH_SAMP_DBG(dma_dbg_reg_vals[6]) & 0x00001000) >> 12);
+               len += snprintf(buf + len, size - len, "%12d %12d ",
+                       (ATH_SAMP_DBG(dma_dbg_reg_vals[6]) & 0x0001e000) >> 13,
+                       (ATH_SAMP_DBG(dma_dbg_reg_vals[6]) & 0x001e0000) >> 17);
+               len += snprintf(buf + len, size - len, "0x%07x 0x%07x\n",
+                               ATH_SAMP_DBG(pcu_obs), ATH_SAMP_DBG(pcu_cr));
+       }
+
+       len += snprintf(buf + len, size - len,
+                       "Sample ChNoise Chain privNF #Reading Readings\n");
+       for (sampidx = 0; sampidx < ATH_DBG_MAX_SAMPLES; sampidx++) {
+               h = ATH_SAMP_DBG(nfCalHist);
+               if (!ATH_SAMP_DBG(noise))
+                       continue;
+
+               for (i = 0; i < NUM_NF_READINGS; i++) {
+                       if (!(chainmask & (1 << i)) ||
+                           ((i >= AR5416_MAX_CHAINS) && !conf_is_ht40(conf)))
+                               continue;
+
+                       nread = AR_PHY_CCA_FILTERWINDOW_LENGTH -
+                               h[i].invalidNFcount;
+                       len += snprintf(buf + len, size - len,
+                                       "%4d %5d %4d\t   %d\t %d\t",
+                                       sampidx, ATH_SAMP_DBG(noise),
+                                       i, h[i].privNF, nread);
+                       for (j = 0; j < nread; j++)
+                               len += snprintf(buf + len, size - len,
+                                       " %d", h[i].nfCalBuffer[j]);
+                       len += snprintf(buf + len, size - len, "\n");
+               }
+       }
+       len += snprintf(buf + len, size - len, "\nCycle counters:\n"
+                       "Sample Total    Rxbusy   Rxframes Txframes\n");
+       for (sampidx = 0; sampidx < ATH_DBG_MAX_SAMPLES; sampidx++) {
+               if (!ATH_SAMP_DBG(cc.cycles))
+                       continue;
+               len += snprintf(buf + len, size - len,
+                               "%4d %08x %08x %08x %08x\n",
+                               sampidx, ATH_SAMP_DBG(cc.cycles),
+                               ATH_SAMP_DBG(cc.rx_busy),
+                               ATH_SAMP_DBG(cc.rx_frame),
+                               ATH_SAMP_DBG(cc.tx_frame));
+       }
+
+       len += snprintf(buf + len, size - len, "Tx status Dump :\n");
+       len += snprintf(buf + len, size - len,
+                       "Sample rssi:- ctl0 ctl1 ctl2 ext0 ext1 ext2 comb "
+                       "isok rts_fail data_fail rate tid qid "
+                                       "ba_low  ba_high tx_before(ms)\n");
+       for (sampidx = 0; sampidx < ATH_DBG_MAX_SAMPLES; sampidx++) {
+               for (i = 0; i < ATH_DBG_MAX_SAMPLES; i++) {
+                       if (!ATH_SAMP_DBG(ts[i].jiffies))
+                               continue;
+                       len += snprintf(buf + len, size - len, "%-14d"
+                               "%-4d %-4d %-4d %-4d %-4d %-4d %-4d %-4d %-8d "
+                               "%-9d %-4d %-3d %-3d %08x %08x %-11d\n",
+                               sampidx,
+                               ATH_SAMP_DBG(ts[i].rssi_ctl0),
+                               ATH_SAMP_DBG(ts[i].rssi_ctl1),
+                               ATH_SAMP_DBG(ts[i].rssi_ctl2),
+                               ATH_SAMP_DBG(ts[i].rssi_ext0),
+                               ATH_SAMP_DBG(ts[i].rssi_ext1),
+                               ATH_SAMP_DBG(ts[i].rssi_ext2),
+                               ATH_SAMP_DBG(ts[i].rssi),
+                               ATH_SAMP_DBG(ts[i].isok),
+                               ATH_SAMP_DBG(ts[i].rts_fail_cnt),
+                               ATH_SAMP_DBG(ts[i].data_fail_cnt),
+                               ATH_SAMP_DBG(ts[i].rateindex),
+                               ATH_SAMP_DBG(ts[i].tid),
+                               ATH_SAMP_DBG(ts[i].qid),
+                               ATH_SAMP_DBG(ts[i].ba_low),
+                               ATH_SAMP_DBG(ts[i].ba_high),
+                               jiffies_to_msecs(jiffies -
+                                       ATH_SAMP_DBG(ts[i].jiffies)));
+               }
+       }
+
+       len += snprintf(buf + len, size - len, "Rx status Dump :\n");
+       len += snprintf(buf + len, size - len, "Sample rssi:- ctl0 ctl1 ctl2 "
+                       "ext0 ext1 ext2 comb beacon ant rate rx_before(ms)\n");
+       for (sampidx = 0; sampidx < ATH_DBG_MAX_SAMPLES; sampidx++) {
+               for (i = 0; i < ATH_DBG_MAX_SAMPLES; i++) {
+                       if (!ATH_SAMP_DBG(rs[i].jiffies))
+                               continue;
+                       len += snprintf(buf + len, size - len, "%-14d"
+                               "%-4d %-4d %-4d %-4d %-4d %-4d %-4d %-9s %-2d %02x %-13d\n",
+                               sampidx,
+                               ATH_SAMP_DBG(rs[i].rssi_ctl0),
+                               ATH_SAMP_DBG(rs[i].rssi_ctl1),
+                               ATH_SAMP_DBG(rs[i].rssi_ctl2),
+                               ATH_SAMP_DBG(rs[i].rssi_ext0),
+                               ATH_SAMP_DBG(rs[i].rssi_ext1),
+                               ATH_SAMP_DBG(rs[i].rssi_ext2),
+                               ATH_SAMP_DBG(rs[i].rssi),
+                               ATH_SAMP_DBG(rs[i].is_mybeacon) ?
+                               "True" : "False",
+                               ATH_SAMP_DBG(rs[i].antenna),
+                               ATH_SAMP_DBG(rs[i].rate),
+                               jiffies_to_msecs(jiffies -
+                                       ATH_SAMP_DBG(rs[i].jiffies)));
+               }
+       }
+
+       vfree(bb_mac_samp);
+       file->private_data = buf;
+
+       return 0;
+#undef ATH_SAMP_DBG
+}
+
+static const struct file_operations fops_samps = {
+       .open = open_file_bb_mac_samps,
+       .read = ath9k_debugfs_read_buf,
+       .release = ath9k_debugfs_release_buf,
+       .owner = THIS_MODULE,
+       .llseek = default_llseek,
+};
+
+
 int ath9k_init_debug(struct ath_hw *ah)
 {
        struct ath_common *common = ath9k_hw_common(ah);
@@ -1206,6 +1653,14 @@ int ath9k_init_debug(struct ath_hw *ah)
                            &ah->config.cwm_ignore_extcca);
        debugfs_create_file("regdump", S_IRUSR, sc->debug.debugfs_phy, sc,
                            &fops_regdump);
+       debugfs_create_file("dump_nfcal", S_IRUSR, sc->debug.debugfs_phy, sc,
+                           &fops_dump_nfcal);
+       debugfs_create_file("base_eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
+                           &fops_base_eeprom);
+       debugfs_create_file("modal_eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
+                           &fops_modal_eeprom);
+       debugfs_create_file("samples", S_IRUSR, sc->debug.debugfs_phy, sc,
+                           &fops_samps);
 
        debugfs_create_u32("gpio_mask", S_IRUSR | S_IWUSR,
                           sc->debug.debugfs_phy, &sc->sc_ah->gpio_mask);
@@ -1214,5 +1669,9 @@ int ath9k_init_debug(struct ath_hw *ah)
                           sc->debug.debugfs_phy, &sc->sc_ah->gpio_val);
 
        sc->debug.regidx = 0;
+       memset(&sc->debug.bb_mac_samp, 0, sizeof(sc->debug.bb_mac_samp));
+       sc->debug.sampidx = 0;
+       sc->debug.tsidx = 0;
+       sc->debug.rsidx = 0;
        return 0;
 }