summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDustin Brown <dustinb@codeaurora.org>2018-02-07 14:51:32 -0800
committersnandini <snandini@codeaurora.org>2018-02-08 13:07:25 -0800
commitff19db7511fc5751becfc940b3e9eb6bacf9dda2 (patch)
treef51e1429a4f9e93f56b0988b05798c74e0712e51
parenta0835087e01d7219b7d90defb5cf3e1355afbc08 (diff)
qcacld-3.0: Disable PANIC_ON_BUG for end user builds
PANIC_ON_BUG is currently enabled for all WLAN builds. While a customer can, and should, disable PANIC_ON_BUG for end user builds, this can be easily overlooked. Disable PANIC_ON_BUG by default on pure performance builds, to avoid accidentally crashing end user devices. Customers can opt-in to PANIC_ON_BUG as needed for validation on performance builds. Change-Id: I79371206b20b978f4e61954c2f49bbb7b07ba95e CRs-Fixed: 2186099
-rw-r--r--Kbuild8
-rw-r--r--core/hdd/src/wlan_hdd_main.c8
2 files changed, 14 insertions, 2 deletions
diff --git a/Kbuild b/Kbuild
index 18f4fe569d19..34f2dec0ee8e 100644
--- a/Kbuild
+++ b/Kbuild
@@ -269,7 +269,13 @@ BUILD_DEBUG_VERSION := 1
BUILD_DIAG_VERSION := 1
#Do we panic on bug? default is to warn
-PANIC_ON_BUG := 1
+ifeq ($(CONFIG_SLUB_DEBUG), y)
+ PANIC_ON_BUG := 1
+else ifeq ($(CONFIG_PERF_DEBUG), y)
+ PANIC_ON_BUG := 1
+else
+ PANIC_ON_BUG := 0
+endif
#Enable OL debug and wmi unified functions
CONFIG_ATH_PERF_PWR_OFFLOAD := 1
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index 799f56a5086a..33293562a9d0 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -136,6 +136,12 @@
#define MEMORY_DEBUG_STR ""
#endif
+#ifdef PANIC_ON_BUG
+#define PANIC_ON_BUG_STR " +PANIC_ON_BUG"
+#else
+#define PANIC_ON_BUG_STR ""
+#endif
+
int wlan_start_ret_val;
static DECLARE_COMPLETION(wlan_start_comp);
static unsigned int dev_num = 1;
@@ -12013,7 +12019,7 @@ static int __hdd_module_init(void)
pr_err("%s: Loading driver v%s (%s)\n",
WLAN_MODULE_NAME,
g_wlan_driver_version,
- TIMER_MANAGER_STR MEMORY_DEBUG_STR);
+ TIMER_MANAGER_STR MEMORY_DEBUG_STR PANIC_ON_BUG_STR);
pld_init();