diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
index 16217647fd6717bc4602399c04145dd6b84c2a8d..43277cfa04275c26b2964a110b115fbc2815c737 100644
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
@@ -3319,6 +3319,9 @@ static struct iommu_ops arm_smmu_ops = {
 #endif
 		.free			= arm_smmu_domain_free,
 	}
+#ifdef CONFIG_CVM_HOST
+	.iommu_enable_secure = NULL,
+#endif
 };
 
 /* Probing and initialisation functions */
diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h
index 859d2172988251042645b9cd107c141e0e7e7e47..0f2acb4ed718a4b8b11d3a68edb4f60b24b8be90 100644
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h
@@ -625,6 +625,9 @@ struct arm_smmu_strtab_l1_desc {
 
 	struct arm_smmu_ste		*l2ptr;
 	dma_addr_t			l2ptr_dma;
+#ifdef CONFIG_CVM_HOST
+	bool                is_sync;
+#endif
 };
 
 struct arm_smmu_ctx_desc {
@@ -750,6 +753,12 @@ struct arm_smmu_device {
 	struct mutex			streams_mutex;
 
 	bool				bypass;
+#ifdef CONFIG_CVM_HOST
+	int				s_evtq_irq;
+	int				s_gerr_irq;
+	resource_size_t ioaddr;
+	uint64_t		id;
+#endif
 };
 
 struct arm_smmu_stream {
@@ -802,6 +811,11 @@ struct arm_smmu_domain {
 	spinlock_t			devices_lock;
 
 	struct list_head		mmu_notifiers;
+#ifdef CONFIG_CVM_HOST
+	bool secure;
+	struct list_head node;
+	struct kvm *kvm;
+#endif
 };
 
 static inline struct arm_smmu_domain *to_smmu_domain(struct iommu_domain *dom)
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index 1d70dd0d0c8cf9fccf6e8a73e835facdd36fcefa..9e510e179ee71d06c400e053c368b3c0d11e1c11 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -635,7 +635,12 @@ struct iommu_ops {
 	struct iommu_domain *blocked_domain;
 	struct iommu_domain *default_domain;
 
+#ifdef CONFIG_CVM_HOST
+	KABI_USE(1, int (*iommu_enable_secure)(struct iommu_domain *domain));
+#else
 	KABI_RESERVE(1)
+#endif
+
 	KABI_RESERVE(2)
 	KABI_RESERVE(3)
 	KABI_RESERVE(4)