iommu: Move Intel and AMD drivers into their own subdirectory
Subsystems (3)
Joerg Roedel
maintainercover iommu: Move Intel and AMD drivers into their own subdirectory
Hi,
two small patches to move the Intel and AMD IOMMU drivers into their own subdirectory under drivers/iommu/ to make the file structure a bit less cluttered.
Regards,
Joerg
Joerg Roedel (2):
iommu/amd: Move AMD IOMMU driver into subdirectory iommu/vt-d: Move Intel IOMMU driver into subdirectory
drivers/iommu/Makefile | 18 +++++++++---------
drivers/iommu/{ => amd}/amd_iommu.h | 0
drivers/iommu/{ => amd}/amd_iommu_types.h | 0
.../{amd_iommu_debugfs.c => amd/debugfs.c} | 0
drivers/iommu/{amd_iommu_init.c => amd/init.c} | 2 +-
drivers/iommu/{amd_iommu.c => amd/iommu.c} | 2 +-
.../iommu/{amd_iommu_v2.c => amd/iommu_v2.c} | 0
.../iommu/{amd_iommu_quirks.c => amd/quirks.c} | 0
.../{intel-iommu-debugfs.c => intel/debugfs.c} | 0
drivers/iommu/{ => intel}/dmar.c | 2 +-
drivers/iommu/{ => intel}/intel-pasid.h | 0
drivers/iommu/{intel-iommu.c => intel/iommu.c} | 2 +-
.../irq_remapping.c} | 2 +-
drivers/iommu/{intel-pasid.c => intel/pasid.c} | 0
drivers/iommu/{intel-svm.c => intel/svm.c} | 0
drivers/iommu/{intel-trace.c => intel/trace.c} | 0
16 files changed, 14 insertions(+), 14 deletions(-)
rename drivers/iommu/{ => amd}/amd_iommu.h (100%)
rename drivers/iommu/{ => amd}/amd_iommu_types.h (100%)
rename drivers/iommu/{amd_iommu_debugfs.c => amd/debugfs.c} (100%)
rename drivers/iommu/{amd_iommu_init.c => amd/init.c} (99%)
rename drivers/iommu/{amd_iommu.c => amd/iommu.c} (99%)
rename drivers/iommu/{amd_iommu_v2.c => amd/iommu_v2.c} (100%)
rename drivers/iommu/{amd_iommu_quirks.c => amd/quirks.c} (100%)
rename drivers/iommu/{intel-iommu-debugfs.c => intel/debugfs.c} (100%)
rename drivers/iommu/{ => intel}/dmar.c (99%)
rename drivers/iommu/{ => intel}/intel-pasid.h (100%)
rename drivers/iommu/{intel-iommu.c => intel/iommu.c} (99%)
rename drivers/iommu/{intel_irq_remapping.c => intel/irq_remapping.c} (99%)
rename drivers/iommu/{intel-pasid.c => intel/pasid.c} (100%)
rename drivers/iommu/{intel-svm.c => intel/svm.c} (100%)
rename drivers/iommu/{intel-trace.c => intel/trace.c} (100%)Signature · 1 line
2.17.1
Joerg Roedel
maintainerPATCH 1/2 iommu/amd: Move AMD IOMMU driver into subdirectory
From: Joerg Roedel <[email protected]>
Move all files related to the AMD IOMMU driver into its own subdirectory.
---
drivers/iommu/Makefile | 6 +++---
drivers/iommu/{ => amd}/amd_iommu.h | 0
drivers/iommu/{ => amd}/amd_iommu_types.h | 0
drivers/iommu/{amd_iommu_debugfs.c => amd/debugfs.c} | 0
drivers/iommu/{amd_iommu_init.c => amd/init.c} | 2 +-
drivers/iommu/{amd_iommu.c => amd/iommu.c} | 2 +-
drivers/iommu/{amd_iommu_v2.c => amd/iommu_v2.c} | 0
drivers/iommu/{amd_iommu_quirks.c => amd/quirks.c} | 0
8 files changed, 5 insertions(+), 5 deletions(-)
rename drivers/iommu/{ => amd}/amd_iommu.h (100%)
rename drivers/iommu/{ => amd}/amd_iommu_types.h (100%)
rename drivers/iommu/{amd_iommu_debugfs.c => amd/debugfs.c} (100%)
rename drivers/iommu/{amd_iommu_init.c => amd/init.c} (99%)
rename drivers/iommu/{amd_iommu.c => amd/iommu.c} (99%)
rename drivers/iommu/{amd_iommu_v2.c => amd/iommu_v2.c} (100%)
rename drivers/iommu/{amd_iommu_quirks.c => amd/quirks.c} (100%)drivers/iommu/Makefile +3 -3
@@ -11,9 +11,9 @@ 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
drivers/iommu/amd/amd_iommu.h renamed from drivers/iommu/amd_iommu.h +0 -0
drivers/iommu/amd/amd_iommu_types.h renamed from drivers/iommu/amd_iommu_types.h +0 -0
drivers/iommu/amd/debugfs.c renamed from drivers/iommu/amd_iommu_debugfs.c +0 -0
drivers/iommu/amd/init.c renamed from drivers/iommu/amd_iommu_init.c +1 -1
@@ -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
drivers/iommu/amd/iommu.c renamed from drivers/iommu/amd_iommu.c +1 -1
@@ -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))
drivers/iommu/amd/iommu_v2.c renamed from drivers/iommu/amd_iommu_v2.c +0 -0
drivers/iommu/amd/quirks.c renamed from drivers/iommu/amd_iommu_quirks.c +0 -0
Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Joerg Roedel
maintainerPATCH 2/2 iommu/vt-d: Move Intel IOMMU driver into subdirectory
In reply to Joerg RoedelFrom: Joerg Roedel <[email protected]>
Move all files related to the Intel IOMMU driver into its own subdirectory.
---
drivers/iommu/Makefile | 12 ++++++------
.../iommu/{intel-iommu-debugfs.c => intel/debugfs.c} | 0
drivers/iommu/{ => intel}/dmar.c | 2 +-
drivers/iommu/{ => intel}/intel-pasid.h | 0
drivers/iommu/{intel-iommu.c => intel/iommu.c} | 2 +-
.../{intel_irq_remapping.c => intel/irq_remapping.c} | 2 +-
drivers/iommu/{intel-pasid.c => intel/pasid.c} | 0
drivers/iommu/{intel-svm.c => intel/svm.c} | 0
drivers/iommu/{intel-trace.c => intel/trace.c} | 0
9 files changed, 9 insertions(+), 9 deletions(-)
rename drivers/iommu/{intel-iommu-debugfs.c => intel/debugfs.c} (100%)
rename drivers/iommu/{ => intel}/dmar.c (99%)
rename drivers/iommu/{ => intel}/intel-pasid.h (100%)
rename drivers/iommu/{intel-iommu.c => intel/iommu.c} (99%)
rename drivers/iommu/{intel_irq_remapping.c => intel/irq_remapping.c} (99%)
rename drivers/iommu/{intel-pasid.c => intel/pasid.c} (100%)
rename drivers/iommu/{intel-svm.c => intel/svm.c} (100%)
rename drivers/iommu/{intel-trace.c => intel/trace.c} (100%)drivers/iommu/Makefile +6 -6
@@ -17,13 +17,13 @@ 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
drivers/iommu/intel/debugfs.c renamed from drivers/iommu/intel-iommu-debugfs.c +0 -0
drivers/iommu/intel/dmar.c renamed from drivers/iommu/dmar.c +1 -1
@@ -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 {
drivers/iommu/intel/intel-pasid.h renamed from drivers/iommu/intel-pasid.h +0 -0
drivers/iommu/intel/iommu.c renamed from drivers/iommu/intel-iommu.c +1 -1
@@ -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
drivers/iommu/intel/irq_remapping.c renamed from drivers/iommu/intel_irq_remapping.c +1 -1
@@ -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 ,
drivers/iommu/intel/pasid.c renamed from drivers/iommu/intel-pasid.c +0 -0
drivers/iommu/intel/svm.c renamed from drivers/iommu/intel-svm.c +0 -0
drivers/iommu/intel/trace.c renamed from drivers/iommu/intel-trace.c +0 -0
Signature · 1 line
2.17.1
Quoted 31 lines · Joerg Roedel
Hi,
two small patches to move the Intel and AMD IOMMU drivers into their own subdirectory under
drivers/iommu/to make the file structure a bit less cluttered.Regards,
Joerg
Joerg Roedel (2):
iommu/amd: Move AMD IOMMU driver into subdirectory iommu/vt-d: Move Intel IOMMU driver into subdirectorydrivers/iommu/Makefile | 18 +++++++++--------- drivers/iommu/{ => amd}/amd_iommu.h | 0 drivers/iommu/{ => amd}/amd_iommu_types.h | 0 .../{amd_iommu_debugfs.c => amd/debugfs.c} | 0 drivers/iommu/{amd_iommu_init.c => amd/init.c} | 2 +- drivers/iommu/{amd_iommu.c => amd/iommu.c} | 2 +- .../iommu/{amd_iommu_v2.c => amd/iommu_v2.c} | 0 .../iommu/{amd_iommu_quirks.c => amd/quirks.c} | 0 .../{intel-iommu-debugfs.c => intel/debugfs.c} | 0 drivers/iommu/{ => intel}/dmar.c | 2 +- drivers/iommu/{ => intel}/intel-pasid.h | 0 drivers/iommu/{intel-iommu.c => intel/iommu.c} | 2 +- .../irq_remapping.c} | 2 +- drivers/iommu/{intel-pasid.c => intel/pasid.c} | 0 drivers/iommu/{intel-svm.c => intel/svm.c} | 0 drivers/iommu/{intel-trace.c => intel/trace.c} | 0 16 files changed, 14 insertions(+), 14 deletions(-)
Quoted 19 lines
rename
drivers/iommu/{=>amd}/amd_iommu.h(100%)
renamedrivers/iommu/{=>amd}/amd_iommu_types.h(100%)
renamedrivers/iommu/{amd_iommu_debugfs.c=>amd/debugfs.c} (100%) renamedrivers/iommu/{amd_iommu_init.c=>amd/init.c} (99%) renamedrivers/iommu/{amd_iommu.c=>amd/iommu.c} (99%)
renamedrivers/iommu/{amd_iommu_v2.c=>amd/iommu_v2.c} (100%) renamedrivers/iommu/{amd_iommu_quirks.c=>amd/quirks.c} (100%) renamedrivers/iommu/{intel-iommu-debugfs.c=>intel/debugfs.c} (100%) renamedrivers/iommu/{=>intel}/dmar.c(99%)
renamedrivers/iommu/{=>intel}/intel-pasid.h(100%)
renamedrivers/iommu/{intel-iommu.c=>intel/iommu.c} (99%) renamedrivers/iommu/{intel_irq_remapping.c=>intel/irq_remapping.c} (99%) renamedrivers/iommu/{intel-pasid.c=>intel/pasid.c} (100%) renamedrivers/iommu/{intel-svm.c=>intel/svm.c} (100%)
renamedrivers/iommu/{intel-trace.c=>intel/trace.c} (100%)Signature · 1 line
2.17.1
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerHi Joerg,
Quoted 6 lines · Joerg Roedel
Hi,
two small patches to move the Intel and AMD IOMMU drivers into their own subdirectory under
drivers/iommu/to make the file structure a bit less cluttered.
Does the MAINTAINERS file need to update?
Best regards,
baolu
Quoted 41 lines
Regards,
Joerg
Joerg Roedel (2):
iommu/amd: Move AMD IOMMU driver into subdirectory iommu/vt-d: Move Intel IOMMU driver into subdirectorydrivers/iommu/Makefile | 18 +++++++++--------- drivers/iommu/{ => amd}/amd_iommu.h | 0 drivers/iommu/{ => amd}/amd_iommu_types.h | 0 .../{amd_iommu_debugfs.c => amd/debugfs.c} | 0 drivers/iommu/{amd_iommu_init.c => amd/init.c} | 2 +- drivers/iommu/{amd_iommu.c => amd/iommu.c} | 2 +- .../iommu/{amd_iommu_v2.c => amd/iommu_v2.c} | 0 .../iommu/{amd_iommu_quirks.c => amd/quirks.c} | 0 .../{intel-iommu-debugfs.c => intel/debugfs.c} | 0 drivers/iommu/{ => intel}/dmar.c | 2 +- drivers/iommu/{ => intel}/intel-pasid.h | 0 drivers/iommu/{intel-iommu.c => intel/iommu.c} | 2 +- .../irq_remapping.c} | 2 +- drivers/iommu/{intel-pasid.c => intel/pasid.c} | 0 drivers/iommu/{intel-svm.c => intel/svm.c} | 0 drivers/iommu/{intel-trace.c => intel/trace.c} | 0 16 files changed, 14 insertions(+), 14 deletions(-)rename
drivers/iommu/{=>amd}/amd_iommu.h(100%)
renamedrivers/iommu/{=>amd}/amd_iommu_types.h(100%)
renamedrivers/iommu/{amd_iommu_debugfs.c=>amd/debugfs.c} (100%) renamedrivers/iommu/{amd_iommu_init.c=>amd/init.c} (99%) renamedrivers/iommu/{amd_iommu.c=>amd/iommu.c} (99%)
renamedrivers/iommu/{amd_iommu_v2.c=>amd/iommu_v2.c} (100%) renamedrivers/iommu/{amd_iommu_quirks.c=>amd/quirks.c} (100%) renamedrivers/iommu/{intel-iommu-debugfs.c=>intel/debugfs.c} (100%) renamedrivers/iommu/{=>intel}/dmar.c(99%)
renamedrivers/iommu/{=>intel}/intel-pasid.h(100%)
renamedrivers/iommu/{intel-iommu.c=>intel/iommu.c} (99%) renamedrivers/iommu/{intel_irq_remapping.c=>intel/irq_remapping.c} (99%) renamedrivers/iommu/{intel-pasid.c=>intel/pasid.c} (100%) renamedrivers/iommu/{intel-svm.c=>intel/svm.c} (100%)
renamedrivers/iommu/{intel-trace.c=>intel/trace.c} (100%)
Quoted 10 lines · Lu Baolu
Hi Joerg,
Quoted 6 lines · Joerg Roedel
Hi,
two small patches to move the Intel and AMD IOMMU drivers into their own subdirectory under
drivers/iommu/to make the file structure a bit less cluttered.
Quoted 5 lines
Does the
MAINTAINERSfile need to update?Best regards,
baolu
Yes, that should be updated to point at the new directories. Good catch.
Quoted 33 lines
Quoted 33 lines
Regards,
Joerg
Joerg Roedel (2):
iommu/amd: Move AMD IOMMU driver into subdirectory iommu/vt-d: Move Intel IOMMU driver into subdirectorydrivers/iommu/Makefile | 18 +++++++++--------- drivers/iommu/{ => amd}/amd_iommu.h | 0 drivers/iommu/{ => amd}/amd_iommu_types.h | 0 .../{amd_iommu_debugfs.c => amd/debugfs.c} | 0 drivers/iommu/{amd_iommu_init.c => amd/init.c} | 2 +- drivers/iommu/{amd_iommu.c => amd/iommu.c} | 2 +- .../iommu/{amd_iommu_v2.c => amd/iommu_v2.c} | 0 .../iommu/{amd_iommu_quirks.c => amd/quirks.c} | 0 .../{intel-iommu-debugfs.c => intel/debugfs.c} | 0 drivers/iommu/{ => intel}/dmar.c | 2 +- drivers/iommu/{ => intel}/intel-pasid.h | 0 drivers/iommu/{intel-iommu.c => intel/iommu.c} | 2 +- .../irq_remapping.c} | 2 +- drivers/iommu/{intel-pasid.c => intel/pasid.c} | 0 drivers/iommu/{intel-svm.c => intel/svm.c} | 0 drivers/iommu/{intel-trace.c => intel/trace.c} | 0 16 files changed, 14 insertions(+), 14 deletions(-) rename drivers/iommu/{ => amd}/amd_iommu.h (100%) rename drivers/iommu/{ => amd}/amd_iommu_types.h (100%) rename drivers/iommu/{amd_iommu_debugfs.c => amd/debugfs.c} (100%) rename drivers/iommu/{amd_iommu_init.c => amd/init.c} (99%) rename drivers/iommu/{amd_iommu.c => amd/iommu.c} (99%) rename drivers/iommu/{amd_iommu_v2.c => amd/iommu_v2.c} (100%) rename drivers/iommu/{amd_iommu_quirks.c => amd/quirks.c} (100%) rename drivers/iommu/{intel-iommu-debugfs.c => intel/debugfs.c} (100%)
Quoted 9 lines
Quoted 8 lines
rename drivers/iommu/{ => intel}/dmar.c (99%) rename drivers/iommu/{ => intel}/intel-pasid.h (100%) rename drivers/iommu/{intel-iommu.c => intel/iommu.c} (99%) rename drivers/iommu/{intel_irq_remapping.c => intel/irq_remapping.c} (99%) rename drivers/iommu/{intel-pasid.c => intel/pasid.c} (100%) rename drivers/iommu/{intel-svm.c => intel/svm.c} (100%) rename drivers/iommu/{intel-trace.c => intel/trace.c} (100%)
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu