lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "qcacld-3.0: Use IS_ENABLED for the definition of kernel module"

Browse Source 
This reverts Change-Id: Iaf86c9da2a9946aac09867b5c46dcc79f1b5c37e.
That change fails build for GKI variant.

Change-Id: I6cd7322870023d245fe9d20250ceb0b5d738d214
CRs-Fixed: 2701642
This commit is contained in:
Rajesh Chauhan 2020-06-06 18:35:52 -07:00
parent 91daf1a6ab
commit bc611919e0
10 changed files with 10 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configs/default_defconfig
View File

@ -760,10 +760,7 @@ CONFIG_ATH_PCIE_ACCESS_DEBUG := n
ifeq ($(CONFIG_IPA), y)
CONFIG_IPA_OFFLOAD := y
endif
ifeq ($(CONFIG_IPA3), m)
CONFIG_IPA3_MODULE := y
endif
ifeq (y, $(findstring y, $(CONFIG_IPA3) $(CONFIG_IPA3_MODULE)))
ifeq ($(CONFIG_IPA3), y)
CONFIG_IPA_OFFLOAD := y
endif

5
configs/genoa.pci.debug_defconfig
View File

@ -27,10 +27,7 @@ CONFIG_IPA_OFFLOAD := y
else
CONFIG_IPA_DISABLE_OVERRIDE=y
endif
ifeq ($(CONFIG_IPA3), m)
CONFIG_IPA3_MODULE := y
endif
ifeq (y, $(findstring y, $(CONFIG_IPA3) $(CONFIG_IPA3_MODULE)))
ifeq ($(CONFIG_IPA3), y)
CONFIG_IPA_OFFLOAD := y
else
CONFIG_IPA_DISABLE_OVERRIDE=y

5
configs/genoa.pci.perf_defconfig
View File

@ -24,10 +24,7 @@ CONFIG_DATA_CE_SW_INDEX_NO_INLINE_UPDATE := n
ifeq ($(CONFIG_IPA), y)
CONFIG_IPA_OFFLOAD := y
endif
ifeq ($(CONFIG_IPA3), m)
CONFIG_IPA3_MODULE := y
endif
ifeq (y, $(findstring y, $(CONFIG_IPA3) $(CONFIG_IPA3_MODULE)))
ifeq ($(CONFIG_IPA3), y)
CONFIG_IPA_OFFLOAD := y
endif

5
configs/genoa.snoc.debug_defconfig
View File

@ -36,10 +36,7 @@ endif
ifeq ($(CONFIG_IPA), y)
CONFIG_IPA_OFFLOAD := y
endif
ifeq ($(CONFIG_IPA3), m)
CONFIG_IPA3_MODULE := y
endif
ifeq (y, $(findstring y, $(CONFIG_IPA3) $(CONFIG_IPA3_MODULE)))
ifeq ($(CONFIG_IPA3), y)
CONFIG_IPA_OFFLOAD := y
endif

5
configs/genoa.snoc.perf_defconfig
View File

@ -36,10 +36,7 @@ endif
ifeq ($(CONFIG_IPA), y)
CONFIG_IPA_OFFLOAD := y
endif
ifeq ($(CONFIG_IPA3), m)
CONFIG_IPA3_MODULE := y
endif
ifeq (y, $(findstring y, $(CONFIG_IPA3) $(CONFIG_IPA3_MODULE)))
ifeq ($(CONFIG_IPA3), y)
CONFIG_IPA_OFFLOAD := y
endif

5
configs/qca6174_defconfig
View File

@ -490,10 +490,7 @@ CONFIG_ATH_PCIE_ACCESS_DEBUG := n
ifeq ($(CONFIG_IPA), y)
CONFIG_IPA_OFFLOAD := y
endif
ifeq ($(CONFIG_IPA3), m)
CONFIG_IPA3_MODULE := y
endif
ifeq (y, $(findstring y, $(CONFIG_IPA3) $(CONFIG_IPA3_MODULE)))
ifeq ($(CONFIG_IPA3), y)
CONFIG_IPA_OFFLOAD := y
endif

5
configs/qca6390_defconfig
View File

@ -527,10 +527,7 @@ CONFIG_ATH_PCIE_ACCESS_DEBUG := n
ifeq ($(CONFIG_IPA), y)
CONFIG_IPA_OFFLOAD := y
endif
ifeq ($(CONFIG_IPA3), m)
CONFIG_IPA3_MODULE := y
endif
ifeq (y, $(findstring y, $(CONFIG_IPA3) $(CONFIG_IPA3_MODULE)))
ifeq ($(CONFIG_IPA3), y)
CONFIG_IPA_OFFLOAD := y
endif

5
configs/qcs40x.snoc.perf_defconfig
View File

@ -77,10 +77,7 @@ endif
ifeq ($(CONFIG_IPA), y)
CONFIG_IPA_OFFLOAD := y
endif
ifeq ($(CONFIG_IPA3), m)
CONFIG_IPA3_MODULE := y
endif
ifeq (y, $(findstring y, $(CONFIG_IPA3) $(CONFIG_IPA3_MODULE)))
ifeq ($(CONFIG_IPA3), y)
CONFIG_IPA_OFFLOAD := y
endif

2
core/dp/txrx/ol_txrx_ipa.c
View File

@ -143,7 +143,7 @@ QDF_STATUS ol_txrx_ipa_uc_get_resource(struct cdp_soc_t *soc_hdl,
&ipa_res->tx_comp_ring->mem_info)) ||
(0 == qdf_mem_get_dma_addr(osdev,
&ipa_res->rx_rdy_ring->mem_info))
#if defined(QCA_WIFI_3_0) && IS_ENABLED(CONFIG_IPA3)
#if defined(QCA_WIFI_3_0) && defined(CONFIG_IPA3)
|| (0 == qdf_mem_get_dma_addr(osdev,
&ipa_res->rx2_rdy_ring->mem_info))
#endif

2
core/dp/txrx/ol_txrx_ipa.h
View File

@ -92,7 +92,7 @@ struct ol_txrx_ipa_uc_rx_hdr {
#define OL_TXRX_IPA_UC_WLAN_HDR_DES_MAC_OFFSET \
(OL_TXRX_IPA_WLAN_FRAG_HEADER + OL_TXRX_IPA_WLAN_IPA_HEADER)
#if defined(QCA_WIFI_3_0) && IS_ENABLED(CONFIG_IPA3)
#if defined(QCA_WIFI_3_0) && defined(CONFIG_IPA3)
#define OL_TXRX_IPA_WDI2_SET(pipe_in, ipa_res, osdev) \
do { \
QDF_IPA_PIPE_IN_UL_RDY_RING_RP_VA(pipe_in) = \