wifi: iwlwifi: mvm: MLO scan upon channel condition degradation

This will allow to prevent disconnections.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20241028135215.6402718fbc94.Ia6ce651cc7c96f7aaeee449737dd28ed291788a6@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/constants.h b/drivers/net/wireless/intel/iwlwifi/mvm/constants.h
index 795a166..776600d 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/constants.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/constants.h
@@ -19,6 +19,7 @@
 #define IWL_MVM_BCN_LOSS_EXIT_ESR_THRESH_2_LINKS       5
 #define IWL_MVM_BCN_LOSS_EXIT_ESR_THRESH       15
 #define IWL_MVM_BCN_LOSS_EXIT_ESR_THRESH_BSS_PARAM_CHANGED     11
+#define IWL_MVM_LOW_RSSI_MLO_SCAN_THRESH       -72
 
 #define IWL_MVM_DEFAULT_PS_TX_DATA_TIMEOUT     (100 * USEC_PER_MSEC)
 #define IWL_MVM_DEFAULT_PS_RX_DATA_TIMEOUT     (100 * USEC_PER_MSEC)

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
index c8bc263..2a13d70 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
@@ -1691,6 +1691,9 @@ iwl_mvm_handle_missed_beacons_notif(struct iwl_mvm *mvm,
                        ieee80211_beacon_loss(vif);
                else
                        ieee80211_cqm_beacon_loss_notify(vif, GFP_ATOMIC);
+
+               /* try to switch links, no-op if we don't have MLO */
+               iwl_mvm_int_mlo_scan(mvm, vif);
        }
 
        iwl_dbg_tlv_time_point(&mvm->fwrt,

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rx.c b/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
index 1a0b5f8..9e72db9 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
@@ -560,7 +560,8 @@ static void iwl_mvm_update_link_sig(struct ieee80211_vif *vif, int sig,
                                    struct iwl_mvm_vif_link_info *link_info,
                                    struct ieee80211_bss_conf *bss_conf)
 {
-       struct iwl_mvm *mvm = iwl_mvm_vif_from_mac80211(vif)->mvm;
+       struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
+       struct iwl_mvm *mvm = mvmvif->mvm;
        int thold = bss_conf->cqm_rssi_thold;
        int hyst = bss_conf->cqm_rssi_hyst;
        int last_event;
@@ -625,6 +626,13 @@ static void iwl_mvm_update_link_sig(struct ieee80211_vif *vif, int sig,
        if (!vif->cfg.assoc || !ieee80211_vif_is_mld(vif))
                return;
 
+       /* We're not in EMLSR and our signal is bad, try to switch link maybe */
+       if (sig < IWL_MVM_LOW_RSSI_MLO_SCAN_THRESH && !mvmvif->esr_active) {
+               iwl_mvm_int_mlo_scan(mvm, vif);
+               return;
+       }
+
+       /* We are in EMLSR, check if we need to exit */
        exit_esr_thresh =
                iwl_mvm_get_esr_rssi_thresh(mvm,
                                            &bss_conf->chanreq.oper,

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
index 3ce9150..6fb241d 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
@@ -3597,7 +3597,8 @@ static int iwl_mvm_int_mlo_scan_start(struct iwl_mvm *mvm,
        IWL_DEBUG_SCAN(mvm, "Starting Internal MLO scan: n_channels=%zu\n",
                       n_channels);
 
-       if (!vif->cfg.assoc || !ieee80211_vif_is_mld(vif))
+       if (!vif->cfg.assoc || !ieee80211_vif_is_mld(vif) ||
+           hweight16(vif->valid_links) == 1)
                return -EINVAL;
 
        size = struct_size(req, channels, n_channels);