wifi: ath12k: Defer vdev bring-up until CSA finalize to avoid stale beacon

Mac80211 schedules CSA finalize work twice during a channel switch: first
during the reserved switch phase and again during the finalize phase.
The beacon content is updated only during the second schedule, which occurs
after the reserved switch completes. However, the ath12k driver attempts to
bring up the VDEV during the channel switch callback
(ath12k_mac_update_vif_chan()), which leads to premature installation of
stale beacon templates before the updated content is available.

This premature VDEV bring-up causes outdated beacon information to be
broadcast, which can result in updated channel parameters during the
transition. In MBSSID scenarios, this behavior is particularly problematic
because the transmitting interface's beacon must be updated before
non-transmitting interfaces are brought up. Failing to do so can lead to
beacon mismatches across interfaces.

Introduce a is_csa_in_progress flag to defer VDEV_UP until CSA finalize is
complete. Set this flag during the channel switch callback when CSA is
active. In bss_info_changed(), check this flag and issue VDEV_UP only
after the beacon template has been updated.

Ensure that in MBSSID cases, the transmitting interface is brought up
first, followed by all non-transmitting interfaces. This ordering makes
sure correct beacon propagation and avoids stale beacon installation
during CSA transitions.

Additionally, move the call to ath12k_mac_update_peer_puncturing_width()
before VDEV bring-up during CSA handling. This ensures that the puncturing
bitmap and bandwidth settings are applied before the VDEV is brought up.

Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1

