Commit ef9203d2 authored by Luciano Coelho's avatar Luciano Coelho Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: add function to update only ps 



Add a new iwl_mvm_power_update_ps() function that allows only ps to be
updated according to changes in the vifs.  This allows us to disable
ps only without affecting the pm values of the vifs (and to avoid
sending unnecessary MAC_PM_POWER_TABLE commands to the firmware).

Signed-off-by: default avatarLuciano Coelho <luciano.coelho@intel.com>
Reviewed-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 128aa948

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

+1 −0
Original line number Diff line number Diff line
@@ -983,6 +983,7 @@ int rs_pretty_print_rate(char *buf, const u32 rate); 
/* power management */

int iwl_mvm_power_update_device(struct iwl_mvm *mvm);

int iwl_mvm_power_update_mac(struct iwl_mvm *mvm);

int iwl_mvm_power_update_ps(struct iwl_mvm *mvm);

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

				 char *buf, int bufsz);

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

+40 −12
Original line number Diff line number Diff line
@@ -857,13 +857,50 @@ static int iwl_mvm_power_set_ps(struct iwl_mvm *mvm, 
	return 0;

}



int iwl_mvm_power_update_mac(struct iwl_mvm *mvm)

static int iwl_mvm_power_set_ba(struct iwl_mvm *mvm,

				struct iwl_power_vifs *vifs)

{

	struct iwl_mvm_vif *mvmvif;

	bool ba_enable;



	if (!vifs->bf_vif)

		return 0;



	mvmvif = iwl_mvm_vif_from_mac80211(vifs->bf_vif);



	ba_enable = !(!mvmvif->pm_enabled || mvm->ps_disabled ||

		      !vifs->bf_vif->bss_conf.ps ||

		      iwl_mvm_vif_low_latency(mvmvif));



	return iwl_mvm_update_beacon_abort(mvm, vifs->bf_vif, ba_enable);

}



int iwl_mvm_power_update_ps(struct iwl_mvm *mvm)

{

	struct iwl_power_vifs vifs = {

		.mvm = mvm,

	};

	int ret;



	lockdep_assert_held(&mvm->mutex);



	/* get vifs info */

	ieee80211_iterate_active_interfaces_atomic(mvm->hw,

					IEEE80211_IFACE_ITER_NORMAL,

					iwl_mvm_power_get_vifs_iterator, &vifs);



	ret = iwl_mvm_power_set_ps(mvm, &vifs);

	if (ret)

		return ret;



	return iwl_mvm_power_set_ba(mvm, &vifs);

}



int iwl_mvm_power_update_mac(struct iwl_mvm *mvm)

{

	struct iwl_power_vifs vifs = {

		.mvm = mvm,

	};

	bool ba_enable;

	int ret;



	lockdep_assert_held(&mvm->mutex);
@@ -891,16 +928,7 @@ int iwl_mvm_power_update_mac(struct iwl_mvm *mvm) 
			return ret;

	}



	if (!vifs.bf_vif)

		return 0;



	mvmvif = iwl_mvm_vif_from_mac80211(vifs.bf_vif);



	ba_enable = !(!mvmvif->pm_enabled || mvm->ps_disabled ||

		      !vifs.bf_vif->bss_conf.ps ||

		      iwl_mvm_vif_low_latency(mvmvif));



	return iwl_mvm_update_beacon_abort(mvm, vifs.bf_vif, ba_enable);

	return iwl_mvm_power_set_ba(mvm, &vifs);

}



int iwl_mvm_update_d0i3_power_mode(struct iwl_mvm *mvm,

CRA Git | Maintained and supported by SUSTech CRA and CCSE