Browse Source

qcacld-3.0: Change ROME IPA pipe names

With IPA team's request, in order to match
the pipe setting in the ipa driver of linux
kernel 4.14, we need to change ROME IPA
pipes from IPA_CLIENT_WLAN1_CONS and
IPA_CLIENT_WLAN1_PROD to IPA_CLIENT_WLAN3_CONS and
IPA_CLIENT_WLAN3_PROD. Meanwhile change MCC pipe
to IPA_CLIENT_WLAN2_CONS. Also add one feature
flag to avoid affecting other SPs

Change-Id: I99dd442801b1278742c19e4565da2201e1303607
Guisen Yang 4 years ago
parent
commit
7608656e86
3 changed files with 9 additions and 5 deletions
  1. 4 0
      Kbuild
  2. 1 1
      components/ipa/core/src/wlan_ipa_core.c
  3. 4 4
      core/dp/txrx/ol_txrx_ipa.c

+ 4 - 0
Kbuild

@@ -3665,6 +3665,10 @@ endif
 
 ccflags-$(CONFIG_GET_DRIVER_MODE) += -DFEATURE_GET_DRIVER_MODE
 
+ifeq ($(CONFIG_FEATURE_IPA_PIPE_CHANGE_WDI1), y)
+cppflags-y += -DFEATURE_IPA_PIPE_CHANGE_WDI1
+endif
+
 KBUILD_CPPFLAGS += $(cppflags-y)
 
 # Currently, for versions of gcc which support it, the kernel Makefile

+ 1 - 1
components/ipa/core/src/wlan_ipa_core.c

@@ -40,7 +40,7 @@ static struct wlan_ipa_iface_2_client {
 	{
 		QDF_IPA_CLIENT_WLAN2_CONS, QDF_IPA_CLIENT_WLAN1_PROD
 	}, {
-		QDF_IPA_CLIENT_WLAN3_CONS, QDF_IPA_CLIENT_WLAN1_PROD
+		QDF_IPA_CLIENT_MCC2_CONS,  QDF_IPA_CLIENT_WLAN1_PROD
 	}, {
 		QDF_IPA_CLIENT_WLAN4_CONS, QDF_IPA_CLIENT_WLAN1_PROD
 	}

+ 4 - 4
core/dp/txrx/ol_txrx_ipa.c

@@ -473,7 +473,7 @@ static inline void ol_txrx_ipa_wdi_tx_smmu_params(
 				bool over_gsi)
 {
 	QDF_IPA_WDI_SETUP_INFO_SMMU_CLIENT(tx_smmu) =
-		IPA_CLIENT_WLAN1_CONS;
+		QDF_IPA_CLIENT_WLAN_LEGACY_CONS;
 	qdf_mem_copy(&QDF_IPA_WDI_SETUP_INFO_SMMU_TRANSFER_RING_BASE(
 				tx_smmu),
 		     &ipa_res->tx_comp_ring->sgtable,
@@ -499,7 +499,7 @@ static inline void ol_txrx_ipa_wdi_rx_smmu_params(
 				bool over_gsi)
 {
 	QDF_IPA_WDI_SETUP_INFO_SMMU_CLIENT(rx_smmu) =
-		IPA_CLIENT_WLAN1_PROD;
+		QDF_IPA_CLIENT_WLAN_LEGACY_PROD;
 	qdf_mem_copy(&QDF_IPA_WDI_SETUP_INFO_SMMU_TRANSFER_RING_BASE(
 				rx_smmu),
 		     &ipa_res->rx_rdy_ring->sgtable,
@@ -617,7 +617,7 @@ static inline void ol_txrx_ipa_wdi_tx_params(
 		return;
 	}
 
-	QDF_IPA_WDI_SETUP_INFO_CLIENT(tx) = IPA_CLIENT_WLAN1_CONS;
+	QDF_IPA_WDI_SETUP_INFO_CLIENT(tx) = QDF_IPA_CLIENT_WLAN_LEGACY_CONS;
 	QDF_IPA_WDI_SETUP_INFO_TRANSFER_RING_BASE_PA(tx) =
 		qdf_mem_get_dma_addr(osdev,
 				&ipa_res->tx_comp_ring->mem_info);
@@ -640,7 +640,7 @@ static inline void ol_txrx_ipa_wdi_rx_params(
 				qdf_ipa_wdi_pipe_setup_info_t *rx,
 				bool over_gsi)
 {
-	QDF_IPA_WDI_SETUP_INFO_CLIENT(rx) = IPA_CLIENT_WLAN1_PROD;
+	QDF_IPA_WDI_SETUP_INFO_CLIENT(rx) = QDF_IPA_CLIENT_WLAN_LEGACY_PROD;
 	QDF_IPA_WDI_SETUP_INFO_TRANSFER_RING_BASE_PA(rx) =
 		ipa_res->rx_rdy_ring->mem_info.pa;
 	QDF_IPA_WDI_SETUP_INFO_TRANSFER_RING_SIZE(rx) =