| Message ID | 20241217055408.1293764-3-quic_rdevanat@quicinc.com (mailing list archive) |
|---|---|
| State | New |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | wifi: ath12k: Support AST and Puncture Stats | expand |
Roopni Devanathan <quic_rdevanat@quicinc.com> writes: > From: Rajat Soni <quic_rajson@quicinc.com> > > Add support to request pdev puncture stats from firmware through > HTT stats type 46. These stats give the count of number of > subbands used in different wifi standards. > > Sample output: > ------------- > echo 46 > /sys/kernel/debug/ath12k/pci-0000\:06\:00.0/mac0/htt_stats_type > cat /sys/kernel/debug/ath12k/pci-0000\:06\:00.0/mac0/htt_stats > HTT_PDEV_PUNCTURE_STATS_TLV: > mac_id = 0 > tx_ofdm_su_last_used_pattern_mask = 0x00000001 > tx_ofdm_su_num_subbands_used_cnt_01 = 217 > tx_ofdm_su_num_subbands_used_cnt_02 = 0 > tx_ofdm_su_num_subbands_used_cnt_03 = 0 > ..... > > HTT_PDEV_PUNCTURE_STATS_TLV: > mac_id = 0 > tx_ax_dl_mu_ofdma_last_used_pattern_mask = 0x00000000 > tx_ax_dl_mu_ofdma_num_subbands_used_cnt_01 = 0 > tx_ax_dl_mu_ofdma_num_subbands_used_cnt_02 = 0 > tx_ax_dl_mu_ofdma_num_subbands_used_cnt_03 = 0 > ..... > > HTT_PDEV_PUNCTURE_STATS_TLV: > mac_id = 0 > tx_be_dl_mu_ofdma_last_used_pattern_mask = 0x00000000 > tx_be_dl_mu_ofdma_num_subbands_used_cnt_01 = 0 > tx_be_dl_mu_ofdma_num_subbands_used_cnt_02 = 0 > tx_be_dl_mu_ofdma_num_subbands_used_cnt_03 = 0 > ..... > > HTT_PDEV_PUNCTURE_STATS_TLV: > mac_id = 0 > rx_ax_ul_mu_ofdma_last_used_pattern_mask = 0x00000000 > rx_ax_ul_mu_ofdma_num_subbands_used_cnt_01 = 0 > rx_ax_ul_mu_ofdma_num_subbands_used_cnt_02 = 0 > rx_ax_ul_mu_ofdma_num_subbands_used_cnt_03 = 0 > ..... > > HTT_PDEV_PUNCTURE_STATS_TLV: > mac_id = 0 > rx_be_ul_mu_ofdma_last_used_pattern_mask = 0x00000000 > rx_be_ul_mu_ofdma_num_subbands_used_cnt_01 = 0 > rx_be_ul_mu_ofdma_num_subbands_used_cnt_02 = 0 > rx_be_ul_mu_ofdma_num_subbands_used_cnt_03 = 0 > ..... > > Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1 > Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0-03427-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1.15378.4 > > Signed-off-by: Rajat Soni <quic_rajson@quicinc.com> > Signed-off-by: Roopni Devanathan <quic_rdevanat@quicinc.com> [...] > +static const char* > +ath12k_htt_get_punct_dir_type_str(enum ath12k_htt_stats_direction direction, > + struct debug_htt_stats_req *stats_req) > +{ > + const char *direction_str = "unknown"; > + u32 len = stats_req->buf_len; [...] > + > + stats_req->buf_len = len; What's the idea with len here? I don't get it.
Roopni Devanathan <quic_rdevanat@quicinc.com> writes: > From: Rajat Soni <quic_rajson@quicinc.com> > > Add support to request pdev puncture stats from firmware through > HTT stats type 46. These stats give the count of number of > subbands used in different wifi standards. > > Sample output: > ------------- > echo 46 > /sys/kernel/debug/ath12k/pci-0000\:06\:00.0/mac0/htt_stats_type > cat /sys/kernel/debug/ath12k/pci-0000\:06\:00.0/mac0/htt_stats > HTT_PDEV_PUNCTURE_STATS_TLV: > mac_id = 0 > tx_ofdm_su_last_used_pattern_mask = 0x00000001 > tx_ofdm_su_num_subbands_used_cnt_01 = 217 > tx_ofdm_su_num_subbands_used_cnt_02 = 0 > tx_ofdm_su_num_subbands_used_cnt_03 = 0 > ..... > > HTT_PDEV_PUNCTURE_STATS_TLV: > mac_id = 0 > tx_ax_dl_mu_ofdma_last_used_pattern_mask = 0x00000000 > tx_ax_dl_mu_ofdma_num_subbands_used_cnt_01 = 0 > tx_ax_dl_mu_ofdma_num_subbands_used_cnt_02 = 0 > tx_ax_dl_mu_ofdma_num_subbands_used_cnt_03 = 0 > ..... > > HTT_PDEV_PUNCTURE_STATS_TLV: > mac_id = 0 > tx_be_dl_mu_ofdma_last_used_pattern_mask = 0x00000000 > tx_be_dl_mu_ofdma_num_subbands_used_cnt_01 = 0 > tx_be_dl_mu_ofdma_num_subbands_used_cnt_02 = 0 > tx_be_dl_mu_ofdma_num_subbands_used_cnt_03 = 0 > ..... > > HTT_PDEV_PUNCTURE_STATS_TLV: > mac_id = 0 > rx_ax_ul_mu_ofdma_last_used_pattern_mask = 0x00000000 > rx_ax_ul_mu_ofdma_num_subbands_used_cnt_01 = 0 > rx_ax_ul_mu_ofdma_num_subbands_used_cnt_02 = 0 > rx_ax_ul_mu_ofdma_num_subbands_used_cnt_03 = 0 > ..... > > HTT_PDEV_PUNCTURE_STATS_TLV: > mac_id = 0 > rx_be_ul_mu_ofdma_last_used_pattern_mask = 0x00000000 > rx_be_ul_mu_ofdma_num_subbands_used_cnt_01 = 0 > rx_be_ul_mu_ofdma_num_subbands_used_cnt_02 = 0 > rx_be_ul_mu_ofdma_num_subbands_used_cnt_03 = 0 > ..... > > Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1 > Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0-03427-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1.15378.4 > > Signed-off-by: Rajat Soni <quic_rajson@quicinc.com> > Signed-off-by: Roopni Devanathan <quic_rdevanat@quicinc.com> [...] > +static const char* > +ath12k_htt_get_punct_ppdu_type_str(enum ath12k_htt_stats_ppdu_type ppdu_type, > + struct debug_htt_stats_req *stats_req) > +{ > + const char *ppdu_type_str = "unknown"; > + u32 len = stats_req->buf_len; > + > + switch (ppdu_type) { > + case ATH12K_HTT_STATS_PPDU_TYPE_MODE_SU: > + ppdu_type_str = "su"; > + break; > + case ATH12K_HTT_STATS_PPDU_TYPE_DL_MU_MIMO: > + ppdu_type_str = "dl_mu_mimo"; > + break; > + case ATH12K_HTT_STATS_PPDU_TYPE_UL_MU_MIMO: > + ppdu_type_str = "ul_mu_mimo"; > + break; > + case ATH12K_HTT_STATS_PPDU_TYPE_DL_MU_OFDMA: > + ppdu_type_str = "dl_mu_ofdma"; > + break; > + case ATH12K_HTT_STATS_PPDU_TYPE_UL_MU_OFDMA: > + ppdu_type_str = "ul_mu_ofdma"; > + break; > + default: > + break; > + } > + > + stats_req->buf_len = len; > + return ppdu_type_str; > +} Also here I don't get why the len variable is needed. I would just simplify this and the previous function to: static const char* ath12k_htt_get_punct_ppdu_type_str(enum ath12k_htt_stats_ppdu_type ppdu_type, struct debug_htt_stats_req *stats_req) { switch (ppdu_type) { case ATH12K_HTT_STATS_PPDU_TYPE_MODE_SU: return "su"; case ATH12K_HTT_STATS_PPDU_TYPE_DL_MU_MIMO: return "dl_mu_mimo"; case ATH12K_HTT_STATS_PPDU_TYPE_UL_MU_MIMO: return "ul_mu_mimo"; case ATH12K_HTT_STATS_PPDU_TYPE_DL_MU_OFDMA: return "dl_mu_ofdma"; case ATH12K_HTT_STATS_PPDU_TYPE_UL_MU_OFDMA: return "ul_mu_ofdma"; default: return "unknown"; }
On 12/17/2024 8:56 PM, Kalle Valo wrote: > Roopni Devanathan <quic_rdevanat@quicinc.com> writes: > >> From: Rajat Soni <quic_rajson@quicinc.com> >> >> Add support to request pdev puncture stats from firmware through >> HTT stats type 46. These stats give the count of number of >> subbands used in different wifi standards. >> >> Sample output: >> ------------- >> echo 46 > /sys/kernel/debug/ath12k/pci-0000\:06\:00.0/mac0/htt_stats_type >> cat /sys/kernel/debug/ath12k/pci-0000\:06\:00.0/mac0/htt_stats >> HTT_PDEV_PUNCTURE_STATS_TLV: >> mac_id = 0 >> tx_ofdm_su_last_used_pattern_mask = 0x00000001 >> tx_ofdm_su_num_subbands_used_cnt_01 = 217 >> tx_ofdm_su_num_subbands_used_cnt_02 = 0 >> tx_ofdm_su_num_subbands_used_cnt_03 = 0 >> ..... >> >> HTT_PDEV_PUNCTURE_STATS_TLV: >> mac_id = 0 >> tx_ax_dl_mu_ofdma_last_used_pattern_mask = 0x00000000 >> tx_ax_dl_mu_ofdma_num_subbands_used_cnt_01 = 0 >> tx_ax_dl_mu_ofdma_num_subbands_used_cnt_02 = 0 >> tx_ax_dl_mu_ofdma_num_subbands_used_cnt_03 = 0 >> ..... >> >> HTT_PDEV_PUNCTURE_STATS_TLV: >> mac_id = 0 >> tx_be_dl_mu_ofdma_last_used_pattern_mask = 0x00000000 >> tx_be_dl_mu_ofdma_num_subbands_used_cnt_01 = 0 >> tx_be_dl_mu_ofdma_num_subbands_used_cnt_02 = 0 >> tx_be_dl_mu_ofdma_num_subbands_used_cnt_03 = 0 >> ..... >> >> HTT_PDEV_PUNCTURE_STATS_TLV: >> mac_id = 0 >> rx_ax_ul_mu_ofdma_last_used_pattern_mask = 0x00000000 >> rx_ax_ul_mu_ofdma_num_subbands_used_cnt_01 = 0 >> rx_ax_ul_mu_ofdma_num_subbands_used_cnt_02 = 0 >> rx_ax_ul_mu_ofdma_num_subbands_used_cnt_03 = 0 >> ..... >> >> HTT_PDEV_PUNCTURE_STATS_TLV: >> mac_id = 0 >> rx_be_ul_mu_ofdma_last_used_pattern_mask = 0x00000000 >> rx_be_ul_mu_ofdma_num_subbands_used_cnt_01 = 0 >> rx_be_ul_mu_ofdma_num_subbands_used_cnt_02 = 0 >> rx_be_ul_mu_ofdma_num_subbands_used_cnt_03 = 0 >> ..... >> >> Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1 >> Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0-03427-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1.15378.4 >> >> Signed-off-by: Rajat Soni <quic_rajson@quicinc.com> >> Signed-off-by: Roopni Devanathan <quic_rdevanat@quicinc.com> > > [...] > >> +static const char* >> +ath12k_htt_get_punct_ppdu_type_str(enum ath12k_htt_stats_ppdu_type ppdu_type, >> + struct debug_htt_stats_req *stats_req) >> +{ >> + const char *ppdu_type_str = "unknown"; >> + u32 len = stats_req->buf_len; >> + >> + switch (ppdu_type) { >> + case ATH12K_HTT_STATS_PPDU_TYPE_MODE_SU: >> + ppdu_type_str = "su"; >> + break; >> + case ATH12K_HTT_STATS_PPDU_TYPE_DL_MU_MIMO: >> + ppdu_type_str = "dl_mu_mimo"; >> + break; >> + case ATH12K_HTT_STATS_PPDU_TYPE_UL_MU_MIMO: >> + ppdu_type_str = "ul_mu_mimo"; >> + break; >> + case ATH12K_HTT_STATS_PPDU_TYPE_DL_MU_OFDMA: >> + ppdu_type_str = "dl_mu_ofdma"; >> + break; >> + case ATH12K_HTT_STATS_PPDU_TYPE_UL_MU_OFDMA: >> + ppdu_type_str = "ul_mu_ofdma"; >> + break; >> + default: >> + break; >> + } >> + >> + stats_req->buf_len = len; >> + return ppdu_type_str; >> +} > > Also here I don't get why the len variable is needed. I would just > simplify this and the previous function to: > > static const char* > ath12k_htt_get_punct_ppdu_type_str(enum ath12k_htt_stats_ppdu_type ppdu_type, > struct debug_htt_stats_req *stats_req) > { > switch (ppdu_type) { > case ATH12K_HTT_STATS_PPDU_TYPE_MODE_SU: > return "su"; > case ATH12K_HTT_STATS_PPDU_TYPE_DL_MU_MIMO: > return "dl_mu_mimo"; > case ATH12K_HTT_STATS_PPDU_TYPE_UL_MU_MIMO: > return "ul_mu_mimo"; > case ATH12K_HTT_STATS_PPDU_TYPE_DL_MU_OFDMA: > return "dl_mu_ofdma"; > case ATH12K_HTT_STATS_PPDU_TYPE_UL_MU_OFDMA: > return "ul_mu_ofdma"; > default: > return "unknown"; > } > Sure, Kalle. I'll simplify the function definitions and re-spin the next version.
diff --git a/drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c b/drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c index 9294ef41a169..90f92769b89c 100644 --- a/drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c +++ b/drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c @@ -3522,6 +3522,141 @@ ath12k_htt_print_ast_entry_tlv(const void *tag_buf, u16 tag_len, stats_req->buf_len = len; } +static const char* +ath12k_htt_get_punct_dir_type_str(enum ath12k_htt_stats_direction direction, + struct debug_htt_stats_req *stats_req) +{ + const char *direction_str = "unknown"; + u32 len = stats_req->buf_len; + + switch (direction) { + case ATH12K_HTT_STATS_DIRECTION_TX: + direction_str = "tx"; + break; + case ATH12K_HTT_STATS_DIRECTION_RX: + direction_str = "rx"; + break; + default: + break; + } + + stats_req->buf_len = len; + return direction_str; +} + +static const char* +ath12k_htt_get_punct_ppdu_type_str(enum ath12k_htt_stats_ppdu_type ppdu_type, + struct debug_htt_stats_req *stats_req) +{ + const char *ppdu_type_str = "unknown"; + u32 len = stats_req->buf_len; + + switch (ppdu_type) { + case ATH12K_HTT_STATS_PPDU_TYPE_MODE_SU: + ppdu_type_str = "su"; + break; + case ATH12K_HTT_STATS_PPDU_TYPE_DL_MU_MIMO: + ppdu_type_str = "dl_mu_mimo"; + break; + case ATH12K_HTT_STATS_PPDU_TYPE_UL_MU_MIMO: + ppdu_type_str = "ul_mu_mimo"; + break; + case ATH12K_HTT_STATS_PPDU_TYPE_DL_MU_OFDMA: + ppdu_type_str = "dl_mu_ofdma"; + break; + case ATH12K_HTT_STATS_PPDU_TYPE_UL_MU_OFDMA: + ppdu_type_str = "ul_mu_ofdma"; + break; + default: + break; + } + + stats_req->buf_len = len; + return ppdu_type_str; +} + +static const char* +ath12k_htt_get_punct_pream_type_str(enum ath12k_htt_stats_param_type pream_type, + struct debug_htt_stats_req *stats_req) +{ + const char *pream_type_str = "unknown"; + u32 len = stats_req->buf_len; + + switch (pream_type) { + case ATH12K_HTT_STATS_PREAM_OFDM: + pream_type_str = "ofdm"; + break; + case ATH12K_HTT_STATS_PREAM_CCK: + pream_type_str = "cck"; + break; + case ATH12K_HTT_STATS_PREAM_HT: + pream_type_str = "ht"; + break; + case ATH12K_HTT_STATS_PREAM_VHT: + pream_type_str = "ac"; + break; + case ATH12K_HTT_STATS_PREAM_HE: + pream_type_str = "ax"; + break; + case ATH12K_HTT_STATS_PREAM_EHT: + pream_type_str = "be"; + break; + default: + break; + } + + stats_req->buf_len = len; + return pream_type_str; +} + +static void +ath12k_htt_print_puncture_stats_tlv(const void *tag_buf, u16 tag_len, + struct debug_htt_stats_req *stats_req) +{ + const struct ath12k_htt_pdev_puncture_stats_tlv *stats_buf = tag_buf; + u32 buf_len = ATH12K_HTT_STATS_BUF_SIZE; + u32 len = stats_req->buf_len; + u8 *buf = stats_req->buf; + const char *direction; + const char *ppdu_type; + const char *preamble; + u32 mac_id__word; + u32 subband_limit; + u8 i; + + if (tag_len < sizeof(*stats_buf)) + return; + + mac_id__word = le32_to_cpu(stats_buf->mac_id__word); + subband_limit = min(le32_to_cpu(stats_buf->subband_cnt), + ATH12K_HTT_PUNCT_STATS_MAX_SUBBAND_CNT); + + direction = ath12k_htt_get_punct_dir_type_str(le32_to_cpu(stats_buf->direction), + stats_req); + ppdu_type = ath12k_htt_get_punct_ppdu_type_str(le32_to_cpu(stats_buf->ppdu_type), + stats_req); + preamble = ath12k_htt_get_punct_pream_type_str(le32_to_cpu(stats_buf->preamble), + stats_req); + + len += scnprintf(buf + len, buf_len - len, "HTT_PDEV_PUNCTURE_STATS_TLV:\n"); + len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n", + u32_get_bits(mac_id__word, ATH12K_HTT_STATS_MAC_ID)); + len += scnprintf(buf + len, buf_len - len, + "%s_%s_%s_last_used_pattern_mask = 0x%08x\n", + direction, preamble, ppdu_type, + le32_to_cpu(stats_buf->last_used_pattern_mask)); + + for (i = 0; i < subband_limit; i++) { + len += scnprintf(buf + len, buf_len - len, + "%s_%s_%s_num_subbands_used_cnt_%02d = %u\n", + direction, preamble, ppdu_type, i + 1, + le32_to_cpu(stats_buf->num_subbands_used_cnt[i])); + } + len += scnprintf(buf + len, buf_len - len, "\n"); + + stats_req->buf_len = len; +} + static void ath12k_htt_print_dmac_reset_stats_tlv(const void *tag_buf, u16 tag_len, struct debug_htt_stats_req *stats_req) @@ -3933,6 +4068,9 @@ static int ath12k_dbg_htt_ext_stats_parse(struct ath12k_base *ab, case HTT_STATS_AST_ENTRY_TAG: ath12k_htt_print_ast_entry_tlv(tag_buf, len, stats_req); break; + case HTT_STATS_PDEV_PUNCTURE_STATS_TAG: + ath12k_htt_print_puncture_stats_tlv(tag_buf, len, stats_req); + break; case HTT_STATS_DMAC_RESET_STATS_TAG: ath12k_htt_print_dmac_reset_stats_tlv(tag_buf, len, stats_req); break; diff --git a/drivers/net/wireless/ath/ath12k/debugfs_htt_stats.h b/drivers/net/wireless/ath/ath12k/debugfs_htt_stats.h index 9a9dd368c5d6..4b59976fbc35 100644 --- a/drivers/net/wireless/ath/ath12k/debugfs_htt_stats.h +++ b/drivers/net/wireless/ath/ath12k/debugfs_htt_stats.h @@ -143,6 +143,7 @@ enum ath12k_dbg_htt_ext_stats_type { ATH12K_DBG_HTT_EXT_PDEV_PER_STATS = 40, ATH12K_DBG_HTT_EXT_AST_ENTRIES = 41, ATH12K_DBG_HTT_EXT_STATS_SOC_ERROR = 45, + ATH12K_DBG_HTT_DBG_PDEV_PUNCTURE_STATS = 46, ATH12K_DBG_HTT_EXT_STATS_PDEV_SCHED_ALGO = 49, ATH12K_DBG_HTT_EXT_STATS_MANDATORY_MUOFDMA = 51, ATH12K_DGB_HTT_EXT_STATS_PDEV_MBSSID_CTRL_FRAME = 54, @@ -223,6 +224,7 @@ enum ath12k_dbg_htt_tlv_tag { HTT_STATS_TXBF_OFDMA_AX_STEER_STATS_TAG = 150, HTT_STATS_DMAC_RESET_STATS_TAG = 155, HTT_STATS_PHY_TPC_STATS_TAG = 157, + HTT_STATS_PDEV_PUNCTURE_STATS_TAG = 158, HTT_STATS_PDEV_SCHED_ALGO_OFDMA_STATS_TAG = 165, HTT_STATS_TXBF_OFDMA_AX_STEER_MPDU_STATS_TAG = 172, HTT_STATS_PDEV_MBSSID_CTRL_FRAME_STATS_TAG = 176, @@ -1311,6 +1313,42 @@ struct ath12k_htt_ast_entry_tlv { __le32 info; } __packed; +enum ath12k_htt_stats_direction { + ATH12K_HTT_STATS_DIRECTION_TX, + ATH12K_HTT_STATS_DIRECTION_RX +}; + +enum ath12k_htt_stats_ppdu_type { + ATH12K_HTT_STATS_PPDU_TYPE_MODE_SU, + ATH12K_HTT_STATS_PPDU_TYPE_DL_MU_MIMO, + ATH12K_HTT_STATS_PPDU_TYPE_UL_MU_MIMO, + ATH12K_HTT_STATS_PPDU_TYPE_DL_MU_OFDMA, + ATH12K_HTT_STATS_PPDU_TYPE_UL_MU_OFDMA +}; + +enum ath12k_htt_stats_param_type { + ATH12K_HTT_STATS_PREAM_OFDM, + ATH12K_HTT_STATS_PREAM_CCK, + ATH12K_HTT_STATS_PREAM_HT, + ATH12K_HTT_STATS_PREAM_VHT, + ATH12K_HTT_STATS_PREAM_HE, + ATH12K_HTT_STATS_PREAM_EHT, + ATH12K_HTT_STATS_PREAM_RSVD1, + ATH12K_HTT_STATS_PREAM_COUNT, +}; + +#define ATH12K_HTT_PUNCT_STATS_MAX_SUBBAND_CNT 32 + +struct ath12k_htt_pdev_puncture_stats_tlv { + __le32 mac_id__word; + __le32 direction; + __le32 preamble; + __le32 ppdu_type; + __le32 subband_cnt; + __le32 last_used_pattern_mask; + __le32 num_subbands_used_cnt[ATH12K_HTT_PUNCT_STATS_MAX_SUBBAND_CNT]; +} __packed; + struct ath12k_htt_dmac_reset_stats_tlv { __le32 reset_count; __le32 reset_time_lo_ms;