diff options
| author | Dustin Brown <dustinb@codeaurora.org> | 2017-02-07 13:05:02 -0800 |
|---|---|---|
| committer | qcabuildsw <qcabuildsw@localhost> | 2017-02-07 22:35:01 -0800 |
| commit | 59dd47094ddeda85c5e165cf5ab338cf17819e46 (patch) | |
| tree | ebda3cc5cb4440ec30a08c9b9832d86814e9afc4 | |
| parent | f249f762486bfc061f389c82a1bf939a1d093bb3 (diff) | |
qcacld-3.0: Ignore suspend timeout during module (un)load
During suspend, the host driver asserts if the firmware does not
respond in a set amount of time. Avoid this assert if the driver
is loading or unloading when the suspend operation times out.
Change-Id: I38ff8663e29bcf1a373c1b91c8c358e2b037577d
CRs-Fixed: 2003478
| -rw-r--r-- | core/wma/src/wma_features.c | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index 649511086e71..8a9b82e09001 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -6806,34 +6806,19 @@ int wma_bus_resume(void) * * Return: NONE */ -#ifdef QCA_WIFI_3_0_ADRASTEA static inline void wma_suspend_target_timeout(bool is_self_recovery_enabled) { - if (cds_is_driver_recovering()) { - WMA_LOGE("%s: recovery is in progress, ignore!", __func__); - } else { - if (is_self_recovery_enabled) { - cds_trigger_recovery(false); - } else { - QDF_BUG(0); - } - } -} -#else /* ROME chipset */ -static inline void wma_suspend_target_timeout(bool is_self_recovery_enabled) -{ - if (cds_is_load_or_unload_in_progress() || cds_is_driver_recovering()) { - WMA_LOGE("%s: Unloading/Loading/recovery is in progress, Ignore!", + if (cds_is_load_or_unload_in_progress()) + WMA_LOGE("%s: Module (un)loading; Ignoring suspend timeout", __func__); - } else { - if (is_self_recovery_enabled) { - cds_trigger_recovery(false); - } else { - QDF_BUG(0); - } - } + else if (cds_is_driver_recovering()) + WMA_LOGE("%s: Module recovering; Ignoring suspend timeout", + __func__); + else if (is_self_recovery_enabled) + cds_trigger_recovery(false); + else + QDF_BUG(0); } -#endif /** * wma_suspend_target() - suspend target |