UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

iommu/vt-d: Move deferred device attachment into helper function 

Move the code that does the deferred device attachment into a separate
helper function.

Fixes: 1ee0186b9a ("iommu/vt-d: Refactor find_domain() helper")
Cc: stable@vger.kernel.org # v5.5
Reviewed-by: Jerry Snitselaar <jsnitsel@redhat.com>
Acked-by: Lu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Joerg Roedel 2020-02-17 17:16:19 +01:00
parent 1d4615978f
commit 034d98cc0c
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/iommu/intel-iommu.c
View File

@ -2529,16 +2529,20 @@ struct dmar_domain *find_domain(struct device *dev)
return NULL; return NULL;
} }
static void do_deferred_attach(struct device *dev)
{
struct iommu_domain *domain;
dev->archdata.iommu = NULL;
domain = iommu_get_domain_for_dev(dev);
if (domain)
intel_iommu_attach_device(domain, dev);
}
static struct dmar_domain *deferred_attach_domain(struct device *dev) static struct dmar_domain *deferred_attach_domain(struct device *dev)
{ {
if (unlikely(attach_deferred(dev))) { if (unlikely(attach_deferred(dev)))
struct iommu_domain *domain; do_deferred_attach(dev);
dev->archdata.iommu = NULL;
domain = iommu_get_domain_for_dev(dev);
if (domain)
intel_iommu_attach_device(domain, dev);
}
return find_domain(dev); return find_domain(dev);
} }