iommu/vt-d: Minor cleanups
Subsystems (2)
Lu Baolu
maintainerv2 cover iommu/vt-d: Minor cleanups
Hi folks,
This series include some minor cleanups for the VT-d drivers. No intentional functional impact.
Best regards,
baolu
Change log:
v1: initial post
- https://lore.kernel.org/linux-iommu/[email protected]/
v2:
- Add a new patch to fold dmar_insert_one_dev_info() into its caller.
Lu Baolu (2):
iommu/vt-d: Change return type of dmar_insert_one_dev_info() iommu/vt-d: Fold dmar_insert_one_dev_info() into its caller
drivers/iommu/intel/iommu.c | 111 ++++++++++++++++-------------------- 1 file changed, 49 insertions(+), 62 deletions(-)
Signature · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerPATCH v2 1/2 iommu/vt-d: Change return type of dmar_insert_one_dev_info()
The dmar_insert_one_dev_info() returns the pass-in domain on success and NULL on failure. This doesn't make much sense. Change it to an integer.
--- drivers/iommu/intel/iommu.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-)
drivers/iommu/intel/iommu.c +11 -16
@@ -2474,10 +2474,9 @@ static bool dev_is_real_dma_subdevice(struct device *dev)pci_real_dma_dev (to_pci_dev (dev)) !=to_pci_dev (dev); } -static struct dmar_domain *dmar_insert_one_dev_info (struct intel_iommu *iommu, -int bus,int devfn, -struct device *dev, -struct dmar_domain *domain) +static int dmar_insert_one_dev_info (struct intel_iommu *iommu,int bus, +int devfn,struct device *dev, +struct dmar_domain *domain) {struct device_domain_info *info =dev_iommu_priv_get (dev);unsigned long flags;
@@ -2490,7 +2489,7 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu,spin_unlock (&iommu->lock);if (ret) {spin_unlock_irqrestore (&device_domain_lock, flags); -return NULL ; +return ret; }list_add (&info->link, &domain->devices);spin_unlock_irqrestore (&device_domain_lock, flags);
@@ -2501,7 +2500,7 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu,if (ret) {dev_err (dev,"PASID table allocation failed\n" );dmar_remove_one_dev_info (dev); -return NULL ; +return ret; }/* Setup the PASID entry for requests without PASID: */
@@ -2519,17 +2518,18 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu,if (ret) {dev_err (dev,"Setup RID2PASID failed\n" );dmar_remove_one_dev_info (dev); -return NULL ; +return ret; } } -if (domain_context_mapping (domain, dev)) { + ret =domain_context_mapping (domain, dev); +if (ret) {dev_err (dev,"Domain context map failed\n" );dmar_remove_one_dev_info (dev); -return NULL ; +return ret; } -return domain; +return 0 ; } static int iommu_domain_identity_map(struct dmar_domain *domain,
@@ -2607,7 +2607,6 @@ static int __init si_domain_init(int hw)static int domain_add_dev_info (struct dmar_domain *domain,struct device *dev) { -struct dmar_domain *ndomain;struct intel_iommu *iommu;u8 bus, devfn;
@@ -2615,11 +2614,7 @@ static int domain_add_dev_info(struct dmar_domain *domain, struct device *dev)if (!iommu)return -ENODEV ; - ndomain =dmar_insert_one_dev_info (iommu, bus, devfn, dev, domain); -if (ndomain != domain) -return -EBUSY ; - -return 0 ; +return dmar_insert_one_dev_info (iommu, bus, devfn, dev, domain); }static bool device_has_rmrr (struct device *dev)
Signature · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v2 1/2] iommu/vt-d: Change return type of dmar_insert_one_dev_info()
Looks good:
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerPATCH v2 2/2 iommu/vt-d: Fold dmar_insert_one_dev_info() into its caller
In reply to Lu BaoluFold dmar_insert_one_dev_info() into domain_add_dev_info() which is its only caller.
No intentional functional impact.
--- drivers/iommu/intel/iommu.c | 110 +++++++++++++++++------------------- 1 file changed, 51 insertions(+), 59 deletions(-)
drivers/iommu/intel/iommu.c +51 -59
@@ -2474,64 +2474,6 @@ static bool dev_is_real_dma_subdevice(struct device *dev)pci_real_dma_dev (to_pci_dev (dev)) !=to_pci_dev (dev); } -static int dmar_insert_one_dev_info (struct intel_iommu *iommu,int bus, -int devfn,struct device *dev, -struct dmar_domain *domain) -{ -struct device_domain_info *info =dev_iommu_priv_get (dev); -unsigned long flags; -int ret; - -spin_lock_irqsave (&device_domain_lock, flags); - info->domain = domain; -spin_lock (&iommu->lock); - ret =domain_attach_iommu (domain, iommu); -spin_unlock (&iommu->lock); -if (ret) { -spin_unlock_irqrestore (&device_domain_lock, flags); -return ret; - } -list_add (&info->link, &domain->devices); -spin_unlock_irqrestore (&device_domain_lock, flags); - -/* PASID table is mandatory for a PCI device in scalable mode. */ -if (sm_supported (iommu) && !dev_is_real_dma_subdevice (dev)) { - ret =intel_pasid_alloc_table (dev); -if (ret) { -dev_err (dev,"PASID table allocation failed\n" ); -dmar_remove_one_dev_info (dev); -return ret; - } - -/* Setup the PASID entry for requests without PASID: */ -spin_lock_irqsave (&iommu->lock, flags); -if (hw_pass_through &&domain_type_is_si (domain)) - ret =intel_pasid_setup_pass_through (iommu, domain, - dev,PASID_RID2PASID ); -else if (domain_use_first_level (domain)) - ret =domain_setup_first_level (iommu, domain, dev, -PASID_RID2PASID ); -else - ret =intel_pasid_setup_second_level (iommu, domain, - dev,PASID_RID2PASID ); -spin_unlock_irqrestore (&iommu->lock, flags); -if (ret) { -dev_err (dev,"Setup RID2PASID failed\n" ); -dmar_remove_one_dev_info (dev); -return ret; - } - } - - ret =domain_context_mapping (domain, dev); -if (ret) { -dev_err (dev,"Domain context map failed\n" ); -dmar_remove_one_dev_info (dev); -return ret; - } - -return 0 ; -} -static int iommu_domain_identity_map (struct dmar_domain *domain,unsigned long first_vpfn,unsigned long last_vpfn)
@@ -2607,14 +2549,64 @@ static int __init si_domain_init(int hw)static int domain_add_dev_info (struct dmar_domain *domain,struct device *dev) { +struct device_domain_info *info =dev_iommu_priv_get (dev);struct intel_iommu *iommu; +unsigned long flags;u8 bus, devfn; +int ret; iommu =device_to_iommu (dev, &bus, &devfn);if (!iommu)return -ENODEV ; -return dmar_insert_one_dev_info (iommu, bus, devfn, dev, domain); +spin_lock_irqsave (&device_domain_lock, flags); + info->domain = domain; +spin_lock (&iommu->lock); + ret =domain_attach_iommu (domain, iommu); +spin_unlock (&iommu->lock); +if (ret) { +spin_unlock_irqrestore (&device_domain_lock, flags); +return ret; + } +list_add (&info->link, &domain->devices); +spin_unlock_irqrestore (&device_domain_lock, flags); + +/* PASID table is mandatory for a PCI device in scalable mode. */ +if (sm_supported (iommu) && !dev_is_real_dma_subdevice (dev)) { + ret =intel_pasid_alloc_table (dev); +if (ret) { +dev_err (dev,"PASID table allocation failed\n" ); +dmar_remove_one_dev_info (dev); +return ret; + } + +/* Setup the PASID entry for requests without PASID: */ +spin_lock_irqsave (&iommu->lock, flags); +if (hw_pass_through &&domain_type_is_si (domain)) + ret =intel_pasid_setup_pass_through (iommu, domain, + dev,PASID_RID2PASID ); +else if (domain_use_first_level (domain)) + ret =domain_setup_first_level (iommu, domain, dev, +PASID_RID2PASID ); +else + ret =intel_pasid_setup_second_level (iommu, domain, + dev,PASID_RID2PASID ); +spin_unlock_irqrestore (&iommu->lock, flags); +if (ret) { +dev_err (dev,"Setup RID2PASID failed\n" ); +dmar_remove_one_dev_info (dev); +return ret; + } + } + + ret =domain_context_mapping (domain, dev); +if (ret) { +dev_err (dev,"Domain context map failed\n" ); +dmar_remove_one_dev_info (dev); +return ret; + } + +return 0 ; }static bool device_has_rmrr (struct device *dev)
Signature · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v2 2/2] iommu/vt-d: Fold dmar_insert_one_dev_info() into its caller
Looks good:
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu