brcmfmac: use wiphy debugfs dir entry
The driver used to create a brcmfmac dir entry at the top level debugfs mount point. This moves the debugfs entries into the wiphy debugfs dir entry. Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com> Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com> Reviewed-by: Franky Lin <franky.lin@broadcom.com> Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
parent
856d5a011c
commit
34789d0cf6
|
@ -445,6 +445,11 @@ brcmf_proto_bcdc_init_done(struct brcmf_pub *drvr)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void brcmf_proto_bcdc_debugfs_create(struct brcmf_pub *drvr)
|
||||||
|
{
|
||||||
|
brcmf_fws_debugfs_create(drvr);
|
||||||
|
}
|
||||||
|
|
||||||
int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr)
|
int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr)
|
||||||
{
|
{
|
||||||
struct brcmf_bcdc *bcdc;
|
struct brcmf_bcdc *bcdc;
|
||||||
|
@ -472,6 +477,7 @@ int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr)
|
||||||
drvr->proto->del_if = brcmf_proto_bcdc_del_if;
|
drvr->proto->del_if = brcmf_proto_bcdc_del_if;
|
||||||
drvr->proto->reset_if = brcmf_proto_bcdc_reset_if;
|
drvr->proto->reset_if = brcmf_proto_bcdc_reset_if;
|
||||||
drvr->proto->init_done = brcmf_proto_bcdc_init_done;
|
drvr->proto->init_done = brcmf_proto_bcdc_init_done;
|
||||||
|
drvr->proto->debugfs_create = brcmf_proto_bcdc_debugfs_create;
|
||||||
drvr->proto->pd = bcdc;
|
drvr->proto->pd = bcdc;
|
||||||
|
|
||||||
drvr->hdrlen += BCDC_HEADER_LEN + BRCMF_PROT_FW_SIGNAL_MAX_TXBYTES;
|
drvr->hdrlen += BCDC_HEADER_LEN + BRCMF_PROT_FW_SIGNAL_MAX_TXBYTES;
|
||||||
|
|
|
@ -524,9 +524,6 @@ static int __init brcmfmac_module_init(void)
|
||||||
{
|
{
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
/* Initialize debug system first */
|
|
||||||
brcmf_debugfs_init();
|
|
||||||
|
|
||||||
/* Get the platform data (if available) for our devices */
|
/* Get the platform data (if available) for our devices */
|
||||||
err = platform_driver_probe(&brcmf_pd, brcmf_common_pd_probe);
|
err = platform_driver_probe(&brcmf_pd, brcmf_common_pd_probe);
|
||||||
if (err == -ENODEV)
|
if (err == -ENODEV)
|
||||||
|
@ -538,7 +535,6 @@ static int __init brcmfmac_module_init(void)
|
||||||
/* Continue the initialization by registering the different busses */
|
/* Continue the initialization by registering the different busses */
|
||||||
err = brcmf_core_init();
|
err = brcmf_core_init();
|
||||||
if (err) {
|
if (err) {
|
||||||
brcmf_debugfs_exit();
|
|
||||||
if (brcmfmac_pdata)
|
if (brcmfmac_pdata)
|
||||||
platform_driver_unregister(&brcmf_pd);
|
platform_driver_unregister(&brcmf_pd);
|
||||||
}
|
}
|
||||||
|
@ -551,7 +547,6 @@ static void __exit brcmfmac_module_exit(void)
|
||||||
brcmf_core_exit();
|
brcmf_core_exit();
|
||||||
if (brcmfmac_pdata)
|
if (brcmfmac_pdata)
|
||||||
platform_driver_unregister(&brcmf_pd);
|
platform_driver_unregister(&brcmf_pd);
|
||||||
brcmf_debugfs_exit();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
module_init(brcmfmac_module_init);
|
module_init(brcmfmac_module_init);
|
||||||
|
|
|
@ -972,8 +972,6 @@ static int brcmf_bus_started(struct brcmf_pub *drvr, struct cfg80211_ops *ops)
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
||||||
brcmf_debugfs_add_entry(drvr, "revinfo", brcmf_revinfo_read);
|
|
||||||
|
|
||||||
brcmf_feat_attach(drvr);
|
brcmf_feat_attach(drvr);
|
||||||
|
|
||||||
ret = brcmf_proto_init_done(drvr);
|
ret = brcmf_proto_init_done(drvr);
|
||||||
|
@ -1016,6 +1014,11 @@ static int brcmf_bus_started(struct brcmf_pub *drvr, struct cfg80211_ops *ops)
|
||||||
#endif
|
#endif
|
||||||
#endif /* CONFIG_INET */
|
#endif /* CONFIG_INET */
|
||||||
|
|
||||||
|
/* populate debugfs */
|
||||||
|
brcmf_debugfs_add_entry(drvr, "revinfo", brcmf_revinfo_read);
|
||||||
|
brcmf_feat_debugfs_create(drvr);
|
||||||
|
brcmf_proto_debugfs_create(drvr);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
fail:
|
fail:
|
||||||
|
@ -1068,9 +1071,6 @@ int brcmf_attach(struct device *dev, struct brcmf_mp_device *settings)
|
||||||
drvr->bus_if->drvr = drvr;
|
drvr->bus_if->drvr = drvr;
|
||||||
drvr->settings = settings;
|
drvr->settings = settings;
|
||||||
|
|
||||||
/* attach debug facilities */
|
|
||||||
brcmf_debug_attach(drvr);
|
|
||||||
|
|
||||||
/* Attach and link in the protocol */
|
/* Attach and link in the protocol */
|
||||||
ret = brcmf_proto_attach(drvr);
|
ret = brcmf_proto_attach(drvr);
|
||||||
if (ret != 0) {
|
if (ret != 0) {
|
||||||
|
@ -1160,7 +1160,6 @@ void brcmf_detach(struct device *dev)
|
||||||
|
|
||||||
brcmf_proto_detach(drvr);
|
brcmf_proto_detach(drvr);
|
||||||
|
|
||||||
brcmf_debug_detach(drvr);
|
|
||||||
bus_if->drvr = NULL;
|
bus_if->drvr = NULL;
|
||||||
wiphy_free(drvr->wiphy);
|
wiphy_free(drvr->wiphy);
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,8 +25,6 @@
|
||||||
#include "fweh.h"
|
#include "fweh.h"
|
||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
|
|
||||||
static struct dentry *root_folder;
|
|
||||||
|
|
||||||
int brcmf_debug_create_memdump(struct brcmf_bus *bus, const void *data,
|
int brcmf_debug_create_memdump(struct brcmf_bus *bus, const void *data,
|
||||||
size_t len)
|
size_t len)
|
||||||
{
|
{
|
||||||
|
@ -54,44 +52,9 @@ int brcmf_debug_create_memdump(struct brcmf_bus *bus, const void *data,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void brcmf_debugfs_init(void)
|
|
||||||
{
|
|
||||||
root_folder = debugfs_create_dir(KBUILD_MODNAME, NULL);
|
|
||||||
if (IS_ERR(root_folder))
|
|
||||||
root_folder = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
void brcmf_debugfs_exit(void)
|
|
||||||
{
|
|
||||||
if (!root_folder)
|
|
||||||
return;
|
|
||||||
|
|
||||||
debugfs_remove_recursive(root_folder);
|
|
||||||
root_folder = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
int brcmf_debug_attach(struct brcmf_pub *drvr)
|
|
||||||
{
|
|
||||||
struct device *dev = drvr->bus_if->dev;
|
|
||||||
|
|
||||||
if (!root_folder)
|
|
||||||
return -ENODEV;
|
|
||||||
|
|
||||||
drvr->dbgfs_dir = debugfs_create_dir(dev_name(dev), root_folder);
|
|
||||||
return PTR_ERR_OR_ZERO(drvr->dbgfs_dir);
|
|
||||||
}
|
|
||||||
|
|
||||||
void brcmf_debug_detach(struct brcmf_pub *drvr)
|
|
||||||
{
|
|
||||||
brcmf_fweh_unregister(drvr, BRCMF_E_PSM_WATCHDOG);
|
|
||||||
|
|
||||||
if (!IS_ERR_OR_NULL(drvr->dbgfs_dir))
|
|
||||||
debugfs_remove_recursive(drvr->dbgfs_dir);
|
|
||||||
}
|
|
||||||
|
|
||||||
struct dentry *brcmf_debugfs_get_devdir(struct brcmf_pub *drvr)
|
struct dentry *brcmf_debugfs_get_devdir(struct brcmf_pub *drvr)
|
||||||
{
|
{
|
||||||
return drvr->dbgfs_dir;
|
return drvr->wiphy->debugfsdir;
|
||||||
}
|
}
|
||||||
|
|
||||||
int brcmf_debugfs_add_entry(struct brcmf_pub *drvr, const char *fn,
|
int brcmf_debugfs_add_entry(struct brcmf_pub *drvr, const char *fn,
|
||||||
|
@ -99,7 +62,8 @@ int brcmf_debugfs_add_entry(struct brcmf_pub *drvr, const char *fn,
|
||||||
{
|
{
|
||||||
struct dentry *e;
|
struct dentry *e;
|
||||||
|
|
||||||
|
WARN(!drvr->wiphy->debugfsdir, "wiphy not (yet) registered\n");
|
||||||
e = debugfs_create_devm_seqfile(drvr->bus_if->dev, fn,
|
e = debugfs_create_devm_seqfile(drvr->bus_if->dev, fn,
|
||||||
drvr->dbgfs_dir, read_fn);
|
drvr->wiphy->debugfsdir, read_fn);
|
||||||
return PTR_ERR_OR_ZERO(e);
|
return PTR_ERR_OR_ZERO(e);
|
||||||
}
|
}
|
||||||
|
|
|
@ -113,29 +113,12 @@ extern int brcmf_msg_level;
|
||||||
struct brcmf_bus;
|
struct brcmf_bus;
|
||||||
struct brcmf_pub;
|
struct brcmf_pub;
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
void brcmf_debugfs_init(void);
|
|
||||||
void brcmf_debugfs_exit(void);
|
|
||||||
int brcmf_debug_attach(struct brcmf_pub *drvr);
|
|
||||||
void brcmf_debug_detach(struct brcmf_pub *drvr);
|
|
||||||
struct dentry *brcmf_debugfs_get_devdir(struct brcmf_pub *drvr);
|
struct dentry *brcmf_debugfs_get_devdir(struct brcmf_pub *drvr);
|
||||||
int brcmf_debugfs_add_entry(struct brcmf_pub *drvr, const char *fn,
|
int brcmf_debugfs_add_entry(struct brcmf_pub *drvr, const char *fn,
|
||||||
int (*read_fn)(struct seq_file *seq, void *data));
|
int (*read_fn)(struct seq_file *seq, void *data));
|
||||||
int brcmf_debug_create_memdump(struct brcmf_bus *bus, const void *data,
|
int brcmf_debug_create_memdump(struct brcmf_bus *bus, const void *data,
|
||||||
size_t len);
|
size_t len);
|
||||||
#else
|
#else
|
||||||
static inline void brcmf_debugfs_init(void)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
static inline void brcmf_debugfs_exit(void)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
static inline int brcmf_debug_attach(struct brcmf_pub *drvr)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
static inline void brcmf_debug_detach(struct brcmf_pub *drvr)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
static inline
|
static inline
|
||||||
int brcmf_debugfs_add_entry(struct brcmf_pub *drvr, const char *fn,
|
int brcmf_debugfs_add_entry(struct brcmf_pub *drvr, const char *fn,
|
||||||
int (*read_fn)(struct seq_file *seq, void *data))
|
int (*read_fn)(struct seq_file *seq, void *data))
|
||||||
|
|
|
@ -228,7 +228,10 @@ void brcmf_feat_attach(struct brcmf_pub *drvr)
|
||||||
/* no quirks */
|
/* no quirks */
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void brcmf_feat_debugfs_create(struct brcmf_pub *drvr)
|
||||||
|
{
|
||||||
brcmf_debugfs_add_entry(drvr, "features", brcmf_feat_debugfs_read);
|
brcmf_debugfs_add_entry(drvr, "features", brcmf_feat_debugfs_read);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -89,6 +89,13 @@ enum brcmf_feat_quirk {
|
||||||
*/
|
*/
|
||||||
void brcmf_feat_attach(struct brcmf_pub *drvr);
|
void brcmf_feat_attach(struct brcmf_pub *drvr);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* brcmf_feat_debugfs_create() - create debugfs entries.
|
||||||
|
*
|
||||||
|
* @drvr: driver instance.
|
||||||
|
*/
|
||||||
|
void brcmf_feat_debugfs_create(struct brcmf_pub *drvr);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* brcmf_feat_is_enabled() - query feature.
|
* brcmf_feat_is_enabled() - query feature.
|
||||||
*
|
*
|
||||||
|
|
|
@ -2399,10 +2399,6 @@ struct brcmf_fws_info *brcmf_fws_attach(struct brcmf_pub *drvr)
|
||||||
brcmu_pktq_init(&fws->desc.other.psq, BRCMF_FWS_PSQ_PREC_COUNT,
|
brcmu_pktq_init(&fws->desc.other.psq, BRCMF_FWS_PSQ_PREC_COUNT,
|
||||||
BRCMF_FWS_PSQ_LEN);
|
BRCMF_FWS_PSQ_LEN);
|
||||||
|
|
||||||
/* create debugfs file for statistics */
|
|
||||||
brcmf_debugfs_add_entry(drvr, "fws_stats",
|
|
||||||
brcmf_debugfs_fws_stats_read);
|
|
||||||
|
|
||||||
brcmf_dbg(INFO, "%s bdcv2 tlv signaling [%x]\n",
|
brcmf_dbg(INFO, "%s bdcv2 tlv signaling [%x]\n",
|
||||||
fws->fw_signals ? "enabled" : "disabled", tlv);
|
fws->fw_signals ? "enabled" : "disabled", tlv);
|
||||||
return fws;
|
return fws;
|
||||||
|
@ -2429,6 +2425,13 @@ void brcmf_fws_detach(struct brcmf_fws_info *fws)
|
||||||
kfree(fws);
|
kfree(fws);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void brcmf_fws_debugfs_create(struct brcmf_pub *drvr)
|
||||||
|
{
|
||||||
|
/* create debugfs file for statistics */
|
||||||
|
brcmf_debugfs_add_entry(drvr, "fws_stats",
|
||||||
|
brcmf_debugfs_fws_stats_read);
|
||||||
|
}
|
||||||
|
|
||||||
bool brcmf_fws_queue_skbs(struct brcmf_fws_info *fws)
|
bool brcmf_fws_queue_skbs(struct brcmf_fws_info *fws)
|
||||||
{
|
{
|
||||||
return !fws->avoid_queueing;
|
return !fws->avoid_queueing;
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
|
|
||||||
struct brcmf_fws_info *brcmf_fws_attach(struct brcmf_pub *drvr);
|
struct brcmf_fws_info *brcmf_fws_attach(struct brcmf_pub *drvr);
|
||||||
void brcmf_fws_detach(struct brcmf_fws_info *fws);
|
void brcmf_fws_detach(struct brcmf_fws_info *fws);
|
||||||
|
void brcmf_fws_debugfs_create(struct brcmf_pub *drvr);
|
||||||
bool brcmf_fws_queue_skbs(struct brcmf_fws_info *fws);
|
bool brcmf_fws_queue_skbs(struct brcmf_fws_info *fws);
|
||||||
bool brcmf_fws_fc_active(struct brcmf_fws_info *fws);
|
bool brcmf_fws_fc_active(struct brcmf_fws_info *fws);
|
||||||
void brcmf_fws_hdrpull(struct brcmf_if *ifp, s16 siglen, struct sk_buff *skb);
|
void brcmf_fws_hdrpull(struct brcmf_if *ifp, s16 siglen, struct sk_buff *skb);
|
||||||
|
|
|
@ -1418,6 +1418,11 @@ static int brcmf_msgbuf_stats_read(struct seq_file *seq, void *data)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
static void brcmf_msgbuf_debugfs_create(struct brcmf_pub *drvr)
|
||||||
|
{
|
||||||
|
brcmf_debugfs_add_entry(drvr, "msgbuf_stats", brcmf_msgbuf_stats_read);
|
||||||
|
}
|
||||||
|
|
||||||
int brcmf_proto_msgbuf_attach(struct brcmf_pub *drvr)
|
int brcmf_proto_msgbuf_attach(struct brcmf_pub *drvr)
|
||||||
{
|
{
|
||||||
struct brcmf_bus_msgbuf *if_msgbuf;
|
struct brcmf_bus_msgbuf *if_msgbuf;
|
||||||
|
@ -1472,6 +1477,7 @@ int brcmf_proto_msgbuf_attach(struct brcmf_pub *drvr)
|
||||||
drvr->proto->delete_peer = brcmf_msgbuf_delete_peer;
|
drvr->proto->delete_peer = brcmf_msgbuf_delete_peer;
|
||||||
drvr->proto->add_tdls_peer = brcmf_msgbuf_add_tdls_peer;
|
drvr->proto->add_tdls_peer = brcmf_msgbuf_add_tdls_peer;
|
||||||
drvr->proto->rxreorder = brcmf_msgbuf_rxreorder;
|
drvr->proto->rxreorder = brcmf_msgbuf_rxreorder;
|
||||||
|
drvr->proto->debugfs_create = brcmf_msgbuf_debugfs_create;
|
||||||
drvr->proto->pd = msgbuf;
|
drvr->proto->pd = msgbuf;
|
||||||
|
|
||||||
init_waitqueue_head(&msgbuf->ioctl_resp_wait);
|
init_waitqueue_head(&msgbuf->ioctl_resp_wait);
|
||||||
|
@ -1525,8 +1531,6 @@ int brcmf_proto_msgbuf_attach(struct brcmf_pub *drvr)
|
||||||
spin_lock_init(&msgbuf->flowring_work_lock);
|
spin_lock_init(&msgbuf->flowring_work_lock);
|
||||||
INIT_LIST_HEAD(&msgbuf->work_queue);
|
INIT_LIST_HEAD(&msgbuf->work_queue);
|
||||||
|
|
||||||
brcmf_debugfs_add_entry(drvr, "msgbuf_stats", brcmf_msgbuf_stats_read);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
fail:
|
fail:
|
||||||
|
|
|
@ -54,7 +54,8 @@ int brcmf_proto_attach(struct brcmf_pub *drvr)
|
||||||
if (!proto->tx_queue_data || (proto->hdrpull == NULL) ||
|
if (!proto->tx_queue_data || (proto->hdrpull == NULL) ||
|
||||||
(proto->query_dcmd == NULL) || (proto->set_dcmd == NULL) ||
|
(proto->query_dcmd == NULL) || (proto->set_dcmd == NULL) ||
|
||||||
(proto->configure_addr_mode == NULL) ||
|
(proto->configure_addr_mode == NULL) ||
|
||||||
(proto->delete_peer == NULL) || (proto->add_tdls_peer == NULL)) {
|
(proto->delete_peer == NULL) || (proto->add_tdls_peer == NULL) ||
|
||||||
|
(proto->debugfs_create == NULL)) {
|
||||||
brcmf_err("Not all proto handlers have been installed\n");
|
brcmf_err("Not all proto handlers have been installed\n");
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
|
|
@ -48,6 +48,7 @@ struct brcmf_proto {
|
||||||
void (*del_if)(struct brcmf_if *ifp);
|
void (*del_if)(struct brcmf_if *ifp);
|
||||||
void (*reset_if)(struct brcmf_if *ifp);
|
void (*reset_if)(struct brcmf_if *ifp);
|
||||||
int (*init_done)(struct brcmf_pub *drvr);
|
int (*init_done)(struct brcmf_pub *drvr);
|
||||||
|
void (*debugfs_create)(struct brcmf_pub *drvr);
|
||||||
void *pd;
|
void *pd;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -156,4 +157,10 @@ brcmf_proto_init_done(struct brcmf_pub *drvr)
|
||||||
return drvr->proto->init_done(drvr);
|
return drvr->proto->init_done(drvr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline void
|
||||||
|
brcmf_proto_debugfs_create(struct brcmf_pub *drvr)
|
||||||
|
{
|
||||||
|
drvr->proto->debugfs_create(drvr);
|
||||||
|
}
|
||||||
|
|
||||||
#endif /* BRCMFMAC_PROTO_H */
|
#endif /* BRCMFMAC_PROTO_H */
|
||||||
|
|
Loading…
Reference in New Issue