wifi: ath12k: monitor mode fixes
cover wifi: ath12k: monitor mode fixes
This patch-set includes three nit fixes for monitor mode.
Kang Yang (3):
wifi: ath12k: fix signal in radiotap for WCN7850
wifi: ath12k: fix HAL_PHYRX_COMMON_USER_INFO handling in monitor mode
wifi: ath12k: fix the fetching of combined rssi
drivers/net/wireless/ath/ath12k/dp_mon.c | 49 +++++++++++++++++++----- drivers/net/wireless/ath/ath12k/hal_rx.h | 12 +++--- 2 files changed, 46 insertions(+), 15 deletions(-)
base-commit: e4f11ae0c4b29ca0c133f891412afd5dcddc68ff
Signature · 1 line
2.34.1
PATCH 1/3 wifi: ath12k: fix signal in radiotap for WCN7850
Currently host will add ATH12K_DEFAULT_NOISE_FLOOR to rssi_comb to convert RSSI from dB to dBm.
For WCN7850, this conversion is unnecessary because the RSSI value is already reported in dBm units.
No longer convert for those firmware that already support dBM conversion.
This patch won't affect QCN chips.
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
--- drivers/net/wireless/ath/ath12k/dp_mon.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath12k/dp_mon.c +5 -1
@@ -2154,8 +2154,12 @@ static void ath12k_dp_mon_update_radiotap(struct ath12k *ar,spin_unlock_bh (&ar->data_lock); rxs->flag |=RX_FLAG_MACTIME_START ; - rxs->signal = ppduinfo->rssi_comb + noise_floor; rxs->nss = ppduinfo->nss +1 ; +if (test_bit (WMI_TLV_SERVICE_HW_DB2DBM_CONVERSION_SUPPORT , + ar->ab->wmi_ab.svc_map)) + rxs->signal = ppduinfo->rssi_comb; +else + rxs->signal = ppduinfo->rssi_comb + noise_floor;if (ppduinfo->userstats[ppduinfo->userid].ampdu_present) { rxs->flag |=RX_FLAG_AMPDU_DETAILS ;
Signature · 1 line
2.34.1
PATCH 2/3 wifi: ath12k: fix HAL_PHYRX_COMMON_USER_INFO handling in monitor mode
In reply to Kang YangCurrent monitor mode will parse TLV HAL_PHYRX_OTHER_RECEIVE_INFO with struct hal_phyrx_common_user_info.
Obviously, they do not match. The original intention here was to parse HAL_PHYRX_COMMON_USER_INFO. So fix it by correctly parsing HAL_PHYRX_COMMON_USER_INFO instead.
Also add LTF parsing and report to radiotap along with GI.
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/dp_mon.c | 35 ++++++++++++++++++++---- drivers/net/wireless/ath/ath12k/hal_rx.h | 3 +- 2 files changed, 32 insertions(+), 6 deletions(-)
drivers/net/wireless/ath/ath12k/dp_mon.c +30 -5
@@ -1440,6 +1440,34 @@ static void ath12k_dp_mon_parse_rx_msdu_end_err(u32 info, u32 *errmap) *errmap |=HAL_RX_MPDU_ERR_MPDU_LEN ; } +static void +ath12k_parse_cmn_usr_info (const struct hal_phyrx_common_user_info *cmn_usr_info, +struct hal_rx_mon_ppdu_info *ppdu_info) +{ +struct hal_rx_radiotap_eht *eht = &ppdu_info->eht_info.eht; +u32 known, data, cp_setting, ltf_size; + + known =__le32_to_cpu (eht->known); + known |=IEEE80211_RADIOTAP_EHT_KNOWN_GI | +IEEE80211_RADIOTAP_EHT_KNOWN_EHT_LTF ; + eht->known =cpu_to_le32 (known); + + cp_setting =le32_get_bits (cmn_usr_info->info0, +HAL_RX_CMN_USR_INFO0_CP_SETTING ); + ltf_size =le32_get_bits (cmn_usr_info->info0, +HAL_RX_CMN_USR_INFO0_LTF_SIZE ); + + data =__le32_to_cpu (eht->data[0 ]); + data |=u32_encode_bits (cp_setting,IEEE80211_RADIOTAP_EHT_DATA0_GI ); + data |=u32_encode_bits (ltf_size,IEEE80211_RADIOTAP_EHT_DATA0_LTF ); + eht->data[0 ] =cpu_to_le32 (data); + +if (!ppdu_info->ltf_size) + ppdu_info->ltf_size = ltf_size; +if (!ppdu_info->gi) + ppdu_info->gi = cp_setting; +} +static void ath12k_dp_mon_parse_status_msdu_end (struct ath12k_mon_data *pmon,const struct hal_rx_msdu_end *msdu_end)
@@ -1641,11 +1669,8 @@ ath12k_dp_mon_rx_parse_status_tlv(struct ath12k *ar, HAL_RX_PHYRX_RSSI_LEGACY_INFO_INFO0_RX_BW);break ; } -case HAL_PHYRX_OTHER_RECEIVE_INFO : { -const struct hal_phyrx_common_user_info *cmn_usr_info = tlv_data; - - ppdu_info->gi =le32_get_bits (cmn_usr_info->info0, -HAL_RX_PHY_CMN_USER_INFO0_GI ); +case HAL_PHYRX_COMMON_USER_INFO : { +ath12k_parse_cmn_usr_info (tlv_data, ppdu_info);break ; }case HAL_RX_PPDU_START_USER_INFO :
drivers/net/wireless/ath/ath12k/hal_rx.h +2 -1
@@ -695,7 +695,8 @@ struct hal_rx_resp_req_info {#define HAL_RX_MPDU_ERR_MPDU_LEN BIT(6)#define HAL_RX_MPDU_ERR_UNENCRYPTED_FRAME BIT(7) -#define HAL_RX_PHY_CMN_USER_INFO0_GI GENMASK(17, 16) +#define HAL_RX_CMN_USR_INFO0_CP_SETTING GENMASK(17, 16) +#define HAL_RX_CMN_USR_INFO0_LTF_SIZE GENMASK(19, 18)struct hal_phyrx_common_user_info {__le32 rsvd[2 ];
Signature · 1 line
2.34.1
PATCH 3/3 wifi: ath12k: fix the fetching of combined rssi
In reply to Kang YangCurrently, host fetches combined rssi from rssi_comb in struct hal_rx_phyrx_rssi_legacy_info.
rssi_comb is 8th to 15th bits of the second to last variable. rssi_comb_ppdu is the 0th to 7th of the last variable.
When bandwidth = 20MHz, rssi_comb = rssi_comb_ppdu. But when bandwidth > 20MHz, rssi_comb < rssi_comb_ppdu because rssi_comb only includes power of primary 20 MHz while rssi_comb_ppdu includes power of active RUs/subchannels. So should fetch combined rssi from rssi_comb_ppdu.
Also related macro definitions are too long, rename them.
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/dp_mon.c | 8 ++++---- drivers/net/wireless/ath/ath12k/hal_rx.h | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-)
drivers/net/wireless/ath/ath12k/dp_mon.c +4 -4
@@ -1655,18 +1655,18 @@ ath12k_dp_mon_rx_parse_status_tlv(struct ath12k *ar,const struct hal_rx_phyrx_rssi_legacy_info *rssi = tlv_data; info[0 ] =__le32_to_cpu (rssi->info0); - info[1 ] =__le32_to_cpu (rssi->info1); + info[2 ] =__le32_to_cpu (rssi->info2);/* TODO: Please note that the combined rssi will not be accurate * in MU case. Rssi in MU needs to be retrieved from * PHYRX_OTHER_RECEIVE_INFO TLV. */ ppdu_info->rssi_comb = -u32_get_bits (info[1 ], -HAL_RX_PHYRX_RSSI_LEGACY_INFO_INFO1_RSSI_COMB ); +u32_get_bits (info[2 ], +HAL_RX_RSSI_LEGACY_INFO_INFO2_RSSI_COMB_PPDU ); ppdu_info->bw =u32_get_bits (info[0 ], -HAL_RX_PHYRX_RSSI_LEGACY_INFO_INFO0_RX_BW ); +HAL_RX_RSSI_LEGACY_INFO_INFO0_RX_BW );break ; }case HAL_PHYRX_COMMON_USER_INFO : {
drivers/net/wireless/ath/ath12k/hal_rx.h +5 -4
@@ -483,15 +483,16 @@ enum hal_rx_ul_reception_type { HAL_RECEPTION_TYPE_FRAMELESS }; -#define HAL_RX_PHYRX_RSSI_LEGACY_INFO_INFO0_RECEPTION GENMASK(3, 0) -#define HAL_RX_PHYRX_RSSI_LEGACY_INFO_INFO0_RX_BW GENMASK(7, 5) -#define HAL_RX_PHYRX_RSSI_LEGACY_INFO_INFO1_RSSI_COMB GENMASK(15, 8) +#define HAL_RX_RSSI_LEGACY_INFO_INFO0_RECEPTION GENMASK(3, 0) +#define HAL_RX_RSSI_LEGACY_INFO_INFO0_RX_BW GENMASK(7, 5) +#define HAL_RX_RSSI_LEGACY_INFO_INFO1_RSSI_COMB GENMASK(15, 8) +#define HAL_RX_RSSI_LEGACY_INFO_INFO2_RSSI_COMB_PPDU GENMASK(7, 0)struct hal_rx_phyrx_rssi_legacy_info {__le32 info0;__le32 rsvd0[39 ];__le32 info1; -__le32 rsvd1; +__le32 info2; } __packed;#define HAL_RX_MPDU_START_INFO0_PPDU_ID GENMASK(31, 16)
Signature · 1 line
2.34.1
Quoted 11 lines · Kang Yang
This patch-set includes three nit fixes for monitor mode.
Kang Yang (3):
wifi: ath12k: fix signal in radiotap for WCN7850
wifi: ath12k: fixHAL_PHYRX_COMMON_USER_INFOhandling in monitor mode
wifi: ath12k: fix the fetching of combined rssidrivers/net/wireless/ath/ath12k/dp_mon.c | 49 +++++++++++++++++++----- drivers/net/wireless/ath/ath12k/hal_rx.h | 12 +++--- 2 files changed, 46 insertions(+), 15 deletions(-)
Quoted 7 lines · Kang Yang
This patch-set includes three nit fixes for monitor mode.
Kang Yang (3):
wifi: ath12k: fix signal in radiotap for WCN7850
wifi: ath12k: fixHAL_PHYRX_COMMON_USER_INFOhandling in monitor mode
wifi: ath12k: fix the fetching of combined rssi
Quoted 6 lines
drivers/net/wireless/ath/ath12k/dp_mon.c | 49 +++++++++++++++++++----- drivers/net/wireless/ath/ath12k/hal_rx.h | 12 +++--- 2 files changed, 46 insertions(+), 15 deletions(-)base-commit:
e4f11ae0c4b29ca0c133f891412afd5dcddc68ff
Jeff Johnson
AppliedQuoted 8 lines · Kang Yang
This patch-set includes three nit fixes for monitor mode.
Kang Yang (3):
wifi: ath12k: fix signal in radiotap for WCN7850
wifi: ath12k: fixHAL_PHYRX_COMMON_USER_INFOhandling in monitor mode
wifi: ath12k: fix the fetching of combined rssi[...]
Applied, thanks!
[1/3] wifi: ath12k: fix signal in radiotap for WCN7850
commit: cf412ae7b7124e2b3bfe472616ec24b117b6008a
[2/3] wifi: ath12k: fix HAL_PHYRX_COMMON_USER_INFO handling in monitor mode
commit: 6b46e85129185ec076f9c3bd2813dfd2f968522b
[3/3] wifi: ath12k: fix the fetching of combined rssi
commit: 7695fa71c1d50a375e54426421acbc8d457bc5a3Best regards,
Signature · 1 line
Jeff Johnson <[email protected]>