Commit 87f7e243 authored by Miri Korenblit's avatar Miri Korenblit Committed by Johannes Berg
Browse files

wifi: iwlwifi: mvm: add sta handling flows for MLD mode 



In MLD mode we have a new STA cmd. As a result, it is also changes
the flows of adding/updating/removing and handling state of
a station. Add these flows.

Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230328104948.b5548cfd8fe3.I70f9c8f3c95e18d5c9af0a5681e0830893509531@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 9e2de88d

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c

+45 −13
Original line number Diff line number Diff line
@@ -2103,8 +2103,7 @@ static void iwl_mvm_get_optimal_ppe_info(struct iwl_he_pkt_ext_v2 *pkt_ext, 
}



/* Set the pkt_ext field according to PPE Thresholds element */

static int iwl_mvm_set_sta_pkt_ext(struct iwl_mvm *mvm,

				   struct ieee80211_sta *sta,

int iwl_mvm_set_sta_pkt_ext(struct iwl_mvm *mvm, struct ieee80211_sta *sta,

			    struct iwl_he_pkt_ext_v2 *pkt_ext)

{

	u8 nominal_padding;
@@ -2250,7 +2249,7 @@ bool iwl_mvm_is_nic_ack_enabled(struct iwl_mvm *mvm, struct ieee80211_vif *vif) 
			       IEEE80211_HE_MAC_CAP2_ACK_EN));

}



static __le32 iwl_mvm_get_sta_htc_flags(struct ieee80211_sta *sta)

__le32 iwl_mvm_get_sta_htc_flags(struct ieee80211_sta *sta)

{

	u8 *mac_cap_info = &sta->deflink.he_cap.he_cap_elem.mac_cap_info[0];

	__le32 htc_flags = 0;
@@ -3425,11 +3424,37 @@ static void iwl_mvm_mei_host_associated(struct iwl_mvm *mvm, 
#endif

}



static int iwl_mvm_mac_ctxt_changed_wrapper(struct iwl_mvm *mvm,

					    struct ieee80211_vif *vif,

					    bool force_assoc_off)

{

	return iwl_mvm_mac_ctxt_changed(mvm, vif, force_assoc_off, NULL);

}



static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw,

				 struct ieee80211_vif *vif,

				 struct ieee80211_sta *sta,

				 enum ieee80211_sta_state old_state,

				 enum ieee80211_sta_state new_state)

{

	struct iwl_mvm_sta_state_ops callbacks = {

		.add_sta = iwl_mvm_add_sta,

		.update_sta = iwl_mvm_update_sta,

		.rm_sta = iwl_mvm_rm_sta,

		.mac_ctxt_changed = iwl_mvm_mac_ctxt_changed_wrapper,

	};



	return iwl_mvm_mac_sta_state_common(hw, vif, sta, old_state, new_state,

					    &callbacks);

}



/* Common part for MLD and non-MLD modes */

int iwl_mvm_mac_sta_state_common(struct ieee80211_hw *hw,

				 struct ieee80211_vif *vif,

				 struct ieee80211_sta *sta,

				 enum ieee80211_sta_state old_state,

				 enum ieee80211_sta_state new_state,

				 struct iwl_mvm_sta_state_ops *callbacks)

