diff --git a/drivers/hwtracing/coresight/coresight-tmc-usb.c b/drivers/hwtracing/coresight/coresight-tmc-usb.c
index d9185045d19d..d4dabac8e1a0 100644
--- a/drivers/hwtracing/coresight/coresight-tmc-usb.c
+++ b/drivers/hwtracing/coresight/coresight-tmc-usb.c
@@ -6,6 +6,7 @@
 
 #include <linux/of_address.h>
 #include <linux/delay.h>
+#include <linux/qcom-iommu-util.h>
 #include "coresight-tmc-usb.h"
 #include "coresight-priv.h"
 #include "coresight-common.h"
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index eeab0528f8ad..76683fb7c68f 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -149,31 +149,6 @@ enum iommu_attr {
 	DOMAIN_ATTR_MAX,
 };
 
-#define EXTENDED_ATTR_BASE			(DOMAIN_ATTR_MAX + 16)
-
-#define DOMAIN_ATTR_PT_BASE_ADDR		(EXTENDED_ATTR_BASE + 0)
-#define DOMAIN_ATTR_CONTEXT_BANK		(EXTENDED_ATTR_BASE + 1)
-#define DOMAIN_ATTR_DYNAMIC			(EXTENDED_ATTR_BASE + 2)
-#define DOMAIN_ATTR_TTBR0			(EXTENDED_ATTR_BASE + 3)
-#define DOMAIN_ATTR_CONTEXTIDR			(EXTENDED_ATTR_BASE + 4)
-#define DOMAIN_ATTR_PROCID			(EXTENDED_ATTR_BASE + 5)
-#define DOMAIN_ATTR_NON_FATAL_FAULTS		(EXTENDED_ATTR_BASE + 6)
-#define DOMAIN_ATTR_S1_BYPASS			(EXTENDED_ATTR_BASE + 7)
-#define DOMAIN_ATTR_ATOMIC			(EXTENDED_ATTR_BASE + 8)
-#define DOMAIN_ATTR_SECURE_VMID			(EXTENDED_ATTR_BASE + 9)
-#define DOMAIN_ATTR_FAST			(EXTENDED_ATTR_BASE + 10)
-#define DOMAIN_ATTR_PGTBL_INFO			(EXTENDED_ATTR_BASE + 11)
-#define DOMAIN_ATTR_USE_UPSTREAM_HINT		(EXTENDED_ATTR_BASE + 12)
-#define DOMAIN_ATTR_EARLY_MAP			(EXTENDED_ATTR_BASE + 13)
-#define DOMAIN_ATTR_PAGE_TABLE_IS_COHERENT	(EXTENDED_ATTR_BASE + 14)
-#define DOMAIN_ATTR_PAGE_TABLE_FORCE_COHERENT	(EXTENDED_ATTR_BASE + 15)
-#define DOMAIN_ATTR_USE_LLC_NWA			(EXTENDED_ATTR_BASE + 16)
-#define DOMAIN_ATTR_SPLIT_TABLES		(EXTENDED_ATTR_BASE + 17)
-#define DOMAIN_ATTR_FAULT_MODEL_NO_CFRE		(EXTENDED_ATTR_BASE + 18)
-#define DOMAIN_ATTR_FAULT_MODEL_NO_STALL	(EXTENDED_ATTR_BASE + 19)
-#define DOMAIN_ATTR_FAULT_MODEL_HUPCF		(EXTENDED_ATTR_BASE + 20)
-#define DOMAIN_ATTR_EXTENDED_MAX		(EXTENDED_ATTR_BASE + 21)
-
 /* These are the possible reserved region types */
 enum iommu_resv_type {
 	/* Memory regions which must be mapped 1:1 at all times */
diff --git a/include/linux/qcom-iommu-util.h b/include/linux/qcom-iommu-util.h
index 311f53df7be2..2d95841b71c0 100644
--- a/include/linux/qcom-iommu-util.h
+++ b/include/linux/qcom-iommu-util.h
@@ -10,6 +10,32 @@
 #include <linux/dma-mapping.h>
 #include <linux/iova.h>
 
+/* QCOM iommu domain attributes */
+#define EXTENDED_ATTR_BASE			(DOMAIN_ATTR_MAX + 16)
+
+#define DOMAIN_ATTR_PT_BASE_ADDR		(EXTENDED_ATTR_BASE + 0)
+#define DOMAIN_ATTR_CONTEXT_BANK		(EXTENDED_ATTR_BASE + 1)
+#define DOMAIN_ATTR_DYNAMIC			(EXTENDED_ATTR_BASE + 2)
+#define DOMAIN_ATTR_TTBR0			(EXTENDED_ATTR_BASE + 3)
+#define DOMAIN_ATTR_CONTEXTIDR			(EXTENDED_ATTR_BASE + 4)
+#define DOMAIN_ATTR_PROCID			(EXTENDED_ATTR_BASE + 5)
+#define DOMAIN_ATTR_NON_FATAL_FAULTS		(EXTENDED_ATTR_BASE + 6)
+#define DOMAIN_ATTR_S1_BYPASS			(EXTENDED_ATTR_BASE + 7)
+#define DOMAIN_ATTR_ATOMIC			(EXTENDED_ATTR_BASE + 8)
+#define DOMAIN_ATTR_SECURE_VMID			(EXTENDED_ATTR_BASE + 9)
+#define DOMAIN_ATTR_FAST			(EXTENDED_ATTR_BASE + 10)
+#define DOMAIN_ATTR_PGTBL_INFO			(EXTENDED_ATTR_BASE + 11)
+#define DOMAIN_ATTR_USE_UPSTREAM_HINT		(EXTENDED_ATTR_BASE + 12)
+#define DOMAIN_ATTR_EARLY_MAP			(EXTENDED_ATTR_BASE + 13)
+#define DOMAIN_ATTR_PAGE_TABLE_IS_COHERENT	(EXTENDED_ATTR_BASE + 14)
+#define DOMAIN_ATTR_PAGE_TABLE_FORCE_COHERENT	(EXTENDED_ATTR_BASE + 15)
+#define DOMAIN_ATTR_USE_LLC_NWA			(EXTENDED_ATTR_BASE + 16)
+#define DOMAIN_ATTR_SPLIT_TABLES		(EXTENDED_ATTR_BASE + 17)
+#define DOMAIN_ATTR_FAULT_MODEL_NO_CFRE		(EXTENDED_ATTR_BASE + 18)
+#define DOMAIN_ATTR_FAULT_MODEL_NO_STALL	(EXTENDED_ATTR_BASE + 19)
+#define DOMAIN_ATTR_FAULT_MODEL_HUPCF		(EXTENDED_ATTR_BASE + 20)
+#define DOMAIN_ATTR_EXTENDED_MAX		(EXTENDED_ATTR_BASE + 21)
+
 /* iommu transaction flags */
 /* 1 Write, 0 Read */
 #define QCOM_IOMMU_ATOS_TRANS_WRITE	BIT(0)