wifi: iwlwifi: mld: allow EMLSR on separated 5 GHz subbands

If there are two links on 5 GHz subbands that are separated
enough (using channels 36-64 and 100+) then we can support
EMLSR across those two links. Allow that in the logic.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250424153620.d568a26661d5.Ie4277945272c5bbf637957704fda34ea03ef28d2@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mld/mlo.c b/drivers/net/wireless/intel/iwlwifi/mld/mlo.c
index 8f7578bc46b19813b80986631cc555f766e10205..da16fff1ce86d979e104a123f2e3c73ff3b8b5f3 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mld/mlo.c
+++ b/drivers/net/wireless/intel/iwlwifi/mld/mlo.c
@@ -805,8 +805,28 @@ iwl_mld_valid_emlsr_pair(struct ieee80211_vif *vif,
            iwl_mld_emlsr_disallowed_with_link(mld, vif, b, false))
                return false;
 
-       if (a->chandef->chan->band == b->chandef->chan->band)
-               reason_mask |= IWL_MLD_EMLSR_EXIT_EQUAL_BAND;
+       if (a->chandef->chan->band == b->chandef->chan->band) {
+               const struct cfg80211_chan_def *c_low = a->chandef;
+               const struct cfg80211_chan_def *c_high = b->chandef;
+               u32 c_low_upper_edge, c_high_lower_edge;
+
+               if (c_low->chan->center_freq > c_high->chan->center_freq)
+                       swap(c_low, c_high);
+
+               c_low_upper_edge = c_low->chan->center_freq +
+                                  cfg80211_chandef_get_width(c_low) / 2;
+               c_high_lower_edge = c_high->chan->center_freq -
+                                   cfg80211_chandef_get_width(c_high) / 2;
+
+               if (a->chandef->chan->band == NL80211_BAND_5GHZ &&
+                   c_low_upper_edge <= 5330 && c_high_lower_edge >= 5490) {
+                       /* This case is fine - HW/FW can deal with it, there's
+                        * enough separation between the two channels.
+                        */
+               } else {
+                       reason_mask |= IWL_MLD_EMLSR_EXIT_EQUAL_BAND;
+               }
+       }
        if (!iwl_mld_channel_load_allows_emlsr(mld, vif, a, b))
                reason_mask |= IWL_MLD_EMLSR_EXIT_CHAN_LOAD;