diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2010-02-03 16:13:41 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-02-23 07:37:56 -0800 |
| commit | 314a4e5441e5402e16c5e810f33a4ed842d0a473 (patch) | |
| tree | 0f7f135694e568d1e33eb60556bcd5df9db00c3b /arch/x86 | |
| parent | 16ecf8a237415fac700d6c227f763a2be566c92a (diff) | |
x86/amd-iommu: Fix deassignment of a device from the pt_domain
commit d3ad9373b7c29b63d5e8460a69453718d200cc3b upstream.
Deassigning a device from the passthrough domain does not
work and breaks device assignment to kvm guests. This patch
fixes the issue.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/amd_iommu.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c index ff964960e065..23fc9fe1625f 100644 --- a/arch/x86/kernel/amd_iommu.c +++ b/arch/x86/kernel/amd_iommu.c @@ -1230,9 +1230,10 @@ static void __detach_device(struct protection_domain *domain, u16 devid) /* * If we run in passthrough mode the device must be assigned to the - * passthrough domain if it is detached from any other domain + * passthrough domain if it is detached from any other domain. + * Make sure we can deassign from the pt_domain itself. */ - if (iommu_pass_through) { + if (iommu_pass_through && domain != pt_domain) { struct amd_iommu *iommu = amd_iommu_rlookup_table[devid]; __attach_device(iommu, pt_domain, devid); } |