Fixes: 8c6faa56bfb2 ("wifi: ath12k: add MBSSID beacon support")
Signed-off-by: Aditya Kumar Singh <aditya.kumar.singh@oss.qualcomm.com>
Signed-off-by: Maharaja Kennadyrajan <maharaja.kennadyrajan@oss.qualcomm.com>
Reviewed-by: Vasanthakumar Thiagarajan <vasanthakumar.thiagarajan@oss.qualcomm.com>
Link: https://patch.msgid.link/20250924134336.888-1-maharaja.kennadyrajan@oss.qualcomm.com
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath12k/core.h b/drivers/net/wireless/ath/ath12k/core.h
index 48d95ea7b3dbc36d7c272f70d22df398b98baca0..02a32b9f3ac29a8ccecd6a595a8614383b285df0 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/core.h
+++ b/drivers/net/wireless/ath/ath12k/core.h
@@ -355,6 +355,7 @@ struct ath12k_link_vif {
        struct wmi_vdev_install_key_arg group_key;
        bool pairwise_key_done;
        u16 num_stations;
+       bool is_csa_in_progress;
 };
 
 struct ath12k_vif {

diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
index 1d7b60aa5cb09a7f1d6b6ff4cca6181f4ddd2f76..84473dbf22e13d1dc4a9596edc2890e459b484d7 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@ -4221,6 +4221,30 @@ static bool ath12k_mac_supports_tpc(struct ath12k *ar, struct ath12k_vif *ahvif,
                chandef->chan->band == NL80211_BAND_6GHZ;
 }
 
+static void ath12k_wmi_vdev_params_up(struct ath12k *ar,
+                                     struct ath12k_link_vif *arvif,
+                                     struct ath12k_link_vif *tx_arvif,
+                                     struct ieee80211_bss_conf *info, u16 aid)
+{
+       struct ath12k_wmi_vdev_up_params params = {
+               .vdev_id = arvif->vdev_id,
+               .aid = aid,
+               .bssid = arvif->bssid
+       };
+       int ret;
+
+       if (tx_arvif) {
+               params.tx_bssid = tx_arvif->bssid;
+               params.nontx_profile_idx = info->bssid_index;
+               params.nontx_profile_cnt = 1 << info->bssid_indicator;
+       }
+
+       ret = ath12k_wmi_vdev_up(arvif->ar, &params);
+       if (ret)
+               ath12k_warn(ar->ab, "failed to bring vdev up %d: %d\n",
+                           arvif->vdev_id, ret);
+}
+
 static void ath12k_mac_bss_info_changed(struct ath12k *ar,
                                        struct ath12k_link_vif *arvif,
                                        struct ieee80211_bss_conf *info,
@@ -4228,6 +4252,7 @@ static void ath12k_mac_bss_info_changed(struct ath12k *ar,
 {
        struct ath12k_vif *ahvif = arvif->ahvif;
        struct ieee80211_vif *vif = ath12k_ahvif_to_vif(ahvif);
+       struct ath12k_link_vif *tx_arvif;
        struct cfg80211_chan_def def;
        u32 param_id, param_value;
        enum nl80211_band band;
@@ -4236,9 +4261,9 @@ static void ath12k_mac_bss_info_changed(struct ath12k *ar,
        u32 preamble;
        u16 hw_value;
        u16 bitrate;
-       int ret;
        u8 rateidx;
        u32 rate;
+       int ret;
 
        lockdep_assert_wiphy(ath12k_ar_to_hw(ar)->wiphy);
 
@@ -4271,12 +4296,41 @@ static void ath12k_mac_bss_info_changed(struct ath12k *ar,
                                   "Set burst beacon mode for VDEV: %d\n",
                                   arvif->vdev_id);
 
+               /* In MBSSID case, need to install transmitting VIF's template first */
+
                ret = ath12k_mac_setup_bcn_tmpl(arvif);
                if (ret)
                        ath12k_warn(ar->ab, "failed to update bcn template: %d\n",
                                    ret);
+
+               if (!arvif->is_csa_in_progress)
+                       goto skip_vdev_up;
+
+               tx_arvif = ath12k_mac_get_tx_arvif(arvif, info);
+               if (tx_arvif && arvif != tx_arvif && tx_arvif->is_csa_in_progress)
+                       /* skip non tx vif's */
+                       goto skip_vdev_up;
+
+               ath12k_wmi_vdev_params_up(ar, arvif, tx_arvif, info, ahvif->aid);
+
+               arvif->is_csa_in_progress = false;
+
+               if (tx_arvif && arvif == tx_arvif) {
+                       struct ath12k_link_vif *arvif_itr;
+
+                       list_for_each_entry(arvif_itr, &ar->arvifs, list) {
+                               if (!arvif_itr->is_csa_in_progress)
+                                       continue;
+
+                               ath12k_wmi_vdev_params_up(ar, arvif, tx_arvif,
+                                                         info, ahvif->aid);
+                               arvif_itr->is_csa_in_progress = false;
+                       }
+               }
        }
 
+skip_vdev_up:
+
        if (changed & (BSS_CHANGED_BEACON_INFO | BSS_CHANGED_BEACON)) {
                arvif->dtim_period = info->dtim_period;
 
@@ -10862,9 +10916,9 @@ ath12k_mac_update_vif_chan(struct ath12k *ar,
                           int n_vifs)
 {
        struct ath12k_wmi_vdev_up_params params = {};
-       struct ath12k_link_vif *arvif;
        struct ieee80211_bss_conf *link_conf;
        struct ath12k_base *ab = ar->ab;
+       struct ath12k_link_vif *arvif;
        struct ieee80211_vif *vif;
        struct ath12k_vif *ahvif;
        u8 link_id;
@@ -10925,6 +10979,28 @@ ath12k_mac_update_vif_chan(struct ath12k *ar,
                        continue;
                }
 
+               ret = ath12k_mac_update_peer_puncturing_width(arvif->ar, arvif,
+                                                             vifs[i].new_ctx->def);
+               if (ret) {
+                       ath12k_warn(ar->ab,
+                                   "failed to update puncturing bitmap %02x and width %d: %d\n",
+                                   vifs[i].new_ctx->def.punctured,
+                                   vifs[i].new_ctx->def.width, ret);
+                       continue;
+               }
+
+               /* Defer VDEV bring-up during CSA to avoid installing stale
+                * beacon templates. The beacon content is updated only
+                * after CSA finalize, so we mark CSA in progress and skip
+                * VDEV_UP for now. It will be handled later in
+                * bss_info_changed().
+                */
+               if (link_conf->csa_active &&
+                   arvif->ahvif->vdev_type == WMI_VDEV_TYPE_AP) {
+                       arvif->is_csa_in_progress = true;
+                       continue;
+               }
+
                ret = ath12k_mac_setup_bcn_tmpl(arvif);
                if (ret)
                        ath12k_warn(ab, "failed to update bcn tmpl during csa: %d\n",
@@ -10945,16 +11021,6 @@ ath12k_mac_update_vif_chan(struct ath12k *ar,
                                    arvif->vdev_id, ret);
                        continue;
                }
-
-               ret = ath12k_mac_update_peer_puncturing_width(arvif->ar, arvif,
-                                                             vifs[i].new_ctx->def);
-               if (ret) {
-                       ath12k_warn(ar->ab,
-                                   "failed to update puncturing bitmap %02x and width %d: %d\n",
-                                   vifs[i].new_ctx->def.punctured,
-                                   vifs[i].new_ctx->def.width, ret);
-                       continue;
-               }
        }
 
        /* Restart the internal monitor vdev on new channel */