Commit b2b7875b authored by Johannes Berg's avatar Johannes Berg Committed by Emmanuel Grumbach

iwlwifi: mvm: don't update quota in firmware too often

When updating quota in the firmware, it has to reset quite a bit
of internal state, which apparently can have an adverse impact on
its operation.

Avoid that by only updating the quota command when there are any
signification changes, i.e. added/removed bindings or changes in
quota that are bigger than 8 TU within a binding.
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent bbab7582
...@@ -87,5 +87,6 @@ ...@@ -87,5 +87,6 @@
#define IWL_MVM_BT_COEX_CORUNNING 1 #define IWL_MVM_BT_COEX_CORUNNING 1
#define IWL_MVM_BT_COEX_MPLUT 1 #define IWL_MVM_BT_COEX_MPLUT 1
#define IWL_MVM_FW_MCAST_FILTER_PASS_ALL 0 #define IWL_MVM_FW_MCAST_FILTER_PASS_ALL 0
#define IWL_MVM_QUOTA_THRESHOLD 8
#endif /* __MVM_CONSTANTS_H */ #endif /* __MVM_CONSTANTS_H */
...@@ -454,6 +454,9 @@ int iwl_mvm_up(struct iwl_mvm *mvm) ...@@ -454,6 +454,9 @@ int iwl_mvm_up(struct iwl_mvm *mvm)
for (i = 0; i < IWL_MVM_STATION_COUNT; i++) for (i = 0; i < IWL_MVM_STATION_COUNT; i++)
RCU_INIT_POINTER(mvm->fw_id_to_mac_id[i], NULL); RCU_INIT_POINTER(mvm->fw_id_to_mac_id[i], NULL);
/* reset quota debouncing buffer - 0xff will yield invalid data */
memset(&mvm->last_quota_cmd, 0xff, sizeof(mvm->last_quota_cmd));
/* Add auxiliary station for scanning */ /* Add auxiliary station for scanning */
ret = iwl_mvm_add_aux_sta(mvm); ret = iwl_mvm_add_aux_sta(mvm);
if (ret) if (ret)
......
...@@ -709,6 +709,8 @@ struct iwl_mvm { ...@@ -709,6 +709,8 @@ struct iwl_mvm {
*/ */
bool temperature_test; /* Debug test temperature is enabled */ bool temperature_test; /* Debug test temperature is enabled */
struct iwl_time_quota_cmd last_quota_cmd;
#ifdef CONFIG_NL80211_TESTMODE #ifdef CONFIG_NL80211_TESTMODE
u32 noa_duration; u32 noa_duration;
struct ieee80211_vif *noa_vif; struct ieee80211_vif *noa_vif;
......
...@@ -175,12 +175,14 @@ int iwl_mvm_update_quotas(struct iwl_mvm *mvm, ...@@ -175,12 +175,14 @@ int iwl_mvm_update_quotas(struct iwl_mvm *mvm,
struct ieee80211_vif *disabled_vif) struct ieee80211_vif *disabled_vif)
{ {
struct iwl_time_quota_cmd cmd = {}; struct iwl_time_quota_cmd cmd = {};
int i, idx, ret, num_active_macs, quota, quota_rem, n_non_lowlat; int i, idx, err, num_active_macs, quota, quota_rem, n_non_lowlat;
struct iwl_mvm_quota_iterator_data data = { struct iwl_mvm_quota_iterator_data data = {
.n_interfaces = {}, .n_interfaces = {},
.colors = { -1, -1, -1, -1 }, .colors = { -1, -1, -1, -1 },
.disabled_vif = disabled_vif, .disabled_vif = disabled_vif,
}; };
struct iwl_time_quota_cmd *last = &mvm->last_quota_cmd;
bool send = false;
lockdep_assert_held(&mvm->mutex); lockdep_assert_held(&mvm->mutex);
...@@ -293,15 +295,34 @@ int iwl_mvm_update_quotas(struct iwl_mvm *mvm, ...@@ -293,15 +295,34 @@ int iwl_mvm_update_quotas(struct iwl_mvm *mvm,
/* check that we have non-zero quota for all valid bindings */ /* check that we have non-zero quota for all valid bindings */
for (i = 0; i < MAX_BINDINGS; i++) { for (i = 0; i < MAX_BINDINGS; i++) {
if (cmd.quotas[i].id_and_color != last->quotas[i].id_and_color)
send = true;
if (cmd.quotas[i].max_duration != last->quotas[i].max_duration)
send = true;
if (abs((int)le32_to_cpu(cmd.quotas[i].quota) -
(int)le32_to_cpu(last->quotas[i].quota))
> IWL_MVM_QUOTA_THRESHOLD)
send = true;
if (cmd.quotas[i].id_and_color == cpu_to_le32(FW_CTXT_INVALID)) if (cmd.quotas[i].id_and_color == cpu_to_le32(FW_CTXT_INVALID))
continue; continue;
WARN_ONCE(cmd.quotas[i].quota == 0, WARN_ONCE(cmd.quotas[i].quota == 0,
"zero quota on binding %d\n", i); "zero quota on binding %d\n", i);
} }
ret = iwl_mvm_send_cmd_pdu(mvm, TIME_QUOTA_CMD, 0, if (send) {
err = iwl_mvm_send_cmd_pdu(mvm, TIME_QUOTA_CMD, 0,
sizeof(cmd), &cmd); sizeof(cmd), &cmd);
if (ret) } else {
IWL_ERR(mvm, "Failed to send quota: %d\n", ret); /* don't send a practically unchanged command, the firmware has
return ret; * to re-initialize a lot of state and that can have an adverse
* impact on it
*/
err = 0;
}
if (err)
IWL_ERR(mvm, "Failed to send quota: %d\n", err);
else
mvm->last_quota_cmd = cmd;
return err;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment