Merge tag 'iommu-drivers-move-v5.8' of git://git.kernel.org/pub/scm/l…

…inux/kernel/git/joro/iommu Pull iommu driver directory structure cleanup from Joerg Roedel: "Move the Intel and AMD IOMMU drivers into their own subdirectory. Both drivers consist of several files by now and giving them their own directory unclutters the IOMMU top-level directory a bit" * tag 'iommu-drivers-move-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: iommu/vt-d: Move Intel IOMMU driver into subdirectory iommu/amd: Move AMD IOMMU driver into subdirectory
wangyan0507 · Jun 12, 2020 · 8f02f36 · 8f02f36
2 parents 5c2fb57 + 672cf6d
commit 8f02f36
Show file tree

Hide file tree

Showing 17 changed files with 16 additions and 17 deletions.
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -884,7 +884,7 @@ M:	Joerg Roedel <[email protected]>
 L:	[email protected]
 S:	Maintained
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
-F:	drivers/iommu/amd_iommu*.[ch]
+F:	drivers/iommu/amd/
 F:	include/linux/amd-iommu.h
 
 AMD KFD
@@ -8735,8 +8735,7 @@ M:	Lu Baolu <[email protected]>
 L:	[email protected]
 S:	Supported
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
-F:	drivers/iommu/dmar.c
-F:	drivers/iommu/intel*.[ch]
+F:	drivers/iommu/intel/
 F:	include/linux/intel-iommu.h
 F:	include/linux/intel-svm.h
 

diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile
@@ -11,19 +11,19 @@ obj-$(CONFIG_IOASID) += ioasid.o
 obj-$(CONFIG_IOMMU_IOVA) += iova.o
 obj-$(CONFIG_OF_IOMMU)	+= of_iommu.o
 obj-$(CONFIG_MSM_IOMMU) += msm_iommu.o
-obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o amd_iommu_init.o amd_iommu_quirks.o
-obj-$(CONFIG_AMD_IOMMU_DEBUGFS) += amd_iommu_debugfs.o
-obj-$(CONFIG_AMD_IOMMU_V2) += amd_iommu_v2.o
+obj-$(CONFIG_AMD_IOMMU) += amd/iommu.o amd/init.o amd/quirks.o
+obj-$(CONFIG_AMD_IOMMU_DEBUGFS) += amd/debugfs.o
+obj-$(CONFIG_AMD_IOMMU_V2) += amd/iommu_v2.o
 obj-$(CONFIG_ARM_SMMU) += arm_smmu.o
 arm_smmu-objs += arm-smmu.o arm-smmu-impl.o arm-smmu-qcom.o
 obj-$(CONFIG_ARM_SMMU_V3) += arm-smmu-v3.o
-obj-$(CONFIG_DMAR_TABLE) += dmar.o
-obj-$(CONFIG_INTEL_IOMMU) += intel-iommu.o intel-pasid.o
-obj-$(CONFIG_INTEL_IOMMU) += intel-trace.o
-obj-$(CONFIG_INTEL_IOMMU_DEBUGFS) += intel-iommu-debugfs.o
-obj-$(CONFIG_INTEL_IOMMU_SVM) += intel-svm.o
+obj-$(CONFIG_DMAR_TABLE) += intel/dmar.o
+obj-$(CONFIG_INTEL_IOMMU) += intel/iommu.o intel/pasid.o
+obj-$(CONFIG_INTEL_IOMMU) += intel/trace.o
+obj-$(CONFIG_INTEL_IOMMU_DEBUGFS) += intel/debugfs.o
+obj-$(CONFIG_INTEL_IOMMU_SVM) += intel/svm.o
 obj-$(CONFIG_IPMMU_VMSA) += ipmmu-vmsa.o
-obj-$(CONFIG_IRQ_REMAP) += intel_irq_remapping.o irq_remapping.o
+obj-$(CONFIG_IRQ_REMAP) += intel/irq_remapping.o irq_remapping.o
 obj-$(CONFIG_MTK_IOMMU) += mtk_iommu.o
 obj-$(CONFIG_MTK_IOMMU_V1) += mtk_iommu_v1.o
 obj-$(CONFIG_OMAP_IOMMU) += omap-iommu.o

