From 9d37c641212fa3c7e96b4ce6ee640906611f2def Mon Sep 17 00:00:00 2001
From: Manjunathappa Prakash <prakashpm@codeaurora.org>
Date: Fri, 28 Feb 2020 16:08:35 -0800
Subject: [PATCH] qcacld-3.0: Enable SMMU S1 for Lahaina platform

Enable IPA SMMU S1 translation feature flag for
Lahaina target.
asm/dma-iommu.h file is removed in latest 5.4 kernel,
resulting in include failure. Remove as it is unused
for version 5.4 and above.

Change-Id: Ie2147f2fc2debad4d700fae5414d1d3becb28f13
CRs-Fixed: 2638580
---
 configs/default_defconfig | 6 ++++++
 core/cds/src/cds_api.c    | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/configs/default_defconfig b/configs/default_defconfig
index 7f36ab273371..d04dfb3fe7b2 100644
--- a/configs/default_defconfig
+++ b/configs/default_defconfig
@@ -729,6 +729,12 @@ CONFIG_ENABLE_SMMU_S1_TRANSLATION := y
 endif
 endif
 
+ifeq ($(CONFIG_ARCH_LAHAINA), y)
+ifeq ($(CONFIG_IPA_OFFLOAD), y)
+CONFIG_ENABLE_SMMU_S1_TRANSLATION := y
+endif
+endif
+
 ifeq ($(CONFIG_HELIUMPLUS), y)
 ifneq ($(CONFIG_ARCH_SDM630), y)
 ifneq ($(CONFIG_ARCH_SDM660), y)
diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c
index 1e9aedbfed30..418b81107aa8 100644
--- a/core/cds/src/cds_api.c
+++ b/core/cds/src/cds_api.c
@@ -64,7 +64,9 @@
 #include "dp_txrx.h"
 #ifdef ENABLE_SMMU_S1_TRANSLATION
 #include "pld_common.h"
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0))
 #include <asm/dma-iommu.h>
+#endif
 #include <linux/iommu.h>
 #endif