diff --git a/MAINTAINERS b/MAINTAINERS index 58bc99a57d95f11d10df11856e559e7af434f3a8..b0642aaa146e4c8767f24a2df4c3fa8be80c5da0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -884,7 +884,7 @@ M: Joerg Roedel <joro@8bytes.org> L: iommu@lists.linux-foundation.org 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 <baolu.lu@linux.intel.com> L: iommu@lists.linux-foundation.org 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 index 57cf4ba5e27cb30689d846a376bd74ff72e6c4e3..342190196dfb068d07e1d7a9bd66d29bbcc7a237 100644 --- 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 b/drivers/iommu/amd/amd_iommu.h similarity index 100% rename from drivers/iommu/amd_iommu.h rename to drivers/iommu/amd/amd_iommu.h diff --git a/drivers/iommu/amd_iommu_types.h b/drivers/iommu/amd/amd_iommu_types.h similarity index 100% rename from drivers/iommu/amd_iommu_types.h rename to drivers/iommu/amd/amd_iommu_types.h diff --git a/drivers/iommu/amd_iommu_debugfs.c b/drivers/iommu/amd/debugfs.c similarity index 100% rename from drivers/iommu/amd_iommu_debugfs.c rename to drivers/iommu/amd/debugfs.c diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd/init.c similarity index 99% rename from drivers/iommu/amd_iommu_init.c rename to drivers/iommu/amd/init.c index 3faff7f80fd25d990ebd62c3a401756450c0d277..6ebd4825e320659e253a1e3cecf1142d85fd6f4f 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/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 b/drivers/iommu/amd/iommu.c similarity index 99% rename from drivers/iommu/amd_iommu.c rename to drivers/iommu/amd/iommu.c index 311ef7105c6d0c3721110d5111708de64729fd99..74cca17571725d47cb00923c2fb391de7b9c7d2e 100644 --- a/drivers/iommu/amd_iommu.c +++ b/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 b/drivers/iommu/amd/iommu_v2.c similarity index 100% rename from drivers/iommu/amd_iommu_v2.c rename to drivers/iommu/amd/iommu_v2.c diff --git a/drivers/iommu/amd_iommu_quirks.c b/drivers/iommu/amd/quirks.c similarity index 100% rename from drivers/iommu/amd_iommu_quirks.c rename to drivers/iommu/amd/quirks.c diff --git a/drivers/iommu/intel-iommu-debugfs.c b/drivers/iommu/intel/debugfs.c similarity index 100% rename from drivers/iommu/intel-iommu-debugfs.c rename to drivers/iommu/intel/debugfs.c diff --git a/drivers/iommu/dmar.c b/drivers/iommu/intel/dmar.c similarity index 99% rename from drivers/iommu/dmar.c rename to drivers/iommu/intel/dmar.c index 60a2970c37ff4f65fba98f5100b7ffd927ddfecc..cc46dff98fa01ce97b6c3cc6ca10d1fc7b019552 100644 --- a/drivers/iommu/dmar.c +++ b/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 b/drivers/iommu/intel/intel-pasid.h similarity index 100% rename from drivers/iommu/intel-pasid.h rename to drivers/iommu/intel/intel-pasid.h diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel/iommu.c similarity index 99% rename from drivers/iommu/intel-iommu.c rename to drivers/iommu/intel/iommu.c index 648a785e078a2d1a2cee3fb7aca2f755203b3446..9129663a7406b260ee21ee80c4eb6c1b0f9ce469 100644 --- a/drivers/iommu/intel-iommu.c +++ b/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 b/drivers/iommu/intel/irq_remapping.c similarity index 99% rename from drivers/iommu/intel_irq_remapping.c rename to drivers/iommu/intel/irq_remapping.c index a042f123b091c695475c3fa555a67449c16ae6fe..7f87698008150298b1e197c3304ce0b23f966a56 100644 --- a/drivers/iommu/intel_irq_remapping.c +++ b/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 b/drivers/iommu/intel/pasid.c similarity index 100% rename from drivers/iommu/intel-pasid.c rename to drivers/iommu/intel/pasid.c diff --git a/drivers/iommu/intel-svm.c b/drivers/iommu/intel/svm.c similarity index 100% rename from drivers/iommu/intel-svm.c rename to drivers/iommu/intel/svm.c diff --git a/drivers/iommu/intel-trace.c b/drivers/iommu/intel/trace.c similarity index 100% rename from drivers/iommu/intel-trace.c rename to drivers/iommu/intel/trace.c