From c4cd69901032954bb089de4d5cd751413bec655f Mon Sep 17 00:00:00 2001
From: Ruslan Bukin <br@FreeBSD.org>
Date: Wed, 5 Aug 2020 19:11:31 +0000
Subject: [PATCH] o Add machine/iommu.h and include MD iommu headers from it,  
 so we don't ifdef for every arch in busdma_iommu.c; o No need to include
 specialreg.h for x86, remove it.

Requested by:	andrew
Reviewed by:	kib
Sponsored by:	DARPA/AFRL
Differential Revision:	https://reviews.freebsd.org/D25957
---
 sys/amd64/include/iommu.h    |  6 ++++++
 sys/dev/iommu/busdma_iommu.c |  9 ++-------
 sys/dev/iommu/iommu_gas.c    |  4 +---
 sys/i386/include/iommu.h     |  6 ++++++
 sys/x86/include/iommu.h      | 13 +++++++++++++
 5 files changed, 28 insertions(+), 10 deletions(-)
 create mode 100644 sys/amd64/include/iommu.h
 create mode 100644 sys/i386/include/iommu.h
 create mode 100644 sys/x86/include/iommu.h

diff --git a/sys/amd64/include/iommu.h b/sys/amd64/include/iommu.h
new file mode 100644
index 000000000000..3737d51fdcef
--- /dev/null
+++ b/sys/amd64/include/iommu.h
@@ -0,0 +1,6 @@
+/*-
+ * This file is in the public domain.
+ */
+/* $FreeBSD$ */
+
+#include <x86/iommu.h>
diff --git a/sys/dev/iommu/busdma_iommu.c b/sys/dev/iommu/busdma_iommu.c
index 428880f85d01..908ed6933c68 100644
--- a/sys/dev/iommu/busdma_iommu.c
+++ b/sys/dev/iommu/busdma_iommu.c
@@ -59,17 +59,12 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
+#include <dev/iommu/iommu.h>
 #include <machine/atomic.h>
 #include <machine/bus.h>
 #include <machine/md_var.h>
-#if defined(__amd64__) || defined(__i386__)
-#include <machine/specialreg.h>
-#include <x86/include/busdma_impl.h>
-#include <x86/iommu/intel_reg.h>
+#include <machine/iommu.h>
 #include <dev/iommu/busdma_iommu.h>
-#include <dev/iommu/iommu.h>
-#include <x86/iommu/intel_dmar.h>
-#endif
 
 /*
  * busdma_iommu.c, the implementation of the busdma(9) interface using
diff --git a/sys/dev/iommu/iommu_gas.c b/sys/dev/iommu/iommu_gas.c
index 0baf996bf416..d6a09d852bfb 100644
--- a/sys/dev/iommu/iommu_gas.c
+++ b/sys/dev/iommu/iommu_gas.c
@@ -65,9 +65,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/atomic.h>
 #include <machine/bus.h>
 #include <machine/md_var.h>
-#if defined(__amd64__) || defined(__i386__)
-#include <x86/iommu/intel_reg.h>
-#endif
+#include <machine/iommu.h>
 #include <dev/iommu/busdma_iommu.h>
 
 /*
diff --git a/sys/i386/include/iommu.h b/sys/i386/include/iommu.h
new file mode 100644
index 000000000000..3737d51fdcef
--- /dev/null
+++ b/sys/i386/include/iommu.h
@@ -0,0 +1,6 @@
+/*-
+ * This file is in the public domain.
+ */
+/* $FreeBSD$ */
+
+#include <x86/iommu.h>
diff --git a/sys/x86/include/iommu.h b/sys/x86/include/iommu.h
new file mode 100644
index 000000000000..2757f1554258
--- /dev/null
+++ b/sys/x86/include/iommu.h
@@ -0,0 +1,13 @@
+/*-
+ * This file is in the public domain.
+ */
+/* $FreeBSD$ */
+
+#ifndef	_MACHINE_IOMMU_H_
+#define	_MACHINE_IOMMU_H_
+
+#include <x86/include/busdma_impl.h>
+#include <x86/iommu/intel_reg.h>
+#include <x86/iommu/intel_dmar.h>
+
+#endif /* !_MACHINE_IOMMU_H_ */