ath6kl: convert ath6kl_dbg() and ath6kl_dbg_dump() into functions
[cascardo/linux.git] / drivers / net / wireless / ath / ath6kl / debug.c
index 460f211..4ba6560 100644 (file)
@@ -19,6 +19,7 @@
 #include <linux/circ_buf.h>
 #include <linux/fs.h>
 #include <linux/vmalloc.h>
+#include <linux/export.h>
 
 #include "debug.h"
 #include "target.h"
@@ -56,6 +57,36 @@ int ath6kl_printk(const char *level, const char *fmt, ...)
 
 #ifdef CONFIG_ATH6KL_DEBUG
 
+void ath6kl_dbg(enum ATH6K_DEBUG_MASK mask, const char *fmt, ...)
+{
+       struct va_format vaf;
+       va_list args;
+
+       if (!(debug_mask & mask))
+               return;
+
+       va_start(args, fmt);
+
+       vaf.fmt = fmt;
+       vaf.va = &args;
+
+       ath6kl_printk(KERN_DEBUG, "%pV", &vaf);
+
+       va_end(args);
+}
+
+void ath6kl_dbg_dump(enum ATH6K_DEBUG_MASK mask,
+                    const char *msg, const char *prefix,
+                    const void *buf, size_t len)
+{
+       if (debug_mask & mask) {
+               if (msg)
+                       ath6kl_dbg(mask, "%s\n", msg);
+
+               print_hex_dump_bytes(prefix, DUMP_PREFIX_OFFSET, buf, len);
+       }
+}
+
 #define REG_OUTPUT_LEN_PER_LINE        25
 #define REGTYPE_STR_LEN                100
 
