Skip to content

L
linux
Commit 115a2d73 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files
Options

mt76: mt7915: introduce mt76 debugfs sub-dir for ext-phy 

Introduce a dedicated mt76 debugfs sub-dir for ext-phy in dbdc mode.
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 3263039d
Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 79 deletions
drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
View file @ 115a2d73
...@@ -120,7 +120,7 @@ static void ...@@ -120,7 +120,7 @@ static void
mt7915_ampdu_stat_read_phy(struct mt7915_phy *phy, mt7915_ampdu_stat_read_phy(struct mt7915_phy *phy,
struct seq_file *file) struct seq_file *file)
{ {
struct mt7915_dev *dev = file->private; struct mt7915_dev *dev = phy->dev;
bool ext_phy = phy != &dev->phy; bool ext_phy = phy != &dev->phy;
int bound[15], range[4], i, n; int bound[15], range[4], i, n;
...@@ -205,14 +205,12 @@ mt7915_txbf_stat_read_phy(struct mt7915_phy *phy, struct seq_file *s) ...@@ -205,14 +205,12 @@ mt7915_txbf_stat_read_phy(struct mt7915_phy *phy, struct seq_file *s)
static int static int
mt7915_tx_stats_show(struct seq_file *file, void *data) mt7915_tx_stats_show(struct seq_file *file, void *data)
{ {
struct mt7915_dev *dev = file->private; struct mt7915_phy *phy = file->private;
struct mt7915_dev *dev = phy->dev;
int stat[8], i, n; int stat[8], i, n;
mt7915_ampdu_stat_read_phy(&dev->phy, file); mt7915_ampdu_stat_read_phy(phy, file);
mt7915_txbf_stat_read_phy(&dev->phy, file); mt7915_txbf_stat_read_phy(phy, file);
mt7915_ampdu_stat_read_phy(mt7915_ext_phy(dev), file);
mt7915_txbf_stat_read_phy(mt7915_ext_phy(dev), file);
/* Tx amsdu info */ /* Tx amsdu info */
seq_puts(file, "Tx MSDU statistics:\n"); seq_puts(file, "Tx MSDU statistics:\n");
...@@ -239,7 +237,8 @@ static void ...@@ -239,7 +237,8 @@ static void
mt7915_hw_queue_read(struct seq_file *s, u32 base, u32 size, mt7915_hw_queue_read(struct seq_file *s, u32 base, u32 size,
const struct hw_queue_map *map) const struct hw_queue_map *map)
{ {
struct mt7915_dev *dev = dev_get_drvdata(s->private); struct mt7915_phy *phy = s->private;
struct mt7915_dev *dev = phy->dev;
u32 i, val; u32 i, val;
val = mt76_rr(dev, base + MT_FL_Q_EMPTY); val = mt76_rr(dev, base + MT_FL_Q_EMPTY);
...@@ -294,40 +293,40 @@ mt7915_sta_hw_queue_read(void *data, struct ieee80211_sta *sta) ...@@ -294,40 +293,40 @@ mt7915_sta_hw_queue_read(void *data, struct ieee80211_sta *sta)
} }
static int static int
mt7915_hw_queues_read(struct seq_file *s, void *data) mt7915_hw_queues_show(struct seq_file *file, void *data)
{ {
struct mt7915_dev *dev = dev_get_drvdata(s->private); struct mt7915_phy *phy = file->private;
struct mt7915_phy *phy = mt7915_ext_phy(dev); struct mt7915_dev *dev = phy->dev;
static const struct hw_queue_map ple_queue_map[] = { static const struct hw_queue_map ple_queue_map[] = {
{"CPU_Q0", 0, 1, MT_CTX0}, { "CPU_Q0", 0, 1, MT_CTX0 },
{"CPU_Q1", 1, 1, MT_CTX0 + 1}, { "CPU_Q1", 1, 1, MT_CTX0 + 1 },
{"CPU_Q2", 2, 1, MT_CTX0 + 2}, { "CPU_Q2", 2, 1, MT_CTX0 + 2 },
{"CPU_Q3", 3, 1, MT_CTX0 + 3}, { "CPU_Q3", 3, 1, MT_CTX0 + 3 },
{"ALTX_Q0", 8, 2, MT_LMAC_ALTX0}, { "ALTX_Q0", 8, 2, MT_LMAC_ALTX0 },
{"BMC_Q0", 9, 2, MT_LMAC_BMC0}, { "BMC_Q0", 9, 2, MT_LMAC_BMC0 },
{"BCN_Q0", 10, 2, MT_LMAC_BCN0}, { "BCN_Q0", 10, 2, MT_LMAC_BCN0 },
{"PSMP_Q0", 11, 2, MT_LMAC_PSMP0}, { "PSMP_Q0", 11, 2, MT_LMAC_PSMP0 },
{"ALTX_Q1", 12, 2, MT_LMAC_ALTX0 + 4}, { "ALTX_Q1", 12, 2, MT_LMAC_ALTX0 + 4 },
{"BMC_Q1", 13, 2, MT_LMAC_BMC0 + 4}, { "BMC_Q1", 13, 2, MT_LMAC_BMC0 + 4 },
{"BCN_Q1", 14, 2, MT_LMAC_BCN0 + 4}, { "BCN_Q1", 14, 2, MT_LMAC_BCN0 + 4 },
{"PSMP_Q1", 15, 2, MT_LMAC_PSMP0 + 4}, { "PSMP_Q1", 15, 2, MT_LMAC_PSMP0 + 4 },
}; };
static const struct hw_queue_map pse_queue_map[] = { static const struct hw_queue_map pse_queue_map[] = {
{"CPU Q0", 0, 1, MT_CTX0}, { "CPU Q0", 0, 1, MT_CTX0 },
{"CPU Q1", 1, 1, MT_CTX0 + 1}, { "CPU Q1", 1, 1, MT_CTX0 + 1 },
{"CPU Q2", 2, 1, MT_CTX0 + 2}, { "CPU Q2", 2, 1, MT_CTX0 + 2 },
{"CPU Q3", 3, 1, MT_CTX0 + 3}, { "CPU Q3", 3, 1, MT_CTX0 + 3 },
{"HIF_Q0", 8, 0, MT_HIF0}, { "HIF_Q0", 8, 0, MT_HIF0 },
{"HIF_Q1", 9, 0, MT_HIF0 + 1}, { "HIF_Q1", 9, 0, MT_HIF0 + 1 },
{"HIF_Q2", 10, 0, MT_HIF0 + 2}, { "HIF_Q2", 10, 0, MT_HIF0 + 2 },
{"HIF_Q3", 11, 0, MT_HIF0 + 3}, { "HIF_Q3", 11, 0, MT_HIF0 + 3 },
{"HIF_Q4", 12, 0, MT_HIF0 + 4}, { "HIF_Q4", 12, 0, MT_HIF0 + 4 },
{"HIF_Q5", 13, 0, MT_HIF0 + 5}, { "HIF_Q5", 13, 0, MT_HIF0 + 5 },
{"LMAC_Q", 16, 2, 0}, { "LMAC_Q", 16, 2, 0 },
{"MDP_TXQ", 17, 2, 1}, { "MDP_TXQ", 17, 2, 1 },
{"MDP_RXQ", 18, 2, 2}, { "MDP_RXQ", 18, 2, 2 },
{"SEC_TXQ", 19, 2, 3}, { "SEC_TXQ", 19, 2, 3 },
{"SEC_RXQ", 20, 2, 4}, { "SEC_RXQ", 20, 2, 4 },
}; };
u32 val, head, tail; u32 val, head, tail;
...@@ -335,49 +334,46 @@ mt7915_hw_queues_read(struct seq_file *s, void *data) ...@@ -335,49 +334,46 @@ mt7915_hw_queues_read(struct seq_file *s, void *data)
val = mt76_rr(dev, MT_PLE_FREEPG_CNT); val = mt76_rr(dev, MT_PLE_FREEPG_CNT);
head = mt76_get_field(dev, MT_PLE_FREEPG_HEAD_TAIL, GENMASK(11, 0)); head = mt76_get_field(dev, MT_PLE_FREEPG_HEAD_TAIL, GENMASK(11, 0));
tail = mt76_get_field(dev, MT_PLE_FREEPG_HEAD_TAIL, GENMASK(27, 16)); tail = mt76_get_field(dev, MT_PLE_FREEPG_HEAD_TAIL, GENMASK(27, 16));
seq_puts(s, "PLE page info:\n"); seq_puts(file, "PLE page info:\n");
seq_printf(s, "\tTotal free page: 0x%08x head: 0x%03x tail: 0x%03x\n", seq_printf(file,
"\tTotal free page: 0x%08x head: 0x%03x tail: 0x%03x\n",
val, head, tail); val, head, tail);
val = mt76_rr(dev, MT_PLE_PG_HIF_GROUP); val = mt76_rr(dev, MT_PLE_PG_HIF_GROUP);
head = mt76_get_field(dev, MT_PLE_HIF_PG_INFO, GENMASK(11, 0)); head = mt76_get_field(dev, MT_PLE_HIF_PG_INFO, GENMASK(11, 0));
tail = mt76_get_field(dev, MT_PLE_HIF_PG_INFO, GENMASK(27, 16)); tail = mt76_get_field(dev, MT_PLE_HIF_PG_INFO, GENMASK(27, 16));
seq_printf(s, "\tHIF free page: 0x%03x res: 0x%03x used: 0x%03x\n", seq_printf(file, "\tHIF free page: 0x%03x res: 0x%03x used: 0x%03x\n",
val, head, tail); val, head, tail);
seq_puts(s, "PLE non-empty queue info:\n"); seq_puts(file, "PLE non-empty queue info:\n");
mt7915_hw_queue_read(s, MT_PLE_BASE, ARRAY_SIZE(ple_queue_map), mt7915_hw_queue_read(file, MT_PLE_BASE, ARRAY_SIZE(ple_queue_map),
&ple_queue_map[0]); &ple_queue_map[0]);
/* iterate per-sta ple queue */ /* iterate per-sta ple queue */
ieee80211_iterate_stations_atomic(dev->mphy.hw, ieee80211_iterate_stations_atomic(phy->mt76->hw,
mt7915_sta_hw_queue_read, s); mt7915_sta_hw_queue_read, file);
if (phy)
ieee80211_iterate_stations_atomic(phy->mt76->hw,
mt7915_sta_hw_queue_read, s);
/* pse queue */ /* pse queue */
seq_puts(s, "PSE non-empty queue info:\n"); seq_puts(file, "PSE non-empty queue info:\n");
mt7915_hw_queue_read(s, MT_PSE_BASE, ARRAY_SIZE(pse_queue_map), mt7915_hw_queue_read(file, MT_PSE_BASE, ARRAY_SIZE(pse_queue_map),
&pse_queue_map[0]); &pse_queue_map[0]);
return 0; return 0;
} }
DEFINE_SHOW_ATTRIBUTE(mt7915_hw_queues);
static int static int
mt7915_queues_read(struct seq_file *s, void *data) mt7915_xmit_queues_show(struct seq_file *file, void *data)
{ {
struct mt7915_dev *dev = dev_get_drvdata(s->private); struct mt7915_phy *phy = file->private;
struct mt76_phy *mphy_ext = dev->mt76.phy2; struct mt7915_dev *dev = phy->dev;
struct mt76_queue *ext_q = mphy_ext ? mphy_ext->q_tx[MT_TXQ_BE] : NULL;
struct { struct {
struct mt76_queue *q; struct mt76_queue *q;
char *queue; char *queue;
} queue_map[] = { } queue_map[] = {
{ dev->mphy.q_tx[MT_TXQ_BE], "MAIN" }, { phy->mt76->q_tx[MT_TXQ_BE], " MAIN" },
{ ext_q, "EXT" }, { dev->mt76.q_mcu[MT_MCUQ_WM], " MCUWM" },
{ dev->mt76.q_mcu[MT_MCUQ_WM], "MCUWM" }, { dev->mt76.q_mcu[MT_MCUQ_WA], " MCUWA" },
{ dev->mt76.q_mcu[MT_MCUQ_WA], "MCUWA" },
{ dev->mt76.q_mcu[MT_MCUQ_FWDL], "MCUFWDL" }, { dev->mt76.q_mcu[MT_MCUQ_FWDL], "MCUFWDL" },
}; };
int i; int i;
...@@ -388,7 +384,7 @@ mt7915_queues_read(struct seq_file *s, void *data) ...@@ -388,7 +384,7 @@ mt7915_queues_read(struct seq_file *s, void *data)
if (!q) if (!q)
continue; continue;
seq_printf(s, seq_printf(file,
"%s: queued=%d head=%d tail=%d\n", "%s: queued=%d head=%d tail=%d\n",
queue_map[i].queue, q->queued, q->head, queue_map[i].queue, q->queued, q->head,
q->tail); q->tail);
...@@ -397,6 +393,8 @@ mt7915_queues_read(struct seq_file *s, void *data) ...@@ -397,6 +393,8 @@ mt7915_queues_read(struct seq_file *s, void *data)
return 0; return 0;
} }
DEFINE_SHOW_ATTRIBUTE(mt7915_xmit_queues);
static void static void
mt7915_puts_rate_txpower(struct seq_file *s, struct mt7915_phy *phy) mt7915_puts_rate_txpower(struct seq_file *s, struct mt7915_phy *phy)
{ {
...@@ -427,16 +425,17 @@ mt7915_puts_rate_txpower(struct seq_file *s, struct mt7915_phy *phy) ...@@ -427,16 +425,17 @@ mt7915_puts_rate_txpower(struct seq_file *s, struct mt7915_phy *phy)
} }
static int static int
mt7915_read_rate_txpower(struct seq_file *s, void *data) mt7915_rate_txpower_show(struct seq_file *file, void *data)
{ {
struct mt7915_dev *dev = dev_get_drvdata(s->private); struct mt7915_phy *phy = file->private;
mt7915_puts_rate_txpower(s, &dev->phy); mt7915_puts_rate_txpower(file, phy);
mt7915_puts_rate_txpower(s, mt7915_ext_phy(dev));
return 0; return 0;
} }
DEFINE_SHOW_ATTRIBUTE(mt7915_rate_txpower);
static int static int
mt7915_twt_stats(struct seq_file *s, void *data) mt7915_twt_stats(struct seq_file *s, void *data)
{ {
...@@ -463,31 +462,35 @@ mt7915_twt_stats(struct seq_file *s, void *data) ...@@ -463,31 +462,35 @@ mt7915_twt_stats(struct seq_file *s, void *data)
return 0; return 0;
} }
int mt7915_init_debugfs(struct mt7915_dev *dev) int mt7915_init_debugfs(struct mt7915_phy *phy)
{ {
struct mt7915_dev *dev = phy->dev;
bool ext_phy = phy != &dev->phy;
struct dentry *dir; struct dentry *dir;
dir = mt76_register_debugfs(&dev->mt76); dir = mt76_register_debugfs_fops(phy->mt76, NULL);
if (!dir) if (!dir)
return -ENOMEM; return -ENOMEM;
debugfs_create_devm_seqfile(dev->mt76.dev, "tx-queues", dir, debugfs_create_file("hw-queues", 0400, dir, phy,
mt7915_queues_read); &mt7915_hw_queues_fops);
debugfs_create_devm_seqfile(dev->mt76.dev, "hw-queues", dir, debugfs_create_file("xmit-queues", 0400, dir, phy,
mt7915_hw_queues_read); &mt7915_xmit_queues_fops);
debugfs_create_file("tx_stats", 0400, dir, dev, &mt7915_tx_stats_fops); debugfs_create_file("tx_stats", 0400, dir, phy, &mt7915_tx_stats_fops);
debugfs_create_file("fw_debug", 0600, dir, dev, &fops_fw_debug); debugfs_create_file("fw_debug", 0600, dir, dev, &fops_fw_debug);
debugfs_create_file("implicit_txbf", 0600, dir, dev, debugfs_create_file("implicit_txbf", 0600, dir, dev,
&fops_implicit_txbf); &fops_implicit_txbf);
debugfs_create_u32("dfs_hw_pattern", 0400, dir, &dev->hw_pattern); debugfs_create_file("txpower_sku", 0400, dir, phy,
&mt7915_rate_txpower_fops);
debugfs_create_devm_seqfile(dev->mt76.dev, "twt_stats", dir, debugfs_create_devm_seqfile(dev->mt76.dev, "twt_stats", dir,
mt7915_twt_stats); mt7915_twt_stats);
/* test knobs */
debugfs_create_file("radar_trigger", 0200, dir, dev,
&fops_radar_trigger);
debugfs_create_file("ser_trigger", 0200, dir, dev, &fops_ser_trigger); debugfs_create_file("ser_trigger", 0200, dir, dev, &fops_ser_trigger);
debugfs_create_devm_seqfile(dev->mt76.dev, "txpower_sku", dir, if (!dev->dbdc_support || ext_phy) {
mt7915_read_rate_txpower); debugfs_create_u32("dfs_hw_pattern", 0400, dir,
&dev->hw_pattern);
debugfs_create_file("radar_trigger", 0200, dir, dev,
&fops_radar_trigger);
}
return 0; return 0;
} }
......
drivers/net/wireless/mediatek/mt76/mt7915/init.c
View file @ 115a2d73
...@@ -477,6 +477,10 @@ static int mt7915_register_ext_phy(struct mt7915_dev *dev) ...@@ -477,6 +477,10 @@ static int mt7915_register_ext_phy(struct mt7915_dev *dev)
if (ret) if (ret)
goto error; goto error;
ret = mt7915_init_debugfs(phy);
if (ret)
goto error;
return 0; return 0;
error: error:
...@@ -949,7 +953,7 @@ int mt7915_register_device(struct mt7915_dev *dev) ...@@ -949,7 +953,7 @@ int mt7915_register_device(struct mt7915_dev *dev)
if (ret) if (ret)
return ret; return ret;
return mt7915_init_debugfs(dev); return mt7915_init_debugfs(&dev->phy);
} }
void mt7915_unregister_device(struct mt7915_dev *dev) void mt7915_unregister_device(struct mt7915_dev *dev)
......
drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
View file @ 115a2d73
...@@ -522,7 +522,7 @@ int mt7915_dfs_init_radar_detector(struct mt7915_phy *phy); ...@@ -522,7 +522,7 @@ int mt7915_dfs_init_radar_detector(struct mt7915_phy *phy);
void mt7915_set_stream_he_caps(struct mt7915_phy *phy); void mt7915_set_stream_he_caps(struct mt7915_phy *phy);
void mt7915_set_stream_vht_txbf_caps(struct mt7915_phy *phy); void mt7915_set_stream_vht_txbf_caps(struct mt7915_phy *phy);
void mt7915_update_channel(struct mt76_phy *mphy); void mt7915_update_channel(struct mt76_phy *mphy);
int mt7915_init_debugfs(struct mt7915_dev *dev); int mt7915_init_debugfs(struct mt7915_phy *phy);
#ifdef CONFIG_MAC80211_DEBUGFS #ifdef CONFIG_MAC80211_DEBUGFS
void mt7915_sta_add_debugfs(struct ieee80211_hw *hw, struct ieee80211_vif *vif, void mt7915_sta_add_debugfs(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
struct ieee80211_sta *sta, struct dentry *dir); struct ieee80211_sta *sta, struct dentry *dir);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7