]> Pileus Git - ~andy/linux/blobdiff - drivers/net/wireless/ath/ath6kl/debug.c
Merge remote branch 'wireless-next/master' into ath6kl-next
[~andy/linux] / drivers / net / wireless / ath / ath6kl / debug.c
index e515c83e3795ec3170385958068bd9e888a45b9b..eb808b46f94cec1010a16e0733f9dacbf5ee4147 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"
@@ -142,50 +143,48 @@ void ath6kl_dump_registers(struct ath6kl_device *dev,
 
 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))
+       if (!AR_DBG_LVL_CHECK(ATH6KL_DBG_CREDIT))
                return;
 
        list_for_each_entry(ep_list, &target->cred_dist_list, list)
                dump_cred_dist(ep_list);
 
-       ath6kl_dbg(ATH6KL_DBG_HTC, "ctxt:%p dist:%p\n",
-                  target->cred_dist_cntxt, NULL);
-       ath6kl_dbg(ATH6KL_DBG_HTC,
-                  "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)
@@ -562,10 +561,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"
@@ -584,8 +583,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)
@@ -1188,7 +1186,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;
 
@@ -1233,7 +1231,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;
 
@@ -1255,7 +1253,7 @@ static ssize_t ath6kl_create_qos_write(struct file *file,
 
        struct ath6kl *ar = file->private_data;
        struct ath6kl_vif *vif;
-       char buf[100];
+       char buf[200];
        ssize_t len;
        char *sptr, *token;
        struct wmi_create_pstream_cmd pstream;
@@ -1506,6 +1504,130 @@ static const struct file_operations fops_bgscan_int = {
        .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;
+       u16 listen_int_t, listen_int_b;
+       char buf[32];
+       char *sptr, *token;
+       ssize_t len;
+
+       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, &listen_int_t))
+               return -EINVAL;
+
+       if (kstrtou16(sptr, 0, &listen_int_b))
+               return -EINVAL;
+
+       if ((listen_int_t < 15) || (listen_int_t > 5000))
+               return -EINVAL;
+
+       if ((listen_int_b < 1) || (listen_int_b > 50))
+               return -EINVAL;
+
+       ar->listen_intvl_t = listen_int_t;
+       ar->listen_intvl_b = listen_int_b;
+
+       ath6kl_wmi_listeninterval_cmd(ar->wmi, 0, ar->listen_intvl_t,
+                                     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 %u\n", ar->listen_intvl_t,
+                                       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);
@@ -1588,6 +1710,9 @@ int ath6kl_debug_init(struct ath6kl *ar)
        debugfs_create_file("bgscan_interval", S_IWUSR,
                                ar->debugfs_phy, ar, &fops_bgscan_int);
 
+       debugfs_create_file("power_params", S_IWUSR, ar->debugfs_phy, ar,
+                                               &fops_power_params);
+
        return 0;
 }