qcacld-3.0: Enable wlan debug features when CONFIG_CNSS2_DEBUG is defined

In latest builds, CONFIG_SLUB_DEBUG is not getting set for debug builds,
which is causing wlan debug features to get disabled. Hence, enable
wlan debug features when either CONFIG_SLUB_DEBUG_ON or CONFIG_CNSS2_DEBUG
are defined.

Change-Id: I8fd94e095f2e5ebc459e73a6ae39e143944cc5f7
CRs-Fixed: 2789834

Kbuild

@@ -3665,8 +3665,8 @@ cppflags-$(CONFIG_MORE_TX_DESC) += -DTX_TO_NPEERS_INC_TX_DESCS
 
 ccflags-$(CONFIG_HASTINGS_BT_WAR) += -DHASTINGS_BT_WAR
 
-cppflags-$(CONFIG_SLUB_DEBUG_ON) += -DHIF_CONFIG_SLUB_DEBUG_ON
-cppflags-$(CONFIG_SLUB_DEBUG_ON) += -DHAL_CONFIG_SLUB_DEBUG_ON
+cppflags-$(CONFIG_HIF_DEBUG) += -DHIF_CONFIG_SLUB_DEBUG_ON
+cppflags-$(CONFIG_HAL_DEBUG) += -DHAL_CONFIG_SLUB_DEBUG_ON
 
 ccflags-$(CONFIG_FOURTH_CONNECTION) += -DFEATURE_FOURTH_CONNECTION
 ccflags-$(CONFIG_FOURTH_CONNECTION_AUTO) += -DFOURTH_CONNECTION_AUTO

configs/default_defconfig

@@ -458,7 +458,7 @@ ifeq ($(CONFIG_64BIT_PADDR), y)
 CONFIG_HTT_PADDR64 := y
 endif
 
-ifeq ($(CONFIG_SLUB_DEBUG_ON), y)
+ifeq (y,$(filter y,$(CONFIG_CNSS2_DEBUG) $(CONFIG_SLUB_DEBUG_ON)))
 CONFIG_OL_RX_INDICATION_RECORD := y
 CONFIG_TSOSEG_DEBUG := y
 CONFIG_HIF_LARGE_CE_RING_HISTORY := 8192
@@ -1002,7 +1002,7 @@ endif
 CONFIG_RX_OL := y
 endif
 
-ifeq ($(CONFIG_SLUB_DEBUG_ON), y)
+ifeq (y,$(filter y,$(CONFIG_CNSS2_DEBUG) $(CONFIG_SLUB_DEBUG_ON)))
 	CONFIG_DSC_DEBUG := y
 	CONFIG_DESC_TIMESTAMP_DEBUG_INFO := y
 	CONFIG_FEATURE_UNIT_TEST_SUSPEND := y
@@ -1013,6 +1013,8 @@ ifeq ($(CONFIG_SLUB_DEBUG_ON), y)
 	CONFIG_UNIT_TEST := y
 	CONFIG_REGISTER_OP_DEBUG := y
 	CONFIG_ENABLE_QDF_PTR_HASH_DEBUG := y
+	CONFIG_HIF_DEBUG := y
+	CONFIG_HAL_DEBUG := y
 endif
 
 ifeq ($(CONFIG_UNIT_TEST), y)
@@ -1022,14 +1024,14 @@ ifeq ($(CONFIG_UNIT_TEST), y)
 endif
 
 ifeq ($(CONFIG_LITHIUM), y)
-	ifeq ($(CONFIG_SLUB_DEBUG_ON), y)
+	ifeq (y,$(filter y,$(CONFIG_CNSS2_DEBUG) $(CONFIG_SLUB_DEBUG_ON)))
 		CONFIG_WLAN_FEATURE_DP_EVENT_HISTORY := y
+		CONFIG_HIF_CE_DEBUG_DATA_BUF := y
 		CONFIG_WLAN_RECORD_RX_PADDR := y
 		CONFIG_HIF_CPU_PERF_AFFINE_MASK := y
 		CONFIG_WLAN_FEATURE_DP_RX_RING_HISTORY := y
 		CONFIG_ALLOW_PKT_DROPPING := y
 	endif
-	CONFIG_HIF_CE_DEBUG_DATA_BUF := y
 	CONFIG_DYNAMIC_RX_AGGREGATION := y
 	CONFIG_RX_DESC_DEBUG_CHECK:= y
 	CONFIG_WLAN_SUPPORT_DATA_STALL := y
@@ -1040,7 +1042,7 @@ ifeq ($(CONFIG_LITHIUM), y)
 	CONFIG_WLAN_DP_PENDING_MEM_FLUSH := y
 endif
 
-ifeq ($(CONFIG_SLUB_DEBUG_ON), y)
+ifeq (y,$(filter y,$(CONFIG_CNSS2_DEBUG) $(CONFIG_SLUB_DEBUG_ON)))
 	ifeq ($(CONFIG_CNSS_QCA6750), y)
 		CONFIG_FEATURE_PKTLOG := y
 	endif