wifi: ath12k: Use mac80211 vif's link_conf instead of bss_conf

Currently mac80211 vif's bss_conf is used to fetch any vif related
configurations in driver but with MLO multiple links are affiliated to a vif
and corresponding link configs are present in vif->link_conf[]. Fetch
link_conf for corresponding link from vif and use the same for configurations.

Add ath12k_mac_get_link_bss_conf() helper to fetch link_conf from arvif.

Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-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: Sriram R <quic_srirrama@quicinc.com>
Signed-off-by: Rameshkumar Sundaram <quic_ramess@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://patch.msgid.link/20241121155806.1862733-8-kvalo@kernel.org

diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
index 956d43520510f19330150661a5a5dca7c6f7afb5..827a1700e8ba0b5de3baad5ba1979dd7bf0c3fcf 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@ -501,6 +501,24 @@ static int ath12k_mac_vif_link_chan(struct ieee80211_vif *vif, u8 link_id,
        return 0;
 }
 
+static struct ieee80211_bss_conf *
+ath12k_mac_get_link_bss_conf(struct ath12k_link_vif *arvif)
+{
+       struct ieee80211_vif *vif = arvif->ahvif->vif;
+       struct ieee80211_bss_conf *link_conf;
+       struct ath12k *ar = arvif->ar;
+
+       lockdep_assert_wiphy(ath12k_ar_to_hw(ar)->wiphy);
+
+       if (arvif->link_id >= IEEE80211_MLD_MAX_NUM_LINKS)
+               return NULL;
+
+       link_conf = wiphy_dereference(ath12k_ar_to_hw(ar)->wiphy,
+                                     vif->link_conf[arvif->link_id]);
+
+       return link_conf;
+}
+
 static bool ath12k_mac_bitrate_is_cck(int bitrate)
 {
        switch (bitrate) {
@@ -1498,7 +1516,7 @@ static void ath12k_mac_set_arvif_ies(struct ath12k_link_vif *arvif, struct sk_bu
 static int ath12k_mac_setup_bcn_tmpl_ema(struct ath12k_link_vif *arvif)
 {
        struct ath12k_vif *ahvif = arvif->ahvif;
-       struct ieee80211_bss_conf *bss_conf = &ahvif->vif->bss_conf;
+       struct ieee80211_bss_conf *bss_conf;
        struct ath12k_wmi_bcn_tmpl_ema_arg ema_args;
        struct ieee80211_ema_beacons *beacons;
        struct ath12k_link_vif *tx_arvif;
@@ -1507,6 +1525,14 @@ static int ath12k_mac_setup_bcn_tmpl_ema(struct ath12k_link_vif *arvif)
        int ret = 0;
        u8 i;
 
+       bss_conf = ath12k_mac_get_link_bss_conf(arvif);
+       if (!bss_conf) {
+               ath12k_warn(arvif->ar->ab,
+                           "failed to get link bss conf to update bcn tmpl for vif %pM link %u\n",
+                           ahvif->vif->addr, arvif->link_id);
+               return -ENOLINK;
+       }
+
        tx_ahvif = ath12k_vif_to_ahvif(ahvif->vif->mbssid_tx_vif);
        tx_arvif = &tx_ahvif->deflink;
        beacons = ieee80211_beacon_get_template_ema_list(ath12k_ar_to_hw(tx_arvif->ar),
@@ -1553,6 +1579,7 @@ static int ath12k_mac_setup_bcn_tmpl(struct ath12k_link_vif *arvif)
 {
        struct ath12k_vif *ahvif = arvif->ahvif;
        struct ieee80211_vif *vif = ath12k_ahvif_to_vif(ahvif);
+       struct ieee80211_bss_conf *link_conf;
        struct ath12k_link_vif *tx_arvif = arvif;
        struct ath12k *ar = arvif->ar;
        struct ath12k_base *ab = ar->ab;
@@ -1565,13 +1592,20 @@ static int ath12k_mac_setup_bcn_tmpl(struct ath12k_link_vif *arvif)
        if (ahvif->vdev_type != WMI_VDEV_TYPE_AP)
                return 0;
 
+       link_conf = ath12k_mac_get_link_bss_conf(arvif);
+       if (!link_conf) {
+               ath12k_warn(ar->ab, "unable to access bss link conf to set bcn tmpl for vif %pM link %u\n",
+                           vif->addr, arvif->link_id);
+               return -ENOLINK;
+       }
+
        if (vif->mbssid_tx_vif) {
                tx_ahvif = ath12k_vif_to_ahvif(vif->mbssid_tx_vif);
                tx_arvif = &tx_ahvif->deflink;
                if (tx_arvif != arvif && arvif->is_up)
                        return 0;
 
-               if (vif->bss_conf.ema_ap)
+               if (link_conf->ema_ap)
                        return ath12k_mac_setup_bcn_tmpl_ema(arvif);
        }
 
@@ -1586,7 +1620,7 @@ static int ath12k_mac_setup_bcn_tmpl(struct ath12k_link_vif *arvif)
                ath12k_mac_set_arvif_ies(arvif, bcn, 0, NULL);
        } else {
                ath12k_mac_set_arvif_ies(arvif, bcn,
-                                        ahvif->vif->bss_conf.bssid_index,
+                                        link_conf->bssid_index,
                                         &nontx_profile_found);
                if (!nontx_profile_found)
                        ath12k_warn(ab,
@@ -1762,6 +1796,7 @@ static void ath12k_peer_assoc_h_basic(struct ath12k *ar,
        struct ieee80211_vif *vif = ath12k_ahvif_to_vif(arvif->ahvif);
        struct ieee80211_sta *sta = ath12k_ahsta_to_sta(arsta->ahsta);
        struct ieee80211_hw *hw = ath12k_ar_to_hw(ar);
+       struct ieee80211_bss_conf *bss_conf;
        u32 aid;
 
        lockdep_assert_wiphy(hw->wiphy);
@@ -1778,7 +1813,15 @@ static void ath12k_peer_assoc_h_basic(struct ath12k *ar,
        /* TODO: STA WAR in ath10k for listen interval required? */
        arg->peer_listen_intval = hw->conf.listen_interval;
        arg->peer_nss = 1;
-       arg->peer_caps = vif->bss_conf.assoc_capability;
+
+       bss_conf = ath12k_mac_get_link_bss_conf(arvif);
+       if (!bss_conf) {
+               ath12k_warn(ar->ab, "unable to access bss link conf in peer assoc for vif %pM link %u\n",
+                           vif->addr, arvif->link_id);
+               return;
+       }
+
+       arg->peer_caps = bss_conf->assoc_capability;
 }
 
 static void ath12k_peer_assoc_h_crypto(struct ath12k *ar,
@@ -1788,7 +1831,7 @@ static void ath12k_peer_assoc_h_crypto(struct ath12k *ar,
 {
        struct ieee80211_vif *vif = ath12k_ahvif_to_vif(arvif->ahvif);
        struct ieee80211_sta *sta = ath12k_ahsta_to_sta(arsta->ahsta);
-       struct ieee80211_bss_conf *info = &vif->bss_conf;
+       struct ieee80211_bss_conf *info;
        struct cfg80211_chan_def def;
        struct cfg80211_bss *bss;
        struct ieee80211_hw *hw = ath12k_ar_to_hw(ar);
@@ -1797,6 +1840,13 @@ static void ath12k_peer_assoc_h_crypto(struct ath12k *ar,
 
        lockdep_assert_wiphy(hw->wiphy);
 
+       info = ath12k_mac_get_link_bss_conf(arvif);
+       if (!info) {
+               ath12k_warn(ar->ab, "unable to access bss link conf for peer assoc crypto for vif %pM link %u\n",
+                           vif->addr, arvif->link_id);
+               return;
+       }
+
        if (WARN_ON(ath12k_mac_vif_link_chan(vif, arvif->link_id, &def)))
                return;
 
@@ -2176,6 +2226,7 @@ static void ath12k_peer_assoc_h_he(struct ath12k *ar,
        struct ieee80211_vif *vif = ath12k_ahvif_to_vif(arvif->ahvif);
        struct ieee80211_sta *sta = ath12k_ahsta_to_sta(arsta->ahsta);
        const struct ieee80211_sta_he_cap *he_cap = &sta->deflink.he_cap;
+       struct ieee80211_bss_conf *link_conf;
        int i;
        u8 ampdu_factor, max_nss;
        u8 rx_mcs_80 = IEEE80211_HE_MCS_NOT_SUPPORTED;
@@ -2184,6 +2235,13 @@ static void ath12k_peer_assoc_h_he(struct ath12k *ar,
        bool support_160;
        u16 v;
 
+       link_conf = ath12k_mac_get_link_bss_conf(arvif);
+       if (!link_conf) {
+               ath12k_warn(ar->ab, "unable to access bss link conf in peer assoc he for vif %pM link %u",
+                           vif->addr, arvif->link_id);
+               return;
+       }
+
        if (!he_cap->has_he)
                return;
 
@@ -2227,7 +2285,7 @@ static void ath12k_peer_assoc_h_he(struct ath12k *ar,
               sizeof(he_cap->he_cap_elem.mac_cap_info));
        memcpy(&arg->peer_he_cap_phyinfo, he_cap->he_cap_elem.phy_cap_info,
               sizeof(he_cap->he_cap_elem.phy_cap_info));
-       arg->peer_he_ops = vif->bss_conf.he_oper.params;
+       arg->peer_he_ops = link_conf->he_oper.params;
 
        /* the top most byte is used to indicate BSS color info */
        arg->peer_he_ops &= 0xffffff;
@@ -3133,6 +3191,7 @@ static void ath12k_recalculate_mgmt_rate(struct ath12k *ar,
        struct ieee80211_vif *vif = ath12k_ahvif_to_vif(arvif->ahvif);
        struct ieee80211_hw *hw = ath12k_ar_to_hw(ar);
        const struct ieee80211_supported_band *sband;
+       struct ieee80211_bss_conf *bss_conf;
        u8 basic_rate_idx;
        int hw_rate_code;
        u32 vdev_param;
@@ -3141,8 +3200,15 @@ static void ath12k_recalculate_mgmt_rate(struct ath12k *ar,
 
        lockdep_assert_wiphy(hw->wiphy);
 
+       bss_conf = ath12k_mac_get_link_bss_conf(arvif);
+       if (!bss_conf) {
+               ath12k_warn(ar->ab, "unable to access bss link conf in mgmt rate calc for vif %pM link %u\n",
+                           vif->addr, arvif->link_id);
+               return;
+       }
+
        sband = hw->wiphy->bands[def->chan->band];
-       basic_rate_idx = ffs(vif->bss_conf.basic_rates) - 1;
+       basic_rate_idx = ffs(bss_conf->basic_rates) - 1;
        bitrate = sband->bitrates[basic_rate_idx].bitrate;
 
        hw_rate_code = ath12k_mac_get_rate_hw_value(bitrate);
@@ -3226,6 +3292,7 @@ static void ath12k_mac_op_vif_cfg_changed(struct ieee80211_hw *hw,
 {
        struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);
        unsigned long links = ahvif->links_map;
+       struct ieee80211_bss_conf *info;
        struct ath12k_link_vif *arvif;
        struct ath12k *ar;
        u8 link_id;
@@ -3246,10 +3313,15 @@ static void ath12k_mac_op_vif_cfg_changed(struct ieee80211_hw *hw,
 
                        ar = arvif->ar;
 
-                       if (vif->cfg.assoc)
-                               ath12k_bss_assoc(ar, arvif, &vif->bss_conf);
-                       else
+                       if (vif->cfg.assoc) {
+                               info = ath12k_mac_get_link_bss_conf(arvif);
+                               if (!info)
+                                       continue;
+
+                               ath12k_bss_assoc(ar, arvif, info);
+                       } else {
                                ath12k_bss_disassoc(ar, arvif);
+                       }
                }
        }
 }
@@ -3260,6 +3332,7 @@ static void ath12k_mac_vif_setup_ps(struct ath12k_link_vif *arvif)
        struct ieee80211_vif *vif = arvif->ahvif->vif;
        struct ieee80211_conf *conf = &ath12k_ar_to_hw(ar)->conf;
        enum wmi_sta_powersave_param param;
+       struct ieee80211_bss_conf *info;
        enum wmi_sta_ps_mode psmode;
        int ret;
        int timeout;
@@ -3277,8 +3350,15 @@ static void ath12k_mac_vif_setup_ps(struct ath12k_link_vif *arvif)
 
                timeout = conf->dynamic_ps_timeout;
                if (timeout == 0) {
+                       info = ath12k_mac_get_link_bss_conf(arvif);
+                       if (!info) {
+                               ath12k_warn(ar->ab, "unable to access bss link conf in setup ps for vif %pM link %u\n",
+                                           vif->addr, arvif->link_id);
+                               return;
+                       }
+
                        /* firmware doesn't like 0 */
-                       timeout = ieee80211_tu_to_usec(vif->bss_conf.beacon_int) / 1000;
+                       timeout = ieee80211_tu_to_usec(info->beacon_int) / 1000;
                }
 
                ret = ath12k_wmi_set_sta_ps_param(ar, arvif->vdev_id, param,
@@ -3389,8 +3469,8 @@ static void ath12k_mac_bss_info_changed(struct ath12k *ar,
        if (changed & BSS_CHANGED_BEACON_ENABLED) {
                ath12k_control_beaconing(arvif, info);
 
-               if (arvif->is_up && vif->bss_conf.he_support &&
-                   vif->bss_conf.he_oper.params) {
+               if (arvif->is_up && info->he_support &&
+                   info->he_oper.params) {
                        /* TODO: Extend to support 1024 BA Bitmap size */
                        ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif->vdev_id,
                                                            WMI_VDEV_PARAM_BA_MODE,
@@ -3401,7 +3481,7 @@ static void ath12k_mac_bss_info_changed(struct ath12k *ar,
                                            arvif->vdev_id);
 
                        param_id = WMI_VDEV_PARAM_HEOPS_0_31;
-                       param_value = vif->bss_conf.he_oper.params;
+                       param_value = info->he_oper.params;
                        ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif->vdev_id,
                                                            param_id, param_value);
                        ath12k_dbg(ar->ab, ATH12K_DBG_MAC,
@@ -3493,12 +3573,12 @@ static void ath12k_mac_bss_info_changed(struct ath12k *ar,
        if (changed & BSS_CHANGED_MCAST_RATE &&
            !ath12k_mac_vif_link_chan(vif, arvif->link_id, &def)) {
                band = def.chan->band;
-               mcast_rate = vif->bss_conf.mcast_rate[band];
+               mcast_rate = info->mcast_rate[band];
 
                if (mcast_rate > 0)
                        rateidx = mcast_rate - 1;
                else
-                       rateidx = ffs(vif->bss_conf.basic_rates) - 1;
+                       rateidx = ffs(info->basic_rates) - 1;
 
                if (ar->pdev->cap.supported_bands & WMI_HOST_WLAN_5G_CAP)
                        rateidx += ATH12K_MAC_FIRST_OFDM_RATE_IDX;
@@ -4278,6 +4358,7 @@ static int ath12k_mac_set_key(struct ath12k *ar, enum set_key_cmd cmd,
 {
        struct ath12k_vif *ahvif = arvif->ahvif;
        struct ieee80211_vif *vif = ath12k_ahvif_to_vif(ahvif);
+       struct ieee80211_bss_conf *link_conf;
        struct ieee80211_sta *sta = NULL;
        struct ath12k_base *ab = ar->ab;
        struct ath12k_peer *peer;
@@ -4294,12 +4375,19 @@ static int ath12k_mac_set_key(struct ath12k *ar, enum set_key_cmd cmd,
        if (test_bit(ATH12K_FLAG_HW_CRYPTO_DISABLED, &ab->dev_flags))
                return 1;
 
+       link_conf = ath12k_mac_get_link_bss_conf(arvif);
+       if (!link_conf) {
+               ath12k_warn(ab, "unable to access bss link conf in set key for vif %pM link %u\n",
+                           vif->addr, arvif->link_id);
+               return -ENOLINK;
+       }
+
        if (sta)
                peer_addr = arsta->addr;
        else if (ahvif->vdev_type == WMI_VDEV_TYPE_STA)
-               peer_addr = vif->bss_conf.bssid;
+               peer_addr = link_conf->bssid;
        else
-               peer_addr = vif->addr;
+               peer_addr = link_conf->addr;
 
        key->hw_key_idx = key->keyidx;
 
@@ -7086,6 +7174,7 @@ static int ath12k_mac_setup_vdev_params_mbssid(struct ath12k_link_vif *arvif,
 {
        struct ath12k_vif *ahvif = arvif->ahvif;
        struct ieee80211_vif *tx_vif = ahvif->vif->mbssid_tx_vif;
+       struct ieee80211_bss_conf *link_conf;
        struct ath12k *ar = arvif->ar;
        struct ath12k_link_vif *tx_arvif;
        struct ath12k_vif *tx_ahvif;
@@ -7093,10 +7182,17 @@ static int ath12k_mac_setup_vdev_params_mbssid(struct ath12k_link_vif *arvif,
        if (!tx_vif)
                return 0;
 
+       link_conf = ath12k_mac_get_link_bss_conf(arvif);
+       if (!link_conf) {
+               ath12k_warn(ar->ab, "unable to access bss link conf in set mbssid params for vif %pM link %u\n",
+                           ahvif->vif->addr, arvif->link_id);
+               return -ENOLINK;
+       }
+
        tx_ahvif = ath12k_vif_to_ahvif(tx_vif);
        tx_arvif = &tx_ahvif->deflink;
 
-       if (ahvif->vif->bss_conf.nontransmitted) {
+       if (link_conf->nontransmitted) {
                if (ar->ah->hw->wiphy != ieee80211_vif_to_wdev(tx_vif)->wiphy)
                        return -EINVAL;
 
@@ -7108,7 +7204,7 @@ static int ath12k_mac_setup_vdev_params_mbssid(struct ath12k_link_vif *arvif,
                return -EINVAL;
        }
 
-       if (ahvif->vif->bss_conf.ema_ap)
+       if (link_conf->ema_ap)
                *flags |= WMI_VDEV_MBSSID_FLAGS_EMA_MODE;
 
        return 0;
@@ -7476,7 +7572,7 @@ int ath12k_mac_vdev_create(struct ath12k *ar, struct ath12k_link_vif *arvif)
                break;
        }
 
-       arvif->txpower = vif->bss_conf.txpower;
+       arvif->txpower = link_conf->txpower;
        ret = ath12k_mac_txpower_recalc(ar);
        if (ret)
                goto err_peer_del;
@@ -8165,11 +8261,18 @@ ath12k_mac_vdev_start_restart(struct ath12k_link_vif *arvif,
        struct wmi_vdev_start_req_arg arg = {};
        const struct cfg80211_chan_def *chandef = &ctx->def;
        struct ath12k_vif *ahvif = arvif->ahvif;
-       int he_support = ahvif->vif->bss_conf.he_support;
+       struct ieee80211_bss_conf *link_conf;
        int ret;
 
        lockdep_assert_wiphy(ath12k_ar_to_hw(ar)->wiphy);
 
+       link_conf = ath12k_mac_get_link_bss_conf(arvif);
+       if (!link_conf) {
+               ath12k_warn(ar->ab, "unable to access bss link conf in vdev start for vif %pM link %u\n",
+                           ahvif->vif->addr, arvif->link_id);
+               return -ENOLINK;
+       }
+
        reinit_completion(&ar->vdev_setup_done);
 
        arg.vdev_id = arvif->vdev_id;
@@ -8221,7 +8324,7 @@ ath12k_mac_vdev_start_restart(struct ath12k_link_vif *arvif,
                spin_unlock_bh(&ab->base_lock);
 
                /* TODO: Notify if secondary 80Mhz also needs radar detection */
-               if (he_support) {
+               if (link_conf->he_support) {
                        ret = ath12k_set_he_mu_sounding_mode(ar, arvif);
                        if (ret) {
                                ath12k_warn(ar->ab, "failed to set he mode vdev %i\n",

diff --git a/drivers/net/wireless/ath/ath12k/wmi.c b/drivers/net/wireless/ath/ath12k/wmi.c
index 50ed7e72f178f162f0324e86e69427a44748e73d..402ae477da61b401ccbbe2e6d96889557d37270d 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/wmi.c
+++ b/drivers/net/wireless/ath/ath12k/wmi.c
@@ -6854,6 +6854,7 @@ ath12k_wmi_process_csa_switch_count_event(struct ath12k_base *ab,
                                          const u32 *vdev_ids)
 {
        int i;
+       struct ieee80211_bss_conf *conf;
        struct ath12k_link_vif *arvif;
        struct ath12k_vif *ahvif;
 
@@ -6872,7 +6873,20 @@ ath12k_wmi_process_csa_switch_count_event(struct ath12k_base *ab,
                }
                ahvif = arvif->ahvif;
 
-               if (arvif->is_up && ahvif->vif->bss_conf.csa_active)
+               if (arvif->link_id > IEEE80211_MLD_MAX_NUM_LINKS) {
+                       ath12k_warn(ab, "Invalid CSA switch count even link id: %d\n",
+                                   arvif->link_id);
+                       continue;
+               }
+
+               conf = rcu_dereference(ahvif->vif->link_conf[arvif->link_id]);
+               if (!conf) {
+                       ath12k_warn(ab, "unable to access bss link conf in process csa for vif %pM link %u\n",
+                                   ahvif->vif->addr, arvif->link_id);
+                       continue;
+               }
+
+               if (arvif->is_up && conf->csa_active)
                        ieee80211_csa_finish(ahvif->vif, 0);
        }
        rcu_read_unlock();