mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-08-30 13:23:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

wifi: rtw89: debug: make implementation of beacon_info entry in order

Browse Source 
When adding more debugfs entries, the beacon_info entry becomes not in
order. Move to correct location. Don't change logic at all.

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/20260506131000.1706298-10-pkshih@realtek.com
This commit is contained in:
Ping-Ke Shih
2026-05-06 21:09:55 +08:00
parent 16a1becdd1
commit 41d78f3f35
1 changed files with 71 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

142
drivers/net/wireless/realtek/rtw89/debug.c
View File

@@ -4919,6 +4919,77 @@ rtw89_debug_priv_mlo_mode_set(struct rtw89_dev *rtwdev,
return count;
}
static int rtw89_get_beacon_info(struct rtw89_dev *rtwdev, struct rtw89_bb_ctx *bb,
char *buf, size_t bufsz)
{
struct rtw89_pkt_stat *pkt_stat = &bb->last_pkt_stat;
char *p = buf, *end = buf + bufsz;
p += scnprintf(p, end - p, "[PHY %u]\n", bb->phy_idx);
p += scnprintf(p, end - p, "Beacon: %u\n", pkt_stat->beacon_nr);
p += scnprintf(p, end - p, "raw rssi: %lu\n", ewma_rssi_read(&bb->bcn_rssi));
p += scnprintf(p, end - p, "hw rate: %u\n", pkt_stat->beacon_rate);
p += scnprintf(p, end - p, "length: %u\n\n", pkt_stat->beacon_len);
return p - buf;
}
static ssize_t
rtw89_debug_priv_beacon_info_get(struct rtw89_dev *rtwdev,
struct rtw89_debugfs_priv *debugfs_priv,
char *buf, size_t bufsz)
{
struct rtw89_beacon_track_info *bcn_track = &rtwdev->bcn_track;
struct rtw89_beacon_stat *bcn_stat = &rtwdev->phystat.bcn_stat;
struct rtw89_beacon_dist *bcn_dist = &bcn_stat->bcn_dist;
u16 upper, lower = bcn_stat->tbtt_tu_min;
char *p = buf, *end = buf + bufsz;
u16 *drift = bcn_stat->drift;
u8 bcn_num = bcn_stat->num;
struct rtw89_bb_ctx *bb;
u8 count;
u8 i;
rtw89_for_each_active_bb(rtwdev, bb)
p += rtw89_get_beacon_info(rtwdev, bb, p, end - p);
p += scnprintf(p, end - p, "[Beacon info]\n");
p += scnprintf(p, end - p, "interval: %u\n", bcn_track->beacon_int);
p += scnprintf(p, end - p, "dtim: %u\n", bcn_track->dtim);
p += scnprintf(p, end - p, "\n[Distribution]\n");
p += scnprintf(p, end - p, "tbtt\n");
for (i = 0; i < RTW89_BCN_TRACK_MAX_BIN_NUM; i++) {
upper = lower + RTW89_BCN_TRACK_BIN_WIDTH - 1;
if (i == RTW89_BCN_TRACK_MAX_BIN_NUM - 1)
upper = max(upper, bcn_stat->tbtt_tu_max);
p += scnprintf(p, end - p, "%02u - %02u: %u\n",
lower, upper, bcn_dist->bins[i]);
lower = upper + 1;
}
p += scnprintf(p, end - p, "\ndrift\n");
for (i = 0; i < bcn_num; i += count) {
count = 1;
while (i + count < bcn_num && drift[i] == drift[i + count])
count++;
p += scnprintf(p, end - p, "%u: %u\n", drift[i], count);
}
p += scnprintf(p, end - p, "\nlower bound: %u\n", bcn_dist->lower_bound);
p += scnprintf(p, end - p, "upper bound: %u\n", bcn_dist->upper_bound);
p += scnprintf(p, end - p, "outlier count: %u\n", bcn_dist->outlier_count);
p += scnprintf(p, end - p, "\n[Tracking]\n");
p += scnprintf(p, end - p, "tbtt offset: %u\n", bcn_track->tbtt_offset);
p += scnprintf(p, end - p, "bcn timeout: %u\n", bcn_track->bcn_timeout);
return p - buf;
}
enum __diag_mac_cmd {
__CMD_EQUALV,
__CMD_EQUALO,
@@ -5255,77 +5326,6 @@ rtw89_debug_priv_diag_bb_get(struct rtw89_dev *rtwdev,
return p - buf;
}
static int rtw89_get_beacon_info(struct rtw89_dev *rtwdev, struct rtw89_bb_ctx *bb,
char *buf, size_t bufsz)
{
struct rtw89_pkt_stat *pkt_stat = &bb->last_pkt_stat;
char *p = buf, *end = buf + bufsz;
p += scnprintf(p, end - p, "[PHY %u]\n", bb->phy_idx);
p += scnprintf(p, end - p, "Beacon: %u\n", pkt_stat->beacon_nr);
p += scnprintf(p, end - p, "raw rssi: %lu\n", ewma_rssi_read(&bb->bcn_rssi));
p += scnprintf(p, end - p, "hw rate: %u\n", pkt_stat->beacon_rate);
p += scnprintf(p, end - p, "length: %u\n\n", pkt_stat->beacon_len);
return p - buf;
}
static ssize_t
rtw89_debug_priv_beacon_info_get(struct rtw89_dev *rtwdev,
struct rtw89_debugfs_priv *debugfs_priv,
char *buf, size_t bufsz)
{
struct rtw89_beacon_track_info *bcn_track = &rtwdev->bcn_track;
struct rtw89_beacon_stat *bcn_stat = &rtwdev->phystat.bcn_stat;
struct rtw89_beacon_dist *bcn_dist = &bcn_stat->bcn_dist;
u16 upper, lower = bcn_stat->tbtt_tu_min;
char *p = buf, *end = buf + bufsz;
u16 *drift = bcn_stat->drift;
u8 bcn_num = bcn_stat->num;
struct rtw89_bb_ctx *bb;
u8 count;
u8 i;
rtw89_for_each_active_bb(rtwdev, bb)
p += rtw89_get_beacon_info(rtwdev, bb, p, end - p);
p += scnprintf(p, end - p, "[Beacon info]\n");
p += scnprintf(p, end - p, "interval: %u\n", bcn_track->beacon_int);
p += scnprintf(p, end - p, "dtim: %u\n", bcn_track->dtim);
p += scnprintf(p, end - p, "\n[Distribution]\n");
p += scnprintf(p, end - p, "tbtt\n");
for (i = 0; i < RTW89_BCN_TRACK_MAX_BIN_NUM; i++) {
upper = lower + RTW89_BCN_TRACK_BIN_WIDTH - 1;
if (i == RTW89_BCN_TRACK_MAX_BIN_NUM - 1)
upper = max(upper, bcn_stat->tbtt_tu_max);
p += scnprintf(p, end - p, "%02u - %02u: %u\n",
lower, upper, bcn_dist->bins[i]);
lower = upper + 1;
}
p += scnprintf(p, end - p, "\ndrift\n");
for (i = 0; i < bcn_num; i += count) {
count = 1;
while (i + count < bcn_num && drift[i] == drift[i + count])
count++;
p += scnprintf(p, end - p, "%u: %u\n", drift[i], count);
}
p += scnprintf(p, end - p, "\nlower bound: %u\n", bcn_dist->lower_bound);
p += scnprintf(p, end - p, "upper bound: %u\n", bcn_dist->upper_bound);
p += scnprintf(p, end - p, "outlier count: %u\n", bcn_dist->outlier_count);
p += scnprintf(p, end - p, "\n[Tracking]\n");
p += scnprintf(p, end - p, "tbtt offset: %u\n", bcn_track->tbtt_offset);
p += scnprintf(p, end - p, "bcn timeout: %u\n", bcn_track->bcn_timeout);
return p - buf;
}
#define rtw89_debug_priv_get(name, opts...) \
{ \
.cb_read = rtw89_debug_priv_ ##name## _get, \