Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a20fd398 authored by Andrei Otcheretianski's avatar Andrei Otcheretianski Committed by Johannes Berg
Browse files

iwlwifi: mvm: Implement CQM offloading 



Use beacon statistics notification to track RSSI.
Notify mac80211 when the tresholds are crossed.
The roaming treshold is configured to be
equal to cqm_thold. If the beacon filtering command
is not supported by fw fall back and use mac80211
mechanism.

Signed-off-by: default avatarAndrei Otcheretianski <andrei.otcheretianski@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent eafe25e0

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

+1 −1
Original line number Diff line number Diff line
@@ -920,7 +920,7 @@ static ssize_t iwl_dbgfs_bf_params_read(struct file *file, 
	};



	iwl_mvm_beacon_filter_debugfs_parameters(vif, &cmd);

	if (mvmvif->bf_enabled)

	if (mvmvif->bf_data.bf_enabled)

		cmd.bf_enable_beacon_filter = cpu_to_le32(1);

	else

		cmd.bf_enable_beacon_filter = 0;

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

+1 −1
Original line number Diff line number Diff line
@@ -1321,7 +1321,7 @@ struct mvm_statistics_general { 
	struct mvm_statistics_general_common common;

	__le32 beacon_filtered;

	__le32 missed_beacons;

	__s8 beacon_filter_everage_energy;

	__s8 beacon_filter_average_energy;

	__s8 beacon_filter_reason;

	__s8 beacon_filter_current_energy;

	__s8 beacon_filter_reserved;

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

+19 −3
Original line number Diff line number Diff line
@@ -575,7 +575,8 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw, 
	    vif->type == NL80211_IFTYPE_STATION && !vif->p2p &&

	    mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_BF_UPDATED){

		mvm->bf_allowed_vif = mvmvif;

		vif->driver_flags |= IEEE80211_VIF_BEACON_FILTER;

		vif->driver_flags |= IEEE80211_VIF_BEACON_FILTER |

				     IEEE80211_VIF_SUPPORTS_CQM_RSSI;

	}



	/*
@@ -615,7 +616,8 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw, 
 out_free_bf:

	if (mvm->bf_allowed_vif == mvmvif) {

		mvm->bf_allowed_vif = NULL;

		vif->driver_flags &= ~IEEE80211_VIF_BEACON_FILTER;

		vif->driver_flags &= ~(IEEE80211_VIF_BEACON_FILTER |

				       IEEE80211_VIF_SUPPORTS_CQM_RSSI);

	}

 out_remove_mac:

	mvmvif->phy_ctxt = NULL;
@@ -681,7 +683,8 @@ static void iwl_mvm_mac_remove_interface(struct ieee80211_hw *hw, 


	if (mvm->bf_allowed_vif == mvmvif) {

		mvm->bf_allowed_vif = NULL;

		vif->driver_flags &= ~IEEE80211_VIF_BEACON_FILTER;

		vif->driver_flags &= ~(IEEE80211_VIF_BEACON_FILTER |

				       IEEE80211_VIF_SUPPORTS_CQM_RSSI);

	}



	iwl_mvm_vif_dbgfs_clean(mvm, vif);
@@ -799,6 +802,10 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm, 
			if (ret)

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

		}



		/* reset rssi values */

		mvmvif->bf_data.ave_beacon_signal = 0;



		if (!(mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_UAPSD)) {

			/* Workaround for FW bug, otherwise FW disables device

			 * power save upon disassociation
@@ -825,6 +832,15 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm, 
				bss_conf->txpower);

		iwl_mvm_set_tx_power(mvm, vif, bss_conf->txpower);

	}



	if (changes & BSS_CHANGED_CQM) {

		IWL_DEBUG_MAC80211(mvm, "cqm info_changed");

		/* reset cqm events tracking */

		mvmvif->bf_data.last_cqm_event = 0;

		ret = iwl_mvm_update_beacon_filter(mvm, vif);

		if (ret)

			IWL_ERR(mvm, "failed to update CQM thresholds\n");

	}

}



static int iwl_mvm_start_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif)

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

+18 −2
Original line number Diff line number Diff line
@@ -232,6 +232,21 @@ enum iwl_mvm_smps_type_request { 
	NUM_IWL_MVM_SMPS_REQ,

};



/**

* struct iwl_mvm_vif_bf_data - beacon filtering related data

* @bf_enabled: indicates if beacon filtering is enabled

* @ba_enabled: indicated if beacon abort is enabled

* @last_beacon_signal: last beacon rssi signal in dbm

* @ave_beacon_signal: average beacon signal

* @last_cqm_event: rssi of the last cqm event

*/