{

	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
@@ -3507,7 +3532,7 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw, 
			goto out_unlock;

		}



		ret = iwl_mvm_add_sta(mvm, vif, sta);

		ret = callbacks->add_sta(mvm, vif, sta);

		if (sta->tdls && ret == 0) {

			iwl_mvm_recalc_tdls_state(mvm, vif, true);

			iwl_mvm_tdls_check_trigger(mvm, vif, sta->addr,
@@ -3529,11 +3554,12 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw, 
		if (vif->type == NL80211_IFTYPE_AP) {

			vif->bss_conf.he_support = sta->deflink.he_cap.has_he;

			mvmvif->ap_assoc_sta_count++;

			iwl_mvm_mac_ctxt_changed(mvm, vif, false, NULL);

			if ((vif->bss_conf.he_support &&

			callbacks->mac_ctxt_changed(mvm, vif, false);

			if (!mvm->mld_api_is_used &&

			    ((vif->bss_conf.he_support &&

			     !iwlwifi_mod_params.disable_11ax) ||

			    (vif->bss_conf.eht_support &&

			     !iwlwifi_mod_params.disable_11be))

			     !iwlwifi_mod_params.disable_11be)))

				iwl_mvm_cfg_he_sta(mvm, vif,

						   mvm_sta->deflink.sta_id);

		} else if (vif->type == NL80211_IFTYPE_STATION) {
@@ -3543,13 +3569,19 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw, 
			if (sta->deflink.he_cap.has_he)

				iwl_mvm_check_he_obss_narrow_bw_ru(hw, vif);



			iwl_mvm_mac_ctxt_changed(mvm, vif, false, NULL);

			callbacks->mac_ctxt_changed(mvm, vif, false);



			if (mvm->mld_api_is_used)

				iwl_mvm_link_changed(mvm, vif,

						     LINK_CONTEXT_MODIFY_ALL &

						     ~LINK_CONTEXT_MODIFY_ACTIVE,

						     true);

		}



		iwl_mvm_rs_rate_init(mvm, sta,

				     mvmvif->deflink.phy_ctxt->channel->band,

				     false);

		ret = iwl_mvm_update_sta(mvm, vif, sta);

		ret = callbacks->update_sta(mvm, vif, sta);

	} else if (old_state == IEEE80211_STA_ASSOC &&

		   new_state == IEEE80211_STA_AUTHORIZED) {

		ret = 0;
@@ -3567,7 +3599,7 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw, 


			mvmvif->authorized = 1;



			iwl_mvm_mac_ctxt_changed(mvm, vif, false, NULL);

			callbacks->mac_ctxt_changed(mvm, vif, false);

			iwl_mvm_mei_host_associated(mvm, vif, mvm_sta);

		}
@@ -3601,7 +3633,7 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw, 
		   new_state == IEEE80211_STA_AUTH) {

		if (vif->type == NL80211_IFTYPE_AP) {

			mvmvif->ap_assoc_sta_count--;

			iwl_mvm_mac_ctxt_changed(mvm, vif, false, NULL);

			callbacks->mac_ctxt_changed(mvm, vif, false);

		} else if (vif->type == NL80211_IFTYPE_STATION && !sta->tdls)

			iwl_mvm_stop_session_protection(mvm, vif);

		ret = 0;
@@ -3612,7 +3644,7 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw, 
		   new_state == IEEE80211_STA_NOTEXIST) {

		if (vif->type == NL80211_IFTYPE_STATION && !sta->tdls)

			iwl_mvm_stop_session_protection(mvm, vif);

		ret = iwl_mvm_rm_sta(mvm, vif, sta);

		ret = callbacks->rm_sta(mvm, vif, sta);

		if (sta->tdls) {

			iwl_mvm_recalc_tdls_state(mvm, vif, false);

			iwl_mvm_tdls_check_trigger(mvm, vif, sta->addr,

drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c

+18 −0
Original line number Diff line number Diff line
@@ -352,6 +352,23 @@ static void iwl_mvm_mld_stop_ap_ibss(struct ieee80211_hw *hw, 
	mutex_unlock(&mvm->mutex);

}



static int iwl_mvm_mld_mac_sta_state(struct ieee80211_hw *hw,

				     struct ieee80211_vif *vif,

				     struct ieee80211_sta *sta,

				     enum ieee80211_sta_state old_state,

				     enum ieee80211_sta_state new_state)

{

	struct iwl_mvm_sta_state_ops callbacks = {

		.add_sta = iwl_mvm_mld_add_sta,

		.update_sta = iwl_mvm_mld_update_sta,

		.rm_sta = iwl_mvm_mld_rm_sta,

		.mac_ctxt_changed = iwl_mvm_mld_mac_ctxt_changed,

	};



	return iwl_mvm_mac_sta_state_common(hw, vif, sta, old_state, new_state,

					    &callbacks);

}



const struct ieee80211_ops iwl_mvm_mld_hw_ops = {

	.add_interface = iwl_mvm_mld_mac_add_interface,

	.remove_interface = iwl_mvm_mld_mac_remove_interface,
@@ -359,4 +376,5 @@ const struct ieee80211_ops iwl_mvm_mld_hw_ops = { 
	.unassign_vif_chanctx = iwl_mvm_mld_unassign_vif_chanctx,

	.join_ibss = iwl_mvm_mld_start_ap_ibss,

	.leave_ibss = iwl_mvm_mld_stop_ap_ibss,

	.sta_state = iwl_mvm_mld_mac_sta_state,

};

drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c

+205 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 * Copyright (C) 2022 Intel Corporation

 */

#include "mvm.h"

#include "time-sync.h"



static int iwl_mvm_mld_send_sta_cmd(struct iwl_mvm *mvm,

				    struct iwl_mvm_sta_cfg_cmd *cmd)
@@ -331,6 +332,210 @@ int iwl_mvm_mld_rm_snif_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif) 
				      IWL_MAX_TID_COUNT, &mvm->snif_queue);

}



/* send a cfg sta command to add/update a sta in firmware */

static int iwl_mvm_mld_cfg_sta(struct iwl_mvm *mvm, struct ieee80211_sta *sta,

			       struct ieee80211_vif *vif, u16 phy_id)

{

	struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);

	struct iwl_mvm_sta_cfg_cmd cmd = {

		.sta_id = cpu_to_le32(mvm_sta->deflink.sta_id),

		.link_id = cpu_to_le32(phy_id),

		.station_type = cpu_to_le32(mvm_sta->sta_type),

		.mfp = cpu_to_le32(sta->mfp),

	};

	u32 agg_size = 0, mpdu_dens = 0;



	/* For now the link addr is the same as the mld addr */

	if (vif->type == NL80211_IFTYPE_AP) {

		memcpy(&cmd.peer_mld_address, sta->addr, ETH_ALEN);

		memcpy(&cmd.peer_link_address, sta->addr, ETH_ALEN);

	} else if (vif->bss_conf.bssid) {

		memcpy(&cmd.peer_mld_address, vif->bss_conf.bssid, ETH_ALEN);

		memcpy(&cmd.peer_link_address, vif->bss_conf.bssid, ETH_ALEN);

	}



	if (mvm_sta->sta_state >= IEEE80211_STA_ASSOC)

		cmd.assoc_id = cpu_to_le32(sta->aid);



	switch (sta->deflink.rx_nss) {

	case 1:

		cmd.mimo = cpu_to_le32(0);

		break;

	case 2 ... 8:

		cmd.mimo = cpu_to_le32(1);

		break;

	}



	switch (sta->deflink.smps_mode) {

	case IEEE80211_SMPS_AUTOMATIC:

	case IEEE80211_SMPS_NUM_MODES:

		WARN_ON(1);

		break;

	case IEEE80211_SMPS_STATIC:

		/* override NSS */

		cmd.mimo = cpu_to_le32(0);

		break;

	case IEEE80211_SMPS_DYNAMIC:

		cmd.mimo_protection = cpu_to_le32(1);

		break;

	case IEEE80211_SMPS_OFF:

		/* nothing */

		break;

	}



	mpdu_dens = iwl_mvm_get_sta_ampdu_dens(sta, &agg_size);

	cmd.tx_ampdu_spacing = cpu_to_le32(mpdu_dens);

	cmd.tx_ampdu_max_size = cpu_to_le32(agg_size);



	if (sta->wme) {

		cmd.sp_length =

			cpu_to_le32(sta->max_sp ? sta->max_sp * 2 : 128);

		cmd.uapsd_acs = cpu_to_le32(iwl_mvm_get_sta_uapsd_acs(sta));

	}



	if (sta->deflink.he_cap.has_he) {

		cmd.trig_rnd_alloc =

			cpu_to_le32(vif->bss_conf.uora_exists ? 1 : 0);



		/* PPE Thresholds */

		iwl_mvm_set_sta_pkt_ext(mvm, sta, &cmd.pkt_ext);



		/* HTC flags */

		cmd.htc_flags = iwl_mvm_get_sta_htc_flags(sta);



		if (sta->deflink.he_cap.he_cap_elem.mac_cap_info[2] &

		    IEEE80211_HE_MAC_CAP2_ACK_EN)

			cmd.ack_enabled = cpu_to_le32(1);

	}



	return iwl_mvm_mld_send_sta_cmd(mvm, &cmd);

}



