diff options
| author |   Joerg Roedel <jroedel@suse.de> | 2020-02-17 17:16:19 +0100 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2020-02-18 17:21:51 +0100 |
| commit | 034d98cc0cdcde2415c6f598fa9125e3eaa02569 (patch) | |
| tree | 4121e19bedab115b60585bc606170d065c8c6060 /drivers/iommu | |
| parent | iommu/vt-d: Add attach_deferred() helper (diff) | |
| download | linux-dev-034d98cc0cdcde2415c6f598fa9125e3eaa02569.tar.xz linux-dev-034d98cc0cdcde2415c6f598fa9125e3eaa02569.zip | |
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: 1ee0186b9a12 ("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>
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/intel-iommu.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index 80f2332a5466..42cdcce1602e 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -2529,16 +2529,20 @@ struct dmar_domain *find_domain(struct device *dev) return NULL; } -static struct dmar_domain *deferred_attach_domain(struct device *dev) +static void do_deferred_attach(struct device *dev) { - if (unlikely(attach_deferred(dev))) { - struct iommu_domain *domain; + struct iommu_domain *domain; - dev->archdata.iommu = NULL; - domain = iommu_get_domain_for_dev(dev); - if (domain) - intel_iommu_attach_device(domain, dev); - } + 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) +{ + if (unlikely(attach_deferred(dev))) + do_deferred_attach(dev); return find_domain(dev); } |