Commit ced19f26 authored by Sara Sharon's avatar Sara Sharon Committed by Luca Coelho
Browse files

iwlwifi: mvm: support station type API 



Support change to ADD_STA API to support station types.
Each station is assigned its type.
This simplifies FW handling of the broadcast and multicast
stations:
* broadcast station is identified by its type and not the mac
  address.
* multicast queue is no longer treated differently. The opening
  and closing of it is done by referring to its station.
  There is no need to specify it in the MAC command.
* When disabling TX to all station driver can disable the traffic
  on multicast station, so FW doesn't have to do it.
Change is backward compatible.
Change the order of adding and removing the stations according to
FW requirements.

Signed-off-by: default avatarSara Sharon <sara.sharon@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 34e10860

drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h

+2 −0
Original line number Diff line number Diff line
@@ -243,6 +243,7 @@ typedef unsigned int __bitwise iwl_ucode_tlv_api_t; 
 *	scan request.

 * @IWL_UCODE_TLV_API_TKIP_MIC_KEYS: This ucode supports version 2 of

 *	ADD_MODIFY_STA_KEY_API_S_VER_2.

 * @IWL_UCODE_TLV_API_STA_TYPE: This ucode supports station type assignement.

 *

 * @NUM_IWL_UCODE_TLV_API: number of bits used

 */
@@ -253,6 +254,7 @@ enum iwl_ucode_tlv_api { 
	IWL_UCODE_TLV_API_NEW_VERSION		= (__force iwl_ucode_tlv_api_t)20,

	IWL_UCODE_TLV_API_SCAN_TSF_REPORT	= (__force iwl_ucode_tlv_api_t)28,

	IWL_UCODE_TLV_API_TKIP_MIC_KEYS		= (__force iwl_ucode_tlv_api_t)29,

	IWL_UCODE_TLV_API_STA_TYPE		= (__force iwl_ucode_tlv_api_t)30,



	NUM_IWL_UCODE_TLV_API

#ifdef __CHECKER__

drivers/net/wireless/intel/iwlwifi/mvm/fw-api-mac.h

+3 −2
Original line number Diff line number Diff line
@@ -157,7 +157,8 @@ enum iwl_tsf_id { 
 * @bi_reciprocal: 2^32 / bi

 * @dtim_interval: dtim transmit time in TU

 * @dtim_reciprocal: 2^32 / dtim_interval

 * @mcast_qid: queue ID for multicast traffic

 * @mcast_qid: queue ID for multicast traffic.

 *	NOTE: obsolete from VER2 and on

 * @beacon_template: beacon template ID

 */

struct iwl_mac_data_ap {
@@ -169,7 +170,7 @@ struct iwl_mac_data_ap { 
	__le32 dtim_reciprocal;

	__le32 mcast_qid;

	__le32 beacon_template;

} __packed; /* AP_MAC_DATA_API_S_VER_1 */

} __packed; /* AP_MAC_DATA_API_S_VER_2 */



/**

 * struct iwl_mac_data_ibss - configuration data for IBSS MAC context

drivers/net/wireless/intel/iwlwifi/mvm/fw-api-sta.h

+22 −2
Original line number Diff line number Diff line
@@ -309,6 +309,24 @@ struct iwl_mvm_add_sta_cmd_v7 { 
	__le32 tfd_queue_msk;

} __packed; /* ADD_STA_CMD_API_S_VER_7 */



/**

 * enum iwl_sta_type - FW station types

 * ( REPLY_ADD_STA = 0x18 )

 * @IWL_STA_LINK: Link station - normal RX and TX traffic.

 * @IWL_STA_GENERAL_PURPOSE: General purpose. In AP mode used for beacons

 *	and probe responses.

 * @IWL_STA_MULTICAST: multicast traffic,

 * @IWL_STA_TDLS_LINK: TDLS link station

 * @IWL_STA_AUX_ACTIVITY: auxilary station (scan, ROC and so on).

 */

enum iwl_sta_type {

	IWL_STA_LINK,

	IWL_STA_GENERAL_PURPOSE,

	IWL_STA_MULTICAST,

	IWL_STA_TDLS_LINK,

	IWL_STA_AUX_ACTIVITY,

};



/**

 * struct iwl_mvm_add_sta_cmd - Add/modify a station in the fw's sta table.

 * ( REPLY_ADD_STA = 0x18 )
@@ -333,6 +351,7 @@ struct iwl_mvm_add_sta_cmd_v7 { 
 * @sleep_tx_count: number of packets to transmit to station even though it is

 *	asleep. Used to synchronise PS-poll and u-APSD responses while ucode

 *	keeps track of STA sleep state.

 * @station_type: type of this station. See &enum iwl_sta_type.

 * @sleep_state_flags: Look at %iwl_sta_sleep_flag.

 * @assoc_id: assoc_id to be sent in VHT PLCP (9-bit), for grp use 0, for AP

 *	mac-addr.
@@ -367,14 +386,15 @@ struct iwl_mvm_add_sta_cmd { 
	u8 remove_immediate_ba_tid;

	__le16 add_immediate_ba_ssn;

	__le16 sleep_tx_count;

	__le16 sleep_state_flags;

	u8 sleep_state_flags;

	u8 station_type;

	__le16 assoc_id;

	__le16 beamform_flags;

	__le32 tfd_queue_msk;

	__le16 rx_ba_window;

	u8 sp_length;

	u8 uapsd_acs;

} __packed; /* ADD_STA_CMD_API_S_VER_9 */

} __packed; /* ADD_STA_CMD_API_S_VER_10 */



/**

 * struct iwl_mvm_add_sta_key_common - add/modify sta key common part

drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c

+4 −2
Original line number Diff line number Diff line
@@ -907,7 +907,7 @@ static int iwl_mvm_mac_ctxt_cmd_listener(struct iwl_mvm *mvm, 


	/* Allocate sniffer station */

	ret = iwl_mvm_allocate_int_sta(mvm, &mvm->snif_sta, tfd_queue_msk,

				       vif->type);

				       vif->type, IWL_STA_GENERAL_PURPOSE);

	if (ret)

		return ret;
