Skip to content

Commit ff7ccaa

Browse files
bbaa-bbaagregkh
authored andcommitted
iommu/vt-d: Fix misplaced domain_attached assignment
Commit fb5873b ("iommu/vt-d: Restore context entry setup order for aliased devices") was incorrectly backported: the domain_attached assignment was mistakenly placed in device_set_dirty_tracking() instead of original identity_domain_attach_dev(). Fix this by moving the assignment to the correct function as in the original commit. Fixes: fb5873b ("iommu/vt-d: Restore context entry setup order for aliased devices") Closes: https://lore.kernel.org/linux-iommu/[email protected]/ Cc: [email protected] Reported-by: Ban ZuoXiang <[email protected]> Signed-off-by: Ban ZuoXiang <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent e82d882 commit ff7ccaa

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/iommu/intel/iommu.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4414,9 +4414,6 @@ static int device_set_dirty_tracking(struct list_head *devices, bool enable)
44144414
break;
44154415
}
44164416

4417-
if (!ret)
4418-
info->domain_attached = true;
4419-
44204417
return ret;
44214418
}
44224419

@@ -4600,6 +4597,9 @@ static int identity_domain_attach_dev(struct iommu_domain *domain, struct device
46004597
ret = device_setup_pass_through(dev);
46014598
}
46024599

4600+
if (!ret)
4601+
info->domain_attached = true;
4602+
46034603
return ret;
46044604
}
46054605

0 commit comments

Comments
 (0)