struct iwl_mvm_vif_bf_data {

	bool bf_enabled;

	bool ba_enabled;

	s8 ave_beacon_signal;

	s8 last_cqm_event;

};



/**

 * struct iwl_mvm_vif - data per Virtual Interface, it is a MAC context

 * @id: between 0 and 3
@@ -257,8 +272,7 @@ struct iwl_mvm_vif { 
	bool uploaded;

	bool ap_active;

	bool monitor_active;

	/* indicate whether beacon filtering is enabled */

	bool bf_enabled;

	struct iwl_mvm_vif_bf_data bf_data;



	u32 ap_beacon_time;
@@ -758,6 +772,8 @@ int iwl_mvm_beacon_filter_send_cmd(struct iwl_mvm *mvm, 
				   struct iwl_beacon_filter_cmd *cmd);

int iwl_mvm_update_beacon_abort(struct iwl_mvm *mvm,

				struct ieee80211_vif *vif, bool enable);

int iwl_mvm_update_beacon_filter(struct iwl_mvm *mvm,

				  struct ieee80211_vif *vif);



/* SMPS */

void iwl_mvm_update_smps(struct iwl_mvm *mvm, struct ieee80211_vif *vif,

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

+34 −3
Original line number Diff line number Diff line
@@ -110,6 +110,23 @@ int iwl_mvm_beacon_filter_send_cmd(struct iwl_mvm *mvm, 
	return ret;

}



static

void iwl_mvm_beacon_filter_set_cqm_params(struct iwl_mvm *mvm,

					  struct ieee80211_vif *vif,

					  struct iwl_beacon_filter_cmd *cmd)

{

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);



	if (vif->bss_conf.cqm_rssi_thold) {

		cmd->bf_energy_delta =

			cpu_to_le32(vif->bss_conf.cqm_rssi_hyst);

		/* fw uses an absolute value for this */

		cmd->bf_roaming_state =

			cpu_to_le32(-vif->bss_conf.cqm_rssi_thold);

	}

	cmd->ba_enable_beacon_abort = cpu_to_le32(mvmvif->bf_data.ba_enabled);

}



int iwl_mvm_update_beacon_abort(struct iwl_mvm *mvm,

				struct ieee80211_vif *vif, bool enable)

{
@@ -120,12 +137,14 @@ int iwl_mvm_update_beacon_abort(struct iwl_mvm *mvm, 
		.ba_enable_beacon_abort = cpu_to_le32(enable),

	};



	if (!mvmvif->bf_enabled)

	if (!mvmvif->bf_data.bf_enabled)

		return 0;



	if (mvm->cur_ucode == IWL_UCODE_WOWLAN)

		cmd.ba_escape_timer = cpu_to_le32(IWL_BA_ESCAPE_TIMER_D3);



	mvmvif->bf_data.ba_enabled = enable;

	iwl_mvm_beacon_filter_set_cqm_params(mvm, vif, &cmd);

	iwl_mvm_beacon_filter_debugfs_parameters(vif, &cmd);

	return iwl_mvm_beacon_filter_send_cmd(mvm, &cmd);

}
@@ -510,11 +529,12 @@ int iwl_mvm_enable_beacon_filter(struct iwl_mvm *mvm, 
	    vif->type != NL80211_IFTYPE_STATION || vif->p2p)

		return 0;



	iwl_mvm_beacon_filter_set_cqm_params(mvm, vif, &cmd);

	iwl_mvm_beacon_filter_debugfs_parameters(vif, &cmd);

	ret = iwl_mvm_beacon_filter_send_cmd(mvm, &cmd);



	if (!ret)

		mvmvif->bf_enabled = true;

		mvmvif->bf_data.bf_enabled = true;



	return ret;

}
@@ -533,11 +553,22 @@ int iwl_mvm_disable_beacon_filter(struct iwl_mvm *mvm, 
	ret = iwl_mvm_beacon_filter_send_cmd(mvm, &cmd);



	if (!ret)

		mvmvif->bf_enabled = false;

		mvmvif->bf_data.bf_enabled = false;



	return ret;

}



int iwl_mvm_update_beacon_filter(struct iwl_mvm *mvm,

				 struct ieee80211_vif *vif)

{

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);



	if (!mvmvif->bf_data.bf_enabled)

		return 0;



	return iwl_mvm_enable_beacon_filter(mvm, vif);

}



const struct iwl_mvm_power_ops pm_mac_ops = {

	.power_update_mode = iwl_mvm_power_mac_update_mode,

	.power_disable = iwl_mvm_power_mac_disable,