1 files changed, 122 insertions, 105 deletions

diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c
index 4cccc29964f6..0bf7313b8a17 100644
--- a/drivers/net/wireless/ath/ath5k/debug.c
+++ b/drivers/net/wireless/ath/ath5k/debug.c
@@ -71,8 +71,6 @@ module_param_named(debug, ath5k_debug, uint, 0);
 #include "reg.h"
 #include "ani.h"
 
-static struct dentry *ath5k_global_debugfs;
-
 static int ath5k_debugfs_open(struct inode *inode, struct file *file)
 {
         file->private_data = inode->i_private;
@@ -271,6 +269,7 @@ static const struct file_operations fops_beacon = {
         .write = write_file_beacon,
         .open = ath5k_debugfs_open,
         .owner = THIS_MODULE,
+        .llseek = default_llseek,
 };
 
 
@@ -290,6 +289,7 @@ static const struct file_operations fops_reset = {
         .write = write_file_reset,
         .open = ath5k_debugfs_open,
         .owner = THIS_MODULE,
+        .llseek = noop_llseek,
 };
 
 
@@ -308,10 +308,10 @@ static const struct {
         { ATH5K_DEBUG_CALIBRATE, "calib",       "periodic calibration" },
         { ATH5K_DEBUG_TXPOWER,  "txpower",      "transmit power setting" },
         { ATH5K_DEBUG_LED,      "led",          "LED management" },
-        { ATH5K_DEBUG_DUMP_RX,  "dumprx",       "print received skb content" },
-        { ATH5K_DEBUG_DUMP_TX,  "dumptx",       "print transmit skb content" },
         { ATH5K_DEBUG_DUMPBANDS, "dumpbands",   "dump bands" },
+        { ATH5K_DEBUG_DMA,      "dma",          "dma start/stop" },
         { ATH5K_DEBUG_ANI,      "ani",          "adaptive noise immunity" },
+        { ATH5K_DEBUG_DESC,     "desc",         "descriptor chains" },
         { ATH5K_DEBUG_ANY,      "all",          "show all debug levels" },
 };
 
@@ -369,6 +369,7 @@ static const struct file_operations fops_debug = {
         .write = write_file_debug,
         .open = ath5k_debugfs_open,
         .owner = THIS_MODULE,
+        .llseek = default_llseek,
 };
 
 
@@ -480,6 +481,61 @@ static const struct file_operations fops_antenna = {
         .write = write_file_antenna,
         .open = ath5k_debugfs_open,
         .owner = THIS_MODULE,
+        .llseek = default_llseek,
+};
+
+/* debugfs: misc */
+
+static ssize_t read_file_misc(struct file *file, char __user *user_buf,
+                                   size_t count, loff_t *ppos)
+{
+        struct ath5k_softc *sc = file->private_data;
+        char buf[700];
+        unsigned int len = 0;
+        u32 filt = ath5k_hw_get_rx_filter(sc->ah);
+
+        len += snprintf(buf+len, sizeof(buf)-len, "bssid-mask: %pM\n",
+                        sc->bssidmask);
+        len += snprintf(buf+len, sizeof(buf)-len, "filter-flags: 0x%x ",
+                        filt);
+        if (filt & AR5K_RX_FILTER_UCAST)
+                len += snprintf(buf+len, sizeof(buf)-len, " UCAST");
+        if (filt & AR5K_RX_FILTER_MCAST)
+                len += snprintf(buf+len, sizeof(buf)-len, " MCAST");
+        if (filt & AR5K_RX_FILTER_BCAST)
+                len += snprintf(buf+len, sizeof(buf)-len, " BCAST");
+        if (filt & AR5K_RX_FILTER_CONTROL)
+                len += snprintf(buf+len, sizeof(buf)-len, " CONTROL");
+        if (filt & AR5K_RX_FILTER_BEACON)
+                len += snprintf(buf+len, sizeof(buf)-len, " BEACON");
+        if (filt & AR5K_RX_FILTER_PROM)
+                len += snprintf(buf+len, sizeof(buf)-len, " PROM");
+        if (filt & AR5K_RX_FILTER_XRPOLL)
+                len += snprintf(buf+len, sizeof(buf)-len, " XRPOLL");
+        if (filt & AR5K_RX_FILTER_PROBEREQ)
+                len += snprintf(buf+len, sizeof(buf)-len, " PROBEREQ");
+        if (filt & AR5K_RX_FILTER_PHYERR_5212)
+                len += snprintf(buf+len, sizeof(buf)-len, " PHYERR-5212");
+        if (filt & AR5K_RX_FILTER_RADARERR_5212)
+                len += snprintf(buf+len, sizeof(buf)-len, " RADARERR-5212");
+        if (filt & AR5K_RX_FILTER_PHYERR_5211)
+                snprintf(buf+len, sizeof(buf)-len, " PHYERR-5211");
+        if (filt & AR5K_RX_FILTER_RADARERR_5211)
+                len += snprintf(buf+len, sizeof(buf)-len, " RADARERR-5211");
+
+        len += snprintf(buf+len, sizeof(buf)-len, "\nopmode: %s (%d)\n",
+                        ath_opmode_to_string(sc->opmode), sc->opmode);
+
+        if (len > sizeof(buf))
+                len = sizeof(buf);
+
+        return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+}
+
+static const struct file_operations fops_misc = {
+        .read = read_file_misc,
+        .open = ath5k_debugfs_open,
+        .owner = THIS_MODULE,
 };
 
 
@@ -496,60 +552,64 @@ static ssize_t read_file_frameerrors(struct file *file, char __user *user_buf,
 
         len += snprintf(buf+len, sizeof(buf)-len,
                         "RX\n---------------------\n");
-        len += snprintf(buf+len, sizeof(buf)-len, "CRC\t%d\t(%d%%)\n",
+        len += snprintf(buf+len, sizeof(buf)-len, "CRC\t%u\t(%u%%)\n",
                         st->rxerr_crc,
                         st->rx_all_count > 0 ?
                                 st->rxerr_crc*100/st->rx_all_count : 0);
-        len += snprintf(buf+len, sizeof(buf)-len, "PHY\t%d\t(%d%%)\n",
+        len += snprintf(buf+len, sizeof(buf)-len, "PHY\t%u\t(%u%%)\n",
                         st->rxerr_phy,
                         st->rx_all_count > 0 ?
                                 st->rxerr_phy*100/st->rx_all_count : 0);
         for (i = 0; i < 32; i++) {
                 if (st->rxerr_phy_code[i])
                         len += snprintf(buf+len, sizeof(buf)-len,
-                                " phy_err[%d]\t%d\n",
+                                " phy_err[%u]\t%u\n",
                                 i, st->rxerr_phy_code[i]);
         }
 
-        len += snprintf(buf+len, sizeof(buf)-len, "FIFO\t%d\t(%d%%)\n",
+        len += snprintf(buf+len, sizeof(buf)-len, "FIFO\t%u\t(%u%%)\n",
                         st->rxerr_fifo,
                         st->rx_all_count > 0 ?
                                 st->rxerr_fifo*100/st->rx_all_count : 0);
-        len += snprintf(buf+len, sizeof(buf)-len, "decrypt\t%d\t(%d%%)\n",
+        len += snprintf(buf+len, sizeof(buf)-len, "decrypt\t%u\t(%u%%)\n",
                         st->rxerr_decrypt,
                         st->rx_all_count > 0 ?
                                 st->rxerr_decrypt*100/st->rx_all_count : 0);
-        len += snprintf(buf+len, sizeof(buf)-len, "MIC\t%d\t(%d%%)\n",
+        len += snprintf(buf+len, sizeof(buf)-len, "MIC\t%u\t(%u%%)\n",
                         st->rxerr_mic,
                         st->rx_all_count > 0 ?
                                 st->rxerr_mic*100/st->rx_all_count : 0);
-        len += snprintf(buf+len, sizeof(buf)-len, "process\t%d\t(%d%%)\n",
+        len += snprintf(buf+len, sizeof(buf)-len, "process\t%u\t(%u%%)\n",
                         st->rxerr_proc,
                         st->rx_all_count > 0 ?
                                 st->rxerr_proc*100/st->rx_all_count : 0);
-        len += snprintf(buf+len, sizeof(buf)-len, "jumbo\t%d\t(%d%%)\n",
+        len += snprintf(buf+len, sizeof(buf)-len, "jumbo\t%u\t(%u%%)\n",
                         st->rxerr_jumbo,
                         st->rx_all_count > 0 ?
                                 st->rxerr_jumbo*100/st->rx_all_count : 0);
-        len += snprintf(buf+len, sizeof(buf)-len, "[RX all\t%d]\n",
+        len += snprintf(buf+len, sizeof(buf)-len, "[RX all\t%u]\n",
                         st->rx_all_count);
+        len += snprintf(buf+len, sizeof(buf)-len, "RX-all-bytes\t%u\n",
+                        st->rx_bytes_count);
 
         len += snprintf(buf+len, sizeof(buf)-len,
                         "\nTX\n---------------------\n");
-        len += snprintf(buf+len, sizeof(buf)-len, "retry\t%d\t(%d%%)\n",
+        len += snprintf(buf+len, sizeof(buf)-len, "retry\t%u\t(%u%%)\n",
                         st->txerr_retry,
                         st->tx_all_count > 0 ?
                                 st->txerr_retry*100/st->tx_all_count : 0);
-        len += snprintf(buf+len, sizeof(buf)-len, "FIFO\t%d\t(%d%%)\n",
+        len += snprintf(buf+len, sizeof(buf)-len, "FIFO\t%u\t(%u%%)\n",
                         st->txerr_fifo,
                         st->tx_all_count > 0 ?
                                 st->txerr_fifo*100/st->tx_all_count : 0);
-        len += snprintf(buf+len, sizeof(buf)-len, "filter\t%d\t(%d%%)\n",
+        len += snprintf(buf+len, sizeof(buf)-len, "filter\t%u\t(%u%%)\n",
                         st->txerr_filt,
                         st->tx_all_count > 0 ?
                                 st->txerr_filt*100/st->tx_all_count : 0);
-        len += snprintf(buf+len, sizeof(buf)-len, "[TX all\t%d]\n",
+        len += snprintf(buf+len, sizeof(buf)-len, "[TX all\t%u]\n",
                         st->tx_all_count);
+        len += snprintf(buf+len, sizeof(buf)-len, "TX-all-bytes\t%u\n",
+                        st->tx_bytes_count);
 
         if (len > sizeof(buf))
                 len = sizeof(buf);
@@ -591,6 +651,7 @@ static const struct file_operations fops_frameerrors = {
         .write = write_file_frameerrors,
         .open = ath5k_debugfs_open,
         .owner = THIS_MODULE,
+        .llseek = default_llseek,
 };
 
 
@@ -656,21 +717,22 @@ static ssize_t read_file_ani(struct file *file, char __user *user_buf,
                         st->mib_intr);
         len += snprintf(buf+len, sizeof(buf)-len,
                         "beacon RSSI average:\t%d\n",
-                        sc->ah->ah_beacon_rssi_avg.avg);
+                        (int)ewma_read(&sc->ah->ah_beacon_rssi_avg));
+
+#define CC_PRINT(_struct, _field) \
+        _struct._field, \
+        _struct.cycles > 0 ? \
+        _struct._field*100/_struct.cycles : 0
+
         len += snprintf(buf+len, sizeof(buf)-len, "profcnt tx\t\t%u\t(%d%%)\n",
-                        as->pfc_tx,
-                        as->pfc_cycles > 0 ?
-                        as->pfc_tx*100/as->pfc_cycles : 0);
+                        CC_PRINT(as->last_cc, tx_frame));
         len += snprintf(buf+len, sizeof(buf)-len, "profcnt rx\t\t%u\t(%d%%)\n",
-                        as->pfc_rx,
-                        as->pfc_cycles > 0 ?
-                        as->pfc_rx*100/as->pfc_cycles : 0);
+                        CC_PRINT(as->last_cc, rx_frame));
         len += snprintf(buf+len, sizeof(buf)-len, "profcnt busy\t\t%u\t(%d%%)\n",
-                        as->pfc_busy,
-                        as->pfc_cycles > 0 ?
-                        as->pfc_busy*100/as->pfc_cycles : 0);
+                        CC_PRINT(as->last_cc, rx_busy));
+#undef CC_PRINT
         len += snprintf(buf+len, sizeof(buf)-len, "profcnt cycles\t\t%u\n",
-                        as->pfc_cycles);
+                        as->last_cc.cycles);
         len += snprintf(buf+len, sizeof(buf)-len,
                         "listen time\t\t%d\tlast: %d\n",
                         as->listen_time, as->last_listen);
@@ -748,6 +810,7 @@ static const struct file_operations fops_ani = {
         .write = write_file_ani,
         .open = ath5k_debugfs_open,
         .owner = THIS_MODULE,
+        .llseek = default_llseek,
 };
 
 
@@ -762,7 +825,7 @@ static ssize_t read_file_queue(struct file *file, char __user *user_buf,
 
         struct ath5k_txq *txq;
         struct ath5k_buf *bf, *bf0;
-        int i, n = 0;
+        int i, n;
 
         len += snprintf(buf+len, sizeof(buf)-len,
                         "available txbuffers: %d\n", sc->txbuf_len);
@@ -776,9 +839,16 @@ static ssize_t read_file_queue(struct file *file, char __user *user_buf,
                 if (!txq->setup)
                         continue;
 
+                n = 0;
+                spin_lock_bh(&txq->lock);
                 list_for_each_entry_safe(bf, bf0, &txq->q, list)
                         n++;
-                len += snprintf(buf+len, sizeof(buf)-len, "  len: %d\n", n);
+                spin_unlock_bh(&txq->lock);
+
+                len += snprintf(buf+len, sizeof(buf)-len,
+                                "  len: %d bufs: %d\n", txq->txq_len, n);
+                len += snprintf(buf+len, sizeof(buf)-len,
+                                "  stuck: %d\n", txq->txq_stuck);
         }
 
         if (len > sizeof(buf))
@@ -811,80 +881,45 @@ static const struct file_operations fops_queue = {
         .write = write_file_queue,
         .open = ath5k_debugfs_open,
         .owner = THIS_MODULE,
+        .llseek = default_llseek,
 };
 
 
-/* init */
-
-void
-ath5k_debug_init(void)
-{
-        ath5k_global_debugfs = debugfs_create_dir("ath5k", NULL);
-}
-
 void
 ath5k_debug_init_device(struct ath5k_softc *sc)
 {
+        struct dentry *phydir;
+
         sc->debug.level = ath5k_debug;
 
-        sc->debug.debugfs_phydir = debugfs_create_dir(wiphy_name(sc->hw->wiphy),
-                                ath5k_global_debugfs);
+        phydir = debugfs_create_dir("ath5k", sc->hw->wiphy->debugfsdir);
+        if (!phydir)
+            return;
 
-        sc->debug.debugfs_debug = debugfs_create_file("debug",
-                                S_IWUSR | S_IRUSR,
-                                sc->debug.debugfs_phydir, sc, &fops_debug);
+        debugfs_create_file("debug", S_IWUSR | S_IRUSR, phydir, sc,
+                            &fops_debug);
 
-        sc->debug.debugfs_registers = debugfs_create_file("registers", S_IRUSR,
-                                sc->debug.debugfs_phydir, sc, &fops_registers);
+        debugfs_create_file("registers", S_IRUSR, phydir, sc, &fops_registers);
 
-        sc->debug.debugfs_beacon = debugfs_create_file("beacon",
-                                S_IWUSR | S_IRUSR,
-                                sc->debug.debugfs_phydir, sc, &fops_beacon);
+        debugfs_create_file("beacon", S_IWUSR | S_IRUSR, phydir, sc,
+                            &fops_beacon);
 
-        sc->debug.debugfs_reset = debugfs_create_file("reset", S_IWUSR,
-                                sc->debug.debugfs_phydir, sc, &fops_reset);
+        debugfs_create_file("reset", S_IWUSR, phydir, sc, &fops_reset);
 
-        sc->debug.debugfs_antenna = debugfs_create_file("antenna",
-                                S_IWUSR | S_IRUSR,
-                                sc->debug.debugfs_phydir, sc, &fops_antenna);
+        debugfs_create_file("antenna", S_IWUSR | S_IRUSR, phydir, sc,
+                            &fops_antenna);
 
-        sc->debug.debugfs_frameerrors = debugfs_create_file("frameerrors",
-                                S_IWUSR | S_IRUSR,
-                                sc->debug.debugfs_phydir, sc,
-                                &fops_frameerrors);
+        debugfs_create_file("misc", S_IRUSR, phydir, sc, &fops_misc);
 
-        sc->debug.debugfs_ani = debugfs_create_file("ani",
-                                S_IWUSR | S_IRUSR,
-                                sc->debug.debugfs_phydir, sc,
-                                &fops_ani);
+        debugfs_create_file("frameerrors", S_IWUSR | S_IRUSR, phydir, sc,
+                            &fops_frameerrors);
 
-        sc->debug.debugfs_queue = debugfs_create_file("queue",
-                                S_IWUSR | S_IRUSR,
-                                sc->debug.debugfs_phydir, sc,
-                                &fops_queue);
-}
+        debugfs_create_file("ani", S_IWUSR | S_IRUSR, phydir, sc, &fops_ani);
 
-void
-ath5k_debug_finish(void)
-{
-        debugfs_remove(ath5k_global_debugfs);
+        debugfs_create_file("queue", S_IWUSR | S_IRUSR, phydir, sc,
+                            &fops_queue);
 }
 
-void
-ath5k_debug_finish_device(struct ath5k_softc *sc)
-{
-        debugfs_remove(sc->debug.debugfs_debug);
-        debugfs_remove(sc->debug.debugfs_registers);
-        debugfs_remove(sc->debug.debugfs_beacon);
-        debugfs_remove(sc->debug.debugfs_reset);
-        debugfs_remove(sc->debug.debugfs_antenna);
-        debugfs_remove(sc->debug.debugfs_frameerrors);
-        debugfs_remove(sc->debug.debugfs_ani);
-        debugfs_remove(sc->debug.debugfs_queue);
-        debugfs_remove(sc->debug.debugfs_phydir);
-}
-
-
 /* functions used in other places */
 
 void
@@ -955,7 +990,7 @@ ath5k_debug_printrxbuffs(struct ath5k_softc *sc, struct ath5k_hw *ah)
         struct ath5k_rx_status rs = {};
         int status;
 
-        if (likely(!(sc->debug.level & ATH5K_DEBUG_RESET)))
+        if (likely(!(sc->debug.level & ATH5K_DEBUG_DESC)))
                 return;
 
         printk(KERN_DEBUG "rxdp %x, rxlink %p\n",
@@ -972,24 +1007,6 @@ ath5k_debug_printrxbuffs(struct ath5k_softc *sc, struct ath5k_hw *ah)
 }
 
 void
-ath5k_debug_dump_skb(struct ath5k_softc *sc,
-                        struct sk_buff *skb, const char *prefix, int tx)
-{
-        char buf[16];
-
-        if (likely(!((tx && (sc->debug.level & ATH5K_DEBUG_DUMP_TX)) ||
-                     (!tx && (sc->debug.level & ATH5K_DEBUG_DUMP_RX)))))
-                return;
-
-        snprintf(buf, sizeof(buf), "%s %s", wiphy_name(sc->hw->wiphy), prefix);
-
-        print_hex_dump_bytes(buf, DUMP_PREFIX_NONE, skb->data,
-                min(200U, skb->len));
-
-        printk(KERN_DEBUG "\n");
-}
-
-void
 ath5k_debug_printtxbuf(struct ath5k_softc *sc, struct ath5k_buf *bf)
 {
         struct ath5k_desc *ds = bf->desc;
@@ -997,7 +1014,7 @@ ath5k_debug_printtxbuf(struct ath5k_softc *sc, struct ath5k_buf *bf)
         struct ath5k_tx_status ts = {};
         int done;
 
-        if (likely(!(sc->debug.level & ATH5K_DEBUG_RESET)))
+        if (likely(!(sc->debug.level & ATH5K_DEBUG_DESC)))
                 return;
 
         done = sc->ah->ah_proc_tx_desc(sc->ah, bf->desc, &ts);