[25/31] wifi: iwlwifi: mvm: adjust internal stations to MLO

Message ID	20230328104949.25b013fd30de.I7f9f5906123acae05040cceec470c9acb07b9d42@changeid
State	New
Headers	show Return-Path: <linux-wireless-owner@vger.kernel.org> From: gregory.greenman@intel.com To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Gregory Greenman <gregory.greenman@intel.com> Subject: [PATCH 25/31] wifi: iwlwifi: mvm: adjust internal stations to MLO Date: Tue, 28 Mar 2023 10:59:05 +0300 Message-Id: <20230328104949.25b013fd30de.I7f9f5906123acae05040cceec470c9acb07b9d42@changeid> In-Reply-To: <20230328075911.2370108-1-gregory.greenman@intel.com> References: <20230328075911.2370108-1-gregory.greenman@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	wifi: iwlwifi: updates intended for v6.4 2023-03-28 \| expand [00/31] wifi: iwlwifi: updates intended for v6.4 2023-03-28 [01/31] wifi: iwlwifi: mvm: vif preparation for MLO [02/31] wifi: iwlwifi: mvm: sta preparation for MLO [03/31] wifi: iwlwifi: mvm: add an indication that the new MLD API is used [04/31] wifi: iwlwifi: mvm: add sta handling flows for MLD mode [05/31] wifi: iwlwifi: mvm: add some new MLD ops [06/31] wifi: iwlwifi: mvm: refactor iwl_mvm_roc() [07/31] wifi: iwlwifi: mvm: add cancel/remain_on_channel for MLD mode [08/31] wifi: iwlwifi: mvm: unite sta_modify_disable_tx flows [09/31] wifi: iwlwifi: mvm: add support for post_channel_switch in MLD mode [10/31] wifi: iwlwifi: mvm: add all missing ops to iwl_mvm_mld_ops [11/31] wifi: iwlwifi: mvm: fix "modify_mask" value in the link cmd. [12/31] wifi: iwlwifi: mvm: fix crash on queue removal for MLD API too [13/31] wifi: iwlwifi: mvm: modify link instead of removing it during csa [14/31] wifi: iwlwifi: mvm: always use the sta->addr as the peers addr [15/31] wifi: iwlwifi: mvm: align to the LINK cmd update in the FW [16/31] wifi: iwlwifi: mvm: adjust smart fifo configuration to MLO [17/31] wifi: iwlwifi: mvm: adjust mld_mac_ctxt_/beacon_changed() for MLO [18/31] wifi: iwlwifi: mvm: adjust some PS and PM methods to MLD [19/31] wifi: iwlwifi: mvm: add link to firmware earlier [20/31] wifi: iwlwifi: mvm: add set_hw_timestamp to mld ops [21/31] wifi: iwlwifi: mvm: adjust SMPS for MLO [22/31] wifi: iwlwifi: mvm: don't check dtim_period in new API [23/31] wifi: iwlwifi: mvm: add link_conf parameter for add/remove/change link [24/31] wifi: iwlwifi: mvm: replace bss_info_changed() with vif_cfg/link_info_changed() [25/31] wifi: iwlwifi: mvm: adjust internal stations to MLO [26/31] wifi: iwlwifi: mvm: add fw link id allocation [27/31] wifi: iwlwifi: mvm: adjust to MLO assign/unassign/switch_vif_chanctx() [28/31] wifi: iwlwifi: mvm: update iwl_mvm_tx_reclaim() for MLO [29/31] wifi: iwlwifi: mvm: refactor iwl_mvm_mac_sta_state_common() [30/31] wifi: iwlwifi: mvm: adjust some cleanup functions to MLO [31/31] wifi: iwlwifi: mvm: implement link change ops

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c index 950f252c1a5a..c81b92d2e8f7 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c @@ -78,7 +78,7 @@ static int iwl_mvm_mld_mac_add_interface(struct ieee80211_hw *hw, if (ret) goto out_remove_link; - ret = iwl_mvm_mld_add_bcast_sta(mvm, vif); + ret = iwl_mvm_mld_add_bcast_sta(mvm, vif, &vif->bss_conf); if (ret) goto out_remove_link; @@ -194,7 +194,9 @@ static void iwl_mvm_mld_mac_remove_interface(struct ieee80211_hw *hw, if (vif->type == NL80211_IFTYPE_P2P_DEVICE) { mvm->p2p_device_vif = NULL; - iwl_mvm_mld_rm_bcast_sta(mvm, vif); + + /* P2P device uses only one link */ + iwl_mvm_mld_rm_bcast_sta(mvm, vif, &vif->bss_conf); /* Link needs to be deactivated before removal */ iwl_mvm_link_changed(mvm, vif, &vif->bss_conf, LINK_CONTEXT_MODIFY_ACTIVE, false); @@ -255,7 +257,8 @@ static int __iwl_mvm_mld_assign_vif_chanctx(struct iwl_mvm *mvm, iwl_mvm_power_update_mac(mvm); if (vif->type == NL80211_IFTYPE_MONITOR) { - ret = iwl_mvm_mld_add_snif_sta(mvm, vif); + ret = iwl_mvm_mld_add_snif_sta(mvm, vif, + &vif->bss_conf); if (ret) goto deactivate; } @@ -348,14 +351,14 @@ static int iwl_mvm_mld_start_ap_ibss(struct ieee80211_hw *hw, if (ret) goto out_unlock; - ret = iwl_mvm_mld_add_mcast_sta(mvm, vif); + ret = iwl_mvm_mld_add_mcast_sta(mvm, vif, link_conf); if (ret) goto out_unlock; /* Send the bcast station. At this stage the TBTT and DTIM time * events are added and applied to the scheduler */ - ret = iwl_mvm_mld_add_bcast_sta(mvm, vif); + ret = iwl_mvm_mld_add_bcast_sta(mvm, vif, link_conf); if (ret) goto out_rm_mcast; @@ -379,9 +382,9 @@ static int iwl_mvm_mld_start_ap_ibss(struct ieee80211_hw *hw, out_failed: iwl_mvm_power_update_mac(mvm); mvmvif->ap_ibss_active = false; - iwl_mvm_mld_rm_bcast_sta(mvm, vif); + iwl_mvm_mld_rm_bcast_sta(mvm, vif, link_conf); out_rm_mcast: - iwl_mvm_mld_rm_mcast_sta(mvm, vif); + iwl_mvm_mld_rm_mcast_sta(mvm, vif, link_conf); out_unlock: mutex_unlock(&mvm->mutex); return ret; @@ -416,8 +419,8 @@ static void iwl_mvm_mld_stop_ap_ibss(struct ieee80211_hw *hw, iwl_mvm_ftm_responder_clear(mvm, vif); - iwl_mvm_mld_rm_bcast_sta(mvm, vif); - iwl_mvm_mld_rm_mcast_sta(mvm, vif); + iwl_mvm_mld_rm_bcast_sta(mvm, vif, link_conf); + iwl_mvm_mld_rm_mcast_sta(mvm, vif, link_conf); iwl_mvm_power_update_mac(mvm); mutex_unlock(&mvm->mutex); diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c index 1608ac371bb0..75d4585c0b21 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c @@ -166,10 +166,13 @@ static int iwl_mvm_mld_add_int_sta(struct iwl_mvm *mvm, * and send it to the FW. * Note that each P2P mac should have its own broadcast station. */ -int iwl_mvm_mld_add_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif) +int iwl_mvm_mld_add_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif, + struct ieee80211_bss_conf *link_conf) { struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif); - struct iwl_mvm_int_sta *bsta = &mvmvif->deflink.bcast_sta; + struct iwl_mvm_vif_link_info *mvm_link = + mvmvif->link[link_conf->link_id]; + struct iwl_mvm_int_sta *bsta = &mvm_link->bcast_sta; static const u8 _baddr[] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; const u8 *baddr = _baddr; unsigned int wdg_timeout = @@ -179,7 +182,7 @@ int iwl_mvm_mld_add_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif) lockdep_assert_held(&mvm->mutex); if (vif->type == NL80211_IFTYPE_ADHOC) - baddr = vif->bss_conf.bssid; + baddr = link_conf->bssid; if (vif->type == NL80211_IFTYPE_AP || vif->type == NL80211_IFTYPE_ADHOC) { @@ -202,10 +205,13 @@ int iwl_mvm_mld_add_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif) * and send it to the FW. * Note that each AP/GO mac should have its own multicast station. */ -int iwl_mvm_mld_add_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif) +int iwl_mvm_mld_add_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif, + struct ieee80211_bss_conf *link_conf) { struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif); - struct iwl_mvm_int_sta *msta = &mvmvif->deflink.mcast_sta; + struct iwl_mvm_vif_link_info *mvm_link = + mvmvif->link[link_conf->link_id]; + struct iwl_mvm_int_sta *msta = &mvm_link->mcast_sta; static const u8 _maddr[] = {0x03, 0x00, 0x00, 0x00, 0x00, 0x00}; const u8 *maddr = _maddr; unsigned int timeout = iwl_mvm_get_wd_timeout(mvm, vif, false, false); @@ -222,9 +228,9 @@ int iwl_mvm_mld_add_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif) * changes in mac80211 layer. */ if (vif->type == NL80211_IFTYPE_ADHOC) - mvmvif->deflink.cab_queue = IWL_MVM_DQA_GCAST_QUEUE; + mvm_link->cab_queue = IWL_MVM_DQA_GCAST_QUEUE; - return iwl_mvm_mld_add_int_sta(mvm, msta, &mvmvif->deflink.cab_queue, + return iwl_mvm_mld_add_int_sta(mvm, msta, &mvm_link->cab_queue, vif->type, STATION_TYPE_MCAST, mvmvif->id, maddr, 0, &timeout); } @@ -232,7 +238,8 @@ int iwl_mvm_mld_add_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif) /* Allocate a new station entry for the sniffer station to the given vif, * and send it to the FW. */ -int iwl_mvm_mld_add_snif_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif) +int iwl_mvm_mld_add_snif_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif, + struct ieee80211_bss_conf *link_conf) { struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif); @@ -310,9 +317,11 @@ static int iwl_mvm_mld_rm_int_sta(struct iwl_mvm *mvm, return ret; } -int iwl_mvm_mld_rm_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif) +int iwl_mvm_mld_rm_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif, + struct ieee80211_bss_conf *link_conf) { struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif); + struct iwl_mvm_vif_link_info *link = mvmvif->link[link_conf->link_id]; u16 *queueptr; lockdep_assert_held(&mvm->mutex); @@ -331,22 +340,23 @@ int iwl_mvm_mld_rm_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif) return -EINVAL; } - return iwl_mvm_mld_rm_int_sta(mvm, &mvmvif->deflink.bcast_sta, true, - IWL_MAX_TID_COUNT, queueptr); + return iwl_mvm_mld_rm_int_sta(mvm, &link->bcast_sta, + true, IWL_MAX_TID_COUNT, queueptr); } /* Send the FW a request to remove the station from it's internal data * structures, and in addition remove it from the local data structure. */ -int iwl_mvm_mld_rm_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif) +int iwl_mvm_mld_rm_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif, + struct ieee80211_bss_conf *link_conf) { struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif); + struct iwl_mvm_vif_link_info *link = mvmvif->link[link_conf->link_id]; lockdep_assert_held(&mvm->mutex); - return iwl_mvm_mld_rm_int_sta(mvm, &mvmvif->deflink.mcast_sta, true, - 0, - &mvmvif->deflink.cab_queue); + return iwl_mvm_mld_rm_int_sta(mvm, &link->mcast_sta, true, 0, + &link->cab_queue); } int iwl_mvm_mld_rm_snif_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.h b/drivers/net/wireless/intel/iwlwifi/mvm/sta.h index 3a9002eeb5fb..7148263dddf8 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.h +++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.h @@ -619,13 +619,18 @@ int iwl_mvm_mac_sta_state_common(struct ieee80211_hw *hw, /* New MLD STA related APIs */ /* STA */ -int iwl_mvm_mld_add_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif); -int iwl_mvm_mld_add_snif_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif); -int iwl_mvm_mld_add_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif); +int iwl_mvm_mld_add_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif, + struct ieee80211_bss_conf *link_conf); +int iwl_mvm_mld_add_snif_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif, + struct ieee80211_bss_conf *link_conf); +int iwl_mvm_mld_add_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif, + struct ieee80211_bss_conf *link_conf); int iwl_mvm_mld_add_aux_sta(struct iwl_mvm *mvm, u32 lmac_id); -int iwl_mvm_mld_rm_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif); +int iwl_mvm_mld_rm_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif, + struct ieee80211_bss_conf *link_conf); int iwl_mvm_mld_rm_snif_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif); -int iwl_mvm_mld_rm_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif); +int iwl_mvm_mld_rm_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif, + struct ieee80211_bss_conf *link_conf); int iwl_mvm_mld_rm_aux_sta(struct iwl_mvm *mvm); int iwl_mvm_mld_add_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif, struct ieee80211_sta *sta);

[25/31] wifi: iwlwifi: mvm: adjust internal stations to MLO

Commit Message

Patch