From: David Woodhouse <dwmw2-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>
To: iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
Subject: [PATCH 3/4] iommu/vt-d: Honour intel_iommu=sp_off for non-VMM domains
Date: Thu, 20 Mar 2014 12:00:38 +0000 [thread overview]
Message-ID: <1395316838.4880.98.camel@i7.infradead.org> (raw)
In-Reply-To: <1395073392.4588.51.camel-W2I5cNIroUsVm/YvaOjsyQ@public.gmane.org>
[-- Attachment #1.1: Type: text/plain, Size: 804 bytes --]
Signed-off-by: David Woodhouse <David.Woodhouse-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
---
drivers/iommu/intel-iommu.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index f5934fc..c3d4bc9 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -1624,7 +1624,11 @@ static int domain_init(struct dmar_domain *domain, int guest_width)
else
domain->iommu_snooping = 0;
- domain->iommu_superpage = fls(cap_super_page_val(iommu->cap));
+ if (intel_iommu_superpage)
+ domain->iommu_superpage = fls(cap_super_page_val(iommu->cap));
+ else
+ domain->iommu_superpage = 0;
+
domain->nid = iommu->node;
/* always allocate the top pgd */
--
1.8.5.3
--
dwmw2
[-- Attachment #1.2: smime.p7s --]
[-- Type: application/x-pkcs7-signature, Size: 5745 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
next prev parent reply other threads:[~2014-03-20 12:00 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-06 16:57 [RFC PATCH] iommu/vt-d: Clean up and fix page table clear/free behaviour David Woodhouse
[not found] ` <1394125043.9994.13.camel-W2I5cNIroUsVm/YvaOjsyQ@public.gmane.org>
2014-03-17 15:30 ` Alex Williamson
[not found] ` <1395070209.8201.8.camel-85EaTFmN5p//9pzu0YdTqQ@public.gmane.org>
2014-03-17 16:23 ` David Woodhouse
[not found] ` <1395073392.4588.51.camel-W2I5cNIroUsVm/YvaOjsyQ@public.gmane.org>
2014-03-20 12:00 ` [PATCH 1/4] iommu/vt-d: Clean up size handling for intel_iommu_unmap() David Woodhouse
2014-03-20 12:00 ` [PATCH 2/4] iommu/vt-d: Clean up and fix page table clear/free behaviour David Woodhouse
2014-03-20 12:00 ` David Woodhouse [this message]
2014-03-20 12:00 ` [PATCH 4/4] iommu/vt-d: Be less pessimistic about domain coherency where possible David Woodhouse
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=1395316838.4880.98.camel@i7.infradead.org \
--to=dwmw2-wegcikhe2lqwvfeawa7xhq@public.gmane.org \
--cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.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;
as well as URLs for NNTP newsgroup(s).