samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "qcacld-3.0: Restore ps params after current modules being stopped" into wlan-cld3.driver.lnx.2.0

Browse Source
This commit is contained in:
CNSS_WLAN Service
2020-07-03 03:02:22 -07:00
committed by Gerrit - the friendly Code Review server
parent f6fa6c6442 8526c047b2
commit 76589117aa
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/hdd/src/wlan_hdd_main.c
View File

@@ -3829,6 +3829,10 @@ int hdd_wlan_start_modules(struct hdd_context *hdd_ctx, bool reinit)
goto close; goto close;
} }
/* Override PS params for monitor mode */
if (hdd_get_conparam() == QDF_GLOBAL_MONITOR_MODE)
hdd_override_all_ps(hdd_ctx);
status = cds_dp_open(hdd_ctx->psoc); status = cds_dp_open(hdd_ctx->psoc);
if (!QDF_IS_STATUS_SUCCESS(status)) { if (!QDF_IS_STATUS_SUCCESS(status)) {
hdd_err("Failed to Open cds post open; status: %d", hdd_err("Failed to Open cds post open; status: %d",
@@ -3883,10 +3887,6 @@ int hdd_wlan_start_modules(struct hdd_context *hdd_ctx, bool reinit)
break; break;
} }
/* Override PS params for monitor mode */
if (hdd_get_conparam() == QDF_GLOBAL_MONITOR_MODE)
hdd_override_all_ps(hdd_ctx);
ret = hdd_configure_cds(hdd_ctx); ret = hdd_configure_cds(hdd_ctx);
if (ret) { if (ret) {
hdd_err("Failed to Enable cds modules; errno: %d", ret); hdd_err("Failed to Enable cds modules; errno: %d", ret);
@@ -13207,10 +13207,6 @@ int hdd_wlan_stop_modules(struct hdd_context *hdd_ctx, bool ftm_mode)
case DRIVER_MODULES_ENABLED: case DRIVER_MODULES_ENABLED:
hdd_debug("Wlan transitioning (CLOSED <- ENABLED)"); hdd_debug("Wlan transitioning (CLOSED <- ENABLED)");
/* Restore PS params for monitor mode */
if (hdd_get_conparam() == QDF_GLOBAL_MONITOR_MODE)
hdd_restore_all_ps(hdd_ctx);
if (hdd_get_conparam() == QDF_GLOBAL_FTM_MODE) { if (hdd_get_conparam() == QDF_GLOBAL_FTM_MODE) {
hdd_disable_power_management(hdd_ctx); hdd_disable_power_management(hdd_ctx);
break; break;
@@ -13344,6 +13340,10 @@ int hdd_wlan_stop_modules(struct hdd_context *hdd_ctx, bool ftm_mode)
hdd_check_for_leaks(hdd_ctx, is_recovery_stop); hdd_check_for_leaks(hdd_ctx, is_recovery_stop);
hdd_debug_domain_set(QDF_DEBUG_DOMAIN_INIT); hdd_debug_domain_set(QDF_DEBUG_DOMAIN_INIT);
/* Restore PS params for monitor mode */
if (hdd_get_conparam() == QDF_GLOBAL_MONITOR_MODE)
hdd_restore_all_ps(hdd_ctx);
/* Once the firmware sequence is completed reset this flag */ /* Once the firmware sequence is completed reset this flag */
hdd_ctx->imps_enabled = false; hdd_ctx->imps_enabled = false;
hdd_ctx->driver_status = DRIVER_MODULES_CLOSED; hdd_ctx->driver_status = DRIVER_MODULES_CLOSED;