| From 034d98cc0cdcde2415c6f598fa9125e3eaa02569 Mon Sep 17 00:00:00 2001 |
| From: Joerg Roedel <jroedel@suse.de> |
| Date: Mon, 17 Feb 2020 17:16:19 +0100 |
| Subject: iommu/vt-d: Move deferred device attachment into helper function |
| |
| From: Joerg Roedel <jroedel@suse.de> |
| |
| commit 034d98cc0cdcde2415c6f598fa9125e3eaa02569 upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/iommu/intel-iommu.c | 20 ++++++++++++-------- |
| 1 file changed, 12 insertions(+), 8 deletions(-) |
| |
| --- a/drivers/iommu/intel-iommu.c |
| +++ b/drivers/iommu/intel-iommu.c |
| @@ -2440,16 +2440,20 @@ static struct dmar_domain *find_domain(s |
| 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); |
| } |
