From: Joerg Roedel Date: Tue, 1 Jun 2010 09:41:44 +0000 (+0200) Subject: x86/amd-iommu: Fix suspend/resume with IOMMU X-Git-Tag: firefly_0821_release~10186^2~1521 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=310f7a3525eae4ef4c760a9d458d028775a49645;p=firefly-linux-kernel-4.4.55.git x86/amd-iommu: Fix suspend/resume with IOMMU This is a suspend resume fix for 2.6.32-stable inclusion. The problem with this patch is that it is not upstream because the code changed with 2.6.33 and the function where this bug is in was removed. So this fix does not make sense anymore for anything later than 2.6.32. The patch was tested by multiple partys and is confirmed to fix the broken suspend/resume issue with the 2.6.32 kernel. This patch fixes suspend/resume with AMD IOMMU enabled. Signed-off-by: Joerg Roedel Signed-off-by: Greg Kroah-Hartman --- diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c index c0ebc6351a60..f0fa7a1782d5 100644 --- a/arch/x86/kernel/amd_iommu.c +++ b/arch/x86/kernel/amd_iommu.c @@ -544,7 +544,7 @@ static void flush_devices_by_domain(struct protection_domain *domain) for (i = 0; i <= amd_iommu_last_bdf; ++i) { if ((domain == NULL && amd_iommu_pd_table[i] == NULL) || - (amd_iommu_pd_table[i] != domain)) + (domain != NULL && amd_iommu_pd_table[i] != domain)) continue; iommu = amd_iommu_rlookup_table[i];