int iwl_mvm_mld_add_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,

			struct ieee80211_sta *sta)

{

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);

	struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);

	int sta_id, ret = 0;



	lockdep_assert_held(&mvm->mutex);



	if (!test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status))

		sta_id = iwl_mvm_find_free_sta_id(mvm,

						  ieee80211_vif_type_p2p(vif));

	else

		sta_id = mvm_sta->deflink.sta_id;



	if (sta_id == IWL_MVM_INVALID_STA)

		return -ENOSPC;



	spin_lock_init(&mvm_sta->lock);



	/* if this is a HW restart re-alloc existing queues */

	if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status)) {

		struct iwl_mvm_int_sta tmp_sta = {

			.sta_id = sta_id,

			.type = mvm_sta->sta_type,

		};



		/* First add an empty station since allocating

		 * a queue requires a valid station

		 */

		ret = iwl_mvm_mld_add_int_sta_to_fw(mvm, &tmp_sta,

						    vif->bss_conf.bssid,

						    mvmvif->deflink.phy_ctxt->id);

		if (ret)

			return ret;



		iwl_mvm_realloc_queues_after_restart(mvm, sta);

	} else {

		ret = iwl_mvm_sta_init(mvm, vif, sta, sta_id,

				       STATION_TYPE_PEER);

	}



	ret = iwl_mvm_mld_cfg_sta(mvm, sta, vif, mvmvif->deflink.phy_ctxt->id);

	if (ret)

		return ret;



	if (vif->type == NL80211_IFTYPE_STATION) {

		if (!sta->tdls) {

			WARN_ON(mvmvif->deflink.ap_sta_id != IWL_MVM_INVALID_STA);

			mvmvif->deflink.ap_sta_id = sta_id;

		} else {

			WARN_ON(mvmvif->deflink.ap_sta_id == IWL_MVM_INVALID_STA);

		}

	}



	rcu_assign_pointer(mvm->fw_id_to_mac_id[sta_id], sta);



	return 0;

}



