qcacld-3.0: Use QCS40X instead of QCS405 in config files
Use QCS40X instead of QCS405 in config files. Kernel defconfig files for
QCS405 and QCS403 has been separated recently, and the arch has been
changed between these two chips. But all QCS related features and changes
in cld should all be included, so use CONFIG_ARCH_QCS40X to replace
CONFIG_ARCH_QCS405.
Change-Id: I6f0837bb3d3f1530aea5b2d4912741beb8c313bd
CRs-Fixed: 2519267
diff --git a/Kbuild b/Kbuild
index d048228..aa7fcb2 100644
--- a/Kbuild
+++ b/Kbuild
@@ -2236,8 +2236,8 @@
#Set RX_PERFORMANCE
cppflags-$(CONFIG_RX_PERFORMANCE) += -DRX_PERFORMANCE
-#Set QCS403_MEM_OPTIMIZE
-cppflags-$(CONFIG_QCS403_MEM_OPTIMIZE) += -DQCS403_MEM_OPTIMIZE
+#Set SLUB_MEM_OPTIMIZE
+cppflags-$(CONFIG_SLUB_MEM_OPTIMIZE) += -DSLUB_MEM_OPTIMIZE
#Enable OL debug and wmi unified functions
cppflags-$(CONFIG_ATH_PERF_PWR_OFFLOAD) += -DATH_PERF_PWR_OFFLOAD
diff --git a/configs/default_defconfig b/configs/default_defconfig
index ed72df5..13da9c0 100644
--- a/configs/default_defconfig
+++ b/configs/default_defconfig
@@ -96,7 +96,11 @@
endif
endif
-ifeq ($(CONFIG_ARCH_QCS405), y)
+ifeq (y,$(findstring y,$(CONFIG_ARCH_QCS405) $(CONFIG_ARCH_QCS403)))
+ CONFIG_ARCH_QCS40X := y
+endif
+
+ifeq ($(CONFIG_ARCH_QCS40X), y)
CONFIG_WLAN_SYNC_TSF_PLUS := y
CONFIG_WLAN_SYNC_TSF_PLUS_NOIRQ := y
CONFIG_RX_PERFORMANCE := y
@@ -138,7 +142,7 @@
CONFIG_QCACLD_FEATURE_COEX_CONFIG := n
#Flag to enable get hw capability
-ifeq ($(CONFIG_ARCH_QCS405), y)
+ifeq ($(CONFIG_ARCH_QCS40X), y)
CONFIG_QCACLD_FEATURE_HW_CAPABILITY := y
endif
@@ -277,7 +281,7 @@
CONFIG_WLAN_TX_FLOW_CONTROL_V2 := y
endif
-ifeq ($(CONFIG_ARCH_QCS405), y)
+ifeq ($(CONFIG_ARCH_QCS40X), y)
CONFIG_WLAN_TX_FLOW_CONTROL_V2 := n
# Flag to improve TCP TX throughput for both
# CONFIG_WLAN_TX_FLOW_CONTROL_LEGACY and CONFIG_WLAN_TX_FLOW_CONTROL_V2
@@ -497,8 +501,8 @@
CONFIG_WLAN_ENABLE_SOCIAL_CHANNELS_5G_ONLY := y
endif
-#enable 4addr support for QCS405
-ifeq ($(CONFIG_ARCH_QCS405), y)
+#enable 4addr support for QCS40X
+ifeq ($(CONFIG_ARCH_QCS40X), y)
CONFIG_FEATURE_WLAN_STA_4ADDR_SCHEME := y
endif
diff --git a/configs/qcs40x.snoc.perf_defconfig b/configs/qcs40x.snoc.perf_defconfig
index 12939c4..b3f73b4 100644
--- a/configs/qcs40x.snoc.perf_defconfig
+++ b/configs/qcs40x.snoc.perf_defconfig
@@ -62,9 +62,10 @@
CONFIG_DESC_DUP_DETECT_DEBUG := n
CONFIG_DEBUG_RX_RING_BUFFER := n
CONFIG_RX_PERFORMANCE := y
-CONFIG_QCS403_MEM_OPTIMIZE := y
+CONFIG_SLUB_MEM_OPTIMIZE := y
CONFIG_TGT_NUM_MSDU_DESC := 900
CONFIG_WLAN_PDEV_TX_FLOW_CONTROL := y
+CONFIG_FEATURE_WLAN_STA_4ADDR_SCHEME := y
ifeq ($(CONFIG_INET_LRO), y)
CONFIG_WLAN_LRO := y
diff --git a/core/dp/ol/inc/ol_cfg.h b/core/dp/ol/inc/ol_cfg.h
index 8da541e..625d97c 100644
--- a/core/dp/ol/inc/ol_cfg.h
+++ b/core/dp/ol/inc/ol_cfg.h
@@ -43,7 +43,7 @@
};
/* Max throughput */
-#ifdef QCS403_MEM_OPTIMIZE
+#ifdef SLUB_MEM_OPTIMIZE
#define MAX_THROUGHPUT 400
#else
#define MAX_THROUGHPUT 800
diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c
index a88f27c..f5c8375 100644
--- a/core/hdd/src/wlan_hdd_driver_ops.c
+++ b/core/hdd/src/wlan_hdd_driver_ops.c
@@ -156,7 +156,7 @@
*
* Return: None
*/
-#ifdef QCS403_MEM_OPTIMIZE
+#ifdef SLUB_MEM_OPTIMIZE
static void hdd_hif_set_attribute(struct hif_opaque_softc *hif_ctx)
{
hif_set_attribute(hif_ctx, HIF_LOWDESC_CE_NO_PKTLOG_CFG);