diff --git a/drivers/iommu/amd_iommu.h → drivers/iommu/amd/amd_iommu.h b/drivers/iommu/amd_iommu.h → drivers/iommu/amd/amd_iommu.h
diff --git a/drivers/iommu/amd_iommu_types.h → drivers/iommu/amd/amd_iommu_types.h b/drivers/iommu/amd_iommu_types.h → drivers/iommu/amd/amd_iommu_types.h
diff --git a/drivers/iommu/amd_iommu_debugfs.c → drivers/iommu/amd/debugfs.c b/drivers/iommu/amd_iommu_debugfs.c → drivers/iommu/amd/debugfs.c
diff --git a/drivers/iommu/amd_iommu_init.c → drivers/iommu/amd/init.c b/drivers/iommu/amd_iommu_init.c → drivers/iommu/amd/init.c
@@ -33,7 +33,7 @@
 #include <linux/crash_dump.h>
 
 #include "amd_iommu.h"
-#include "irq_remapping.h"
+#include "../irq_remapping.h"
 
 /*
  * definitions for the ACPI scanning code

diff --git a/drivers/iommu/amd_iommu.c → drivers/iommu/amd/iommu.c b/drivers/iommu/amd_iommu.c → drivers/iommu/amd/iommu.c
@@ -43,7 +43,7 @@
 #include <asm/dma.h>
 
 #include "amd_iommu.h"
-#include "irq_remapping.h"
+#include "../irq_remapping.h"
 
 #define CMD_SET_TYPE(cmd, t) ((cmd)->data[1] |= ((t) << 28))
 

diff --git a/drivers/iommu/amd_iommu_v2.c → drivers/iommu/amd/iommu_v2.c b/drivers/iommu/amd_iommu_v2.c → drivers/iommu/amd/iommu_v2.c
diff --git a/drivers/iommu/amd_iommu_quirks.c → drivers/iommu/amd/quirks.c b/drivers/iommu/amd_iommu_quirks.c → drivers/iommu/amd/quirks.c
diff --git a/drivers/iommu/intel-iommu-debugfs.c → drivers/iommu/intel/debugfs.c b/drivers/iommu/intel-iommu-debugfs.c → drivers/iommu/intel/debugfs.c
diff --git a/drivers/iommu/dmar.c → drivers/iommu/intel/dmar.c b/drivers/iommu/dmar.c → drivers/iommu/intel/dmar.c
@@ -32,7 +32,7 @@
 #include <asm/irq_remapping.h>
 #include <asm/iommu_table.h>
 
-#include "irq_remapping.h"
+#include "../irq_remapping.h"
 
 typedef int (*dmar_res_handler_t)(struct acpi_dmar_header *, void *);
 struct dmar_res_callback {

diff --git a/drivers/iommu/intel-pasid.h → drivers/iommu/intel/intel-pasid.h b/drivers/iommu/intel-pasid.h → drivers/iommu/intel/intel-pasid.h
diff --git a/drivers/iommu/intel-iommu.c → drivers/iommu/intel/iommu.c b/drivers/iommu/intel-iommu.c → drivers/iommu/intel/iommu.c
@@ -47,7 +47,7 @@
 #include <asm/iommu.h>
 #include <trace/events/intel_iommu.h>
 
-#include "irq_remapping.h"
+#include "../irq_remapping.h"
 #include "intel-pasid.h"
 
 #define ROOT_SIZE		VTD_PAGE_SIZE

diff --git a/drivers/iommu/intel_irq_remapping.c → drivers/iommu/intel/irq_remapping.c b/drivers/iommu/intel_irq_remapping.c → drivers/iommu/intel/irq_remapping.c
@@ -21,7 +21,7 @@
 #include <asm/pci-direct.h>
 #include <asm/msidef.h>
 
-#include "irq_remapping.h"
+#include "../irq_remapping.h"
 
 enum irq_mode {
 	IRQ_REMAPPING,

diff --git a/drivers/iommu/intel-pasid.c → drivers/iommu/intel/pasid.c b/drivers/iommu/intel-pasid.c → drivers/iommu/intel/pasid.c
diff --git a/drivers/iommu/intel-svm.c → drivers/iommu/intel/svm.c b/drivers/iommu/intel-svm.c → drivers/iommu/intel/svm.c
diff --git a/drivers/iommu/intel-trace.c → drivers/iommu/intel/trace.c b/drivers/iommu/intel-trace.c → drivers/iommu/intel/trace.c