int iwl_mvm_mld_update_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,

			   struct ieee80211_sta *sta)

{

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);



	lockdep_assert_held(&mvm->mutex);



	return iwl_mvm_mld_cfg_sta(mvm, sta, vif, mvmvif->deflink.phy_ctxt->id);

}



static void iwl_mvm_mld_disable_sta_queues(struct iwl_mvm *mvm,

					   struct ieee80211_vif *vif,

					   struct ieee80211_sta *sta)

{

	struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);

	int i;



	lockdep_assert_held(&mvm->mutex);



	for (i = 0; i < ARRAY_SIZE(mvm_sta->tid_data); i++) {

		if (mvm_sta->tid_data[i].txq_id == IWL_MVM_INVALID_QUEUE)

			continue;



		iwl_mvm_mld_disable_txq(mvm, sta, &mvm_sta->tid_data[i].txq_id,

					i);

		mvm_sta->tid_data[i].txq_id = IWL_MVM_INVALID_QUEUE;

	}



	for (i = 0; i < ARRAY_SIZE(sta->txq); i++) {

		struct iwl_mvm_txq *mvmtxq =

			iwl_mvm_txq_from_mac80211(sta->txq[i]);



		mvmtxq->txq_id = IWL_MVM_INVALID_QUEUE;

	}

}



int iwl_mvm_mld_rm_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,

		       struct ieee80211_sta *sta)

{

	struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);

	int ret;



	lockdep_assert_held(&mvm->mutex);



	kfree(mvm_sta->dup_data);



	/* flush its queues here since we are freeing mvm_sta */

	ret = iwl_mvm_flush_sta(mvm, mvm_sta, false);

	if (ret)

		return ret;

	ret = iwl_mvm_wait_sta_queues_empty(mvm, mvm_sta);

	if (ret)

		return ret;



	iwl_mvm_mld_disable_sta_queues(mvm, vif, sta);



	if (iwl_mvm_sta_del(mvm, vif, sta, &ret))

		return ret;



	ret = iwl_mvm_mld_rm_sta_from_fw(mvm, mvm_sta->deflink.sta_id);

	RCU_INIT_POINTER(mvm->fw_id_to_mac_id[mvm_sta->deflink.sta_id], NULL);



	return ret;

}



static void iwl_mvm_mld_sta_modify_disable_tx(struct iwl_mvm *mvm,

					      struct ieee80211_sta *sta,

					      bool disable)

drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

