wifi: iwlwifi: mvm: Always allow entering EMLSR from debugfs

EMLSR can't be activated from mac80211. Except for the debugfs, which is
intended for testing purposes. Currently we don't allow entering EMLSR
from debugfs if EMLSR is blocked, i.e. if mvmvif::esr_disable_reason is
not 0. But we need a way to activate EMLSR regardless of the vif being
blocked, for testing. Remove the check of esr_disable_reason

Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240505091420.bc3c24d9e0e6.Iad60e22a0d7e2b2b989051e1140b6dc98bef7bcc@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/link.c b/drivers/net/wireless/intel/iwlwifi/mvm/link.c
index 32ae606a0aa7bc66709a0b82da39df37215cbcbc..1ce52adf317368ad7cbdbb40f1f767e4961f6068 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/link.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/link.c
@@ -703,9 +703,9 @@ void iwl_mvm_select_links(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
        primary_link = best_link->link_id;
        new_active_links = BIT(best_link->link_id);
 
-       /* eSR is not supported/allowed, or only one usable link */
-       if (max_active_links == 1 || !iwl_mvm_esr_allowed_on_vif(mvm, vif) ||
-           n_data == 1)
+       /* eSR is not supported/blocked, or only one usable link */
+       if (max_active_links == 1 || !iwl_mvm_vif_has_esr_cap(mvm, vif) ||
+           mvmvif->esr_disable_reason || n_data == 1)
                goto set_active;
 
        for (u8 a = 0; a < n_data; a++)

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c
index e16f1eee84735d7dcd21384fd1d34167eb4071d2..5609b0321647e0e96fb2b43600a529d00ec41d14 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c
@@ -1159,10 +1159,8 @@ iwl_mvm_mld_change_sta_links(struct ieee80211_hw *hw,
        return ret;
 }
 
-bool iwl_mvm_esr_allowed_on_vif(struct iwl_mvm *mvm,
-                               struct ieee80211_vif *vif)
+bool iwl_mvm_vif_has_esr_cap(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);
@@ -1176,11 +1174,8 @@ bool iwl_mvm_esr_allowed_on_vif(struct iwl_mvm *mvm,
 
        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;
+       return (ext_capa &&
+               (ext_capa->eml_capabilities & IEEE80211_EML_CAP_EMLSR_SUPP));
 }
 
 static bool iwl_mvm_mld_can_activate_links(struct ieee80211_hw *hw,
@@ -1204,7 +1199,7 @@ static bool iwl_mvm_mld_can_activate_links(struct ieee80211_hw *hw,
 
        /* If it is an eSR device, check that we can enter eSR */
        ret = iwl_mvm_is_esr_supported(mvm->fwrt.trans) &&
-             iwl_mvm_esr_allowed_on_vif(mvm, vif);
+             iwl_mvm_vif_has_esr_cap(mvm, vif);
 
 unlock:
        mutex_unlock(&mvm->mutex);

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index fc167ed4578cc2c77e8c06ff1b15c05f4cc4fe2b..c0e0600c4d997a48e9d3eb71206574d7d4d95eae 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -2873,8 +2873,7 @@ int iwl_mvm_roc_add_cmd(struct iwl_mvm *mvm,
                        int duration, u32 activity);
 
 /* EMLSR */
-bool iwl_mvm_esr_allowed_on_vif(struct iwl_mvm *mvm,
-                               struct ieee80211_vif *vif);
+bool iwl_mvm_vif_has_esr_cap(struct iwl_mvm *mvm, struct ieee80211_vif *vif);
 void iwl_mvm_block_esr(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
                       enum iwl_mvm_esr_state reason,
                       u8 link_to_keep);