clear_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status);
iwl_mvm_d0i3_enable_tx(mvm, NULL);
- ret = iwl_mvm_update_quotas(mvm, NULL);
+ ret = iwl_mvm_update_quotas(mvm, NULL,
+ IWL_MVM_QUOTA_UPDATE_TYPE_REGULAR);
if (ret)
IWL_ERR(mvm, "Failed to update quotas after restart (%d)\n",
ret);
if (changes & BSS_CHANGED_ASSOC) {
if (bss_conf->assoc) {
/* add quota for this interface */
- ret = iwl_mvm_update_quotas(mvm, vif);
+ ret = iwl_mvm_update_quotas(mvm, vif,
+ IWL_MVM_QUOTA_UPDATE_TYPE_NEW);
if (ret) {
IWL_ERR(mvm, "failed to update quotas\n");
return;
mvm->d0i3_ap_sta_id = IWL_MVM_STATION_COUNT;
mvmvif->ap_sta_id = IWL_MVM_STATION_COUNT;
/* remove quota for this interface */
- ret = iwl_mvm_update_quotas(mvm, NULL);
+ ret = iwl_mvm_update_quotas(mvm, NULL,
+ IWL_MVM_QUOTA_UPDATE_TYPE_REGULAR);
if (ret)
IWL_ERR(mvm, "failed to update quotas\n");
/* power updated needs to be done before quotas */
iwl_mvm_power_update_mac(mvm);
- ret = iwl_mvm_update_quotas(mvm, vif);
+ ret = iwl_mvm_update_quotas(mvm, vif, IWL_MVM_QUOTA_UPDATE_TYPE_NEW);
if (ret)
goto out_quota_failed;
if (vif->p2p && mvm->p2p_device_vif)
iwl_mvm_mac_ctxt_changed(mvm, mvm->p2p_device_vif, false);
- iwl_mvm_update_quotas(mvm, NULL);
+ iwl_mvm_update_quotas(mvm, NULL, IWL_MVM_QUOTA_UPDATE_TYPE_REGULAR);
iwl_mvm_send_rm_bcast_sta(mvm, &mvmvif->bcast_sta);
iwl_mvm_binding_remove_vif(mvm, vif);
*/
if (vif->type == NL80211_IFTYPE_MONITOR) {
mvmvif->monitor_active = true;
- ret = iwl_mvm_update_quotas(mvm, vif);
+ ret = iwl_mvm_update_quotas(mvm, vif,
+ IWL_MVM_QUOTA_UPDATE_TYPE_NEW);
if (ret)
goto out_remove_binding;
}
/* Handle binding during CSA */
if (vif->type == NL80211_IFTYPE_AP) {
- iwl_mvm_update_quotas(mvm, vif);
+ iwl_mvm_update_quotas(mvm, vif, IWL_MVM_QUOTA_UPDATE_TYPE_NEW);
iwl_mvm_mac_ctxt_changed(mvm, vif, false);
}
goto out_unlock;
case NL80211_IFTYPE_MONITOR:
mvmvif->monitor_active = false;
- iwl_mvm_update_quotas(mvm, NULL);
+ iwl_mvm_update_quotas(mvm, NULL,
+ IWL_MVM_QUOTA_UPDATE_TYPE_REGULAR);
break;
case NL80211_IFTYPE_AP:
/* This part is triggered only during CSA */
goto out_unlock;
mvmvif->ap_ibss_active = false;
- iwl_mvm_update_quotas(mvm, NULL);
- /*TODO: bt_coex notification here? */
+ iwl_mvm_update_quotas(mvm, NULL,
+ IWL_MVM_QUOTA_UPDATE_TYPE_REGULAR);
default:
break;
}
mvm->noa_duration = noa_duration;
mvm->noa_vif = vif;
- return iwl_mvm_update_quotas(mvm, NULL);
+ return iwl_mvm_update_quotas(mvm, NULL,
+ IWL_MVM_QUOTA_UPDATE_TYPE_REGULAR);
case IWL_MVM_TM_CMD_SET_BEACON_FILTER:
/* must be associated client vif - ignore authorized */
if (!vif || vif->type != NL80211_IFTYPE_STATION ||
int iwl_mvm_binding_remove_vif(struct iwl_mvm *mvm, struct ieee80211_vif *vif);
/* Quota management */
-int iwl_mvm_update_quotas(struct iwl_mvm *mvm, struct ieee80211_vif *newvif);
+
+/**
+ * enum iwl_mvm_quota_update_type - quota update type
+
+ * @IWL_MVM_QUOTA_UPDATE_TYPE_REGULAR: regular quota update, use the
+ * existing vifs (ie. no new vif nor a disabled vif is passed).
+ * @IWL_MVM_QUOTA_UPDATE_TYPE_NEW: a new vif is being added to the
+ * quota calculation and needs to be treated differently.
+ * @IWL_MVM_QUOTA_UPDATE_TYPE_DISABLED: temporarily disable a vif from
+ * the quota calculation. The mvm mutex must remain held for the
+ * entire time during which the vif is to remain disabled,
+ * otherwise there is no guarantee that another code flow will
+ * not reenable it accidentally (by updating the quotas without
+ * marking the vif as disabled).
+ */
+enum iwl_mvm_quota_update_type {
+ IWL_MVM_QUOTA_UPDATE_TYPE_REGULAR,
+ IWL_MVM_QUOTA_UPDATE_TYPE_NEW,
+ IWL_MVM_QUOTA_UPDATE_TYPE_DISABLED,
+};
+
+int iwl_mvm_update_quotas(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
+ enum iwl_mvm_quota_update_type type);
/* Scanning */
int iwl_mvm_scan_request(struct iwl_mvm *mvm,
int colors[MAX_BINDINGS];
int low_latency[MAX_BINDINGS];
int n_low_latency_bindings;
- struct ieee80211_vif *new_vif;
+ struct ieee80211_vif *vif;
+ enum iwl_mvm_quota_update_type type;
};
static void iwl_mvm_quota_iterator(void *_data, u8 *mac,
* the add_interface callback (otherwise it won't show
* up in iteration)
*/
- if (vif == data->new_vif)
+ if (data->type == IWL_MVM_QUOTA_UPDATE_TYPE_NEW && vif == data->vif)
return;
if (!mvmvif->phy_ctxt)
else
WARN_ON_ONCE(data->colors[id] != mvmvif->phy_ctxt->color);
+ if (data->type == IWL_MVM_QUOTA_UPDATE_TYPE_DISABLED &&
+ vif == data->vif)
+ return;
+
switch (vif->type) {
case NL80211_IFTYPE_STATION:
if (vif->bss_conf.assoc)
#endif
}
-int iwl_mvm_update_quotas(struct iwl_mvm *mvm, struct ieee80211_vif *newvif)
+int iwl_mvm_update_quotas(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
+ enum iwl_mvm_quota_update_type type)
{
struct iwl_time_quota_cmd cmd = {};
int i, idx, ret, num_active_macs, quota, quota_rem, n_non_lowlat;
struct iwl_mvm_quota_iterator_data data = {
.n_interfaces = {},
.colors = { -1, -1, -1, -1 },
- .new_vif = newvif,
+ .vif = vif,
+ .type = type,
};
lockdep_assert_held(&mvm->mutex);
/* iterator data above must match */
BUILD_BUG_ON(MAX_BINDINGS != 4);
+ if (WARN_ON_ONCE((type != IWL_MVM_QUOTA_UPDATE_TYPE_REGULAR && !vif) ||
+ (type == IWL_MVM_QUOTA_UPDATE_TYPE_REGULAR && vif)))
+ return -EINVAL;
+
ieee80211_iterate_active_interfaces_atomic(
mvm->hw, IEEE80211_IFACE_ITER_NORMAL,
iwl_mvm_quota_iterator, &data);
- if (newvif) {
- data.new_vif = NULL;
- iwl_mvm_quota_iterator(&data, newvif->addr, newvif);
+ if (type == IWL_MVM_QUOTA_UPDATE_TYPE_NEW) {
+ data.vif = NULL;
+ data.type = IWL_MVM_QUOTA_UPDATE_TYPE_REGULAR;
+ iwl_mvm_quota_iterator(&data, vif->addr, vif);
}
/*