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

Commit 65d66628 authored by Johannes Berg's avatar Johannes Berg Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: remove using max_duration in firmware API 



The firmware decided to not implement this API in this way,
so for now remove setting the field completely. This will
allow the firmware to change how to use this field later.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent cdb00563

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

+0 −2
Original line number Diff line number Diff line
@@ -79,8 +79,6 @@ 
#define IWL_MVM_PS_SNOOZE_WINDOW		50

#define IWL_MVM_WOWLAN_PS_SNOOZE_WINDOW		25

#define IWL_MVM_LOWLAT_QUOTA_MIN_PERCENT	64

#define IWL_MVM_LOWLAT_SINGLE_BINDING_MAXDUR	24 /* TU */

#define IWL_MVM_LOWLAT_DUAL_BINDING_MAXDUR	24 /* TU */

#define IWL_MVM_BT_COEX_SYNC2SCO		1

#define IWL_MVM_BT_COEX_CORUNNING		1

#define IWL_MVM_BT_COEX_MPLUT			1

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

+1 −21
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ int iwl_mvm_update_quotas(struct iwl_mvm *mvm, struct ieee80211_vif *newvif) 
		.colors = { -1, -1, -1, -1 },

		.new_vif = newvif,

	};

	u32 ll_max_duration;



	lockdep_assert_held(&mvm->mutex);
@@ -199,21 +198,6 @@ int iwl_mvm_update_quotas(struct iwl_mvm *mvm, struct ieee80211_vif *newvif) 
		iwl_mvm_quota_iterator(&data, newvif->addr, newvif);

	}



	switch (data.n_low_latency_bindings) {

	case 0: /* no low latency - use default */

		ll_max_duration = 0;

		break;

	case 1: /* SingleBindingLowLatencyMode */

		ll_max_duration = IWL_MVM_LOWLAT_SINGLE_BINDING_MAXDUR;

		break;

	case 2: /* DualBindingLowLatencyMode */

		ll_max_duration = IWL_MVM_LOWLAT_DUAL_BINDING_MAXDUR;

		break;

	default: /* MultiBindingLowLatencyMode */

		ll_max_duration = 0;

		break;

	}



	/*

	 * The FW's scheduling session consists of

	 * IWL_MVM_MAX_QUOTA fragments. Divide these fragments
@@ -287,10 +271,6 @@ int iwl_mvm_update_quotas(struct iwl_mvm *mvm, struct ieee80211_vif *newvif) 
			  "Binding=%d, quota=%u > max=%u\n",

			  idx, le32_to_cpu(cmd.quotas[idx].quota), QUOTA_100);



		if (data.n_interfaces[i] && !data.low_latency[i])

			cmd.quotas[idx].max_duration =

				cpu_to_le32(ll_max_duration);

		else

		cmd.quotas[idx].max_duration = cpu_to_le32(0);



		idx++;