Commit e3c588ec authored by Alexander Bondar's avatar Alexander Bondar Committed by Johannes Berg
Browse files

iwlwifi: mvm: Add basic uAPSD client support 



Implement basic uAPSD client support adding the following:

- Advertise uAPSD support in HW capabilities
- Set all ACs trigger- and delivery-enabled
- Set max SP length to 2 buffered frames
- Assign QNDP with the highest TID with no mandatory admission
  control required
- Set uAPSD related parameters in Power Table command

Signed-off-by: default avatarAlexander Bondar <alexander.bondar@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent faec6f91

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

+6 −0
Original line number Diff line number Diff line
@@ -67,5 +67,11 @@ 
#define IWL_MVM_DEFAULT_PS_RX_DATA_TIMEOUT	(100 * USEC_PER_MSEC)

#define IWL_MVM_WOWLAN_PS_TX_DATA_TIMEOUT	(10 * USEC_PER_MSEC)

#define IWL_MVM_WOWLAN_PS_RX_DATA_TIMEOUT	(10 * USEC_PER_MSEC)

#define IWL_MVM_UAPSD_RX_DATA_TIMEOUT		(50 * USEC_PER_MSEC)

#define IWL_MVM_UAPSD_TX_DATA_TIMEOUT		(50 * USEC_PER_MSEC)

#define IWL_MVM_PS_HEAVY_TX_THLD_PACKETS	20

#define IWL_MVM_PS_HEAVY_RX_THLD_PACKETS	20

#define IWL_MVM_PS_HEAVY_TX_THLD_PERCENT	50

#define IWL_MVM_PS_HEAVY_RX_THLD_PERCENT	50



#endif /* __MVM_CONSTANTS_H */

drivers/net/wireless/iwlwifi/mvm/debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ static ssize_t iwl_dbgfs_pm_params_read(struct file *file, 
	struct ieee80211_vif *vif = file->private_data;

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);

	struct iwl_mvm *mvm = mvmvif->dbgfs_data;

	char buf[256];

	char buf[512];

	int bufsz = sizeof(buf);

	int pos;

drivers/net/wireless/iwlwifi/mvm/fw-api-power.h

+8 −8
Original line number Diff line number Diff line
@@ -164,10 +164,10 @@ struct iwl_powertable_cmd { 
 *			Use IEEE80211_WMM_IE_STA_QOSINFO_AC* for correct values.

 * @uapsd_max_sp:	Use IEEE80211_WMM_IE_STA_QOSINFO_SP_* for correct

 *			values.

 * @heavy_traffic_thr_tx_pkts:	TX threshold measured in number of packets

 * @heavy_traffic_thr_rx_pkts:	RX threshold measured in number of packets

 * @heavy_traffic_thr_tx_load:	TX threshold measured in load's percentage

 * @heavy_traffic_thr_rx_load:	RX threshold measured in load's percentage

 * @heavy_tx_thld_packets:	TX threshold measured in number of packets

 * @heavy_rx_thld_packets:	RX threshold measured in number of packets

 * @heavy_tx_thld_percentage:	TX threshold measured in load's percentage

 * @heavy_rx_thld_percentage:	RX threshold measured in load's percentage

 * @limited_ps_threshold:

*/

struct iwl_mac_power_cmd {
@@ -189,10 +189,10 @@ struct iwl_mac_power_cmd { 
	u8 qndp_tid;

	u8 uapsd_ac_flags;

	u8 uapsd_max_sp;

	u8 heavy_traffic_threshold_tx_packets;

	u8 heavy_traffic_threshold_rx_packets;

	u8 heavy_traffic_threshold_tx_percentage;

	u8 heavy_traffic_threshold_rx_percentage;

	u8 heavy_tx_thld_packets;

	u8 heavy_rx_thld_packets;

	u8 heavy_tx_thld_percentage;

	u8 heavy_rx_thld_percentage;

	u8 limited_ps_threshold;

	u8 reserved;

} __packed;

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

+5 −2
Original line number Diff line number Diff line
@@ -155,7 +155,8 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) 
		    IEEE80211_HW_TIMING_BEACON_ONLY |

		    IEEE80211_HW_CONNECTION_MONITOR |

		    IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS |

		    IEEE80211_HW_SUPPORTS_STATIC_SMPS;

		    IEEE80211_HW_SUPPORTS_STATIC_SMPS |

		    IEEE80211_HW_SUPPORTS_UAPSD;



	hw->queues = IWL_MVM_FIRST_AGG_QUEUE;

	hw->offchannel_tx_hw_queue = IWL_MVM_OFFCHANNEL_QUEUE;
@@ -190,6 +191,8 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) 


	hw->wiphy->max_remain_on_channel_duration = 10000;

	hw->max_listen_interval = IWL_CONN_MAX_LISTEN_INTERVAL;

	hw->uapsd_queues = IWL_UAPSD_AC_INFO;

	hw->uapsd_max_sp_len = IWL_UAPSD_MAX_SP;



	/* Extract MAC address */

	memcpy(mvm->addresses[0].addr, mvm->nvm_data->hw_addr, ETH_ALEN);
@@ -812,7 +815,7 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm, 
		 */

		iwl_mvm_remove_time_event(mvm, mvmvif,

					  &mvmvif->time_event_data);

	} else if (changes & BSS_CHANGED_PS) {

	} else if (changes & (BSS_CHANGED_PS | BSS_CHANGED_QOS)) {

		ret = iwl_mvm_power_update_mode(mvm, vif);

		if (ret)

			IWL_ERR(mvm, "failed to update power mode\n");

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

+5 −0
Original line number Diff line number Diff line
@@ -153,6 +153,11 @@ enum iwl_power_scheme { 
};



#define IWL_CONN_MAX_LISTEN_INTERVAL	70

#define IWL_UAPSD_AC_INFO		(IEEE80211_WMM_IE_STA_QOSINFO_AC_VO |\

					 IEEE80211_WMM_IE_STA_QOSINFO_AC_VI |\

					 IEEE80211_WMM_IE_STA_QOSINFO_AC_BK |\

					 IEEE80211_WMM_IE_STA_QOSINFO_AC_BE)

#define IWL_UAPSD_MAX_SP		IEEE80211_WMM_IE_STA_QOSINFO_SP_2



struct iwl_mvm_power_ops {

	int (*power_update_mode)(struct iwl_mvm *mvm,

CRA Git | Maintained and supported by SUSTech CRA and CCSE