iommu/amd: Updates and Cleanups
Subsystems (2)
Joerg Roedel
maintainercover iommu/amd: Updates and Cleanups
Hi,
here is a collection of patches that clean up a few things in the AMD IOMMU driver. Foremost, it moves all related files of the driver into a separate subdirectory.
But the patches also remove usage of dev->archdata.iommu and clean up dev_data handling and domain allocation.
Patches are runtime-tested, including device-assignment.
Please review.
Regards,
Joerg
Joerg Roedel (10):
iommu/amd: Move AMD IOMMU driver to a subdirectory iommu/amd: Unexport get_dev_data()
iommu/amd: Let free_pagetable() not rely on domain->pt_root iommu/amd: Allocate page-table in protection_domain_init() iommu/amd: Free page-table in protection_domain_free() iommu/amd: Consolidate domain allocation/freeing iommu/amd: Remove PD_DMA_OPS_MASK
iommu/amd: Merge private header files
iommu/amd: Store dev_data as device iommu private data iommu/amd: Remove redundant devid checks
MAINTAINERS | 2 +-
drivers/iommu/Makefile | 6 +-
.../{amd_iommu_proto.h => amd/amd_iommu.h} | 20 +-
drivers/iommu/{ => amd}/amd_iommu_types.h | 0
.../{amd_iommu_debugfs.c => amd/debugfs.c} | 5 +-
.../iommu/{amd_iommu_init.c => amd/init.c} | 6 +-
drivers/iommu/{amd_iommu.c => amd/iommu.c} | 265 ++++++------------
.../iommu/{amd_iommu_v2.c => amd/iommu_v2.c} | 14 +-
.../{amd_iommu_quirks.c => amd/quirks.c} | 0
drivers/iommu/amd_iommu.h | 14 -
10 files changed, 117 insertions(+), 215 deletions(-)
rename drivers/iommu/{amd_iommu_proto.h => amd/amd_iommu.h} (88%)
rename drivers/iommu/{ => amd}/amd_iommu_types.h (100%)
rename drivers/iommu/{amd_iommu_debugfs.c => amd/debugfs.c} (89%)
rename drivers/iommu/{amd_iommu_init.c => amd/init.c} (99%)
rename drivers/iommu/{amd_iommu.c => amd/iommu.c} (95%)
rename drivers/iommu/{amd_iommu_v2.c => amd/iommu_v2.c} (98%)
rename drivers/iommu/{amd_iommu_quirks.c => amd/quirks.c} (100%)
delete mode 100644 drivers/iommu/amd_iommu.hSignature · 1 line
2.17.1
Joerg Roedel
maintainerPATCH 1/10 iommu/amd: Move AMD IOMMU driver to a subdirectory
From: Joerg Roedel <[email protected]>
The driver consists of five C files and three header files by now. Move them to their own subdirectory to not clutter to iommu top-level directory with them.
---
MAINTAINERS | 2 +-
drivers/iommu/Makefile | 6 +++---
drivers/iommu/{ => amd}/amd_iommu.h | 0
drivers/iommu/{ => amd}/amd_iommu_proto.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
10 files changed, 6 insertions(+), 6 deletions(-)
rename drivers/iommu/{ => amd}/amd_iommu.h (100%)
rename drivers/iommu/{ => amd}/amd_iommu_proto.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%)MAINTAINERS +1 -1
@@ -876,7 +876,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
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_proto.h renamed from drivers/iommu/amd_iommu_proto.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
@@ -35,7 +35,7 @@#include "amd_iommu.h" #include "amd_iommu_proto.h" #include "amd_iommu_types.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
@@ -45,7 +45,7 @@#include "amd_iommu_proto.h" #include "amd_iommu_types.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
maintainerRe: [PATCH 01/10] iommu/amd: Move AMD IOMMU driver to a subdirectory
Quoted 19 lines · Joerg Roedel
From: Joerg Roedel <[email protected]>
The driver consists of five C files and three header files by now. Move them to their own subdirectory to not clutter to iommu top-level directory with them.
Signed-off-by Joerg Roedel <[email protected]>--- MAINTAINERS | 2 +- drivers/iommu/Makefile | 6 +++--- drivers/iommu/{ => amd}/amd_iommu.h | 0 drivers/iommu/{ => amd}/amd_iommu_proto.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 10 files changed, 6 insertions(+), 6 deletions(-)
Quoted 8 lines
rename drivers/iommu/{ => amd}/amd_iommu.h (100%)
rename drivers/iommu/{ => amd}/amd_iommu_proto.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%)Okay, so there were a lot of conflicts creating my next branch after this patch-set was applied, so I skipped this patch to make resolving them a bit easier.
I will send out this patch again separatly together with a patch doing the same for VT-d and merge it directly into the next branch I will send to Linus.
Joerg
Joerg Roedel
maintainerPATCH 2/10 iommu/amd: Unexport get_dev_data()
In reply to Joerg RoedelFrom: Joerg Roedel <[email protected]>
This function is internal to the AMD IOMMU driver and only exported because the amd_iommu_v2 modules calls it. But the reason it is called from there could better be handled by amd_iommu_is_attach_deferred(). So unexport get_dev_data() and use amd_iommu_is_attach_deferred() instead.
--- drivers/iommu/amd/amd_iommu_proto.h | 3 ++- drivers/iommu/amd/iommu.c | 9 +++++---- drivers/iommu/amd/iommu_v2.c | 10 ++++------ 3 files changed, 11 insertions(+), 11 deletions(-)
drivers/iommu/amd/amd_iommu_proto.h +2 -1
@@ -92,5 +92,6 @@ static inline void *iommu_phys_to_virt(unsigned long paddr) }extern bool translation_pre_enabled (struct amd_iommu *iommu); -extern struct iommu_dev_data *get_dev_data (struct device *dev); +extern bool amd_iommu_is_attach_deferred (struct iommu_domain *domain, +struct device *dev);#endif /* _ASM_X86_AMD_IOMMU_PROTO_H */
drivers/iommu/amd/iommu.c +5 -4
@@ -280,11 +280,10 @@ static struct iommu_dev_data *find_dev_data(u16 devid)return dev_data; } -struct iommu_dev_data *get_dev_data (struct device *dev) +static struct iommu_dev_data *get_dev_data (struct device *dev) {return dev->archdata.iommu; } -EXPORT_SYMBOL (get_dev_data);/* * Find or create an IOMMU group for a acpihid device.
@@ -2706,12 +2705,14 @@ static void amd_iommu_get_resv_regions(struct device *dev,list_add_tail (®ion->list, head); } -static bool amd_iommu_is_attach_deferred (struct iommu_domain *domain, -struct device *dev) +bool amd_iommu_is_attach_deferred (struct iommu_domain *domain, +struct device *dev) {struct iommu_dev_data *dev_data = dev->archdata.iommu; +return dev_data->defer_attach; } +EXPORT_SYMBOL_GPL (amd_iommu_is_attach_deferred);static void amd_iommu_flush_iotlb_all (struct iommu_domain *domain) {
drivers/iommu/amd/iommu_v2.c +4 -6
@@ -517,13 +517,12 @@ static int ppr_notifier(struct notifier_block *nb, unsigned long e, void *data)struct amd_iommu_fault *iommu_fault;struct pasid_state *pasid_state;struct device_state *dev_state; +struct pci_dev *pdev =NULL ;unsigned long flags;struct fault *fault;bool finish;u16 tag, devid;int ret; -struct iommu_dev_data *dev_data; -struct pci_dev *pdev =NULL ; iommu_fault = data; tag = iommu_fault->tag &0x1ff ;
@@ -534,12 +533,11 @@ static int ppr_notifier(struct notifier_block *nb, unsigned long e, void *data) devid & 0xff);if (!pdev)return -ENODEV ; - dev_data =get_dev_data (&pdev->dev); -/* In kdump kernel pci dev is not initialized yet -> send INVALID */ ret =NOTIFY_DONE ; -if (translation_pre_enabled (amd_iommu_rlookup_table[devid]) - && dev_data->defer_attach) { + +/* In kdump kernel pci dev is not initialized yet -> send INVALID */ +if (amd_iommu_is_attach_deferred (NULL , &pdev->dev)) {amd_iommu_complete_ppr (pdev, iommu_fault->pasid,PPR_INVALID , tag); goto out;
Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH 02/10] iommu/amd: Unexport get_dev_data()
Quoted 7 lines · Joerg Roedel
From: Joerg Roedel <[email protected]>
This function is internal to the AMD IOMMU driver and only exported because the
amd_iommu_v2modules calls it. But the reason it is called from there could better be handled byamd_iommu_is_attach_deferred(). So unexportget_dev_data()and useamd_iommu_is_attach_deferred()instead.
Btw, what is the reason amd_iommu_v2 is a separate module? It is very little code, and other drivers seem to just integrate such functionality.
Joerg Roedel
maintainerRe: [PATCH 02/10] iommu/amd: Unexport get_dev_data()
Quoted 9 lines · Christoph Hellwig
Quoted 7 lines · Joerg Roedel
From: Joerg Roedel <[email protected]>
This function is internal to the AMD IOMMU driver and only exported because the
amd_iommu_v2modules calls it. But the reason it is called from there could better be handled byamd_iommu_is_attach_deferred(). So unexportget_dev_data()and useamd_iommu_is_attach_deferred()instead.
Quoted 3 lines
Btw, what is the reason
amd_iommu_v2is a separate module? It is very little code, and other drivers seem to just integrate such functionality.
The module contains optional functionality that is only needed by the amd_kfd driver, which itself only does something useful on (newer) AMD GPUs. So I made it a separate module back in the days to save the memory when it is not needed. But this caused other problems with the amd_kfd module, when they got loaded in the wrong order. And the module is often loaded by distros anyway, as it successfully loads even when no AMD IOMMU is in the system. The reason for that was to have the symbols available for drivers which can optionally use AMD IOMMUv2 functionality.
In fact I have already thought about making it built-in, just havn't done so yet.
Regards,
Joerg
Joerg Roedel
maintainerPATCH 3/10 iommu/amd: Let free_pagetable() not rely on domain->pt_root
In reply to Joerg RoedelFrom: Joerg Roedel <[email protected]>
Use 'struct domain_pgtable' instead to free_pagetable(). This solves the problem that amd_iommu_domain_direct_map() needs to restore domain->pt_root after the device table has been updated just to make free_pagetable release the domain page-table.
--- drivers/iommu/amd/iommu.c | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-)
drivers/iommu/amd/iommu.c +16 -20
@@ -1391,20 +1391,19 @@ static struct page *free_sub_pt(unsigned long root, int mode,return freelist; } -static void free_pagetable (struct protection_domain *domain) +static void free_pagetable (struct domain_pgtable *pgtable) { -struct domain_pgtable pgtable;struct page *freelist =NULL ;unsigned long root; -amd_iommu_domain_get_pgtable (domain, &pgtable); -atomic64_set (&domain->pt_root,0 ); +if (pgtable->mode ==PAGE_MODE_NONE ) +return ; -BUG_ON (pgtable.mode <PAGE_MODE_NONE || - pgtable.mode >PAGE_MODE_6_LEVEL ); +BUG_ON (pgtable->mode <PAGE_MODE_NONE || + pgtable->mode >PAGE_MODE_6_LEVEL ); - root = (unsigned long )pgtable.root; - freelist =free_sub_pt (root, pgtable.mode, freelist); + root = (unsigned long )pgtable->root; + freelist =free_sub_pt (root, pgtable->mode, freelist);free_page_list (freelist); }
@@ -1823,12 +1822,16 @@ static void free_gcr3_table(struct protection_domain *domain)*/ static void dma_ops_domain_free (struct protection_domain *domain) { +struct domain_pgtable pgtable; +if (!domain)return ;iommu_put_dma_cookie (&domain->domain); -free_pagetable (domain); +amd_iommu_domain_get_pgtable (domain, &pgtable); +atomic64_set (&domain->pt_root,0 ); +free_pagetable (&pgtable);if (domain->id)domain_id_free (domain->id);
@@ -2496,9 +2499,8 @@ static void amd_iommu_domain_free(struct iommu_domain *dom)break ;default :amd_iommu_domain_get_pgtable (domain, &pgtable); - -if (pgtable.mode !=PAGE_MODE_NONE ) -free_pagetable (domain); +atomic64_set (&domain->pt_root,0 ); +free_pagetable (&pgtable);if (domain->flags &PD_IOMMUV2_MASK )free_gcr3_table (domain);
@@ -2796,7 +2798,6 @@ void amd_iommu_domain_direct_map(struct iommu_domain *dom)struct protection_domain *domain =to_pdomain (dom);struct domain_pgtable pgtable;unsigned long flags; -u64 pt_root;spin_lock_irqsave (&domain->lock, flags);
@@ -2804,18 +2805,13 @@ void amd_iommu_domain_direct_map(struct iommu_domain *dom)amd_iommu_domain_get_pgtable (domain, &pgtable);/* Update data structure */ - pt_root =amd_iommu_domain_encode_pgtable (NULL ,PAGE_MODE_NONE ); -atomic64_set (&domain->pt_root, pt_root); +atomic64_set (&domain->pt_root,0 );/* Make changes visible to IOMMUs */ update_domain (domain); -/* Restore old pgtable in domain->ptroot to free page-table */ - pt_root =amd_iommu_domain_encode_pgtable (pgtable.root, pgtable.mode); -atomic64_set (&domain->pt_root, pt_root); -/* Page-table is not visible to IOMMU anymore, so free it */ -free_pagetable (domain); +free_pagetable (&pgtable);spin_unlock_irqrestore (&domain->lock, flags); }
Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Joerg Roedel
maintainerPATCH 4/10 iommu/amd: Allocate page-table in protection_domain_init()
In reply to Joerg RoedelFrom: Joerg Roedel <[email protected]>
Consolidate the allocation of the domain page-table in one place.
--- drivers/iommu/amd/iommu.c | 48 ++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 26 deletions(-)
drivers/iommu/amd/iommu.c +22 -26
@@ -71,6 +71,8 @@*/ #define AMD_IOMMU_PGSIZES ((~0xFFFUL) & ~(2ULL << 38)) +#define DEFAULT_PGTABLE_LEVEL PAGE_MODE_3_LEVEL +static DEFINE_SPINLOCK (pd_bitmap_lock);/* List of all available dev_data structures */
@@ -99,7 +101,7 @@ struct iommu_cmd {struct kmem_cache *amd_iommu_irq_cache;static void update_domain (struct protection_domain *domain); -static int protection_domain_init (struct protection_domain *domain); +static int protection_domain_init (struct protection_domain *domain,int mode);static void detach_device (struct device *dev);static void update_and_flush_device_table (struct protection_domain *domain,struct domain_pgtable *pgtable);
@@ -1847,21 +1849,14 @@ static void dma_ops_domain_free(struct protection_domain *domain)static struct protection_domain *dma_ops_domain_alloc (void ) {struct protection_domain *domain; -u64 *pt_root, root; domain =kzalloc (sizeof (struct protection_domain ),GFP_KERNEL );if (!domain)return NULL ; -if (protection_domain_init (domain)) - goto free_domain; - - pt_root = (void *)get_zeroed_page (GFP_KERNEL ); -if (!pt_root) +if (protection_domain_init (domain,DEFAULT_PGTABLE_LEVEL )) goto free_domain; - root =amd_iommu_domain_encode_pgtable (pt_root,PAGE_MODE_3_LEVEL ); -atomic64_set (&domain->pt_root, root); domain->flags =PD_DMA_OPS_MASK ;if (iommu_get_dma_cookie (&domain->domain) == -ENOMEM )
@@ -2401,18 +2396,31 @@ static void protection_domain_free(struct protection_domain *domain)kfree (domain); } -static int protection_domain_init (struct protection_domain *domain) +static int protection_domain_init (struct protection_domain *domain,int mode) { +u64 *pt_root =NULL , root; + +BUG_ON (mode <PAGE_MODE_NONE || mode >PAGE_MODE_6_LEVEL ); +spin_lock_init (&domain->lock); domain->id =domain_id_alloc ();if (!domain->id)return -ENOMEM ;INIT_LIST_HEAD (&domain->dev_list); +if (mode !=PAGE_MODE_NONE ) { + pt_root = (void *)get_zeroed_page (GFP_KERNEL ); +if (!pt_root) +return -ENOMEM ; + } + + root =amd_iommu_domain_encode_pgtable (pt_root, mode); +atomic64_set (&domain->pt_root, root); +return 0 ; } -static struct protection_domain *protection_domain_alloc (void ) +static struct protection_domain *protection_domain_alloc (int mode) {struct protection_domain *domain;
@@ -2420,7 +2428,7 @@ static struct protection_domain *protection_domain_alloc(void)if (!domain)return NULL ; -if (protection_domain_init (domain)) +if (protection_domain_init (domain, mode)) goto out_err;return domain;
@@ -2434,23 +2442,13 @@ static struct protection_domain *protection_domain_alloc(void)static struct iommu_domain *amd_iommu_domain_alloc (unsigned type) {struct protection_domain *pdomain; -u64 *pt_root, root;switch (type) {case IOMMU_DOMAIN_UNMANAGED : - pdomain =protection_domain_alloc (); + pdomain =protection_domain_alloc (DEFAULT_PGTABLE_LEVEL );if (!pdomain)return NULL ; - pt_root = (void *)get_zeroed_page (GFP_KERNEL ); -if (!pt_root) { -protection_domain_free (pdomain); -return NULL ; - } - - root =amd_iommu_domain_encode_pgtable (pt_root,PAGE_MODE_3_LEVEL ); -atomic64_set (&pdomain->pt_root, root); - pdomain->domain.geometry.aperture_start =0 ; pdomain->domain.geometry.aperture_end = ~0ULL ; pdomain->domain.geometry.force_aperture = true;
@@ -2464,11 +2462,9 @@ static struct iommu_domain *amd_iommu_domain_alloc(unsigned type) }break ;case IOMMU_DOMAIN_IDENTITY : - pdomain =protection_domain_alloc (); + pdomain =protection_domain_alloc (PAGE_MODE_NONE );if (!pdomain)return NULL ; - -atomic64_set (&pdomain->pt_root,PAGE_MODE_NONE );break ;default :return NULL ;
Signature · 1 line
2.17.1
Joerg Roedel
maintainerPATCH 5/10 iommu/amd: Free page-table in protection_domain_free()
In reply to Joerg RoedelFrom: Joerg Roedel <[email protected]>
Align release of the page-table with the place where it is allocated.
--- drivers/iommu/amd/iommu.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/iommu/amd/iommu.c +6 -5
@@ -2387,12 +2387,18 @@ static void cleanup_domain(struct protection_domain *domain)static void protection_domain_free (struct protection_domain *domain) { +struct domain_pgtable pgtable; +if (!domain)return ;if (domain->id)domain_id_free (domain->id); +amd_iommu_domain_get_pgtable (domain, &pgtable); +atomic64_set (&domain->pt_root,0 ); +free_pagetable (&pgtable); +kfree (domain); }
@@ -2476,7 +2482,6 @@ static struct iommu_domain *amd_iommu_domain_alloc(unsigned type)static void amd_iommu_domain_free (struct iommu_domain *dom) {struct protection_domain *domain; -struct domain_pgtable pgtable; domain =to_pdomain (dom);
@@ -2494,10 +2499,6 @@ static void amd_iommu_domain_free(struct iommu_domain *dom)dma_ops_domain_free (domain);break ;default : -amd_iommu_domain_get_pgtable (domain, &pgtable); -atomic64_set (&domain->pt_root,0 ); -free_pagetable (&pgtable); -if (domain->flags &PD_IOMMUV2_MASK )free_gcr3_table (domain);
Signature · 1 line
2.17.1
Joerg Roedel
maintainerPATCH 6/10 iommu/amd: Consolidate domain allocation/freeing
In reply to Joerg RoedelFrom: Joerg Roedel <[email protected]>
Merge the allocation code paths of DMA and UNMANAGED domains and remove code duplication.
--- drivers/iommu/amd/iommu.c | 116 +++++++++----------------------------- 1 file changed, 27 insertions(+), 89 deletions(-)
drivers/iommu/amd/iommu.c +27 -89
@@ -101,7 +101,6 @@ struct iommu_cmd {struct kmem_cache *amd_iommu_irq_cache;static void update_domain (struct protection_domain *domain); -static int protection_domain_init (struct protection_domain *domain,int mode);static void detach_device (struct device *dev);static void update_and_flush_device_table (struct protection_domain *domain,struct domain_pgtable *pgtable);
@@ -1818,58 +1817,6 @@ static void free_gcr3_table(struct protection_domain *domain)free_page ((unsigned long )domain->gcr3_tbl); } -/* -* Free a domain, only used if something went wrong in the -* allocation path and we need to free an already allocated page table -*/ -static void dma_ops_domain_free (struct protection_domain *domain) -{ -struct domain_pgtable pgtable; - -if (!domain) -return ; - -iommu_put_dma_cookie (&domain->domain); - -amd_iommu_domain_get_pgtable (domain, &pgtable); -atomic64_set (&domain->pt_root,0 ); -free_pagetable (&pgtable); - -if (domain->id) -domain_id_free (domain->id); - -kfree (domain); -} - -/* -* Allocates a new protection domain usable for the dma_ops functions. -* It also initializes the page table and the address allocator data -* structures required for the dma_ops interface -*/ -static struct protection_domain *dma_ops_domain_alloc (void ) -{ -struct protection_domain *domain; - - domain =kzalloc (sizeof (struct protection_domain ),GFP_KERNEL ); -if (!domain) -return NULL ; - -if (protection_domain_init (domain,DEFAULT_PGTABLE_LEVEL )) - goto free_domain; - - domain->flags =PD_DMA_OPS_MASK ; - -if (iommu_get_dma_cookie (&domain->domain) == -ENOMEM ) - goto free_domain; - -return domain; - -free_domain: -dma_ops_domain_free (domain); - -return NULL ; -} -/* * little helper function to check whether a given protection domain is a * dma_ops domain
@@ -2447,36 +2394,32 @@ static struct protection_domain *protection_domain_alloc(int mode)static struct iommu_domain *amd_iommu_domain_alloc (unsigned type) { -struct protection_domain *pdomain; - -switch (type) { -case IOMMU_DOMAIN_UNMANAGED : - pdomain =protection_domain_alloc (DEFAULT_PGTABLE_LEVEL ); -if (!pdomain) -return NULL ; +struct protection_domain *domain; +int mode =DEFAULT_PGTABLE_LEVEL ; - pdomain->domain.geometry.aperture_start =0 ; - pdomain->domain.geometry.aperture_end = ~0ULL ; - pdomain->domain.geometry.force_aperture = true; +if (type ==IOMMU_DOMAIN_IDENTITY ) + mode =PAGE_MODE_NONE ; -break ; -case IOMMU_DOMAIN_DMA : - pdomain =dma_ops_domain_alloc (); -if (!pdomain) { -pr_err ("Failed to allocate\n" ); -return NULL ; - } -break ; -case IOMMU_DOMAIN_IDENTITY : - pdomain =protection_domain_alloc (PAGE_MODE_NONE ); -if (!pdomain) -return NULL ; -break ; -default : + domain =protection_domain_alloc (mode); +if (!domain)return NULL ; + + domain->domain.geometry.aperture_start =0 ; + domain->domain.geometry.aperture_end = ~0ULL ; + domain->domain.geometry.force_aperture = true; + +if (type ==IOMMU_DOMAIN_DMA ) { +if (iommu_get_dma_cookie (&domain->domain) == -ENOMEM ) + goto free_domain; + domain->flags =PD_DMA_OPS_MASK ; } -return &pdomain->domain; +return &domain->domain; + +free_domain: +protection_domain_free (domain); + +return NULL ; }static void amd_iommu_domain_free (struct iommu_domain *dom)
@@ -2493,18 +2436,13 @@ static void amd_iommu_domain_free(struct iommu_domain *dom)if (!dom)return ; -switch (dom->type) { -case IOMMU_DOMAIN_DMA : -/* Now release the domain */ -dma_ops_domain_free (domain); -break ; -default : -if (domain->flags &PD_IOMMUV2_MASK ) -free_gcr3_table (domain); +if (dom->type ==IOMMU_DOMAIN_DMA ) +iommu_put_dma_cookie (&domain->domain); -protection_domain_free (domain); -break ; - } +if (domain->flags &PD_IOMMUV2_MASK ) +free_gcr3_table (domain); + +protection_domain_free (domain); } static void amd_iommu_detach_device(struct iommu_domain *dom,
Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Joerg Roedel
maintainerPATCH 7/10 iommu/amd: Remove PD_DMA_OPS_MASK
In reply to Joerg RoedelFrom: Joerg Roedel <[email protected]>
This is covered by IOMMU_DOMAIN_DMA from the IOMMU core code already, so remove it.
--- drivers/iommu/amd/iommu.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-)
drivers/iommu/amd/iommu.c +7 -17
@@ -1817,15 +1817,6 @@ static void free_gcr3_table(struct protection_domain *domain)free_page ((unsigned long )domain->gcr3_tbl); } -/* -* little helper function to check whether a given protection domain is a -* dma_ops domain -*/ -static bool dma_ops_domain (struct protection_domain *domain) -{ -return domain->flags &PD_DMA_OPS_MASK ; -} -static void set_dte_entry (u16 devid,struct protection_domain *domain,struct domain_pgtable *pgtable,bool ats,bool ppr)
@@ -2408,11 +2399,9 @@ static struct iommu_domain *amd_iommu_domain_alloc(unsigned type) domain->domain.geometry.aperture_end = ~0ULL ; domain->domain.geometry.force_aperture = true; -if (type ==IOMMU_DOMAIN_DMA ) { -if (iommu_get_dma_cookie (&domain->domain) == -ENOMEM ) - goto free_domain; - domain->flags =PD_DMA_OPS_MASK ; - } +if (type ==IOMMU_DOMAIN_DMA && +iommu_get_dma_cookie (&domain->domain) == -ENOMEM ) + goto free_domain;return &domain->domain;
@@ -3024,17 +3013,18 @@ struct iommu_domain *amd_iommu_get_v2_domain(struct pci_dev *pdev)if (!check_device (dev))return NULL ; - pdomain =get_dev_data (dev)->domain; + pdomain =get_dev_data (dev)->domain; + io_domain =iommu_get_domain_for_dev (dev);if (pdomain ==NULL &&get_dev_data (dev)->defer_attach) {get_dev_data (dev)->defer_attach = false; - io_domain =iommu_get_domain_for_dev (dev); pdomain =to_pdomain (io_domain);attach_device (dev, pdomain); } +if (pdomain ==NULL )return NULL ; -if (!dma_ops_domain (pdomain)) +if (io_domain->type !=IOMMU_DOMAIN_DMA )return NULL ;/* Only return IOMMUv2 domains */
Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Joerg Roedel
maintainerPATCH 8/10 iommu/amd: Merge private header files
In reply to Joerg RoedelFrom: Joerg Roedel <[email protected]>
Merge amd_iommu_proto.h into amd_iommu.h.
--- drivers/iommu/amd/amd_iommu.h | 96 +++++++++++++++++++++++++++- drivers/iommu/amd/amd_iommu_proto.h | 97 ----------------------------- drivers/iommu/amd/debugfs.c | 5 +- drivers/iommu/amd/init.c | 4 +- drivers/iommu/amd/iommu.c | 4 +- drivers/iommu/amd/iommu_v2.c | 4 +- 6 files changed, 100 insertions(+), 110 deletions(-) delete mode 100644 drivers/iommu/amd/amd_iommu_proto.h
drivers/iommu/amd/amd_iommu.h +95 -1
@@ -1,9 +1,103 @@/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (C) 2009-2010 Advanced Micro Devices, Inc. +* Author: Joerg Roedel <[email protected]> +*/ #ifndef AMD_IOMMU_H #define AMD_IOMMU_H -int __init add_special_device (u8 type,u8 id,u16 *devid,bool cmd_line); +#include <linux/iommu.h> + +#include "amd_iommu_types.h" + +extern int amd_iommu_get_num_iommus (void ); +extern int amd_iommu_init_dma_ops (void ); +extern int amd_iommu_init_passthrough (void ); +extern irqreturn_t amd_iommu_int_thread (int irq,void *data); +extern irqreturn_t amd_iommu_int_handler (int irq,void *data); +extern void amd_iommu_apply_erratum_63 (u16 devid); +extern void amd_iommu_reset_cmd_buffer (struct amd_iommu *iommu); +extern int amd_iommu_init_devices (void ); +extern void amd_iommu_uninit_devices (void ); +extern void amd_iommu_init_notifier (void ); +extern int amd_iommu_init_api (void ); + +#ifdef CONFIG_AMD_IOMMU_DEBUGFS +void amd_iommu_debugfs_setup (struct amd_iommu *iommu); +#else +static inline void amd_iommu_debugfs_setup (struct amd_iommu *iommu) {} +#endif + +/* Needed for interrupt remapping */ +extern int amd_iommu_prepare (void ); +extern int amd_iommu_enable (void ); +extern void amd_iommu_disable (void ); +extern int amd_iommu_reenable (int ); +extern int amd_iommu_enable_faulting (void ); +extern int amd_iommu_guest_ir; + +/* IOMMUv2 specific functions */ +struct iommu_domain ; + +extern bool amd_iommu_v2_supported (void ); +extern int amd_iommu_register_ppr_notifier (struct notifier_block *nb); +extern int amd_iommu_unregister_ppr_notifier (struct notifier_block *nb); +extern void amd_iommu_domain_direct_map (struct iommu_domain *dom); +extern int amd_iommu_domain_enable_v2 (struct iommu_domain *dom,int pasids); +extern int amd_iommu_flush_page (struct iommu_domain *dom,int pasid, +u64 address); +extern int amd_iommu_flush_tlb (struct iommu_domain *dom,int pasid); +extern int amd_iommu_domain_set_gcr3 (struct iommu_domain *dom,int pasid, +unsigned long cr3); +extern int amd_iommu_domain_clear_gcr3 (struct iommu_domain *dom,int pasid); +extern struct iommu_domain *amd_iommu_get_v2_domain (struct pci_dev *pdev); + +#ifdef CONFIG_IRQ_REMAP +extern int amd_iommu_create_irq_domain (struct amd_iommu *iommu); +#else +static inline int amd_iommu_create_irq_domain (struct amd_iommu *iommu) +{ +return 0 ; +} +#endif + +#define PPR_SUCCESS 0x0 +#define PPR_INVALID 0x1 +#define PPR_FAILURE 0xf + +extern int amd_iommu_complete_ppr (struct pci_dev *pdev,int pasid, +int status,int tag); + +static inline bool is_rd890_iommu (struct pci_dev *pdev) +{ +return (pdev->vendor ==PCI_VENDOR_ID_ATI ) && + (pdev->device ==PCI_DEVICE_ID_RD890_IOMMU ); +} + +static inline bool iommu_feature (struct amd_iommu *iommu,u64 f) +{ +if (!(iommu->cap & (1 <<IOMMU_CAP_EFR ))) +return false; + +return !!(iommu->features & f); +} + +static inline u64 iommu_virt_to_phys (void *vaddr) +{ +return (u64 )__sme_set (virt_to_phys (vaddr)); +} + +static inline void *iommu_phys_to_virt (unsigned long paddr) +{ +return phys_to_virt (__sme_clr (paddr)); +} + +extern bool translation_pre_enabled (struct amd_iommu *iommu); +extern bool amd_iommu_is_attach_deferred (struct iommu_domain *domain, +struct device *dev); +extern int __init add_special_device (u8 type,u8 id,u16 *devid, +bool cmd_line);#ifdef CONFIG_DMI void amd_iommu_apply_ivrs_quirks (void );
drivers/iommu/amd/amd_iommu_proto.h deleted +0 -97
97 lines not on this page · raw message
drivers/iommu/amd/debugfs.c +2 -3
@@ -8,10 +8,9 @@*/ #include <linux/debugfs.h> -#include <linux/iommu.h> #include <linux/pci.h> -#include "amd_iommu_proto.h" -#include "amd_iommu_types.h" + +#include "amd_iommu.h" static struct dentry *amd_iommu_debugfs;static DEFINE_MUTEX (amd_iommu_debugfs_lock);
drivers/iommu/amd/init.c +1 -3
@@ -18,7 +18,6 @@#include <linux/msi.h> #include <linux/amd-iommu.h> #include <linux/export.h> -#include <linux/iommu.h> #include <linux/kmemleak.h> #include <linux/mem_encrypt.h> #include <asm/pci-direct.h>
@@ -32,9 +31,8 @@#include <asm/irq_remapping.h> #include <linux/crash_dump.h> +#include "amd_iommu.h" -#include "amd_iommu_proto.h" -#include "amd_iommu_types.h" #include "../irq_remapping.h" /*
drivers/iommu/amd/iommu.c +1 -3
@@ -22,7 +22,6 @@#include <linux/dma-direct.h> #include <linux/dma-iommu.h> #include <linux/iommu-helper.h> -#include <linux/iommu.h> #include <linux/delay.h> #include <linux/amd-iommu.h> #include <linux/notifier.h>
@@ -43,8 +42,7 @@#include <asm/gart.h> #include <asm/dma.h> -#include "amd_iommu_proto.h" -#include "amd_iommu_types.h" +#include "amd_iommu.h" #include "../irq_remapping.h" #define CMD_SET_TYPE (cmd, t) ((cmd)->data[1] |= ((t) << 28))
drivers/iommu/amd/iommu_v2.c +1 -3
@@ -13,13 +13,11 @@#include <linux/module.h> #include <linux/sched.h> #include <linux/sched/mm.h> -#include <linux/iommu.h> #include <linux/wait.h> #include <linux/pci.h> #include <linux/gfp.h> -#include "amd_iommu_types.h" -#include "amd_iommu_proto.h" +#include "amd_iommu.h" MODULE_LICENSE ("GPL v2" );MODULE_AUTHOR ("Joerg Roedel <[email protected]>" );
Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Joerg Roedel
maintainerPATCH 9/10 iommu/amd: Store dev_data as device iommu private data
In reply to Joerg RoedelFrom: Joerg Roedel <[email protected]>
Do not use dev->archdata.iommu anymore and switch to using the private per-device pointer provided by the IOMMU core code.
--- drivers/iommu/amd/iommu.c | 44 +++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 22 deletions(-)
drivers/iommu/amd/iommu.c +22 -22
@@ -279,11 +279,6 @@ static struct iommu_dev_data *find_dev_data(u16 devid)return dev_data; } -static struct iommu_dev_data *get_dev_data (struct device *dev) -{ -return dev->archdata.iommu; -} -/* * Find or create an IOMMU group for a acpihid device. */
@@ -334,7 +329,7 @@ static bool pdev_pri_erratum(struct pci_dev *pdev, u32 erratum) {struct iommu_dev_data *dev_data; - dev_data =get_dev_data (&pdev->dev); + dev_data =dev_iommu_priv_get (&pdev->dev);return dev_data->errata & (1 << erratum) ? true : false; }
@@ -369,7 +364,7 @@ static int iommu_init_device(struct device *dev)struct iommu_dev_data *dev_data;int devid; -if (dev->archdata.iommu) +if (dev_iommu_priv_get (dev))return 0 ; devid =get_device_id (dev);
@@ -396,7 +391,7 @@ static int iommu_init_device(struct device *dev) dev_data->iommu_v2 = iommu->is_iommu_v2; } - dev->archdata.iommu = dev_data; +dev_iommu_priv_set (dev, dev_data);return 0 ; }
@@ -431,6 +426,8 @@ static void amd_iommu_uninit_device(struct device *dev)if (dev_data->domain)detach_device (dev); +dev_iommu_priv_set (dev,NULL ); +/* * We keep dev_data around for unplugged devices and reuse it when the * device is re-plugged - not doing so would introduce a ton of races.
@@ -493,7 +490,7 @@ static void amd_iommu_report_page_fault(u16 devid, u16 domain_id, pdev =pci_get_domain_bus_and_slot (0 ,PCI_BUS_NUM (devid), devid &0xff );if (pdev) - dev_data =get_dev_data (&pdev->dev); + dev_data =dev_iommu_priv_get (&pdev->dev);if (dev_data &&__ratelimit (&dev_data->rs)) { pci_err(pdev, "Event logged [IO_PAGE_FAULT domain=0x%04x address=0x%llx flags=0x%04x]\n",
@@ -2033,7 +2030,7 @@ static int attach_device(struct device *dev,spin_lock_irqsave (&domain->lock, flags); - dev_data =get_dev_data (dev); + dev_data =dev_iommu_priv_get (dev);spin_lock (&dev_data->lock);
@@ -2097,7 +2094,7 @@ static void detach_device(struct device *dev)struct iommu_dev_data *dev_data;unsigned long flags; - dev_data =get_dev_data (dev); + dev_data =dev_iommu_priv_get (dev); domain = dev_data->domain;spin_lock_irqsave (&domain->lock, flags);
@@ -2146,7 +2143,7 @@ static struct iommu_device *amd_iommu_probe_device(struct device *dev) iommu = amd_iommu_rlookup_table[devid]; -if (get_dev_data (dev)) +if (dev_iommu_priv_get (dev))return &iommu->iommu; ret =iommu_init_device (dev);
@@ -2435,7 +2432,7 @@ static void amd_iommu_domain_free(struct iommu_domain *dom)static void amd_iommu_detach_device (struct iommu_domain *dom,struct device *dev) { -struct iommu_dev_data *dev_data = dev->archdata.iommu; +struct iommu_dev_data *dev_data =dev_iommu_priv_get (dev);struct amd_iommu *iommu;int devid;
@@ -2473,7 +2470,7 @@ static int amd_iommu_attach_device(struct iommu_domain *dom,if (!check_device (dev))return -EINVAL ; - dev_data = dev->archdata.iommu; + dev_data =dev_iommu_priv_get (dev); dev_data->defer_attach = false; iommu = amd_iommu_rlookup_table[dev_data->devid];
@@ -2632,7 +2629,7 @@ static void amd_iommu_get_resv_regions(struct device *dev,bool amd_iommu_is_attach_deferred (struct iommu_domain *domain,struct device *dev) { -struct iommu_dev_data *dev_data = dev->archdata.iommu; +struct iommu_dev_data *dev_data =dev_iommu_priv_get (dev);return dev_data->defer_attach; }
@@ -2659,7 +2656,7 @@ static int amd_iommu_def_domain_type(struct device *dev) {struct iommu_dev_data *dev_data; - dev_data =get_dev_data (dev); + dev_data =dev_iommu_priv_get (dev);if (!dev_data)return 0 ;
@@ -2992,7 +2989,7 @@ int amd_iommu_complete_ppr(struct pci_dev *pdev, int pasid,struct amd_iommu *iommu;struct iommu_cmd cmd; - dev_data =get_dev_data (&pdev->dev); + dev_data =dev_iommu_priv_get (&pdev->dev); iommu = amd_iommu_rlookup_table[dev_data->devid]; build_complete_ppr(&cmd, dev_data->devid, pasid, status,
@@ -3005,16 +3002,19 @@ EXPORT_SYMBOL(amd_iommu_complete_ppr);struct iommu_domain *amd_iommu_get_v2_domain (struct pci_dev *pdev) {struct protection_domain *pdomain; -struct iommu_domain *io_domain; +struct iommu_dev_data *dev_data;struct device *dev = &pdev->dev; +struct iommu_domain *io_domain;if (!check_device (dev))return NULL ; - pdomain =get_dev_data (dev)->domain; + dev_data =dev_iommu_priv_get (&pdev->dev); + pdomain = dev_data->domain; io_domain =iommu_get_domain_for_dev (dev); -if (pdomain ==NULL &&get_dev_data (dev)->defer_attach) { -get_dev_data (dev)->defer_attach = false; + +if (pdomain ==NULL && dev_data->defer_attach) { + dev_data->defer_attach = false; pdomain =to_pdomain (io_domain);attach_device (dev, pdomain); }
@@ -3040,7 +3040,7 @@ void amd_iommu_enable_device_erratum(struct pci_dev *pdev, u32 erratum)if (!amd_iommu_v2_supported ())return ; - dev_data =get_dev_data (&pdev->dev); + dev_data =dev_iommu_priv_get (&pdev->dev); dev_data->errata |= (1 << erratum); }EXPORT_SYMBOL (amd_iommu_enable_device_erratum);
Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Joerg Roedel
maintainerPATCH 10/10 iommu/amd: Remove redundant devid checks
In reply to Joerg RoedelFrom: Joerg Roedel <[email protected]>
Checking the return value of get_device_id() in a code-path which has already done check_device() is not needed, as check_device() does the same check and bails out if it fails.
--- drivers/iommu/amd/iommu.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)
drivers/iommu/amd/iommu.c +2 -11
@@ -413,13 +413,8 @@ static void iommu_ignore_device(struct device *dev)static void amd_iommu_uninit_device (struct device *dev) {struct iommu_dev_data *dev_data; -int devid; - - devid =get_device_id (dev); -if (devid <0 ) -return ; - dev_data =search_dev_data (devid); + dev_data =dev_iommu_priv_get (dev);if (!dev_data)return ;
@@ -2173,16 +2168,12 @@ static void amd_iommu_probe_finalize(struct device *dev)static void amd_iommu_release_device (struct device *dev) { +int devid =get_device_id (dev);struct amd_iommu *iommu; -int devid;if (!check_device (dev))return ; - devid =get_device_id (dev); -if (devid <0 ) -return ; - iommu = amd_iommu_rlookup_table[devid];amd_iommu_uninit_device (dev);
Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Joerg,
Quoted 40 lines · Joerg Roedel
Hi,
here is a collection of patches that clean up a few things in the AMD IOMMU driver. Foremost, it moves all related files of the driver into a separate subdirectory.
But the patches also remove usage of
dev->archdata.iommuand clean updev_datahandling and domain allocation.Patches are runtime-tested, including device-assignment.
Please review.
Regards,
Joerg
Joerg Roedel (10):
iommu/amd: Move AMD IOMMU driver to a subdirectory iommu/amd: Unexportget_dev_data()
iommu/amd: Letfree_pagetable()not rely ondomain->pt_rootiommu/amd: Allocate page-table inprotection_domain_init()iommu/amd: Free page-table inprotection_domain_free()iommu/amd: Consolidate domain allocation/freeing iommu/amd: RemovePD_DMA_OPS_MASK
iommu/amd: Merge private header files
iommu/amd: Storedev_dataas device iommu private data iommu/amd: Remove redundant devid checksMAINTAINERS | 2 +- drivers/iommu/Makefile | 6 +- .../{amd_iommu_proto.h => amd/amd_iommu.h} | 20 +- drivers/iommu/{ => amd}/amd_iommu_types.h | 0 .../{amd_iommu_debugfs.c => amd/debugfs.c} | 5 +- .../iommu/{amd_iommu_init.c => amd/init.c} | 6 +- drivers/iommu/{amd_iommu.c => amd/iommu.c} | 265 ++++++------------ .../iommu/{amd_iommu_v2.c => amd/iommu_v2.c} | 14 +- .../{amd_iommu_quirks.c => amd/quirks.c} | 0 drivers/iommu/amd_iommu.h | 14 - 10 files changed, 117 insertions(+), 215 deletions(-)
Quoted 9 lines
rename
drivers/iommu/{amd_iommu_proto.h=>amd/amd_iommu.h} (88%) renamedrivers/iommu/{=>amd}/amd_iommu_types.h(100%) renamedrivers/iommu/{amd_iommu_debugfs.c=>amd/debugfs.c} (89%) renamedrivers/iommu/{amd_iommu_init.c=>amd/init.c} (99%) renamedrivers/iommu/{amd_iommu.c=>amd/iommu.c} (95%) renamedrivers/iommu/{amd_iommu_v2.c=>amd/iommu_v2.c} (98%) renamedrivers/iommu/{amd_iommu_quirks.c=>amd/quirks.c} (100%) delete mode 100644drivers/iommu/amd_iommu.h
Thank you for cleaning up.
Joerg Roedel
maintainerQuoted 3 lines · Suravee Suthikulpanit
Thank you for cleaning up.
Reviewed-by Suravee Suthikulpanit <[email protected]>
Thanks for you review, Suravee. Patches are now applied.