From: Shuah Khan <shuah.khan@hp.com>
To: joerg.roedel@amd.com
Cc: iommu@lists.linux-foundation.org,
LKML <linux-kernel@vger.kernel.org>,
Shuah Khan <shuah.khan@hp.com>
Subject: [PATCH RFC] iommu/amd: Fix missing iommu_shutdown initialization in passthrough mode
Date: Wed, 06 Jun 2012 10:50:06 -0600 [thread overview]
Message-ID: <1339001406.2763.49.camel@lorien2> (raw)
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@hp.com>
---
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
next reply other threads:[~2012-06-06 16:50 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-06 16:50 Shuah Khan [this message]
2012-06-07 9:32 ` [PATCH RFC] iommu/amd: Fix missing iommu_shutdown initialization in passthrough mode Joerg Roedel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1339001406.2763.49.camel@lorien2 \
--to=shuah.khan@hp.com \
--cc=iommu@lists.linux-foundation.org \
--cc=joerg.roedel@amd.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox