ath11k: fix wmi service ready ext tlv parsing

The current ath11k driver failed to parse
wmi_tlv_svc_rdy_ext_parse if there is change in
wmi_mac_phy_capabilities length with below error.

ath11k c000000.wifi1: failed to extract mac caps, idx :0
ath11k c000000.wifi1: failed to parse tlv -22

This is needed to get firmware version
WLAN.HK.2.0.0.1-00240-QCAHKSWPL_SILICONZ-1 working.

Signed-off-by: Anilkumar Kolli <akolli@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c
index 2c3c973f5f7c5cd291ce7d4962fd46dbf9397d2c..ccebf7ce420a2c6a230a1f7cee4e9ecec05c67e8 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/wmi.c
+++ b/drivers/net/wireless/ath/ath11k/wmi.c
@@ -310,7 +310,7 @@ ath11k_pull_mac_phy_cap_svc_ready_ext(struct ath11k_pdev_wmi *wmi_handle,
        if (phy_id >= hal_reg_caps->num_phy)
                return -EINVAL;
 
-       mac_phy_caps = &wmi_mac_phy_caps[phy_idx];
+       mac_phy_caps = wmi_mac_phy_caps + phy_idx;
 
        pdev->pdev_id = mac_phy_caps->pdev_id;
        pdev_cap->supported_bands = mac_phy_caps->supported_bands;
@@ -2959,6 +2959,15 @@ static int ath11k_wmi_tlv_mac_phy_caps_parse(struct ath11k_base *soc,
        if (svc_rdy_ext->n_mac_phy_caps >= svc_rdy_ext->tot_phy_id)
                return -ENOBUFS;
 
+       len = min_t(u16, len, sizeof(struct wmi_mac_phy_capabilities));
+       if (!svc_rdy_ext->n_mac_phy_caps) {
+               svc_rdy_ext->mac_phy_caps = kzalloc((svc_rdy_ext->tot_phy_id) * len,
+                                                   GFP_ATOMIC);
+               if (!svc_rdy_ext->mac_phy_caps)
+                       return -ENOMEM;
+       }
+
+       memcpy(svc_rdy_ext->mac_phy_caps + svc_rdy_ext->n_mac_phy_caps, ptr, len);
        svc_rdy_ext->n_mac_phy_caps++;
        return 0;
 }
@@ -3092,8 +3101,6 @@ static int ath11k_wmi_tlv_svc_rdy_ext_parse(struct ath11k_base *ab,
                        svc_rdy_ext->hw_mode_done = true;
                } else if (!svc_rdy_ext->mac_phy_done) {
                        svc_rdy_ext->n_mac_phy_caps = 0;
-                       svc_rdy_ext->mac_phy_caps =
-                                       (struct wmi_mac_phy_capabilities *)ptr;
                        ret = ath11k_wmi_tlv_iter(ab, ptr, len,
                                                  ath11k_wmi_tlv_mac_phy_caps_parse,
                                                  svc_rdy_ext);
@@ -3134,6 +3141,7 @@ static int ath11k_service_ready_ext_event(struct ath11k_base *ab,
                return ret;
        }
 
+       kfree(svc_rdy_ext.mac_phy_caps);
        return 0;
 }
 

diff --git a/drivers/net/wireless/ath/ath11k/wmi.h b/drivers/net/wireless/ath/ath11k/wmi.h
index 7d5690c65279ba8072273342d031adcf774cdd54..6a0468094694e0b40538e9b99a7e6c37eac2dd13 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/wmi.h
+++ b/drivers/net/wireless/ath/ath11k/wmi.h
@@ -2276,7 +2276,6 @@ struct wmi_hw_mode_capabilities {
 #define WMI_MAX_HECAP_PHY_SIZE                 (3)
 
 struct wmi_mac_phy_capabilities {
-       u32 tlv_header;
        u32 hw_mode_id;
        u32 pdev_id;
        u32 phy_id;