From cc33f70e91ea9e84e3f7b375d46ee6fd4b80348e Mon Sep 17 00:00:00 2001 From: Sravan Kumar Kairam Date: Fri, 9 Mar 2018 19:48:28 +0530 Subject: [PATCH] qcacmn: Fix SMMU enable compilation error Fix SMMU enable compilation error by protecting IPA SMMU OS abstractions under feature flag. Change-Id: Ib6a241d16a1906dad59781f1592988ce7eba1e57 CRS-Fixed: 2203169 --- qdf/linux/src/i_qdf_ipa.h | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/qdf/linux/src/i_qdf_ipa.h b/qdf/linux/src/i_qdf_ipa.h index 280a264f310d..ddd02f99207f 100644 --- a/qdf/linux/src/i_qdf_ipa.h +++ b/qdf/linux/src/i_qdf_ipa.h @@ -266,12 +266,15 @@ typedef struct ipa_wdi_in_params __qdf_ipa_wdi_in_params_t; (((struct ipa_wdi_in_params *)(pipe_in))->sys.keep_ipa_awake) #define QDF_IPA_PIPE_IN_KEEP_IPA_AWAKE(pipe_in) \ (((struct ipa_wdi_in_params *)(pipe_in))->sys.keep_ipa_awake) -#define QDF_IPA_PIPE_IN_SMMU_ENABLED(pipe_in) \ - (((struct ipa_wdi_in_params *)(pipe_in))->smmu_enabled) #ifdef FEATURE_METERING #define QDF_IPA_PIPE_IN_WDI_NOTIFY(pipe_in) \ (((struct ipa_wdi_in_params *)(pipe_in))->wdi_notify) #endif + +#ifdef ENABLE_SMMU_S1_TRANSLATION +#define QDF_IPA_PIPE_IN_SMMU_ENABLED(pipe_in) \ + (((struct ipa_wdi_in_params *)(pipe_in))->smmu_enabled) + #define QDF_IPA_PIPE_IN_DL_SMMU_COMP_RING(pipe_in) \ (((struct ipa_wdi_in_params *)(pipe_in))->u.dl_smmu.comp_ring) #define QDF_IPA_PIPE_IN_DL_SMMU_CE_RING(pipe_in) \ @@ -284,18 +287,6 @@ typedef struct ipa_wdi_in_params __qdf_ipa_wdi_in_params_t; (((struct ipa_wdi_in_params *)(pipe_in))->u.dl_smmu.ce_door_bell_pa) #define QDF_IPA_PIPE_IN_DL_SMMU_NUM_TX_BUFFERS(pipe_in) \ (((struct ipa_wdi_in_params *)(pipe_in))->u.dl_smmu.num_tx_buffers) -#define QDF_IPA_PIPE_IN_DL_COMP_RING_BASE_PA(pipe_in) \ - (((struct ipa_wdi_in_params *)(pipe_in))->u.dl.comp_ring_base_pa) -#define QDF_IPA_PIPE_IN_DL_COMP_RING_SIZE(pipe_in) \ - (((struct ipa_wdi_in_params *)(pipe_in))->u.dl.comp_ring_size) -#define QDF_IPA_PIPE_IN_DL_CE_RING_BASE_PA(pipe_in) \ - (((struct ipa_wdi_in_params *)(pipe_in))->u.dl.ce_ring_base_pa) -#define QDF_IPA_PIPE_IN_DL_CE_RING_SIZE(pipe_in) \ - (((struct ipa_wdi_in_params *)(pipe_in))->u.dl.ce_ring_size) -#define QDF_IPA_PIPE_IN_DL_CE_DOOR_BELL_PA(pipe_in) \ - (((struct ipa_wdi_in_params *)(pipe_in))->u.dl.ce_door_bell_pa) -#define QDF_IPA_PIPE_IN_DL_NUM_TX_BUFFERS(pipe_in) \ - (((struct ipa_wdi_in_params *)(pipe_in))->u.dl.num_tx_buffers) #define QDF_IPA_PIPE_IN_UL_SMMU_RDY_RING(pipe_in) \ (((struct ipa_wdi_in_params *)(pipe_in))->u.ul_smmu.rdy_ring) @@ -313,6 +304,20 @@ typedef struct ipa_wdi_in_params __qdf_ipa_wdi_in_params_t; (((struct ipa_wdi_in_params *)(pipe_in))->u.ul_smmu.rdy_comp_ring_wp_pa) #define QDF_IPA_PIPE_IN_UL_SMMU_RDY_COMP_RING_WP_VA(pipe_in) \ (((struct ipa_wdi_in_params *)(pipe_in))->u.ul_smmu.rdy_comp_ring_wp_va) +#endif + +#define QDF_IPA_PIPE_IN_DL_COMP_RING_BASE_PA(pipe_in) \ + (((struct ipa_wdi_in_params *)(pipe_in))->u.dl.comp_ring_base_pa) +#define QDF_IPA_PIPE_IN_DL_COMP_RING_SIZE(pipe_in) \ + (((struct ipa_wdi_in_params *)(pipe_in))->u.dl.comp_ring_size) +#define QDF_IPA_PIPE_IN_DL_CE_RING_BASE_PA(pipe_in) \ + (((struct ipa_wdi_in_params *)(pipe_in))->u.dl.ce_ring_base_pa) +#define QDF_IPA_PIPE_IN_DL_CE_RING_SIZE(pipe_in) \ + (((struct ipa_wdi_in_params *)(pipe_in))->u.dl.ce_ring_size) +#define QDF_IPA_PIPE_IN_DL_CE_DOOR_BELL_PA(pipe_in) \ + (((struct ipa_wdi_in_params *)(pipe_in))->u.dl.ce_door_bell_pa) +#define QDF_IPA_PIPE_IN_DL_NUM_TX_BUFFERS(pipe_in) \ + (((struct ipa_wdi_in_params *)(pipe_in))->u.dl.num_tx_buffers) #define QDF_IPA_PIPE_IN_UL_RDY_RING_BASE_PA(pipe_in) \ (((struct ipa_wdi_in_params *)(pipe_in))->u.ul.rdy_ring_base_pa)