@@ -81,31 +112,31 @@ void ath6kl_dump_registers(struct ath6kl_device *dev,
                           struct ath6kl_irq_enable_reg *irq_enable_reg)
 {
 
-       ath6kl_dbg(ATH6KL_DBG_ANY, ("<------- Register Table -------->\n"));
+       ath6kl_dbg(ATH6KL_DBG_IRQ, ("<------- Register Table -------->\n"));
 
        if (irq_proc_reg != NULL) {
-               ath6kl_dbg(ATH6KL_DBG_ANY,
+               ath6kl_dbg(ATH6KL_DBG_IRQ,
                        "Host Int status:           0x%x\n",
                        irq_proc_reg->host_int_status);
-               ath6kl_dbg(ATH6KL_DBG_ANY,
+               ath6kl_dbg(ATH6KL_DBG_IRQ,
                           "CPU Int status:            0x%x\n",
                        irq_proc_reg->cpu_int_status);
-               ath6kl_dbg(ATH6KL_DBG_ANY,
+               ath6kl_dbg(ATH6KL_DBG_IRQ,
                           "Error Int status:          0x%x\n",
                        irq_proc_reg->error_int_status);
-               ath6kl_dbg(ATH6KL_DBG_ANY,
+               ath6kl_dbg(ATH6KL_DBG_IRQ,
                           "Counter Int status:        0x%x\n",
                        irq_proc_reg->counter_int_status);
-               ath6kl_dbg(ATH6KL_DBG_ANY,
+               ath6kl_dbg(ATH6KL_DBG_IRQ,
                           "Mbox Frame:                0x%x\n",
                        irq_proc_reg->mbox_frame);
-               ath6kl_dbg(ATH6KL_DBG_ANY,
+               ath6kl_dbg(ATH6KL_DBG_IRQ,
                           "Rx Lookahead Valid:        0x%x\n",
                        irq_proc_reg->rx_lkahd_valid);
-               ath6kl_dbg(ATH6KL_DBG_ANY,
+               ath6kl_dbg(ATH6KL_DBG_IRQ,
                           "Rx Lookahead 0:            0x%x\n",
                        irq_proc_reg->rx_lkahd[0]);
-               ath6kl_dbg(ATH6KL_DBG_ANY,
+               ath6kl_dbg(ATH6KL_DBG_IRQ,
                           "Rx Lookahead 1:            0x%x\n",
                        irq_proc_reg->rx_lkahd[1]);
 
@@ -114,16 +145,16 @@ void ath6kl_dump_registers(struct ath6kl_device *dev,
                         * If the target supports GMBOX hardware, dump some
                         * additional state.
                         */
-                       ath6kl_dbg(ATH6KL_DBG_ANY,
+                       ath6kl_dbg(ATH6KL_DBG_IRQ,
                                "GMBOX Host Int status 2:   0x%x\n",
                                irq_proc_reg->host_int_status2);
-                       ath6kl_dbg(ATH6KL_DBG_ANY,
+                       ath6kl_dbg(ATH6KL_DBG_IRQ,
                                "GMBOX RX Avail:            0x%x\n",
                                irq_proc_reg->gmbox_rx_avail);
-                       ath6kl_dbg(ATH6KL_DBG_ANY,
+                       ath6kl_dbg(ATH6KL_DBG_IRQ,
                                "GMBOX lookahead alias 0:   0x%x\n",
                                irq_proc_reg->rx_gmbox_lkahd_alias[0]);
-                       ath6kl_dbg(ATH6KL_DBG_ANY,
+                       ath6kl_dbg(ATH6KL_DBG_IRQ,
                                "GMBOX lookahead alias 1:   0x%x\n",
                                irq_proc_reg->rx_gmbox_lkahd_alias[1]);
                }
@@ -131,60 +162,56 @@ void ath6kl_dump_registers(struct ath6kl_device *dev,
        }
 
        if (irq_enable_reg != NULL) {
-               ath6kl_dbg(ATH6KL_DBG_ANY,
+               ath6kl_dbg(ATH6KL_DBG_IRQ,
                        "Int status Enable:         0x%x\n",
                        irq_enable_reg->int_status_en);
-               ath6kl_dbg(ATH6KL_DBG_ANY, "Counter Int status Enable: 0x%x\n",
+               ath6kl_dbg(ATH6KL_DBG_IRQ, "Counter Int status Enable: 0x%x\n",
                        irq_enable_reg->cntr_int_status_en);
        }
-       ath6kl_dbg(ATH6KL_DBG_ANY, "<------------------------------->\n");
+       ath6kl_dbg(ATH6KL_DBG_IRQ, "<------------------------------->\n");
 }
 
 static void dump_cred_dist(struct htc_endpoint_credit_dist *ep_dist)
 {
-       ath6kl_dbg(ATH6KL_DBG_ANY,
+       ath6kl_dbg(ATH6KL_DBG_CREDIT,
                   "--- endpoint: %d  svc_id: 0x%X ---\n",
                   ep_dist->endpoint, ep_dist->svc_id);
-       ath6kl_dbg(ATH6KL_DBG_ANY, " dist_flags     : 0x%X\n",
+       ath6kl_dbg(ATH6KL_DBG_CREDIT, " dist_flags     : 0x%X\n",
                   ep_dist->dist_flags);
-       ath6kl_dbg(ATH6KL_DBG_ANY, " cred_norm      : %d\n",
+       ath6kl_dbg(ATH6KL_DBG_CREDIT, " cred_norm      : %d\n",
                   ep_dist->cred_norm);
-       ath6kl_dbg(ATH6KL_DBG_ANY, " cred_min       : %d\n",
+       ath6kl_dbg(ATH6KL_DBG_CREDIT, " cred_min       : %d\n",
                   ep_dist->cred_min);
-       ath6kl_dbg(ATH6KL_DBG_ANY, " credits        : %d\n",
+       ath6kl_dbg(ATH6KL_DBG_CREDIT, " credits        : %d\n",
                   ep_dist->credits);
-       ath6kl_dbg(ATH6KL_DBG_ANY, " cred_assngd    : %d\n",
+       ath6kl_dbg(ATH6KL_DBG_CREDIT, " cred_assngd    : %d\n",
                   ep_dist->cred_assngd);
-       ath6kl_dbg(ATH6KL_DBG_ANY, " seek_cred      : %d\n",
+       ath6kl_dbg(ATH6KL_DBG_CREDIT, " seek_cred      : %d\n",
                   ep_dist->seek_cred);
-       ath6kl_dbg(ATH6KL_DBG_ANY, " cred_sz        : %d\n",
+       ath6kl_dbg(ATH6KL_DBG_CREDIT, " cred_sz        : %d\n",
                   ep_dist->cred_sz);
-       ath6kl_dbg(ATH6KL_DBG_ANY, " cred_per_msg   : %d\n",
+       ath6kl_dbg(ATH6KL_DBG_CREDIT, " cred_per_msg   : %d\n",
                   ep_dist->cred_per_msg);
-       ath6kl_dbg(ATH6KL_DBG_ANY, " cred_to_dist   : %d\n",
+       ath6kl_dbg(ATH6KL_DBG_CREDIT, " cred_to_dist   : %d\n",
                   ep_dist->cred_to_dist);
-       ath6kl_dbg(ATH6KL_DBG_ANY, " txq_depth      : %d\n",
-                  get_queue_depth(&((struct htc_endpoint *)
-                                    ep_dist->htc_rsvd)->txq));
-       ath6kl_dbg(ATH6KL_DBG_ANY,
+       ath6kl_dbg(ATH6KL_DBG_CREDIT, " txq_depth      : %d\n",
+                  get_queue_depth(&ep_dist->htc_ep->txq));
+       ath6kl_dbg(ATH6KL_DBG_CREDIT,
                   "----------------------------------\n");
 }
 
+/* FIXME: move to htc.c */
 void dump_cred_dist_stats(struct htc_target *target)
 {
        struct htc_endpoint_credit_dist *ep_list;
 
-       if (!AR_DBG_LVL_CHECK(ATH6KL_DBG_TRC))
-               return;
-
        list_for_each_entry(ep_list, &target->cred_dist_list, list)
                dump_cred_dist(ep_list);
 
-       ath6kl_dbg(ATH6KL_DBG_HTC_SEND, "ctxt:%p dist:%p\n",
-                  target->cred_dist_cntxt, NULL);
-       ath6kl_dbg(ATH6KL_DBG_TRC, "credit distribution, total : %d, free : %d\n",
-                  target->cred_dist_cntxt->total_avail_credits,
-                  target->cred_dist_cntxt->cur_free_credits);
+       ath6kl_dbg(ATH6KL_DBG_CREDIT,
+                  "credit distribution total %d free %d\n",
+                  target->credit_info->total_avail_credits,
+                  target->credit_info->cur_free_credits);
 }
 
 static int ath6kl_debugfs_open(struct inode *inode, struct file *file)
@@ -396,13 +423,20 @@ static ssize_t read_file_tgt_stats(struct file *file, char __user *user_buf,
                                   size_t count, loff_t *ppos)
 {
        struct ath6kl *ar = file->private_data;
-       struct target_stats *tgt_stats = &ar->target_stats;
+       struct ath6kl_vif *vif;
+       struct target_stats *tgt_stats;
        char *buf;
        unsigned int len = 0, buf_len = 1500;
        int i;
        long left;
        ssize_t ret_cnt;
 
+       vif = ath6kl_vif_first(ar);
+       if (!vif)
+               return -EIO;
+
+       tgt_stats = &vif->target_stats;
+
        buf = kzalloc(buf_len, GFP_KERNEL);
        if (!buf)
                return -ENOMEM;
@@ -412,9 +446,9 @@ static ssize_t read_file_tgt_stats(struct file *file, char __user *user_buf,
                return -EBUSY;
        }
 
-       set_bit(STATS_UPDATE_PEND, &ar->flag);
+       set_bit(STATS_UPDATE_PEND, &vif->flags);
 
-       if (ath6kl_wmi_get_stats_cmd(ar->wmi)) {
+       if (ath6kl_wmi_get_stats_cmd(ar->wmi, 0)) {
                up(&ar->sem);
                kfree(buf);
                return -EIO;
@@ -422,7 +456,7 @@ static ssize_t read_file_tgt_stats(struct file *file, char __user *user_buf,
 
        left = wait_event_interruptible_timeout(ar->event_wq,
                                                !test_bit(STATS_UPDATE_PEND,
-                                               &ar->flag), WMI_TIMEOUT);
+                                               &vif->flags), WMI_TIMEOUT);
 
        up(&ar->sem);
 
@@ -554,10 +588,10 @@ static ssize_t read_file_credit_dist_stats(struct file *file,
 
        len += scnprintf(buf + len, buf_len - len, "%25s%5d\n",
                         "Total Avail Credits: ",
-                        target->cred_dist_cntxt->total_avail_credits);
+                        target->credit_info->total_avail_credits);
        len += scnprintf(buf + len, buf_len - len, "%25s%5d\n",
                         "Free credits :",
-                        target->cred_dist_cntxt->cur_free_credits);
+                        target->credit_info->cur_free_credits);
 
        len += scnprintf(buf + len, buf_len - len,
                         " Epid  Flags    Cred_norm  Cred_min  Credits  Cred_assngd"
@@ -576,8 +610,7 @@ static ssize_t read_file_credit_dist_stats(struct file *file,
                print_credit_info("%9d", cred_per_msg);
                print_credit_info("%14d", cred_to_dist);
                len += scnprintf(buf + len, buf_len - len, "%12d\n",
-                                get_queue_depth(&((struct htc_endpoint *)
-                                                ep_list->htc_rsvd)->txq));
+                                get_queue_depth(&ep_list->htc_ep->txq));
        }
 
        if (len > buf_len)
@@ -1180,7 +1213,7 @@ static ssize_t ath6kl_keepalive_write(struct file *file,
        if (ret)
                return ret;
 
-       ret = ath6kl_wmi_set_keepalive_cmd(ar->wmi, val);
+       ret = ath6kl_wmi_set_keepalive_cmd(ar->wmi, 0, val);
        if (ret)
                return ret;
 
@@ -1225,7 +1258,7 @@ static ssize_t ath6kl_disconnect_timeout_write(struct file *file,
        if (ret)
                return ret;
 
-       ret = ath6kl_wmi_disctimeout_cmd(ar->wmi, val);
+       ret = ath6kl_wmi_disctimeout_cmd(ar->wmi, 0, val);
        if (ret)
                return ret;
 
@@ -1246,13 +1279,18 @@ static ssize_t ath6kl_create_qos_write(struct file *file,
 {
 
        struct ath6kl *ar = file->private_data;
-       char buf[100];
+       struct ath6kl_vif *vif;
+       char buf[200];
        ssize_t len;
        char *sptr, *token;
        struct wmi_create_pstream_cmd pstream;
        u32 val32;
        u16 val16;
 
+       vif = ath6kl_vif_first(ar);
+       if (!vif)
+               return -EIO;
+
        len = min(count, sizeof(buf) - 1);
        if (copy_from_user(buf, user_buf, len))
                return -EFAULT;
@@ -1400,7 +1438,7 @@ static ssize_t ath6kl_create_qos_write(struct file *file,
                return -EINVAL;
        pstream.medium_time = cpu_to_le32(val32);
 
-       ath6kl_wmi_create_pstream_cmd(ar->wmi, &pstream);
+       ath6kl_wmi_create_pstream_cmd(ar->wmi, vif->fw_vif_idx, &pstream);
 
        return count;
 }
@@ -1418,12 +1456,17 @@ static ssize_t ath6kl_delete_qos_write(struct file *file,
 {
 
        struct ath6kl *ar = file->private_data;
+       struct ath6kl_vif *vif;
        char buf[100];
        ssize_t len;
        char *sptr, *token;
        u8 traffic_class;
        u8 tsid;
 
+       vif = ath6kl_vif_first(ar);
+       if (!vif)
+               return -EIO;
+
        len = min(count, sizeof(buf) - 1);
        if (copy_from_user(buf, user_buf, len))
                return -EFAULT;
@@ -1442,7 +1485,8 @@ static ssize_t ath6kl_delete_qos_write(struct file *file,
        if (kstrtou8(token, 0, &tsid))
                return -EINVAL;
 
-       ath6kl_wmi_delete_pstream_cmd(ar->wmi, traffic_class, tsid);
+       ath6kl_wmi_delete_pstream_cmd(ar->wmi, vif->fw_vif_idx,
+                                     traffic_class, tsid);
 
        return count;
 }
@@ -1454,6 +1498,152 @@ static const struct file_operations fops_delete_qos = {
        .llseek = default_llseek,
 };
 
+static ssize_t ath6kl_bgscan_int_write(struct file *file,
+                               const char __user *user_buf,
+                               size_t count, loff_t *ppos)
+{
+       struct ath6kl *ar = file->private_data;
+       u16 bgscan_int;
+       char buf[32];
+       ssize_t len;
+
+       len = min(count, sizeof(buf) - 1);
+       if (copy_from_user(buf, user_buf, len))
+               return -EFAULT;
+
+       buf[len] = '\0';
+       if (kstrtou16(buf, 0, &bgscan_int))
+               return -EINVAL;
+
+       if (bgscan_int == 0)
+               bgscan_int = 0xffff;
+
+       ath6kl_wmi_scanparams_cmd(ar->wmi, 0, 0, 0, bgscan_int, 0, 0, 0, 3,
+                                 0, 0, 0);
+
+       return count;
+}
+
+static const struct file_operations fops_bgscan_int = {
+       .write = ath6kl_bgscan_int_write,
+       .open = ath6kl_debugfs_open,
+       .owner = THIS_MODULE,
+       .llseek = default_llseek,
+};
+
+static ssize_t ath6kl_listen_int_write(struct file *file,
+                                      const char __user *user_buf,
+                                      size_t count, loff_t *ppos)
+{
+       struct ath6kl *ar = file->private_data;
+       struct ath6kl_vif *vif;
+       u16 listen_interval;
+       char buf[32];
+       ssize_t len;
+
+       vif = ath6kl_vif_first(ar);
+       if (!vif)
+               return -EIO;
+
+       len = min(count, sizeof(buf) - 1);
+       if (copy_from_user(buf, user_buf, len))
+               return -EFAULT;
+
+       buf[len] = '\0';
+       if (kstrtou16(buf, 0, &listen_interval))
+               return -EINVAL;
+
+       if ((listen_interval < 1) || (listen_interval > 50))
+               return -EINVAL;
+
+       ar->listen_intvl_b = listen_interval;
+       ath6kl_wmi_listeninterval_cmd(ar->wmi, vif->fw_vif_idx, 0,
+                                     ar->listen_intvl_b);
+
+       return count;
+}
+
+static ssize_t ath6kl_listen_int_read(struct file *file,
+                                     char __user *user_buf,
+                                     size_t count, loff_t *ppos)
+{
+       struct ath6kl *ar = file->private_data;
+       char buf[32];
+       int len;
+
+       len = scnprintf(buf, sizeof(buf), "%u\n", ar->listen_intvl_b);
+
+       return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+}
+
+static const struct file_operations fops_listen_int = {
+       .read = ath6kl_listen_int_read,
+       .write = ath6kl_listen_int_write,
+       .open = ath6kl_debugfs_open,
+       .owner = THIS_MODULE,
+       .llseek = default_llseek,
+};
+
+static ssize_t ath6kl_power_params_write(struct file *file,
+                                               const char __user *user_buf,
+                                               size_t count, loff_t *ppos)
+{
+       struct ath6kl *ar = file->private_data;
+       u8 buf[100];
+       unsigned int len = 0;
+       char *sptr, *token;
+       u16 idle_period, ps_poll_num, dtim,
+               tx_wakeup, num_tx;
+
+       len = min(count, sizeof(buf) - 1);
+       if (copy_from_user(buf, user_buf, len))
+               return -EFAULT;
+       buf[len] = '\0';
+       sptr = buf;
+
+       token = strsep(&sptr, " ");
+       if (!token)
+               return -EINVAL;
+       if (kstrtou16(token, 0, &idle_period))
+               return -EINVAL;
+
+       token = strsep(&sptr, " ");
+       if (!token)
+               return -EINVAL;
+       if (kstrtou16(token, 0, &ps_poll_num))
+               return -EINVAL;
+
+       token = strsep(&sptr, " ");
+       if (!token)
+               return -EINVAL;
+       if (kstrtou16(token, 0, &dtim))
+               return -EINVAL;
+
+       token = strsep(&sptr, " ");
+       if (!token)
+               return -EINVAL;
+       if (kstrtou16(token, 0, &tx_wakeup))
+               return -EINVAL;
+
+       token = strsep(&sptr, " ");
+       if (!token)
+               return -EINVAL;
+       if (kstrtou16(token, 0, &num_tx))
+               return -EINVAL;
+
+       ath6kl_wmi_pmparams_cmd(ar->wmi, 0, idle_period, ps_poll_num,
+                               dtim, tx_wakeup, num_tx, 0);
+
+       return count;
+}
+
+static const struct file_operations fops_power_params = {
+       .write = ath6kl_power_params_write,
+       .open = ath6kl_debugfs_open,
+       .owner = THIS_MODULE,
+       .llseek = default_llseek,
+};
+
 int ath6kl_debug_init(struct ath6kl *ar)
 {
        ar->debug.fwlog_buf.buf = vmalloc(ATH6KL_FWLOG_SIZE);
@@ -1475,7 +1665,7 @@ int ath6kl_debug_init(struct ath6kl *ar)
        ar->debug.fwlog_mask = 0;
 
        ar->debugfs_phy = debugfs_create_dir("ath6kl",
-                                            ar->wdev->wiphy->debugfsdir);
+                                            ar->wiphy->debugfsdir);
        if (!ar->debugfs_phy) {
                vfree(ar->debug.fwlog_buf.buf);
                kfree(ar->debug.fwlog_tmp);
@@ -1533,6 +1723,15 @@ int ath6kl_debug_init(struct ath6kl *ar)
        debugfs_create_file("delete_qos", S_IWUSR, ar->debugfs_phy, ar,
                                &fops_delete_qos);
 
+       debugfs_create_file("bgscan_interval", S_IWUSR,
+                               ar->debugfs_phy, ar, &fops_bgscan_int);
+
+       debugfs_create_file("listen_interval", S_IRUSR | S_IWUSR,
+                           ar->debugfs_phy, ar, &fops_listen_int);
+
+       debugfs_create_file("power_params", S_IWUSR, ar->debugfs_phy, ar,
+                                               &fops_power_params);
+
        return 0;
 }