wifi: ath12k: refactor 320 MHz bandwidth support parsing

For single pdev device, 320 MHz bandwidth support is reported only in
capability of WMI_HOST_HW_MODE_SINGLE mode, hence commit d4e244c85e45
("wifi: ath12k: enable 320 MHz bandwidth for 6 GHz band in EHT PHY
capability for WCN7850") relaxed the condition check in
ath12k_wmi_tlv_mac_phy_caps_ext() to allow SINGLE mode getting parsed in
ath12k_wmi_tlv_mac_phy_caps_ext_parse(). Since SINGLE mode is not assumed
to be preferred, the function returns unconditionally after parsing 320
MHz support.

This works for WCN7850 because it prefers another mode indeed, while it
breaks QCC2072 since it prefers SINGLE mode. Due to the unconditional
return, the subsequent EHT parsing is skipped. Consequently EHT related
features are disabled.

Refactor it by moving 320 MHz parsing to ath12k_wmi_tlv_mac_phy_caps_ext(),
before the mode checking. This makes the code more straightforward, and
work for both WCN7850 and QCC2072.

Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c5-00302-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1.115823.3

Signed-off-by: Baochen Qiang <baochen.qiang@oss.qualcomm.com>
Reviewed-by: Vasanthakumar Thiagarajan <vasanthakumar.thiagarajan@oss.qualcomm.com>
Link: https://patch.msgid.link/20260112-ath12k-support-qcc2072-v2-5-fc8ce1e43969@oss.qualcomm.com
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath12k/wmi.c b/drivers/net/wireless/ath/ath12k/wmi.c
index ce2bbf6acb4a24e5f46ba4d60985419684d8ec6c..dd643af892c28930239f63abd8f28e130ca2d4e6 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/wmi.c
+++ b/drivers/net/wireless/ath/ath12k/wmi.c
@@ -4918,19 +4918,10 @@ ath12k_wmi_tlv_mac_phy_caps_ext_parse(struct ath12k_base *ab,
                                      const struct ath12k_wmi_caps_ext_params *caps,
                                      struct ath12k_pdev *pdev)
 {
-       struct ath12k_band_cap *cap_band;
-       u32 bands, support_320mhz;
+       u32 bands;
        int i;
 
        if (ab->hw_params->single_pdev_only) {
-               if (caps->hw_mode_id == WMI_HOST_HW_MODE_SINGLE) {
-                       support_320mhz = le32_to_cpu(caps->eht_cap_phy_info_5ghz[0]) &
-                               IEEE80211_EHT_PHY_CAP0_320MHZ_IN_6GHZ;
-                       cap_band = &pdev->cap.band[NL80211_BAND_6GHZ];
-                       cap_band->eht_cap_phy_info[0] |= support_320mhz;
-                       return 0;
-               }
-
                for (i = 0; i < ab->fw_pdev_count; i++) {
                        struct ath12k_fw_pdev *fw_pdev = &ab->fw_pdev[i];
 
@@ -4983,14 +4974,22 @@ static int ath12k_wmi_tlv_mac_phy_caps_ext(struct ath12k_base *ab, u16 tag,
                                           void *data)
 {
        const struct ath12k_wmi_caps_ext_params *caps = ptr;
+       struct ath12k_band_cap *cap_band;
+       u32 support_320mhz;
        int i = 0, ret;
 
        if (tag != WMI_TAG_MAC_PHY_CAPABILITIES_EXT)
                return -EPROTO;
 
        if (ab->hw_params->single_pdev_only) {
-               if (ab->wmi_ab.preferred_hw_mode != le32_to_cpu(caps->hw_mode_id) &&
-                   caps->hw_mode_id != WMI_HOST_HW_MODE_SINGLE)
+               if (caps->hw_mode_id == WMI_HOST_HW_MODE_SINGLE) {
+                       support_320mhz = le32_to_cpu(caps->eht_cap_phy_info_5ghz[0]) &
+                                        IEEE80211_EHT_PHY_CAP0_320MHZ_IN_6GHZ;
+                       cap_band = &ab->pdevs[0].cap.band[NL80211_BAND_6GHZ];
+                       cap_band->eht_cap_phy_info[0] |= support_320mhz;
+               }
+
+               if (ab->wmi_ab.preferred_hw_mode != le32_to_cpu(caps->hw_mode_id))
                        return 0;
        } else {
                for (i = 0; i < ab->num_radios; i++) {