diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-04-18 23:22:38 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-04-18 23:22:38 -0700 |
| commit | 11409428a9eafed9af49e9c6eb40bc0bc71b3425 (patch) | |
| tree | 791b9ab5d0588b883d2011ceda45a6ea1808142e | |
| parent | 3fc177aa54c14037fe951ce923dc0c6b2f0e4f46 (diff) | |
| parent | 19d2063faa0d0b53f4cf7653bf26bb7f26e9684c (diff) | |
Merge "qcacld-2.0: Disable cpu sleep when collecting ramdump" into wlan-cld2.driver.lnx.1.0-dev
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_main.c | 1 | ||||
| -rw-r--r-- | CORE/SERVICES/BMI/ol_fw.c | 3 | ||||
| -rw-r--r-- | CORE/VOSS/inc/vos_cnss.h | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c index bbf82b0a46cb..7315438a8875 100644 --- a/CORE/HDD/src/wlan_hdd_main.c +++ b/CORE/HDD/src/wlan_hdd_main.c @@ -166,7 +166,6 @@ extern int hdd_hostapd_stop (struct net_device *dev); #define MEMORY_DEBUG_STR "" #endif -#define DISABLE_KRAIT_IDLE_PS_VAL 1 #ifdef IPA_UC_OFFLOAD /* If IPA UC data path is enabled, target should reserve extra tx descriptors * for IPA WDI data path. diff --git a/CORE/SERVICES/BMI/ol_fw.c b/CORE/SERVICES/BMI/ol_fw.c index 47e665365b23..e14f00fb51b8 100644 --- a/CORE/SERVICES/BMI/ol_fw.c +++ b/CORE/SERVICES/BMI/ol_fw.c @@ -1014,7 +1014,10 @@ int ol_copy_ramdump(struct ol_softc *scn) goto out; } + vos_request_pm_qos_type(PM_QOS_CPU_DMA_LATENCY, + DISABLE_KRAIT_IDLE_PS_VAL); ret = ol_target_coredump(scn, scn->ramdump_base, scn->ramdump_size); + vos_remove_pm_qos(); out: return ret; diff --git a/CORE/VOSS/inc/vos_cnss.h b/CORE/VOSS/inc/vos_cnss.h index 2fc75253edd0..0ef997411687 100644 --- a/CORE/VOSS/inc/vos_cnss.h +++ b/CORE/VOSS/inc/vos_cnss.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2016 The Linux Foundation. All rights reserved. + * Copyright (c) 2015-2017 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -30,6 +30,8 @@ #include <net/cnss.h> #endif +#define DISABLE_KRAIT_IDLE_PS_VAL 1 + #if defined(WLAN_OPEN_SOURCE) && !defined(CONFIG_CNSS) #include <linux/device.h> #include <linux/pm_wakeup.h> |