@@ -1228,6 +1228,8 @@ static void iwl_mvm_mac_ctxt_cmd_fill_ap(struct iwl_mvm *mvm, 
		cpu_to_le32(iwl_mvm_reciprocal(vif->bss_conf.beacon_int *

					       vif->bss_conf.dtim_period));



	if (!fw_has_api(&mvm->fw->ucode_capa,

			IWL_UCODE_TLV_API_STA_TYPE))

		ctxt_ap->mcast_qid = cpu_to_le32(vif->cab_queue);



	/*

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

+22 −9
Original line number Diff line number Diff line
@@ -1358,7 +1358,8 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw, 
			 * which shouldn't be in TFD mask anyway

			 */

			ret = iwl_mvm_allocate_int_sta(mvm, &mvmvif->mcast_sta,

						       0, vif->type);

						       0, vif->type,

						       IWL_STA_MULTICAST);

			if (ret)

				goto out_release;

		}
@@ -2111,15 +2112,15 @@ static int iwl_mvm_start_ap_ibss(struct ieee80211_hw *hw, 
	if (ret)

		goto out_remove;



	/* Send the bcast station. At this stage the TBTT and DTIM time events

	 * are added and applied to the scheduler */

	ret = iwl_mvm_send_add_bcast_sta(mvm, vif);

	ret = iwl_mvm_add_mcast_sta(mvm, vif);

	if (ret)

		goto out_unbind;



	ret = iwl_mvm_add_mcast_sta(mvm, vif);

	/* Send the bcast station. At this stage the TBTT and DTIM time events

	 * are added and applied to the scheduler */

	ret = iwl_mvm_send_add_bcast_sta(mvm, vif);

	if (ret)

		goto out_rm_bcast;

		goto out_rm_mcast;



	/* must be set before quota calculations */

	mvmvif->ap_ibss_active = true;
@@ -2148,9 +2149,9 @@ static int iwl_mvm_start_ap_ibss(struct ieee80211_hw *hw, 
out_quota_failed:

	iwl_mvm_power_update_mac(mvm);

	mvmvif->ap_ibss_active = false;

	iwl_mvm_rm_mcast_sta(mvm, vif);

out_rm_bcast:

	iwl_mvm_send_rm_bcast_sta(mvm, vif);

out_rm_mcast:

	iwl_mvm_rm_mcast_sta(mvm, vif);

out_unbind:

	iwl_mvm_binding_remove_vif(mvm, vif);

out_remove:
@@ -2196,8 +2197,20 @@ static void iwl_mvm_stop_ap_ibss(struct ieee80211_hw *hw, 
		iwl_mvm_mac_ctxt_changed(mvm, mvm->p2p_device_vif, false, NULL);



	iwl_mvm_update_quotas(mvm, false, NULL);



	/*

	 * This is not very nice, but the simplest:

	 * For older FWs removing the mcast sta before the bcast station may

	 * cause assert 0x2b00.

	 * This is fixed in later FW (which will stop beaconing when removing

	 * bcast station).

	 * So make the order of removal depend on the TLV

	 */

	if (!fw_has_api(&mvm->fw->ucode_capa, IWL_UCODE_TLV_API_STA_TYPE))

		iwl_mvm_rm_mcast_sta(mvm, vif);

	iwl_mvm_send_rm_bcast_sta(mvm, vif);

	if (fw_has_api(&mvm->fw->ucode_capa, IWL_UCODE_TLV_API_STA_TYPE))

		iwl_mvm_rm_mcast_sta(mvm, vif);

	iwl_mvm_binding_remove_vif(mvm, vif);



	iwl_mvm_power_update_mac(mvm);

CRA Git | Maintained and supported by SUSTech CRA and CCSE