diff options
author | Shaul Triebitz <shaul.triebitz@intel.com> | 2017-12-04 08:33:46 -0500 |
---|---|---|
committer | Luca Coelho <luciano.coelho@intel.com> | 2017-12-20 11:28:25 -0500 |
commit | dad3340fd988173aa79afb03941416c85f82ac0c (patch) | |
tree | 1d7ab5a52bf6e84c39bc3f238cd56a461b50590f | |
parent | 49940fc06687a063a3290410d7118be9288c2509 (diff) |
iwlwifi: mvm: adjust to quota offload
Skip Quota handling if firmware implements Quota.
Signed-off-by: Shaul Triebitz <shaul.triebitz@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
-rw-r--r-- | drivers/net/wireless/intel/iwlwifi/fw/file.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/quota.c | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/file.h b/drivers/net/wireless/intel/iwlwifi/fw/file.h index 12f97a2fc7ea..1a05d506ac9a 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/file.h +++ b/drivers/net/wireless/intel/iwlwifi/fw/file.h | |||
@@ -314,6 +314,7 @@ typedef unsigned int __bitwise iwl_ucode_tlv_capa_t; | |||
314 | * @IWL_UCODE_TLV_CAPA_GSCAN_SUPPORT: supports gscan | 314 | * @IWL_UCODE_TLV_CAPA_GSCAN_SUPPORT: supports gscan |
315 | * @IWL_UCODE_TLV_CAPA_STA_PM_NOTIF: firmware will send STA PM notification | 315 | * @IWL_UCODE_TLV_CAPA_STA_PM_NOTIF: firmware will send STA PM notification |
316 | * @IWL_UCODE_TLV_CAPA_TLC_OFFLOAD: firmware implements rate scaling algorithm | 316 | * @IWL_UCODE_TLV_CAPA_TLC_OFFLOAD: firmware implements rate scaling algorithm |
317 | * @IWL_UCODE_TLV_CAPA_DYNAMIC_QUOTA: firmware implements quota related | ||
317 | * @IWL_UCODE_TLV_CAPA_EXTENDED_DTS_MEASURE: extended DTS measurement | 318 | * @IWL_UCODE_TLV_CAPA_EXTENDED_DTS_MEASURE: extended DTS measurement |
318 | * @IWL_UCODE_TLV_CAPA_SHORT_PM_TIMEOUTS: supports short PM timeouts | 319 | * @IWL_UCODE_TLV_CAPA_SHORT_PM_TIMEOUTS: supports short PM timeouts |
319 | * @IWL_UCODE_TLV_CAPA_BT_MPLUT_SUPPORT: supports bt-coex Multi-priority LUT | 320 | * @IWL_UCODE_TLV_CAPA_BT_MPLUT_SUPPORT: supports bt-coex Multi-priority LUT |
@@ -369,6 +370,7 @@ enum iwl_ucode_tlv_capa { | |||
369 | IWL_UCODE_TLV_CAPA_CDB_SUPPORT = (__force iwl_ucode_tlv_capa_t)40, | 370 | IWL_UCODE_TLV_CAPA_CDB_SUPPORT = (__force iwl_ucode_tlv_capa_t)40, |
370 | IWL_UCODE_TLV_CAPA_D0I3_END_FIRST = (__force iwl_ucode_tlv_capa_t)41, | 371 | IWL_UCODE_TLV_CAPA_D0I3_END_FIRST = (__force iwl_ucode_tlv_capa_t)41, |
371 | IWL_UCODE_TLV_CAPA_TLC_OFFLOAD = (__force iwl_ucode_tlv_capa_t)43, | 372 | IWL_UCODE_TLV_CAPA_TLC_OFFLOAD = (__force iwl_ucode_tlv_capa_t)43, |
373 | IWL_UCODE_TLV_CAPA_DYNAMIC_QUOTA = (__force iwl_ucode_tlv_capa_t)44, | ||
372 | IWL_UCODE_TLV_CAPA_EXTENDED_DTS_MEASURE = (__force iwl_ucode_tlv_capa_t)64, | 374 | IWL_UCODE_TLV_CAPA_EXTENDED_DTS_MEASURE = (__force iwl_ucode_tlv_capa_t)64, |
373 | IWL_UCODE_TLV_CAPA_SHORT_PM_TIMEOUTS = (__force iwl_ucode_tlv_capa_t)65, | 375 | IWL_UCODE_TLV_CAPA_SHORT_PM_TIMEOUTS = (__force iwl_ucode_tlv_capa_t)65, |
374 | IWL_UCODE_TLV_CAPA_BT_MPLUT_SUPPORT = (__force iwl_ucode_tlv_capa_t)67, | 376 | IWL_UCODE_TLV_CAPA_BT_MPLUT_SUPPORT = (__force iwl_ucode_tlv_capa_t)67, |
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/quota.c b/drivers/net/wireless/intel/iwlwifi/mvm/quota.c index b4a0264329b7..690559bdf421 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/quota.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/quota.c | |||
@@ -202,6 +202,10 @@ int iwl_mvm_update_quotas(struct iwl_mvm *mvm, | |||
202 | 202 | ||
203 | lockdep_assert_held(&mvm->mutex); | 203 | lockdep_assert_held(&mvm->mutex); |
204 | 204 | ||
205 | if (fw_has_capa(&mvm->fw->ucode_capa, | ||
206 | IWL_UCODE_TLV_CAPA_DYNAMIC_QUOTA)) | ||
207 | return 0; | ||
208 | |||
205 | /* update all upon completion */ | 209 | /* update all upon completion */ |
206 | if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status)) | 210 | if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status)) |
207 | return 0; | 211 | return 0; |