iommu/vt-d: Move deferred device attachment into helper function (034d98cc) · Commits · 戴 / test

Move the code that does the deferred device attachment into a separate helper function. Fixes: ("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>

drivers/iommu/intel-iommu.c

+12 −8

Original line number	Diff line number	Diff line
		@@ -2529,9 +2529,8 @@ 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;

		dev->archdata.iommu = NULL;
		@@ -2540,6 +2539,11 @@ static struct dmar_domain deferred_attach_domain(struct device dev)
		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);
		}

Admin message