| Message ID | 20211208090319.19096-1-MeiChia.Chiu@mediatek.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Felix Fietkau |
| Headers | show |
| Series | [v2] mt76: mt7915: add mu-mimo and ofdma debugfs knobs | expand |
Hi MeiChia,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on kvalo-wireless-drivers-next/master]
[also build test WARNING on kvalo-wireless-drivers/master v5.16-rc4 next-20211208]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/MeiChia-Chiu/mt76-mt7915-add-mu-mimo-and-ofdma-debugfs-knobs/20211208-170525
base: https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git master
config: alpha-allyesconfig (https://download.01.org/0day-ci/archive/20211208/202112082145.YwvZAzNR-lkp@intel.com/config)
compiler: alpha-linux-gcc (GCC) 11.2.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/2d224f4e59aa02c401f3f6f5e9d4586040773a8a
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review MeiChia-Chiu/mt76-mt7915-add-mu-mimo-and-ofdma-debugfs-knobs/20211208-170525
git checkout 2d224f4e59aa02c401f3f6f5e9d4586040773a8a
# save the config file to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross O=build_dir ARCH=alpha SHELL=/bin/bash drivers/net/wireless/
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All warnings (new ones prefixed by >>):
drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c: In function 'mt7915_muru_stat_show':
>> drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c:167:29: warning: format '%d' expects argument of type 'int', but argument 3 has type 'u64' {aka 'long long unsigned int'} [-Wformat=]
167 | seq_printf(file, "%7d%% | %7d%% | %7d%% | %7d%% | %7d%% | ",
| ~~^
| |
| int
| %7lld
drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c:167:37: warning: format '%d' expects argument of type 'int', but argument 4 has type 'u64' {aka 'long long unsigned int'} [-Wformat=]
167 | seq_printf(file, "%7d%% | %7d%% | %7d%% | %7d%% | %7d%% | ",
| ~~^
| |
| int
| %7lld
drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c:167:45: warning: format '%d' expects argument of type 'int', but argument 5 has type 'u64' {aka 'long long unsigned int'} [-Wformat=]
167 | seq_printf(file, "%7d%% | %7d%% | %7d%% | %7d%% | %7d%% | ",
| ~~^
| |
| int
| %7lld
drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c:167:53: warning: format '%d' expects argument of type 'int', but argument 6 has type 'u64' {aka 'long long unsigned int'} [-Wformat=]
167 | seq_printf(file, "%7d%% | %7d%% | %7d%% | %7d%% | %7d%% | ",
| ~~^
| |
| int
| %7lld
drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c:167:61: warning: format '%d' expects argument of type 'int', but argument 7 has type 'u64' {aka 'long long unsigned int'} [-Wformat=]
167 | seq_printf(file, "%7d%% | %7d%% | %7d%% | %7d%% | %7d%% | ",
| ~~^
| |
| int
| %7lld
drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c:186:29: warning: format '%d' expects argument of type 'int', but argument 3 has type 'u64' {aka 'long long unsigned int'} [-Wformat=]
186 | seq_printf(file, "%7d%% | %7d%% | %7d%% | ",
| ~~^
| |
| int
| %7lld
drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c:186:37: warning: format '%d' expects argument of type 'int', but argument 4 has type 'u64' {aka 'long long unsigned int'} [-Wformat=]
186 | seq_printf(file, "%7d%% | %7d%% | %7d%% | ",
| ~~^
| |
| int
| %7lld
drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c:186:45: warning: format '%d' expects argument of type 'int', but argument 5 has type 'u64' {aka 'long long unsigned int'} [-Wformat=]
186 | seq_printf(file, "%7d%% | %7d%% | %7d%% | ",
| ~~^
| |
| int
| %7lld
drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c:215:29: warning: format '%d' expects argument of type 'int', but argument 3 has type 'u64' {aka 'long long unsigned int'} [-Wformat=]
215 | seq_printf(file, "%7d%% | %7d%% | ",
| ~~^
| |
| int
| %7lld
drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c:215:37: warning: format '%d' expects argument of type 'int', but argument 4 has type 'u64' {aka 'long long unsigned int'} [-Wformat=]
215 | seq_printf(file, "%7d%% | %7d%% | ",
| ~~^
| |
| int
| %7lld
drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c:231:29: warning: format '%d' expects argument of type 'int', but argument 3 has type 'u64' {aka 'long long unsigned int'} [-Wformat=]
231 | seq_printf(file, "%7d%% | %7d%% | %7d%% | ",
| ~~^
| |
| int
| %7lld
drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c:231:37: warning: format '%d' expects argument of type 'int', but argument 4 has type 'u64' {aka 'long long unsigned int'} [-Wformat=]
231 | seq_printf(file, "%7d%% | %7d%% | %7d%% | ",
| ~~^
| |
| int
| %7lld
drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c:231:45: warning: format '%d' expects argument of type 'int', but argument 5 has type 'u64' {aka 'long long unsigned int'} [-Wformat=]
231 | seq_printf(file, "%7d%% | %7d%% | %7d%% | ",
| ~~^
| |
| int
| %7lld
drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c:251:29: warning: format '%d' expects argument of type 'int', but argument 3 has type 'u64' {aka 'long long unsigned int'} [-Wformat=]
251 | seq_printf(file, "%7d%% | %7d%% | %7d%% | %7d%% | %8d%% | %7d%% | ",
| ~~^
| |
| int
| %7lld
drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c:251:37: warning: format '%d' expects argument of type 'int', but argument 4 has type 'u64' {aka 'long long unsigned int'} [-Wformat=]
251 | seq_printf(file, "%7d%% | %7d%% | %7d%% | %7d%% | %8d%% | %7d%% | ",
| ~~^
| |
| int
| %7lld
drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c:251:45: warning: format '%d' expects argument of type 'int', but argument 5 has type 'u64' {aka 'long long unsigned int'} [-Wformat=]
251 | seq_printf(file, "%7d%% | %7d%% | %7d%% | %7d%% | %8d%% | %7d%% | ",
| ~~^
| |
| int
| %7lld
drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c:251:53: warning: format '%d' expects argument of type 'int', but argument 6 has type 'u64' {aka 'long long unsigned int'} [-Wformat=]
251 | seq_printf(file, "%7d%% | %7d%% | %7d%% | %7d%% | %8d%% | %7d%% | ",
| ~~^
| |
| int
vim +167 drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
104
105 DEFINE_DEBUGFS_ATTRIBUTE(fops_muru_debug, mt7915_muru_debug_get,
106 mt7915_muru_debug_set, "%lld\n");
107
108 static int mt7915_muru_stat_show(struct seq_file *file, void *data)
109 {
110 struct mt7915_phy *phy = file->private;
111 struct mt7915_dev *dev = phy->dev;
112 struct mt7915_mcu_muru_stats mu_stats = {};
113 static const char * const dl_non_he_type[] = {
114 "CCK", "OFDM", "HT MIX", "HT GF",
115 "VHT SU", "VHT 2MU", "VHT 3MU", "VHT 4MU"
116 };
117 static const char * const dl_he_type[] = {
118 "HE SU", "HE EXT", "HE 2MU", "HE 3MU", "HE 4MU",
119 "HE 2RU", "HE 3RU", "HE 4RU", "HE 5-8RU", "HE 9-16RU",
120 "HE >16RU"
121 };
122 static const char * const ul_he_type[] = {
123 "HE 2MU", "HE 3MU", "HE 4MU", "HE SU", "HE 2RU",
124 "HE 3RU", "HE 4RU", "HE 5-8RU", "HE 9-16RU", "HE >16RU"
125 };
126 int ret, i;
127 u64 total_ppdu_cnt;
128
129 if (!dev->muru_debug) {
130 seq_puts(file, "Please enable muru_debug first.\n");
131 return 0;
132 }
133
134 mutex_lock(&dev->mt76.mutex);
135
136 ret = mt7915_mcu_muru_debug_get(phy, &mu_stats);
137 if (ret)
138 goto exit;
139
140 #define __ms_ratio(s) (!total_ppdu_cnt ? 0 : \
141 le32_to_cpu(s) * 100 / total_ppdu_cnt)
142 #define __dl_u32(s) le32_to_cpu(mu_stats.dl.s)
143 /* Non-HE Downlink*/
144 total_ppdu_cnt = __dl_u32(cck_cnt) +
145 __dl_u32(ofdm_cnt) +
146 __dl_u32(htmix_cnt) +
147 __dl_u32(htgf_cnt) +
148 __dl_u32(vht_su_cnt) +
149 __dl_u32(vht_2mu_cnt) +
150 __dl_u32(vht_3mu_cnt) +
151 __dl_u32(vht_4mu_cnt);
152
153 seq_puts(file, "[Non-HE]\nDownlink\nData Type: ");
154
155 for (i = 0; i < 5; i++)
156 seq_printf(file, "%8s | ", dl_non_he_type[i]);
157
158 seq_puts(file, "\nTotal Cnt: ");
159 seq_printf(file, "%8u | %8u | %8u | %8u | %8u | ",
160 __dl_u32(cck_cnt),
161 __dl_u32(ofdm_cnt),
162 __dl_u32(htmix_cnt),
163 __dl_u32(htgf_cnt),
164 __dl_u32(vht_su_cnt));
165
166 seq_puts(file, "\nRatio : ");
> 167 seq_printf(file, "%7d%% | %7d%% | %7d%% | %7d%% | %7d%% | ",
168 __ms_ratio(mu_stats.dl.cck_cnt),
169 __ms_ratio(mu_stats.dl.ofdm_cnt),
170 __ms_ratio(mu_stats.dl.htmix_cnt),
171 __ms_ratio(mu_stats.dl.htgf_cnt),
172 __ms_ratio(mu_stats.dl.vht_su_cnt));
173
174 seq_puts(file, "\nDownlink MU-MIMO\nData Type: ");
175
176 for (i = 5; i < 8; i++)
177 seq_printf(file, "%8s | ", dl_non_he_type[i]);
178
179 seq_puts(file, "\nTotal Cnt: ");
180 seq_printf(file, "%8u | %8u | %8u | ",
181 __dl_u32(vht_2mu_cnt),
182 __dl_u32(vht_3mu_cnt),
183 __dl_u32(vht_4mu_cnt));
184
185 seq_puts(file, "\nRatio : ");
186 seq_printf(file, "%7d%% | %7d%% | %7d%% | ",
187 __ms_ratio(mu_stats.dl.vht_2mu_cnt),
188 __ms_ratio(mu_stats.dl.vht_3mu_cnt),
189 __ms_ratio(mu_stats.dl.vht_4mu_cnt));
190
191 /* HE Downlink */
192 total_ppdu_cnt = __dl_u32(he_su_cnt) +
193 __dl_u32(he_ext_su_cnt) +
194 __dl_u32(he_2mu_cnt) +
195 __dl_u32(he_3mu_cnt) +
196 __dl_u32(he_4mu_cnt) +
197 __dl_u32(he_2ru_cnt) +
198 __dl_u32(he_3ru_cnt) +
199 __dl_u32(he_4ru_cnt) +
200 __dl_u32(he_5to8ru_cnt) +
201 __dl_u32(he_9to16ru_cnt) +
202 __dl_u32(he_gtr16ru_cnt);
203
204 seq_puts(file, "\n\n[HE]\nDownlink\nData Type: ");
205
206 for (i = 0; i < 2; i++)
207 seq_printf(file, "%8s | ", dl_he_type[i]);
208
209 seq_puts(file, "\nTotal Cnt: ");
210 seq_printf(file, "%8u | %8u | ",
211 __dl_u32(he_su_cnt),
212 __dl_u32(he_ext_su_cnt));
213
214 seq_puts(file, "\nRatio : ");
215 seq_printf(file, "%7d%% | %7d%% | ",
216 __ms_ratio(mu_stats.dl.he_su_cnt),
217 __ms_ratio(mu_stats.dl.he_ext_su_cnt));
218
219 seq_puts(file, "\nDownlink MU-MIMO\nData Type: ");
220
221 for (i = 2; i < 5; i++)
222 seq_printf(file, "%8s | ", dl_he_type[i]);
223
224 seq_puts(file, "\nTotal Cnt: ");
225 seq_printf(file, "%8u | %8u | %8u | ",
226 __dl_u32(he_2mu_cnt),
227 __dl_u32(he_3mu_cnt),
228 __dl_u32(he_4mu_cnt));
229
230 seq_puts(file, "\nRatio : ");
231 seq_printf(file, "%7d%% | %7d%% | %7d%% | ",
232 __ms_ratio(mu_stats.dl.he_2mu_cnt),
233 __ms_ratio(mu_stats.dl.he_3mu_cnt),
234 __ms_ratio(mu_stats.dl.he_4mu_cnt));
235
236 seq_puts(file, "\nDownlink OFDMA\nData Type: ");
237
238 for (i = 5; i < 11; i++)
239 seq_printf(file, "%8s | ", dl_he_type[i]);
240
241 seq_puts(file, "\nTotal Cnt: ");
242 seq_printf(file, "%8u | %8u | %8u | %8u | %9u | %8u | ",
243 __dl_u32(he_2ru_cnt),
244 __dl_u32(he_3ru_cnt),
245 __dl_u32(he_4ru_cnt),
246 __dl_u32(he_5to8ru_cnt),
247 __dl_u32(he_9to16ru_cnt),
248 __dl_u32(he_gtr16ru_cnt));
249 #undef __dl_u32
250 seq_puts(file, "\nRatio : ");
251 seq_printf(file, "%7d%% | %7d%% | %7d%% | %7d%% | %8d%% | %7d%% | ",
252 __ms_ratio(mu_stats.dl.he_2ru_cnt),
253 __ms_ratio(mu_stats.dl.he_3ru_cnt),
254 __ms_ratio(mu_stats.dl.he_4ru_cnt),
255 __ms_ratio(mu_stats.dl.he_5to8ru_cnt),
256 __ms_ratio(mu_stats.dl.he_9to16ru_cnt),
257 __ms_ratio(mu_stats.dl.he_gtr16ru_cnt));
258
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c index a15aa256..4e8b721b 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c @@ -81,6 +81,246 @@ mt7915_radar_trigger(void *data, u64 val) DEFINE_DEBUGFS_ATTRIBUTE(fops_radar_trigger, NULL, mt7915_radar_trigger, "%lld\n"); +static int +mt7915_muru_debug_set(void *data, u64 val) +{ + struct mt7915_dev *dev = data; + + dev->muru_debug = val; + mt7915_mcu_muru_debug_set(dev, data); + + return 0; +} + +static int +mt7915_muru_debug_get(void *data, u64 *val) +{ + struct mt7915_dev *dev = data; + + *val = dev->muru_debug; + + return 0; +} + +DEFINE_DEBUGFS_ATTRIBUTE(fops_muru_debug, mt7915_muru_debug_get, + mt7915_muru_debug_set, "%lld\n"); + +static int mt7915_muru_stat_show(struct seq_file *file, void *data) +{ + struct mt7915_phy *phy = file->private; + struct mt7915_dev *dev = phy->dev; + struct mt7915_mcu_muru_stats mu_stats = {}; + static const char * const dl_non_he_type[] = { + "CCK", "OFDM", "HT MIX", "HT GF", + "VHT SU", "VHT 2MU", "VHT 3MU", "VHT 4MU" + }; + static const char * const dl_he_type[] = { + "HE SU", "HE EXT", "HE 2MU", "HE 3MU", "HE 4MU", + "HE 2RU", "HE 3RU", "HE 4RU", "HE 5-8RU", "HE 9-16RU", + "HE >16RU" + }; + static const char * const ul_he_type[] = { + "HE 2MU", "HE 3MU", "HE 4MU", "HE SU", "HE 2RU", + "HE 3RU", "HE 4RU", "HE 5-8RU", "HE 9-16RU", "HE >16RU" + }; + int ret, i; + u64 total_ppdu_cnt; + + if (!dev->muru_debug) { + seq_puts(file, "Please enable muru_debug first.\n"); + return 0; + } + + mutex_lock(&dev->mt76.mutex); + + ret = mt7915_mcu_muru_debug_get(phy, &mu_stats); + if (ret) + goto exit; + +#define __ms_ratio(s) (!total_ppdu_cnt ? 0 : \ + le32_to_cpu(s) * 100 / total_ppdu_cnt) +#define __dl_u32(s) le32_to_cpu(mu_stats.dl.s) + /* Non-HE Downlink*/ + total_ppdu_cnt = __dl_u32(cck_cnt) + + __dl_u32(ofdm_cnt) + + __dl_u32(htmix_cnt) + + __dl_u32(htgf_cnt) + + __dl_u32(vht_su_cnt) + + __dl_u32(vht_2mu_cnt) + + __dl_u32(vht_3mu_cnt) + + __dl_u32(vht_4mu_cnt); + + seq_puts(file, "[Non-HE]\nDownlink\nData Type: "); + + for (i = 0; i < 5; i++) + seq_printf(file, "%8s | ", dl_non_he_type[i]); + + seq_puts(file, "\nTotal Cnt: "); + seq_printf(file, "%8u | %8u | %8u | %8u | %8u | ", + __dl_u32(cck_cnt), + __dl_u32(ofdm_cnt), + __dl_u32(htmix_cnt), + __dl_u32(htgf_cnt), + __dl_u32(vht_su_cnt)); + + seq_puts(file, "\nRatio : "); + seq_printf(file, "%7d%% | %7d%% | %7d%% | %7d%% | %7d%% | ", + __ms_ratio(mu_stats.dl.cck_cnt), + __ms_ratio(mu_stats.dl.ofdm_cnt), + __ms_ratio(mu_stats.dl.htmix_cnt), + __ms_ratio(mu_stats.dl.htgf_cnt), + __ms_ratio(mu_stats.dl.vht_su_cnt)); + + seq_puts(file, "\nDownlink MU-MIMO\nData Type: "); + + for (i = 5; i < 8; i++) + seq_printf(file, "%8s | ", dl_non_he_type[i]); + + seq_puts(file, "\nTotal Cnt: "); + seq_printf(file, "%8u | %8u | %8u | ", + __dl_u32(vht_2mu_cnt), + __dl_u32(vht_3mu_cnt), + __dl_u32(vht_4mu_cnt)); + + seq_puts(file, "\nRatio : "); + seq_printf(file, "%7d%% | %7d%% | %7d%% | ", + __ms_ratio(mu_stats.dl.vht_2mu_cnt), + __ms_ratio(mu_stats.dl.vht_3mu_cnt), + __ms_ratio(mu_stats.dl.vht_4mu_cnt)); + + /* HE Downlink */ + total_ppdu_cnt = __dl_u32(he_su_cnt) + + __dl_u32(he_ext_su_cnt) + + __dl_u32(he_2mu_cnt) + + __dl_u32(he_3mu_cnt) + + __dl_u32(he_4mu_cnt) + + __dl_u32(he_2ru_cnt) + + __dl_u32(he_3ru_cnt) + + __dl_u32(he_4ru_cnt) + + __dl_u32(he_5to8ru_cnt) + + __dl_u32(he_9to16ru_cnt) + + __dl_u32(he_gtr16ru_cnt); + + seq_puts(file, "\n\n[HE]\nDownlink\nData Type: "); + + for (i = 0; i < 2; i++) + seq_printf(file, "%8s | ", dl_he_type[i]); + + seq_puts(file, "\nTotal Cnt: "); + seq_printf(file, "%8u | %8u | ", + __dl_u32(he_su_cnt), + __dl_u32(he_ext_su_cnt)); + + seq_puts(file, "\nRatio : "); + seq_printf(file, "%7d%% | %7d%% | ", + __ms_ratio(mu_stats.dl.he_su_cnt), + __ms_ratio(mu_stats.dl.he_ext_su_cnt)); + + seq_puts(file, "\nDownlink MU-MIMO\nData Type: "); + + for (i = 2; i < 5; i++) + seq_printf(file, "%8s | ", dl_he_type[i]); + + seq_puts(file, "\nTotal Cnt: "); + seq_printf(file, "%8u | %8u | %8u | ", + __dl_u32(he_2mu_cnt), + __dl_u32(he_3mu_cnt), + __dl_u32(he_4mu_cnt)); + + seq_puts(file, "\nRatio : "); + seq_printf(file, "%7d%% | %7d%% | %7d%% | ", + __ms_ratio(mu_stats.dl.he_2mu_cnt), + __ms_ratio(mu_stats.dl.he_3mu_cnt), + __ms_ratio(mu_stats.dl.he_4mu_cnt)); + + seq_puts(file, "\nDownlink OFDMA\nData Type: "); + + for (i = 5; i < 11; i++) + seq_printf(file, "%8s | ", dl_he_type[i]); + + seq_puts(file, "\nTotal Cnt: "); + seq_printf(file, "%8u | %8u | %8u | %8u | %9u | %8u | ", + __dl_u32(he_2ru_cnt), + __dl_u32(he_3ru_cnt), + __dl_u32(he_4ru_cnt), + __dl_u32(he_5to8ru_cnt), + __dl_u32(he_9to16ru_cnt), + __dl_u32(he_gtr16ru_cnt)); +#undef __dl_u32 + seq_puts(file, "\nRatio : "); + seq_printf(file, "%7d%% | %7d%% | %7d%% | %7d%% | %8d%% | %7d%% | ", + __ms_ratio(mu_stats.dl.he_2ru_cnt), + __ms_ratio(mu_stats.dl.he_3ru_cnt), + __ms_ratio(mu_stats.dl.he_4ru_cnt), + __ms_ratio(mu_stats.dl.he_5to8ru_cnt), + __ms_ratio(mu_stats.dl.he_9to16ru_cnt), + __ms_ratio(mu_stats.dl.he_gtr16ru_cnt)); + +#define __ul_u32(s) le32_to_cpu(mu_stats.ul.s) + /* HE Uplink */ + total_ppdu_cnt = __ul_u32(hetrig_2ru_cnt) + + __ul_u32(hetrig_3ru_cnt) + + __ul_u32(hetrig_4ru_cnt) + + __ul_u32(hetrig_5to8ru_cnt) + + __ul_u32(hetrig_9to16ru_cnt) + + __ul_u32(hetrig_gtr16ru_cnt) + + __ul_u32(hetrig_su_cnt) + + __ul_u32(hetrig_2mu_cnt) + + __ul_u32(hetrig_3mu_cnt) + + __ul_u32(hetrig_4mu_cnt); + + seq_puts(file, "\n\nUplink\nData Type: "); + seq_puts(file, "\nTrigger-based Uplink MU-MIMO\nData Type: "); + + for (i = 0; i < 3; i++) + seq_printf(file, "%8s | ", ul_he_type[i]); + + seq_puts(file, "\nTotal Cnt: "); + seq_printf(file, "%8u | %8u | %8u | ", + __ul_u32(hetrig_2mu_cnt), + __ul_u32(hetrig_3mu_cnt), + __ul_u32(hetrig_4mu_cnt)); + + seq_puts(file, "\nRatio : "); + seq_printf(file, "%7d%% | %7d%% | %7d%% | ", + __ms_ratio(mu_stats.ul.hetrig_2mu_cnt), + __ms_ratio(mu_stats.ul.hetrig_3mu_cnt), + __ms_ratio(mu_stats.ul.hetrig_4mu_cnt)); + + seq_puts(file, "\nTrigger-based Uplink OFDMA\nData Type: "); + + for (i = 3; i < 10; i++) + seq_printf(file, "%8s | ", ul_he_type[i]); + + seq_puts(file, "\nTotal Cnt: "); + seq_printf(file, "%8u | %8u | %8u | %8u | %8u | %9u | %7u | ", + __ul_u32(hetrig_su_cnt), + __ul_u32(hetrig_2ru_cnt), + __ul_u32(hetrig_3ru_cnt), + __ul_u32(hetrig_4ru_cnt), + __ul_u32(hetrig_5to8ru_cnt), + __ul_u32(hetrig_9to16ru_cnt), + __ul_u32(hetrig_gtr16ru_cnt)); +#undef __ul_u32 + + seq_puts(file, "\nRatio : "); + seq_printf(file, "%7d%% | %7d%% | %7d%% | %7d%% | %7d%% | %7d%% | %7d%% |\n", + __ms_ratio(mu_stats.ul.hetrig_su_cnt), + __ms_ratio(mu_stats.ul.hetrig_2ru_cnt), + __ms_ratio(mu_stats.ul.hetrig_3ru_cnt), + __ms_ratio(mu_stats.ul.hetrig_4ru_cnt), + __ms_ratio(mu_stats.ul.hetrig_5to8ru_cnt), + __ms_ratio(mu_stats.ul.hetrig_9to16ru_cnt), + __ms_ratio(mu_stats.ul.hetrig_gtr16ru_cnt)); +#undef __ms_ratio + +exit: + mutex_unlock(&dev->mt76.mutex); + + return ret; +} +DEFINE_SHOW_ATTRIBUTE(mt7915_muru_stat); + static int mt7915_fw_debug_wm_set(void *data, u64 val) { @@ -528,7 +768,9 @@ int mt7915_init_debugfs(struct mt7915_phy *phy) dir = mt76_register_debugfs_fops(phy->mt76, NULL); if (!dir) return -ENOMEM; - + debugfs_create_file("muru_debug", 0600, dir, dev, &fops_muru_debug); + debugfs_create_file("muru_stat", 0400, dir, phy, + &mt7915_muru_stat_fops); debugfs_create_file("hw-queues", 0400, dir, phy, &mt7915_hw_queues_fops); debugfs_create_file("xmit-queues", 0400, dir, phy, diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c index 73a11448..a32d2199 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c @@ -2993,6 +2993,47 @@ int mt7915_mcu_fw_dbg_ctrl(struct mt7915_dev *dev, u32 module, u8 level) sizeof(data), false); } +int mt7915_mcu_muru_debug_set(struct mt7915_dev *dev, bool enabled) +{ + struct { + __le32 cmd; + u8 enable; + } data = { + .cmd = cpu_to_le32(MURU_SET_TXC_TX_STATS_EN), + .enable = enabled, + }; + + return mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD(MURU_CTRL), &data, + sizeof(data), false); +} + +int mt7915_mcu_muru_debug_get(struct mt7915_phy *phy, void *ms) +{ + struct mt7915_dev *dev = phy->dev; + struct sk_buff *skb; + struct mt7915_mcu_muru_stats *mu_stats = + (struct mt7915_mcu_muru_stats *)ms; + int ret; + + struct { + __le32 cmd; + u8 band_idx; + } req = { + .cmd = cpu_to_le32(MURU_GET_TXC_TX_STATS), + .band_idx = phy != &dev->phy, + }; + + ret = mt76_mcu_send_and_get_msg(&dev->mt76, MCU_EXT_CMD(MURU_CTRL), + &req, sizeof(req), true, &skb); + if (ret) + return ret; + + memcpy(mu_stats, skb->data, sizeof(struct mt7915_mcu_muru_stats)); + dev_kfree_skb(skb); + + return 0; +} + static int mt7915_mcu_set_mwds(struct mt7915_dev *dev, bool enabled) { struct { diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h index 4636b7dc..60b18457 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h @@ -44,6 +44,13 @@ enum { MCU_EXT_EVENT_RDD_REPORT = 0x3a, MCU_EXT_EVENT_CSA_NOTIFY = 0x4f, MCU_EXT_EVENT_BCC_NOTIFY = 0x75, + MCU_EXT_EVENT_MURU_CTRL = 0x9f, +}; + +/* tx cmd tx statistics */ +enum { + MURU_SET_TXC_TX_STATS_EN = 150, + MURU_GET_TXC_TX_STATS = 151, }; enum { @@ -206,6 +213,44 @@ struct mt7915_mcu_tx { struct edca edca[IEEE80211_NUM_ACS]; } __packed; +struct mt7915_mcu_muru_stats { + __le32 event_id; + struct { + __le32 cck_cnt; + __le32 ofdm_cnt; + __le32 htmix_cnt; + __le32 htgf_cnt; + __le32 vht_su_cnt; + __le32 vht_2mu_cnt; + __le32 vht_3mu_cnt; + __le32 vht_4mu_cnt; + __le32 he_su_cnt; + __le32 he_ext_su_cnt; + __le32 he_2ru_cnt; + __le32 he_2mu_cnt; + __le32 he_3ru_cnt; + __le32 he_3mu_cnt; + __le32 he_4ru_cnt; + __le32 he_4mu_cnt; + __le32 he_5to8ru_cnt; + __le32 he_9to16ru_cnt; + __le32 he_gtr16ru_cnt; + } dl; + + struct { + __le32 hetrig_su_cnt; + __le32 hetrig_2ru_cnt; + __le32 hetrig_3ru_cnt; + __le32 hetrig_4ru_cnt; + __le32 hetrig_5to8ru_cnt; + __le32 hetrig_9to16ru_cnt; + __le32 hetrig_gtr16ru_cnt; + __le32 hetrig_2mu_cnt; + __le32 hetrig_3mu_cnt; + __le32 hetrig_4mu_cnt; + } ul; +}; + #define WMM_AIFS_SET BIT(0) #define WMM_CW_MIN_SET BIT(1) #define WMM_CW_MAX_SET BIT(2) diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h index c6c846d1..81f1ab18 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h @@ -273,6 +273,7 @@ struct mt7915_dev { bool dbdc_support; bool flash_mode; + bool muru_debug; bool ibf; u8 fw_debug_wm; u8 fw_debug_wa; @@ -526,6 +527,8 @@ int mt7915_dfs_init_radar_detector(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_update_channel(struct mt76_phy *mphy); +int mt7915_mcu_muru_debug_set(struct mt7915_dev *dev, bool enable); +int mt7915_mcu_muru_debug_get(struct mt7915_phy *phy, void *ms); int mt7915_init_debugfs(struct mt7915_phy *phy); #ifdef CONFIG_MAC80211_DEBUGFS void mt7915_sta_add_debugfs(struct ieee80211_hw *hw, struct ieee80211_vif *vif,