wifi: iwlwifi: mvm: check if EMLSR is allowed before selecting links

Currenty iwl_mvm_mld_select_links() doesn't fully check that
EMLSR is allowed before selecting the 2 best links.
Although it will fail in ieee80211_set_active_links(), it is preferred
to avoid the redundent calculations.

Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Link: https://msgid.link/20240416134215.3578a93feb1a.I1cd91608bb73fbe19b8dfdf90e14ce40b98c3430@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c
index 797c088ea0c8645a9abdfef283eae6c2efab9dbe..33440fff762c93bc5781ef6f77101d6102d379b4 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c
@@ -697,6 +697,30 @@ iwl_mvm_set_link_selection_data(struct ieee80211_vif *vif,
        return n_data;
 }
 
+static bool iwl_mvm_esr_allowed_on_vif(struct iwl_mvm *mvm,
+                                      struct ieee80211_vif *vif)
+{
+       struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
+       const struct wiphy_iftype_ext_capab *ext_capa;
+
+       lockdep_assert_held(&mvm->mutex);
+
+       if (!ieee80211_vif_is_mld(vif) || !vif->cfg.assoc ||
+           hweight16(ieee80211_vif_usable_links(vif)) == 1)
+               return false;
+
+       if (!(vif->cfg.eml_cap & IEEE80211_EML_CAP_EMLSR_SUPP))
+               return false;
+
+       ext_capa = cfg80211_get_iftype_ext_capa(mvm->hw->wiphy,
+                                               ieee80211_vif_type_p2p(vif));
+       if (!ext_capa ||
+           !(ext_capa->eml_capabilities & IEEE80211_EML_CAP_EMLSR_SUPP))
+               return false;
+
+       return !(mvmvif->esr_disable_reason & ~IWL_MVM_ESR_DISABLE_COEX);
+}
+
 void iwl_mvm_mld_select_links(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
                              bool valid_links_changed)
 {
@@ -709,9 +733,6 @@ void iwl_mvm_mld_select_links(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
        if (!IWL_MVM_AUTO_EML_ENABLE)
                return;
 
-       if (!ieee80211_vif_is_mld(vif) || usable_links == 1)
-               return;
-
        /* The logic below is a simple version that doesn't suit more than 2
         * links
         */
@@ -729,6 +750,9 @@ void iwl_mvm_mld_select_links(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
        if (hweight16(vif->active_links) == max_active_links)
                return;
 
+       if (!iwl_mvm_esr_allowed_on_vif(mvm, vif))
+               return;
+
        n_data = iwl_mvm_set_link_selection_data(vif, data, usable_links);
 
        /* this is expected to be the current active link */
@@ -1367,22 +1391,10 @@ static bool iwl_mvm_can_enter_esr(struct iwl_mvm *mvm,
                                  struct ieee80211_vif *vif,
                                  unsigned long desired_links)
 {
-       u16 usable_links = ieee80211_vif_usable_links(vif);
        struct iwl_mvm_link_sel_data data[IEEE80211_MLD_MAX_NUM_LINKS];
-       const struct wiphy_iftype_ext_capab *ext_capa;
        u8 n_data;
 
-       if (!ieee80211_vif_is_mld(vif) || !vif->cfg.assoc ||
-           hweight16(usable_links) <= 1)
-               return false;
-
-       if (!(vif->cfg.eml_cap & IEEE80211_EML_CAP_EMLSR_SUPP))
-               return false;
-
-       ext_capa = cfg80211_get_iftype_ext_capa(mvm->hw->wiphy,
-                                               ieee80211_vif_type_p2p(vif));
-       if (!ext_capa ||
-           !(ext_capa->eml_capabilities & IEEE80211_EML_CAP_EMLSR_SUPP))
+       if (!iwl_mvm_esr_allowed_on_vif(mvm, vif))
                return false;
 
        n_data = iwl_mvm_set_link_selection_data(vif, data, desired_links);

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index 6ac20d42a09ce1b652aec289250928c03be611c9..c887263a2159f0c3231e9174695fc14695852b59 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -1587,14 +1587,12 @@ static inline int iwl_mvm_max_active_links(struct iwl_mvm *mvm,
                                           struct ieee80211_vif *vif)
 {
        struct iwl_trans *trans = mvm->fwrt.trans;
-       struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
 
        if (vif->type == NL80211_IFTYPE_AP)
                return mvm->fw->ucode_capa.num_beacons;
 
        /* Check if HW supports eSR or STR */
-       if ((iwl_mvm_is_esr_supported(trans) &&
-            !(mvmvif->esr_disable_reason & ~IWL_MVM_ESR_DISABLE_COEX)) ||
+       if (iwl_mvm_is_esr_supported(trans) ||
            (CSR_HW_RFID_TYPE(trans->hw_rf_id) == IWL_CFG_RF_TYPE_FM &&
             CSR_HW_RFID_IS_CDB(trans->hw_rf_id)))
                return IWL_MVM_FW_MAX_ACTIVE_LINKS_NUM;