wifi: ath12k: fetch correct pdev id from WMI_SERVICE_READY_EXT_EVENTID

Currently while fetching for pdev id from WMI_SERVICE_READY_EXT_EVENTID
we consider 32 bit pdev_id in ath12k_wmi_caps_ext_params structure. But
Firmware sends lower 16 bit for pdev id along with higher 16 bit for
hw_link_id. Due to this wrong pdev id is fetched. This wrong pdev id
when used for WMI commands leads to Firmware crash.

Hence fetch the correct pdev id considering only the lower 16 bits.

Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00188-QCAHKSWPL_SILICONZ-1
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.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3

Signed-off-by: Sowmiya Sree Elavalagan <quic_ssreeela@quicinc.com>
Co-developed-by: Raj Kumar Bhagat <quic_rajkbhag@quicinc.com>
Signed-off-by: Raj Kumar Bhagat <quic_rajkbhag@quicinc.com>
Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://msgid.link/20240129065724.2310207-3-quic_rajkbhag@quicinc.com

diff --git a/drivers/net/wireless/ath/ath12k/wmi.c b/drivers/net/wireless/ath/ath12k/wmi.c
index 5f1cce16589f8cb267fa5d3bf528fb0cc008b331..487ca82bd17d8870b1dfe383be9a343567e478c9 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/wmi.c
+++ b/drivers/net/wireless/ath/ath12k/wmi.c
@@ -493,13 +493,13 @@ ath12k_pull_mac_phy_cap_svc_ready_ext(struct ath12k_wmi_pdev *wmi_handle,
 
        mac_caps = wmi_mac_phy_caps + phy_idx;
 
-       pdev->pdev_id = le32_to_cpu(mac_caps->pdev_id);
+       pdev->pdev_id = ath12k_wmi_mac_phy_get_pdev_id(mac_caps);
        pdev_cap->supported_bands |= le32_to_cpu(mac_caps->supported_bands);
        pdev_cap->ampdu_density = le32_to_cpu(mac_caps->ampdu_density);
 
        fw_pdev = &ab->fw_pdev[ab->fw_pdev_count];
        fw_pdev->supported_bands = le32_to_cpu(mac_caps->supported_bands);
-       fw_pdev->pdev_id = le32_to_cpu(mac_caps->pdev_id);
+       fw_pdev->pdev_id = ath12k_wmi_mac_phy_get_pdev_id(mac_caps);
        fw_pdev->phy_id = le32_to_cpu(mac_caps->phy_id);
        ab->fw_pdev_count++;
 
@@ -4215,7 +4215,7 @@ ath12k_wmi_tlv_mac_phy_caps_ext_parse(struct ath12k_base *ab,
                for (i = 0; i < ab->fw_pdev_count; i++) {
                        struct ath12k_fw_pdev *fw_pdev = &ab->fw_pdev[i];
 
-                       if (fw_pdev->pdev_id == le32_to_cpu(caps->pdev_id) &&
+                       if (fw_pdev->pdev_id == ath12k_wmi_caps_ext_get_pdev_id(caps) &&
                            fw_pdev->phy_id == le32_to_cpu(caps->phy_id)) {
                                bands = fw_pdev->supported_bands;
                                break;
@@ -4272,7 +4272,8 @@ static int ath12k_wmi_tlv_mac_phy_caps_ext(struct ath12k_base *ab, u16 tag,
                        return 0;
        } else {
                for (i = 0; i < ab->num_radios; i++) {
-                       if (ab->pdevs[i].pdev_id == le32_to_cpu(caps->pdev_id))
+                       if (ab->pdevs[i].pdev_id ==
+                           ath12k_wmi_caps_ext_get_pdev_id(caps))
                                break;
                }
 

diff --git a/drivers/net/wireless/ath/ath12k/wmi.h b/drivers/net/wireless/ath/ath12k/wmi.h
index d8481c710021ccfc2e3a7d99ab7d04b3b29efa33..06b931222321ad070ce72ca1b7526349e8ba3f36 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/wmi.h
+++ b/drivers/net/wireless/ath/ath12k/wmi.h
@@ -2542,9 +2542,17 @@ struct ath12k_wmi_hw_mode_cap_params {
 
 #define WMI_MAX_HECAP_PHY_SIZE                 (3)
 
+/* pdev_id is present in lower 16 bits of pdev_and_hw_link_ids in
+ * ath12k_wmi_mac_phy_caps_params & ath12k_wmi_caps_ext_params.
+ *
+ * hw_link_id is present in higher 16 bits of pdev_and_hw_link_ids.
+ */
+#define WMI_CAPS_PARAMS_PDEV_ID                GENMASK(15, 0)
+#define WMI_CAPS_PARAMS_HW_LINK_ID     GENMASK(31, 16)
+
 struct ath12k_wmi_mac_phy_caps_params {
        __le32 hw_mode_id;
-       __le32 pdev_id;
+       __le32 pdev_and_hw_link_ids;
        __le32 phy_id;
        __le32 supported_flags;
        __le32 supported_bands;
@@ -2636,13 +2644,7 @@ struct wmi_service_ready_ext2_event {
 
 struct ath12k_wmi_caps_ext_params {
        __le32 hw_mode_id;
-       union {
-               struct {
-                       __le16 pdev_id;
-                       __le16 hw_link_id;
-               } __packed ath12k_wmi_pdev_to_link_map;
-               __le32 pdev_id;
-       };
+       __le32 pdev_and_hw_link_ids;
        __le32 phy_id;
        __le32 wireless_modes_ext;
        __le32 eht_cap_mac_info_2ghz[WMI_MAX_EHTCAP_MAC_SIZE];
@@ -4921,4 +4923,30 @@ int ath12k_wmi_probe_resp_tmpl(struct ath12k *ar, u32 vdev_id,
 int ath12k_wmi_set_hw_mode(struct ath12k_base *ab,
                           enum wmi_host_hw_mode_config_type mode);
 
+static inline u32
+ath12k_wmi_caps_ext_get_pdev_id(const struct ath12k_wmi_caps_ext_params *param)
+{
+       return le32_get_bits(param->pdev_and_hw_link_ids, WMI_CAPS_PARAMS_PDEV_ID);
+}
+
+static inline u32
+ath12k_wmi_caps_ext_get_hw_link_id(const struct ath12k_wmi_caps_ext_params *param)
+{
+       return le32_get_bits(param->pdev_and_hw_link_ids, WMI_CAPS_PARAMS_HW_LINK_ID);
+}
+
+static inline u32
+ath12k_wmi_mac_phy_get_pdev_id(const struct ath12k_wmi_mac_phy_caps_params *param)
+{
+       return le32_get_bits(param->pdev_and_hw_link_ids,
+                            WMI_CAPS_PARAMS_PDEV_ID);
+}
+
+static inline u32
+ath12k_wmi_mac_phy_get_hw_link_id(const struct ath12k_wmi_mac_phy_caps_params *param)
+{
+       return le32_get_bits(param->pdev_and_hw_link_ids,
+                            WMI_CAPS_PARAMS_HW_LINK_ID);
+}
+
 #endif