wifi: ath12k: fix HAL_PHYRX_COMMON_USER_INFO handling in monitor mode

Current 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

Fixes: d939919a36f4 ("wifi: ath12k: Add HAL_PHYRX_OTHER_RECEIVE_INFO TLV parsing support")
Signed-off-by: Kang Yang <kang.yang@oss.qualcomm.com>
Reviewed-by: Baochen Qiang <baochen.qiang@oss.qualcomm.com>
Reviewed-by: Vasanthakumar Thiagarajan <vasanthakumar.thiagarajan@oss.qualcomm.com>
Link: https://patch.msgid.link/20250722095934.67-3-kang.yang@oss.qualcomm.com
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath12k/dp_mon.c b/drivers/net/wireless/ath/ath12k/dp_mon.c
index ec1587d0b917c103349b8026111b9e5ad16abb1e..e93ede5e6197c07937406bc3530f648dc99d28f5 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/dp_mon.c
+++ b/drivers/net/wireless/ath/ath12k/dp_mon.c
@@ -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:

diff --git a/drivers/net/wireless/ath/ath12k/hal_rx.h b/drivers/net/wireless/ath/ath12k/hal_rx.h
index a3ab588aae19d67124b66eb748c4d2b24ec29680..801a5f6d3458b6bea99c4a82a87b74a6d3c3f3a4 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/hal_rx.h
+++ b/drivers/net/wireless/ath/ath12k/hal_rx.h
@@ -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];