[PATCH RFC] iommu/amd: Fix missing iommu_shutdown initialization inpassthrough mode

From: Shuah Khan
Date: Wed Jun 06 2012 - 12:50:05 EST


Change AMD iommu driver to call disable iommus in pass-through mode. AMD
iommu driver's amd_iommu_init() routine doesn't initialize iommu_shutdown
in pass-through mode. As a result iommu disable via a call to disable_iommus()
doesn't happen at shutdown. Enable and disable of iommus is inconsistent in
pass-through mode. IOMMU is enabled, but not disabled. IOMMU disable is called
from error legs in amd_iommu_init() in pass-through mode.

Requesting for comments as I don't have access to AMD system that supports
IOMMU. I tested the change on AMD platforms with GART IOMMU which is not
sufficient.

Signed-off-by: Shuah Khan <shuah.khan@xxxxxx>
---
drivers/iommu/amd_iommu_init.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
index c567903..1d8ab7f 100644
--- a/drivers/iommu/amd_iommu_init.c
+++ b/drivers/iommu/amd_iommu_init.c
@@ -1644,6 +1644,8 @@ static int __init amd_iommu_init(void)

amd_iommu_init_api();

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

@@ -1652,8 +1654,6 @@ static int __init amd_iommu_init(void)
else
printk(KERN_INFO "AMD-Vi: Lazy IO/TLB flushing enabled\n");

- x86_platform.iommu_shutdown = disable_iommus;
-
out:
return ret;

--
1.7.9.5



--
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/