Wifi fix has been upstreamed already
This commit is contained in:
David Heinemeier Hansson committed
1 parent
545caf467d
commit
7514a91deb
2 files changed
+2
-204
No files matched your search
-201
@@ -1,201 +0,0 @@
|
||||
From ddaa85feeb15783cf8b4a1a673303f8affb9b155 Mon Sep 17 00:00:00 2001
|
||||
From: Johannes Berg <johannes.berg@intel.com>
|
||||
Date: Thu, 19 Mar 2026 11:09:24 +0200
|
||||
Subject: wifi: iwlwifi: mld: correctly set wifi generation data
|
||||
|
||||
In each MAC context, the firmware expects the wifi generation
|
||||
data, i.e. whether or not HE/EHT (and in the future UHR) is
|
||||
enabled on that MAC.
|
||||
|
||||
However, this is currently handled wrong in two ways:
|
||||
- EHT is only enabled when the interface is also an MLD, but
|
||||
we currently allow (despite the spec) connecting with EHT
|
||||
but without MLO.
|
||||
- when HE or EHT are used by TDLS peers, the firmware needs
|
||||
to have them enabled regardless of the AP
|
||||
|
||||
Fix this by iterating setting up the data depending on the
|
||||
interface type:
|
||||
- for AP, just set it according to the BSS configuration
|
||||
- for monitor, set it according to HW capabilities
|
||||
- otherwise, particularly for client, iterate all stations
|
||||
and then their links on the interface in question and set
|
||||
according to their capabilities, this handles the AP and
|
||||
TDLS peers. Re-calculate this whenever a TDLS station is
|
||||
marked associated or removed so that it's kept updated,
|
||||
for the AP it's already updated on assoc/disassoc.
|
||||
|
||||
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
||||
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
|
||||
Link: https://patch.msgid.link/20260319110722.404713b22177.Ic972b5e557d011a5438f8f97c1e793cc829e2ea9@changeid
|
||||
---
|
||||
drivers/net/wireless/intel/iwlwifi/mld/iface.c | 101 +++++++++++++++-------
|
||||
drivers/net/wireless/intel/iwlwifi/mld/mac80211.c | 19 ++++
|
||||
2 files changed, 88 insertions(+), 32 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/intel/iwlwifi/mld/iface.c b/drivers/net/wireless/intel/iwlwifi/mld/iface.c
|
||||
index 29df747c893801..9215fc7e2eca70 100644
|
||||
--- a/drivers/net/wireless/intel/iwlwifi/mld/iface.c
|
||||
+++ b/drivers/net/wireless/intel/iwlwifi/mld/iface.c
|
||||
@@ -111,14 +111,75 @@ static bool iwl_mld_is_nic_ack_enabled(struct iwl_mld *mld,
|
||||
IEEE80211_HE_MAC_CAP2_ACK_EN);
|
||||
}
|
||||
|
||||
-static void iwl_mld_set_he_support(struct iwl_mld *mld,
|
||||
- struct ieee80211_vif *vif,
|
||||
- struct iwl_mac_config_cmd *cmd)
|
||||
+struct iwl_mld_mac_wifi_gen_sta_iter_data {
|
||||
+ struct ieee80211_vif *vif;
|
||||
+ struct iwl_mac_wifi_gen_support *support;
|
||||
+};
|
||||
+
|
||||
+static void iwl_mld_mac_wifi_gen_sta_iter(void *_data,
|
||||
+ struct ieee80211_sta *sta)
|
||||
{
|
||||
- if (vif->type == NL80211_IFTYPE_AP)
|
||||
- cmd->wifi_gen.he_ap_support = 1;
|
||||
- else
|
||||
- cmd->wifi_gen.he_support = 1;
|
||||
+ struct iwl_mld_sta *mld_sta = iwl_mld_sta_from_mac80211(sta);
|
||||
+ struct iwl_mld_mac_wifi_gen_sta_iter_data *data = _data;
|
||||
+ struct ieee80211_link_sta *link_sta;
|
||||
+ unsigned int link_id;
|
||||
+
|
||||
+ if (mld_sta->vif != data->vif)
|
||||
+ return;
|
||||
+
|
||||
+ for_each_sta_active_link(data->vif, sta, link_sta, link_id) {
|
||||
+ if (link_sta->he_cap.has_he)
|
||||
+ data->support->he_support = 1;
|
||||
+ if (link_sta->eht_cap.has_eht)
|
||||
+ data->support->eht_support = 1;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static void iwl_mld_set_wifi_gen(struct iwl_mld *mld,
|
||||
+ struct ieee80211_vif *vif,
|
||||
+ struct iwl_mac_wifi_gen_support *support)
|
||||
+{
|
||||
+ struct iwl_mld_mac_wifi_gen_sta_iter_data sta_iter_data = {
|
||||
+ .vif = vif,
|
||||
+ .support = support,
|
||||
+ };
|
||||
+ struct ieee80211_bss_conf *link_conf;
|
||||
+ unsigned int link_id;
|
||||
+
|
||||
+ switch (vif->type) {
|
||||
+ case NL80211_IFTYPE_MONITOR:
|
||||
+ /* for sniffer, set to HW capabilities */
|
||||
+ support->he_support = 1;
|
||||
+ support->eht_support = mld->trans->cfg->eht_supported;
|
||||
+ break;
|
||||
+ case NL80211_IFTYPE_AP:
|
||||
+ /* for AP set according to the link configs */
|
||||
+ for_each_vif_active_link(vif, link_conf, link_id) {
|
||||
+ support->he_ap_support |= link_conf->he_support;
|
||||
+ support->eht_support |= link_conf->eht_support;
|
||||
+ }
|
||||
+ break;
|
||||
+ default:
|
||||
+ /*
|
||||
+ * If we have MLO enabled, then the firmware needs to enable
|
||||
+ * address translation for the station(s) we add. That depends
|
||||
+ * on having EHT enabled in firmware, which in turn depends on
|
||||
+ * mac80211 in the iteration below.
|
||||
+ * However, mac80211 doesn't enable capabilities on the AP STA
|
||||
+ * until it has parsed the association response successfully,
|
||||
+ * so set EHT (and HE as a pre-requisite for EHT) when the vif
|
||||
+ * is an MLD.
|
||||
+ */
|
||||
+ if (ieee80211_vif_is_mld(vif)) {
|
||||
+ support->he_support = 1;
|
||||
+ support->eht_support = 1;
|
||||
+ }
|
||||
+
|
||||
+ ieee80211_iterate_stations_mtx(mld->hw,
|
||||
+ iwl_mld_mac_wifi_gen_sta_iter,
|
||||
+ &sta_iter_data);
|
||||
+ break;
|
||||
+ }
|
||||
}
|
||||
|
||||
/* fill the common part for all interface types */
|
||||
@@ -128,8 +189,6 @@ static void iwl_mld_mac_cmd_fill_common(struct iwl_mld *mld,
|
||||
u32 action)
|
||||
{
|
||||
struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);
|
||||
- struct ieee80211_bss_conf *link_conf;
|
||||
- unsigned int link_id;
|
||||
|
||||
lockdep_assert_wiphy(mld->wiphy);
|
||||
|
||||
@@ -147,29 +206,7 @@ static void iwl_mld_mac_cmd_fill_common(struct iwl_mld *mld,
|
||||
cmd->nic_not_ack_enabled =
|
||||
cpu_to_le32(!iwl_mld_is_nic_ack_enabled(mld, vif));
|
||||
|
||||
- /* If we have MLO enabled, then the firmware needs to enable
|
||||
- * address translation for the station(s) we add. That depends
|
||||
- * on having EHT enabled in firmware, which in turn depends on
|
||||
- * mac80211 in the code below.
|
||||
- * However, mac80211 doesn't enable HE/EHT until it has parsed
|
||||
- * the association response successfully, so just skip all that
|
||||
- * and enable both when we have MLO.
|
||||
- */
|
||||
- if (ieee80211_vif_is_mld(vif)) {
|
||||
- iwl_mld_set_he_support(mld, vif, cmd);
|
||||
- cmd->wifi_gen.eht_support = 1;
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- for_each_vif_active_link(vif, link_conf, link_id) {
|
||||
- if (!link_conf->he_support)
|
||||
- continue;
|
||||
-
|
||||
- iwl_mld_set_he_support(mld, vif, cmd);
|
||||
-
|
||||
- /* EHT, if supported, was already set above */
|
||||
- break;
|
||||
- }
|
||||
+ iwl_mld_set_wifi_gen(mld, vif, &cmd->wifi_gen);
|
||||
}
|
||||
|
||||
static void iwl_mld_fill_mac_cmd_sta(struct iwl_mld *mld,
|
||||
diff --git a/drivers/net/wireless/intel/iwlwifi/mld/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mld/mac80211.c
|
||||
index 0c53d6bd96514c..71a9a72c9ac0ed 100644
|
||||
--- a/drivers/net/wireless/intel/iwlwifi/mld/mac80211.c
|
||||
+++ b/drivers/net/wireless/intel/iwlwifi/mld/mac80211.c
|
||||
@@ -1761,6 +1761,16 @@ static int iwl_mld_move_sta_state_up(struct iwl_mld *mld,
|
||||
|
||||
if (vif->type == NL80211_IFTYPE_STATION)
|
||||
iwl_mld_link_set_2mhz_block(mld, vif, sta);
|
||||
+
|
||||
+ if (sta->tdls) {
|
||||
+ /*
|
||||
+ * update MAC since wifi generation flags may change,
|
||||
+ * we also update MAC on association to the AP via the
|
||||
+ * vif assoc change
|
||||
+ */
|
||||
+ iwl_mld_mac_fw_action(mld, vif, FW_CTXT_ACTION_MODIFY);
|
||||
+ }
|
||||
+
|
||||
/* Now the link_sta's capabilities are set, update the FW */
|
||||
iwl_mld_config_tlc(mld, vif, sta);
|
||||
|
||||
@@ -1873,6 +1883,15 @@ static int iwl_mld_move_sta_state_down(struct iwl_mld *mld,
|
||||
/* just removed last TDLS STA, so enable PM */
|
||||
iwl_mld_update_mac_power(mld, vif, false);
|
||||
}
|
||||
+
|
||||
+ if (sta->tdls) {
|
||||
+ /*
|
||||
+ * update MAC since wifi generation flags may change,
|
||||
+ * we also update MAC on disassociation to the AP via
|
||||
+ * the vif assoc change
|
||||
+ */
|
||||
+ iwl_mld_mac_fw_action(mld, vif, FW_CTXT_ACTION_MODIFY);
|
||||
+ }
|
||||
} else {
|
||||
return -EINVAL;
|
||||
}
|
||||
--
|
||||
cgit 1.2.3-korg
|
||||
@@ -42,7 +42,6 @@ source=(
|
||||
0013-ASoC-SDCA-Add-regmap-defaults-for-specification-defi.patch
|
||||
0014-ASoC-SDCA-Limit-values-user-can-write-to-Selected-Mo.patch
|
||||
0017-ASoC-SDCA-Fix-NULL-pointer-dereference-in-sdca_jack_.patch
|
||||
0018-wifi-iwlwifi-mld-correctly-set-wifi-generation-data.patch
|
||||
0019-drm-i915-psr-accept-early-transport-for-psr2.patch
|
||||
0020-drm-i915-psr-fix-su-granularity-source-for-psr2.patch
|
||||
0022-drm-i915-psr-allow-psr-with-vrr-on-ptl.patch
|
||||
@@ -63,7 +62,7 @@ b2sums=('d016cebe33cfd8f43798d52f90c94b81cc61a0914ac3ac663c399cdde2ebf024331c84d
|
||||
'SKIP'
|
||||
'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
|
||||
'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
|
||||
'SKIP' 'SKIP' 'SKIP' 'SKIP')
|
||||
'SKIP' 'SKIP' 'SKIP')
|
||||
b2sums_x86_64=('9742088ab0381d8196046e42e8acb4ce01ea77461fada77dc90d197e859631e73b06ead4d512f15ab619b33ebad7bca58a10d4506d66916a99c40f9f52708a53')
|
||||
|
||||
# https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
|
||||
@@ -73,7 +72,7 @@ sha256sums=('ce5c4f1205f9729286b569b037649591555f31ca1e03cc504bd3b70b8e58a8d5'
|
||||
'SKIP'
|
||||
'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
|
||||
'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
|
||||
'SKIP' 'SKIP' 'SKIP' 'SKIP')
|
||||
'SKIP' 'SKIP' 'SKIP')
|
||||
|
||||
export KBUILD_BUILD_HOST=archlinux
|
||||
export KBUILD_BUILD_USER=$pkgbase
|
||||
|
||||
Reference in new issue
Block a user