wifi: ath11k: move power type check to ASSOC stage when connecting to 6 GHz AP

With commit bc8a0fac8677 ("wifi: mac80211: don't set bss_conf in parsing")
ath11k fails to connect to 6 GHz AP.

This is because currently ath11k checks AP's power type in
ath11k_mac_op_assign_vif_chanctx() which would be called in AUTH stage.
However with above commit power type is not available until ASSOC stage.
As a result power type check fails and therefore connection fails.

Fix this by moving power type check to ASSOC stage, also move regulatory
rules update there because it depends on power type.

Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.30

Fixes: bc8a0fac8677 ("wifi: mac80211: don't set bss_conf in parsing")
Signed-off-by: Baochen Qiang <[email protected]>
Acked-by: Jeff Johnson <[email protected]>
Signed-off-by: Kalle Valo <[email protected]>
Link: https://msgid.link/[email protected]

diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index 4f62e38ba48b3a144ba658ce11f4c8193024d89a..9b96dbb21d8336fd5bf8264514cfd3386e74537c 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -7988,8 +7988,6 @@ ath11k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw,
        struct ath11k_base *ab = ar->ab;
        struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);
        int ret;
-       struct cur_regulatory_info *reg_info;
-       enum ieee80211_ap_reg_power power_type;
 
        mutex_lock(&ar->conf_mutex);
 
@@ -8000,17 +7998,6 @@ ath11k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw,
        if (ath11k_wmi_supports_6ghz_cc_ext(ar) &&
            ctx->def.chan->band == NL80211_BAND_6GHZ &&
            arvif->vdev_type == WMI_VDEV_TYPE_STA) {
-               reg_info = &ab->reg_info_store[ar->pdev_idx];
-               power_type = vif->bss_conf.power_type;
-
-               ath11k_dbg(ab, ATH11K_DBG_MAC, "chanctx power type %d\n", power_type);
-
-               if (power_type == IEEE80211_REG_UNSET_AP) {
-                       ret = -EINVAL;
-                       goto out;
-               }
-
-               ath11k_reg_handle_chan_list(ab, reg_info, power_type);
                arvif->chanctx = *ctx;
                ath11k_mac_parse_tx_pwr_env(ar, vif, ctx);
        }
@@ -9626,6 +9613,8 @@ static int ath11k_mac_op_sta_state(struct ieee80211_hw *hw,
        struct ath11k *ar = hw->priv;
        struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);
        struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta);
+       enum ieee80211_ap_reg_power power_type;
+       struct cur_regulatory_info *reg_info;
        struct ath11k_peer *peer;
        int ret = 0;
 
@@ -9705,6 +9694,29 @@ static int ath11k_mac_op_sta_state(struct ieee80211_hw *hw,
                                ath11k_warn(ar->ab, "Unable to authorize peer %pM vdev %d: %d\n",
                                            sta->addr, arvif->vdev_id, ret);
                }
+
+               if (!ret &&
+                   ath11k_wmi_supports_6ghz_cc_ext(ar) &&
+                   arvif->vdev_type == WMI_VDEV_TYPE_STA &&
+                   arvif->chanctx.def.chan &&
+                   arvif->chanctx.def.chan->band == NL80211_BAND_6GHZ) {
+                       reg_info = &ar->ab->reg_info_store[ar->pdev_idx];
+                       power_type = vif->bss_conf.power_type;
+
+                       if (power_type == IEEE80211_REG_UNSET_AP) {
+                               ath11k_warn(ar->ab, "invalid power type %d\n",
+                                           power_type);
+                               ret = -EINVAL;
+                       } else {
+                               ret = ath11k_reg_handle_chan_list(ar->ab,
+                                                                 reg_info,
+                                                                 power_type);
+                               if (ret)
+                                       ath11k_warn(ar->ab,
+                                                   "failed to handle chan list with power type %d\n",
+                                                   power_type);
+                       }
+               }
        } else if (old_state == IEEE80211_STA_AUTHORIZED &&
                   new_state == IEEE80211_STA_ASSOC) {
                spin_lock_bh(&ar->ab->base_lock);