+7 −0
Original line number Diff line number Diff line
@@ -1573,6 +1573,13 @@ int iwl_mvm_flush_tx_path(struct iwl_mvm *mvm, u32 tfd_msk); 
int iwl_mvm_flush_sta(struct iwl_mvm *mvm, void *sta, bool internal);

int iwl_mvm_flush_sta_tids(struct iwl_mvm *mvm, u32 sta_id, u16 tids);



/* Utils to extract sta related data */

__le32 iwl_mvm_get_sta_htc_flags(struct ieee80211_sta *sta);

u8 iwl_mvm_get_sta_uapsd_acs(struct ieee80211_sta *sta);

u32 iwl_mvm_get_sta_ampdu_dens(struct ieee80211_sta *sta, u32 *_agg_size);

int iwl_mvm_set_sta_pkt_ext(struct iwl_mvm *mvm, struct ieee80211_sta *sta,

			    struct iwl_he_pkt_ext_v2 *pkt_ext);



void iwl_mvm_async_handlers_purge(struct iwl_mvm *mvm);



static inline void iwl_mvm_set_tx_cmd_ccmp(struct ieee80211_tx_info *info,

drivers/net/wireless/intel/iwlwifi/mvm/sta.c

+13 −12
Original line number Diff line number Diff line
@@ -24,8 +24,7 @@ static inline int iwl_mvm_add_sta_cmd_size(struct iwl_mvm *mvm) 
		return sizeof(struct iwl_mvm_add_sta_cmd_v7);

}



static int iwl_mvm_find_free_sta_id(struct iwl_mvm *mvm,

				    enum nl80211_iftype iftype)

int iwl_mvm_find_free_sta_id(struct iwl_mvm *mvm, enum nl80211_iftype iftype)

{

	int sta_id;

	u32 reserved_ids = 0;
@@ -52,8 +51,7 @@ static int iwl_mvm_find_free_sta_id(struct iwl_mvm *mvm, 
}



/* Calculate the ampdu density and max size */

static u32 iwl_mvm_get_sta_ampdu_dens(struct ieee80211_sta *sta,

				      u32 *_agg_size)

u32 iwl_mvm_get_sta_ampdu_dens(struct ieee80211_sta *sta, u32 *_agg_size)

{

	struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);

	u32 agg_size = 0, mpdu_dens = 0;
@@ -97,7 +95,7 @@ static u32 iwl_mvm_get_sta_ampdu_dens(struct ieee80211_sta *sta, 
	return mpdu_dens;

}



static u8 iwl_mvm_get_sta_uapsd_acs(struct ieee80211_sta *sta)

u8 iwl_mvm_get_sta_uapsd_acs(struct ieee80211_sta *sta)

{

	u8 uapsd_acs = 0;
@@ -1528,7 +1526,7 @@ static int iwl_mvm_reserve_sta_stream(struct iwl_mvm *mvm, 
 *

 * Note that re-enabling aggregations isn't done in this function.

 */

static void iwl_mvm_realloc_queues_after_restart(struct iwl_mvm *mvm,

void iwl_mvm_realloc_queues_after_restart(struct iwl_mvm *mvm,

					  struct ieee80211_sta *sta)

{

	struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);
@@ -1649,7 +1647,7 @@ static int iwl_mvm_add_int_sta_common(struct iwl_mvm *mvm, 
}



/* Initialize driver data of a new sta */

static int iwl_mvm_sta_init(struct iwl_mvm *mvm, struct ieee80211_vif *vif,

int iwl_mvm_sta_init(struct iwl_mvm *mvm, struct ieee80211_vif *vif,

		     struct ieee80211_sta *sta, int sta_id, u8 sta_type)

{

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
@@ -1923,8 +1921,11 @@ int iwl_mvm_wait_sta_queues_empty(struct iwl_mvm *mvm, 
	return 0;

}



/* Execute the common part for both MLD and non-MLD modes */

static bool iwl_mvm_sta_del(struct iwl_mvm *mvm, struct ieee80211_vif *vif,

/* Execute the common part for both MLD and non-MLD modes.

 * Returns if we're done with removing the station, either

 * with error or success

 */

bool iwl_mvm_sta_del(struct iwl_mvm *mvm, struct ieee80211_vif *vif,

		     struct ieee80211_sta *sta, int *ret)

{

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);