[ 024/108] iommu/amd: Fix missing iommu_shutdown initialization in passthroughmode

From: Ben Hutchings
Date: Sun Jul 22 2012 - 21:47:43 EST

3.2-stable review patch. If anyone has any objections, please let me know.


From: Shuah Khan <shuah.khan@xxxxxx>

commit f2f12b6fc032c7b1419fd6db84e2868b5f05a878 upstream.

The iommu_shutdown callback is not initialized when the AMD
IOMMU driver runs in passthrough mode. Fix that by moving
the callback initialization before the check for
passthrough mode.

Signed-off-by: Shuah Khan <shuah.khan@xxxxxx>
Signed-off-by: Joerg Roedel <joerg.roedel@xxxxxxx>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
index 542024b..c04ddca 100644
--- a/drivers/iommu/amd_iommu_init.c
+++ b/drivers/iommu/amd_iommu_init.c
@@ -1641,6 +1641,8 @@ static int __init amd_iommu_init(void)


+ x86_platform.iommu_shutdown = disable_iommus;
if (iommu_pass_through)
goto out;

@@ -1649,7 +1651,6 @@ static int __init amd_iommu_init(void)
printk(KERN_INFO "AMD-Vi: Lazy IO/TLB flushing enabled\n");

- x86_platform.iommu_shutdown = disable_iommus;
return ret;

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/