Signed-off-by: Rajkumar Manoharan <[email protected]>
---
drivers/net/wireless/ath/ath9k/htc.h | 1 +
drivers/net/wireless/ath/ath9k/htc_drv_debug.c | 48 ++++++++++++++++++++++++
2 files changed, 49 insertions(+), 0 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h
index cc5d0a4..852cdcf 100644
--- a/drivers/net/wireless/ath/ath9k/htc.h
+++ b/drivers/net/wireless/ath/ath9k/htc.h
@@ -366,6 +366,7 @@ struct ath9k_debug {
struct dentry *debugfs_recv;
struct dentry *debugfs_slot;
struct dentry *debugfs_queue;
+ struct dentry *debugfs_debug;
struct ath_tx_stats tx_stats;
struct ath_rx_stats rx_stats;
};
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_debug.c b/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
index 8d0de60..3899eaa 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
@@ -435,6 +435,47 @@ static const struct file_operations fops_queue = {
.llseek = default_llseek,
};
+static ssize_t read_file_debug(struct file *file, char __user *user_buf,
+ size_t count, loff_t *ppos)
+{
+ struct ath9k_htc_priv *priv = file->private_data;
+ struct ath_common *common = ath9k_hw_common(priv->ah);
+ char buf[32];
+ unsigned int len;
+
+ len = sprintf(buf, "0x%08x\n", common->debug_mask);
+ return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+}
+
+static ssize_t write_file_debug(struct file *file, const char __user *user_buf,
+ size_t count, loff_t *ppos)
+{
+ struct ath9k_htc_priv *priv = file->private_data;
+ struct ath_common *common = ath9k_hw_common(priv->ah);
+ unsigned long mask;
+ 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 (strict_strtoul(buf, 0, &mask))
+ return -EINVAL;
+
+ common->debug_mask = mask;
+ return count;
+}
+
+static const struct file_operations fops_debug = {
+ .read = read_file_debug,
+ .write = write_file_debug,
+ .open = ath9k_debugfs_open,
+ .owner = THIS_MODULE,
+ .llseek = default_llseek,
+};
+
int ath9k_htc_init_debug(struct ath_hw *ah)
{
struct ath_common *common = ath9k_hw_common(ah);
@@ -493,6 +534,12 @@ int ath9k_htc_init_debug(struct ath_hw *ah)
if (!priv->debug.debugfs_queue)
goto err;
+ priv->debug.debugfs_debug = debugfs_create_file("debug", S_IRUSR,
+ priv->debug.debugfs_phy,
+ priv, &fops_debug);
+ if (!priv->debug.debugfs_debug)
+ goto err;
+
return 0;
err:
@@ -512,6 +559,7 @@ void ath9k_htc_exit_debug(struct ath_hw *ah)
debugfs_remove(priv->debug.debugfs_tgt_int_stats);
debugfs_remove(priv->debug.debugfs_tgt_tx_stats);
debugfs_remove(priv->debug.debugfs_tgt_rx_stats);
+ debugfs_remove(priv->debug.debugfs_debug);
debugfs_remove(priv->debug.debugfs_phy);
}
--
1.7.4.4
Move the ath9k_htc debugfs under ieee80211 to be inline
with ath9k driver and it also helps to simplify debug code.
Signed-off-by: Rajkumar Manoharan <[email protected]>
---
drivers/net/wireless/ath/ath9k/htc.h | 14 ---
drivers/net/wireless/ath/ath9k/htc_drv_debug.c | 112 ++++--------------------
drivers/net/wireless/ath/ath9k/htc_drv_init.c | 41 +++------
3 files changed, 31 insertions(+), 136 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h
index 852cdcf..48a8855 100644
--- a/drivers/net/wireless/ath/ath9k/htc.h
+++ b/drivers/net/wireless/ath/ath9k/htc.h
@@ -359,14 +359,6 @@ struct ath_rx_stats {
struct ath9k_debug {
struct dentry *debugfs_phy;
- struct dentry *debugfs_tgt_int_stats;
- struct dentry *debugfs_tgt_tx_stats;
- struct dentry *debugfs_tgt_rx_stats;
- struct dentry *debugfs_xmit;
- struct dentry *debugfs_recv;
- struct dentry *debugfs_slot;
- struct dentry *debugfs_queue;
- struct dentry *debugfs_debug;
struct ath_tx_stats tx_stats;
struct ath_rx_stats rx_stats;
};
@@ -613,15 +605,9 @@ void ath9k_htc_suspend(struct htc_target *htc_handle);
int ath9k_htc_resume(struct htc_target *htc_handle);
#endif
#ifdef CONFIG_ATH9K_HTC_DEBUGFS
-int ath9k_htc_debug_create_root(void);
-void ath9k_htc_debug_remove_root(void);
int ath9k_htc_init_debug(struct ath_hw *ah);
-void ath9k_htc_exit_debug(struct ath_hw *ah);
#else
-static inline int ath9k_htc_debug_create_root(void) { return 0; };
-static inline void ath9k_htc_debug_remove_root(void) {};
static inline int ath9k_htc_init_debug(struct ath_hw *ah) { return 0; };
-static inline void ath9k_htc_exit_debug(struct ath_hw *ah) {};
#endif /* CONFIG_ATH9K_HTC_DEBUGFS */
#endif /* HTC_H */
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_debug.c b/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
index 3899eaa..19b30e4 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
@@ -16,8 +16,6 @@
#include "htc.h"
-static struct dentry *ath9k_debugfs_root;
-
static int ath9k_debugfs_open(struct inode *inode, struct file *file)
{
file->private_data = inode->i_private;
@@ -481,99 +479,27 @@ int ath9k_htc_init_debug(struct ath_hw *ah)
struct ath_common *common = ath9k_hw_common(ah);
struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common->priv;
- if (!ath9k_debugfs_root)
- return -ENOENT;
-
- priv->debug.debugfs_phy = debugfs_create_dir(wiphy_name(priv->hw->wiphy),
- ath9k_debugfs_root);
+ priv->debug.debugfs_phy = debugfs_create_dir("ath9k_htc",
+ priv->hw->wiphy->debugfsdir);
if (!priv->debug.debugfs_phy)
- goto err;
-
- priv->debug.debugfs_tgt_int_stats = debugfs_create_file("tgt_int_stats",
- S_IRUSR,
- priv->debug.debugfs_phy,
- priv, &fops_tgt_int_stats);
- if (!priv->debug.debugfs_tgt_int_stats)
- goto err;
-
- priv->debug.debugfs_tgt_tx_stats = debugfs_create_file("tgt_tx_stats",
- S_IRUSR,
- priv->debug.debugfs_phy,
- priv, &fops_tgt_tx_stats);
- if (!priv->debug.debugfs_tgt_tx_stats)
- goto err;
-
- priv->debug.debugfs_tgt_rx_stats = debugfs_create_file("tgt_rx_stats",
- S_IRUSR,
- priv->debug.debugfs_phy,
- priv, &fops_tgt_rx_stats);
- if (!priv->debug.debugfs_tgt_rx_stats)
- goto err;
-
- priv->debug.debugfs_xmit = debugfs_create_file("xmit", S_IRUSR,
- priv->debug.debugfs_phy,
- priv, &fops_xmit);
- if (!priv->debug.debugfs_xmit)
- goto err;
-
- priv->debug.debugfs_recv = debugfs_create_file("recv", S_IRUSR,
- priv->debug.debugfs_phy,
- priv, &fops_recv);
- if (!priv->debug.debugfs_recv)
- goto err;
-
- priv->debug.debugfs_slot = debugfs_create_file("slot", S_IRUSR,
- priv->debug.debugfs_phy,
- priv, &fops_slot);
- if (!priv->debug.debugfs_slot)
- goto err;
-
- priv->debug.debugfs_queue = debugfs_create_file("queue", S_IRUSR,
- priv->debug.debugfs_phy,
- priv, &fops_queue);
- if (!priv->debug.debugfs_queue)
- goto err;
-
- priv->debug.debugfs_debug = debugfs_create_file("debug", S_IRUSR,
- priv->debug.debugfs_phy,
- priv, &fops_debug);
- if (!priv->debug.debugfs_debug)
- goto err;
-
- return 0;
-
-err:
- ath9k_htc_exit_debug(ah);
- return -ENOMEM;
-}
-
-void ath9k_htc_exit_debug(struct ath_hw *ah)
-{
- struct ath_common *common = ath9k_hw_common(ah);
- struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common->priv;
-
- debugfs_remove(priv->debug.debugfs_queue);
- debugfs_remove(priv->debug.debugfs_slot);
- debugfs_remove(priv->debug.debugfs_recv);
- debugfs_remove(priv->debug.debugfs_xmit);
- debugfs_remove(priv->debug.debugfs_tgt_int_stats);
- debugfs_remove(priv->debug.debugfs_tgt_tx_stats);
- debugfs_remove(priv->debug.debugfs_tgt_rx_stats);
- debugfs_remove(priv->debug.debugfs_debug);
- debugfs_remove(priv->debug.debugfs_phy);
-}
+ return -ENOMEM;
-int ath9k_htc_debug_create_root(void)
-{
- ath9k_debugfs_root = debugfs_create_dir(KBUILD_MODNAME, NULL);
- if (!ath9k_debugfs_root)
- return -ENOENT;
+ debugfs_create_file("tgt_int_stats", S_IRUSR, priv->debug.debugfs_phy,
+ priv, &fops_tgt_int_stats);
+ debugfs_create_file("tgt_tx_stats", S_IRUSR, priv->debug.debugfs_phy,
+ priv, &fops_tgt_tx_stats);
+ debugfs_create_file("tgt_rx_stats", S_IRUSR, priv->debug.debugfs_phy,
+ priv, &fops_tgt_rx_stats);
+ debugfs_create_file("xmit", S_IRUSR, priv->debug.debugfs_phy,
+ priv, &fops_xmit);
+ debugfs_create_file("recv", S_IRUSR, priv->debug.debugfs_phy,
+ priv, &fops_recv);
+ debugfs_create_file("slot", S_IRUSR, priv->debug.debugfs_phy,
+ priv, &fops_slot);
+ debugfs_create_file("queue", S_IRUSR, priv->debug.debugfs_phy,
+ priv, &fops_queue);
+ debugfs_create_file("debug", S_IRUSR, priv->debug.debugfs_phy,
+ priv, &fops_debug);
return 0;
}
-
-void ath9k_htc_debug_remove_root(void)
-{
- debugfs_remove(ath9k_debugfs_root);
- ath9k_debugfs_root = NULL;
-}
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
index 22736eb..1a8980d 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
@@ -140,7 +140,6 @@ static int ath9k_htc_wait_for_target(struct ath9k_htc_priv *priv)
static void ath9k_deinit_priv(struct ath9k_htc_priv *priv)
{
- ath9k_htc_exit_debug(priv->ah);
ath9k_hw_deinit(priv->ah);
kfree(priv->ah);
priv->ah = NULL;
@@ -150,6 +149,10 @@ static void ath9k_deinit_device(struct ath9k_htc_priv *priv)
{
struct ieee80211_hw *hw = priv->hw;
+ if (priv->debug.debugfs_phy) {
+ debugfs_remove_recursive(priv->debug.debugfs_phy);
+ priv->debug.debugfs_phy = NULL;
+ }
wiphy_rfkill_stop_polling(hw->wiphy);
ath9k_deinit_leds(priv);
ieee80211_unregister_hw(hw);
@@ -700,12 +703,6 @@ static int ath9k_init_priv(struct ath9k_htc_priv *priv,
goto err_hw;
}
- ret = ath9k_htc_init_debug(ah);
- if (ret) {
- ath_err(common, "Unable to create debugfs files\n");
- goto err_debug;
- }
-
ret = ath9k_init_queues(priv);
if (ret)
goto err_queues;
@@ -725,8 +722,6 @@ static int ath9k_init_priv(struct ath9k_htc_priv *priv,
return 0;
err_queues:
- ath9k_htc_exit_debug(ah);
-err_debug:
ath9k_hw_deinit(ah);
err_hw:
@@ -867,6 +862,12 @@ static int ath9k_init_device(struct ath9k_htc_priv *priv,
goto err_world;
}
+ error = ath9k_htc_init_debug(priv->ah);
+ if (error) {
+ ath_err(common, "Unable to create debugfs files\n");
+ goto err_world;
+ }
+
ath_dbg(common, ATH_DBG_CONFIG,
"WMI:%d, BCN:%d, CAB:%d, UAPSD:%d, MGMT:%d, "
"BE:%d, BK:%d, VI:%d, VO:%d\n",
@@ -987,38 +988,20 @@ int ath9k_htc_resume(struct htc_target *htc_handle)
static int __init ath9k_htc_init(void)
{
- int error;
-
- error = ath9k_htc_debug_create_root();
- if (error < 0) {
- printk(KERN_ERR
- "ath9k_htc: Unable to create debugfs root: %d\n",
- error);
- goto err_dbg;
- }
-
- error = ath9k_hif_usb_init();
- if (error < 0) {
+ if (ath9k_hif_usb_init() < 0) {
printk(KERN_ERR
"ath9k_htc: No USB devices found,"
" driver not installed.\n");
- error = -ENODEV;
- goto err_usb;
+ return -ENODEV;
}
return 0;
-
-err_usb:
- ath9k_htc_debug_remove_root();
-err_dbg:
- return error;
}
module_init(ath9k_htc_init);
static void __exit ath9k_htc_exit(void)
{
ath9k_hif_usb_exit();
- ath9k_htc_debug_remove_root();
printk(KERN_INFO "ath9k_htc: Driver unloaded\n");
}
module_exit(ath9k_htc_exit);
--
1.7.4.4
Rajkumar Manoharan wrote:
> I think mac80211 handles debugfs_remove_recursive. isn't it?
> If so, Shall I remove it?
In that case, yep.
Sujith
Rajkumar Manoharan wrote:
> + priv->debug.debugfs_phy = debugfs_create_dir("ath9k_htc",
> + priv->hw->wiphy->debugfsdir);
KBUILD_MODNAME can be used.
> + debugfs_create_file("debug", S_IRUSR, priv->debug.debugfs_phy,
> + priv, &fops_debug);
>
S_IWUSR.
> static void ath9k_deinit_priv(struct ath9k_htc_priv *priv)
> {
> - ath9k_htc_exit_debug(priv->ah);
> ath9k_hw_deinit(priv->ah);
> kfree(priv->ah);
> priv->ah = NULL;
> @@ -150,6 +149,10 @@ static void ath9k_deinit_device(struct ath9k_htc_priv *priv)
> {
> struct ieee80211_hw *hw = priv->hw;
>
> + if (priv->debug.debugfs_phy) {
> + debugfs_remove_recursive(priv->debug.debugfs_phy);
> + priv->debug.debugfs_phy = NULL;
> + }
It would be consistent to have this chunk of code in ath9k_htc_exit_debug().
Sujith
Rajkumar Manoharan wrote:
> + priv->debug.debugfs_debug = debugfs_create_file("debug", S_IRUSR,
> + priv->debug.debugfs_phy,
> + priv, &fops_debug);
> + if (!priv->debug.debugfs_debug)
> + goto err;
> +
S_IWUSR ?
Sujith
On Fri, Apr 15, 2011 at 12:10:03PM +0530, Sujith wrote:
> Rajkumar Manoharan wrote:
> > + priv->debug.debugfs_phy = debugfs_create_dir("ath9k_htc",
> > + priv->hw->wiphy->debugfsdir);
>
> KBUILD_MODNAME can be used.
>
> > + debugfs_create_file("debug", S_IRUSR, priv->debug.debugfs_phy,
> > + priv, &fops_debug);
> >
>
> S_IWUSR.
>
> > static void ath9k_deinit_priv(struct ath9k_htc_priv *priv)
> > {
> > - ath9k_htc_exit_debug(priv->ah);
> > ath9k_hw_deinit(priv->ah);
> > kfree(priv->ah);
> > priv->ah = NULL;
> > @@ -150,6 +149,10 @@ static void ath9k_deinit_device(struct ath9k_htc_priv *priv)
> > {
> > struct ieee80211_hw *hw = priv->hw;
> >
> > + if (priv->debug.debugfs_phy) {
> > + debugfs_remove_recursive(priv->debug.debugfs_phy);
> > + priv->debug.debugfs_phy = NULL;
> > + }
>
> It would be consistent to have this chunk of code in ath9k_htc_exit_debug().
>
I think mac80211 handles debugfs_remove_recursive. isn't it?
If so, Shall I remove it?
--
Rajkumar
On Fri, 2011-04-15 at 12:36 +0530, Rajkumar Manoharan wrote:
> > > @@ -150,6 +149,10 @@ static void ath9k_deinit_device(struct ath9k_htc_priv *priv)
> > > {
> > > struct ieee80211_hw *hw = priv->hw;
> > >
> > > + if (priv->debug.debugfs_phy) {
> > > + debugfs_remove_recursive(priv->debug.debugfs_phy);
> > > + priv->debug.debugfs_phy = NULL;
> > > + }
> >
> > It would be consistent to have this chunk of code in ath9k_htc_exit_debug().
> >
> I think mac80211 handles debugfs_remove_recursive. isn't it?
> If so, Shall I remove it?
cfg80211 will remove all per wiphy debugfs files, but you might want to
remove them before so nobody accesses them while you're uninitialising.
johannes