---

yaml --- r: 158083 b: refs/heads/master c: 21129f7 h: refs/heads/master i: 158081: 693c876 158079: b07a464 v: v3
git-mirror · Sep 3, 2009 · 99fdba1 · 99fdba1
1 parent 69579c2
commit 99fdba1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eba6ac60ba66c6bf6858938442204feaa67dea31
+refs/heads/master: 21129f786f231f7a9dce5b504617b893f50a435f
diff --git a/trunk/arch/x86/kernel/amd_iommu.c b/trunk/arch/x86/kernel/amd_iommu.c
@@ -1141,6 +1141,15 @@ static void __detach_device(struct protection_domain *domain, u16 devid)
 
 	/* ready */
 	spin_unlock(&domain->lock);
+
+	/*
+	 * If we run in passthrough mode the device must be assigned to the
+	 * passthrough domain if it is detached from any other domain
+	 */
+	if (iommu_pass_through) {
+		struct amd_iommu *iommu = amd_iommu_rlookup_table[devid];
+		__attach_device(iommu, pt_domain, devid);
+	}
 }
 
 /*