lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 10 Jun 2020 10:09:22 +0800 From: Lu Baolu <baolu.lu@...ux.intel.com> To: Joerg Roedel <joro@...tes.org> Cc: baolu.lu@...ux.intel.com, David Woodhouse <dwmw2@...radead.org>, Suravee Suthikulpanit <suravee.suthikulpanit@....com>, Jerry Snitselaar <jsnitsel@...hat.com>, Qian Cai <cai@....pw>, iommu@...ts.linux-foundation.org, linux-kernel@...r.kernel.org, Joerg Roedel <jroedel@...e.de> Subject: Re: [PATCH v2 2/2] iommu/vt-d: Move Intel IOMMU driver into subdirectory Hi Joerg, On 6/9/20 9:03 PM, Joerg Roedel wrote: > From: Joerg Roedel <jroedel@...e.de> > > Move all files related to the Intel IOMMU driver into its own > subdirectory. > > Signed-off-by: Joerg Roedel <jroedel@...e.de> > Reviewed-by: Jerry Snitselaar <jsnitsel@...hat.com> Reviewed-by: Lu Baolu <baolu.lu@...ux.intel.com> Best regards, baolu > --- > MAINTAINERS | 3 +-- > 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 > 10 files changed, 10 insertions(+), 11 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%) > > diff --git a/MAINTAINERS b/MAINTAINERS > index c2c31d3f8ae4..fa2078dd57d3 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -8716,8 +8716,7 @@ M: Lu Baolu <baolu.lu@...ux.intel.com> > L: iommu@...ts.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 3af7e374b0cb..342190196dfb 100644 > --- a/drivers/iommu/Makefile > +++ b/drivers/iommu/Makefile > @@ -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 > 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 60a2970c37ff..cc46dff98fa0 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 648a785e078a..9129663a7406 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 a042f123b091..7f8769800815 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 >
Powered by blists - more mailing lists