Эх сурвалжийг харах

qcacld-3.0: Cleanup HW-based feature flags from Kbuild

Currently we use hardware based feature flags in Kbuild file to
enable/disable certain feature flags. In case hardware changes, then we
would also need to edit Kbuild file to enable feature flags for the next
target. Instead, use CONFIG_<FEATURE_FLAG> from defconfig files to
enable DP feature flags. This will limit the changes for hardware update
to defconfig files only.

Change-Id: Icc8aa6ad51904946f9141a0f41728ed72b1f6d2f
CRs-Fixed: 2964342
Mohit Khanna 3 жил өмнө
parent
commit
f06df4c16a
2 өөрчлөгдсөн 47 нэмэгдсэн , 30 устгасан
  1. 23 30
      Kbuild
  2. 24 0
      configs/default_defconfig

+ 23 - 30
Kbuild

@@ -245,11 +245,6 @@ ifeq ($(CONFIG_FEATURE_MONITOR_MODE_SUPPORT), y)
 HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_rx_monitor.o
 endif
 
-ifeq (y,$(filter y,$(CONFIG_LITHIUM) $(CONFIG_BERYLLIUM)))
-CONFIG_WLAN_FEATURE_DP_RX_THREADS := y
-CONFIG_WLAN_FEATURE_RX_SOFTIRQ_TIME_LIMIT := y
-endif
-
 ifeq ($(CONFIG_WLAN_NUD_TRACKING), y)
 HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_nud_tracking.o
 endif
@@ -3528,23 +3523,22 @@ ifeq ($(CONFIG_QCA6290_11AX), y)
 cppflags-y += -DQCA_WIFI_QCA6290_11AX -DQCA_WIFI_QCA6290_11AX_MU_UL
 endif
 
-ifeq (y,$(filter y,$(CONFIG_LITHIUM) $(CONFIG_BERYLLIUM)))
 cppflags-$(CONFIG_WLAN_TX_FLOW_CONTROL_V2) += -DQCA_AC_BASED_FLOW_CONTROL
-cppflags-y += -DFEATURE_NO_DBS_INTRABAND_MCC_SUPPORT
-cppflags-y += -DHAL_DISABLE_NON_BA_2K_JUMP_ERROR
-cppflags-y += -DENABLE_HAL_SOC_STATS
-cppflags-y += -DENABLE_HAL_REG_WR_HISTORY
-ifeq ($(CONFIG_LITHIUM), y)
-cppflags-y += -DDP_RX_DESC_COOKIE_INVALIDATE
-endif
-cppflags-y += -DMON_ENABLE_DROP_FOR_MAC
-cppflags-y += -DPCI_LINK_STATUS_SANITY
-cppflags-y += -DDP_MON_RSSI_IN_DBM
-cppflags-y += -DSYSTEM_PM_CHECK
-cppflags-y += -DDISABLE_EAPOL_INTRABSS_FWD
-endif
 
 # Enable Low latency optimisation mode
+cppflags-$(CONFIG_FEATURE_NO_DBS_INTRABAND_MCC_SUPPORT) += -DFEATURE_NO_DBS_INTRABAND_MCC_SUPPORT
+cppflags-$(CONFIG_HAL_DISABLE_NON_BA_2K_JUMP_ERROR) += -DHAL_DISABLE_NON_BA_2K_JUMP_ERROR
+cppflags-$(CONFIG_ENABLE_HAL_SOC_STATS) += -BLE_HAL_SOC_STATS
+cppflags-$(CONFIG_ENABLE_HAL_REG_WR_HISTORY) += -DCONFIG_ENABLE_HAL_REG_WR_HISTORY
+cppflags-$(CONFIG_DP_RX_DESC_COOKIE_INVALIDATE) += -DDP_RX_DESC_COOKIE_INVALIDATE
+cppflags-$(CONFIG_MON_ENABLE_DROP_FOR_MAC) += -DMON_ENABLE_DROP_FOR_MAC
+cppflags-$(CONFIG_PCI_LINK_STATUS_SANITY) += -DPCI_LINK_STATUS_SANITY
+cppflags-$(CONFIG_DDP_MON_RSSI_IN_DBM) += -DDP_MON_RSSI_IN_DBM
+cppflags-$(CONFIG_SYSTEM_PM_CHECK) += -DSYSTEM_PM_CHECK
+cppflags-$(CONFIG_DISABLE_EAPOL_INTRABSS_FWD) += -DDISABLE_EAPOL_INTRABSS_FWD
+cppflags-$(CONFIG_TX_AGGREGATION_SIZE_ENABLE) += -DTX_AGGREGATION_SIZE_ENABLE
+
+# Enable Low latency
 cppflags-$(CONFIG_WLAN_FEATURE_LL_MODE) += -DWLAN_FEATURE_LL_MODE
 
 cppflags-$(CONFIG_WLAN_CLD_PM_QOS) += -DCLD_PM_QOS
@@ -3560,17 +3554,16 @@ cppflags-$(CONFIG_WLAN_TRACE_HIDE_MAC_ADDRESS) += -DWLAN_TRACE_HIDE_MAC_ADDRESS
 cppflags-$(CONFIG_WLAN_FEATURE_11BE) += -DWLAN_FEATURE_11BE
 cppflags-$(CONFIG_WLAN_FEATURE_11BE_MLO) += -DWLAN_FEATURE_11BE_MLO
 
-ifeq (y,$(filter y,$(CONFIG_LITHIUM) $(CONFIG_BERYLLIUM)))
-cppflags-y += -DFIX_TXDMA_LIMITATION
-cppflags-y += -DFEATURE_AST
-cppflags-y += -DPEER_PROTECTED_ACCESS
-cppflags-y += -DSERIALIZE_QUEUE_SETUP
-cppflags-y += -DDP_RX_PKT_NO_PEER_DELIVER
-cppflags-y += -DDP_RX_DROP_RAW_FRM
-cppflags-y += -DFEATURE_ALIGN_STATS_FROM_DP
-cppflags-y += -DDP_RX_SPECIAL_FRAME_NEED
-cppflags-y += -DFEATURE_STATS_EXT_V2
-endif
+cppflags-$(CONFIG_FIX_TXDMA_LIMITATION) += -DFIX_TXDMA_LIMITATION
+cppflags-$(CONFIG_FEATURE_AST) += -DFEATURE_AST
+cppflags-$(CONFIG_PEER_PROTECTED_ACCESS) += -DPEER_PROTECTED_ACCESS
+cppflags-$(CONFIG_SERIALIZE_QUEUE_SETUP) += -DSERIALIZE_QUEUE_SETUP
+cppflags-$(CONFIG_DP_RX_PKT_NO_PEER_DELIVER) += -DDP_RX_PKT_NO_PEER_DELIVER
+cppflags-$(CONFIG_DP_RX_DROP_RAW_FRM) += -DDP_RX_DROP_RAW_FRM
+cppflags-$(CONFIG_FEATURE_ALIGN_STATS_FROM_DP) += -DFEATURE_ALIGN_STATS_FROM_DP
+cppflags-$(CONFIG_DP_RX_SPECIAL_FRAME_NEED) += -DDP_RX_SPECIAL_FRAME_NEED
+cppflags-$(CONFIG_FEATURE_STATS_EXT_V2) += -DFEATURE_STATS_EXT_V2
+
 cppflags-$(CONFIG_VERBOSE_DEBUG) += -DENABLE_VERBOSE_DEBUG
 cppflags-$(CONFIG_RX_DESC_DEBUG_CHECK) += -DRX_DESC_DEBUG_CHECK
 cppflags-$(CONFIG_REGISTER_OP_DEBUG) += -DHAL_REGISTER_WRITE_DEBUG

+ 24 - 0
configs/default_defconfig

@@ -105,6 +105,29 @@ ifeq ($(CONFIG_CNSS_WCN7850), y)
 	CONFIG_WLAN_FEATURE_NEAR_FULL_IRQ := y
 endif
 
+ifeq (y,$(findstring y,$(CONFIG_LITHIUM) $(CONFIG_BERYLLIUM)))
+	CONFIG_FIX_TXDMA_LIMITATION := y
+	CONFIG_FEATURE_AST := y
+	CONFIG_PEER_PROTECTED_ACCESS := y
+	CONFIG_SERIALIZE_QUEUE_SETUP := y
+	CONFIG_DP_RX_PKT_NO_PEER_DELIVER := y
+	CONFIG_DP_RX_DROP_RAW_FRM := y
+	CONFIG_FEATURE_ALIGN_STATS_FROM_DP := y
+	CONFIG_DP_RX_SPECIAL_FRAME_NEED := y
+	CONFIG_FEATURE_STATS_EXT_V2 := y
+	CONFIG_WLAN_FEATURE_DP_RX_THREADS := y
+	CONFIG_WLAN_FEATURE_RX_SOFTIRQ_TIME_LIMIT := y
+	CONFIG_FEATURE_NO_DBS_INTRABAND_MCC_SUPPORT := y
+	CONFIG_HAL_DISABLE_NON_BA_2K_JUMP_ERROR := y
+	CONFIG_ENABLE_HAL_SOC_STATS := y
+	CONFIG_ENABLE_HAL_REG_WR_HISTORY := y
+	CONFIG_MON_ENABLE_DROP_FOR_MAC := y
+	CONFIG_PCI_LINK_STATUS_SANITY := y
+	CONFIG_DDP_MON_RSSI_IN_DBM := y
+	CONFIG_SYSTEM_PM_CHECK := y
+	CONFIG_DISABLE_EAPOL_INTRABSS_FWD := y
+endif
+
 ifeq ($(CONFIG_CLD_HL_SDIO_CORE), y)
 	CONFIG_QCA_WIFI_SDIO := y
 ifndef CONFIG_SDIO_TRANSFER
@@ -1379,6 +1402,7 @@ endif
 
 ifeq ($(CONFIG_LITHIUM), y)
 CONFIG_DP_LEGACY_MODE_CSM_DEFAULT_DISABLE := 1
+CONFIG_DP_RX_DESC_COOKIE_INVALIDATE := y
 else
 CONFIG_DP_LEGACY_MODE_CSM_DEFAULT_DISABLE := 0
 endif