iommu: dma-override: do not use it for kernel-4.14

Kernel-4.14 is not using this dma override function so skip it
for K4.14.

Bug 200427376

Change-Id: I10f76ade31cd278df7c309440c991fa140cf43e0
Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1774425
GVS: Gerrit_Virtual_Submit
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Tested-by: Sachin Nikam <snikam@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

3 files changed, 28 insertions, 1 deletions

diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile
index dc7a6afde..3815bd75e 100644
--- a/drivers/iommu/Makefile
+++ b/drivers/iommu/Makefile
@@ -3,6 +3,7 @@ ifdef CONFIG_ARCH_TEGRA_19x_SOC
 ccflags-y += -Werror
 
 ccflags-y += -I$(srctree)/drivers/iommu
+
 obj-$(CONFIG_TEGRA_ARM_SMMU_T19x) += arm-smmu-t19x.o
 obj-$(CONFIG_ARM_SMMU) += arm-smmu-regs.o
 obj-$(CONFIG_ARM_SMMU) += of_tegra-smmu.o
diff --git a/drivers/iommu/dma-override.c b/drivers/iommu/dma-override.c
index a0da31c95..b1635938e 100644
--- a/drivers/iommu/dma-override.c
+++ b/drivers/iommu/dma-override.c
@@ -16,8 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <linux/dma-override.h>
+#include <linux/version.h>
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
+
 #include <soc/tegra/chip-id.h>
+#include <linux/dma-override.h>
 
 static bool is_t19x;
 
@@ -50,3 +54,4 @@ static int __init dma_override(void)
 }
 arch_initcall(dma_override);
 
+#endif
diff --git a/include/linux/dma-override.h b/include/linux/dma-override.h
index ccc4b1a6c..9d289d022 100644
--- a/include/linux/dma-override.h
+++ b/include/linux/dma-override.h
@@ -1,6 +1,26 @@
+/*
+ * Copyright (c) 2018, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef _LINUX_DMA_MAPPING_OVERRIDE_H
 #define _LINUX_DMA_MAPPING_OVERRIDE_H
 
+#include <linux/version.h>
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
+
 #include <linux/mm.h>
 #include <linux/dma-mapping.h>
 #include <linux/iommu.h>
@@ -16,4 +36,5 @@ void dma_marshal_handle(enum dma_data_direction dir, dma_addr_t *handle);
 void dma_unmarshal_handle(enum dma_data_direction dir, dma_addr_t *handle);
 
 #endif
+#endif