From: Tom Murphy via iommu <iommu@lists.linux-foundation.org>
To: iommu@lists.linux-foundation.org
Cc: Heiko Stuebner <heiko@sntech.de>,
kvm@vger.kernel.org, Will Deacon <will.deacon@arm.com>,
David Brown <david.brown@linaro.org>,
Thierry Reding <thierry.reding@gmail.com>,
linux-s390@vger.kernel.org, linux-samsung-soc@vger.kernel.org,
Krzysztof Kozlowski <krzk@kernel.org>,
Jonathan Hunter <jonathanh@nvidia.com>,
linux-rockchip@lists.infradead.org, Kukjin Kim <kgene@kernel.org>,
Gerald Schaefer <gerald.schaefer@de.ibm.com>,
Andy Gross <andy.gross@linaro.org>,
linux-tegra@vger.kernel.org, Marc Zyngier <marc.zyngier@arm.com>,
linux-arm-msm@vger.kernel.org,
Alex Williamson <alex.williamson@redhat.com>,
linux-mediatek@lists.infradead.org,
Matthias Brugger <matthias.bgg@gmail.com>,
Thomas Gleixner <tglx@linutronix.de>,
linux-arm-kernel@lists.infradead.org,
Tom Murphy <tmurphy@arista.com>,
Robin Murphy <robin.murphy@arm.com>,
linux-kernel@vger.kernel.org, murphyt7@tcd.ie,
David Woodhouse <dwmw2@infradead.org>
Subject: [RFC 7/7] iommu/vt-d: Always set DMA_PTE_READ if the iommu doens't support zero length reads
Date: Sat, 4 May 2019 14:23:23 +0100 [thread overview]
Message-ID: <20190504132327.27041-8-tmurphy@arista.com> (raw)
In-Reply-To: <20190504132327.27041-1-tmurphy@arista.com>
To match the dma-ops api path the DMA_PTE_READ should be set if ZLR
isn't supported in the iommu
Signed-off-by: Tom Murphy <tmurphy@arista.com>
---
drivers/iommu/intel-iommu.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 980fc4816d72..e78b0000056d 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -4378,6 +4378,17 @@ static void intel_iommu_detach_device(struct iommu_domain *domain,
dmar_remove_one_dev_info(dev);
}
+static bool supports_zlr(struct dmar_domain *domain)
+{
+ int i;
+
+ for_each_domain_iommu(i, domain) {
+ if (cap_zlr(g_iommus[i]->cap))
+ return true;
+ }
+ return false;
+}
+
static int intel_iommu_map(struct iommu_domain *domain,
unsigned long iova, phys_addr_t hpa,
size_t size, int iommu_prot)
@@ -4391,7 +4402,7 @@ static int intel_iommu_map(struct iommu_domain *domain,
if (dmar_domain == si_domain && hw_pass_through)
return 0;
- if (iommu_prot & IOMMU_READ)
+ if (iommu_prot & IOMMU_READ || !supports_zlr(dmar_domain))
prot |= DMA_PTE_READ;
if (iommu_prot & IOMMU_WRITE)
prot |= DMA_PTE_WRITE;
--
2.17.1
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
prev parent reply other threads:[~2019-05-04 13:26 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-04 13:23 [RFC 0/7] Convert the Intel iommu driver to the dma-ops api Tom Murphy via iommu
2019-05-04 13:23 ` [RFC 1/7] iommu/vt-d: Set the dma_ops per device so we can remove the iommu_no_mapping code Tom Murphy via iommu
2019-05-06 1:42 ` Lu Baolu
2019-05-06 15:27 ` Tom Murphy via iommu
2019-05-04 13:23 ` [RFC 2/7] iommu/vt-d: Remove iova handling code from non-dma ops path Tom Murphy via iommu
2019-05-05 1:19 ` Lu Baolu
2019-05-05 1:22 ` Lu Baolu
2019-05-04 13:23 ` [RFC 3/7] iommu: improve iommu iotlb flushing Tom Murphy via iommu
2019-05-04 13:23 ` [RFC 4/7] iommu/dma-iommu: Handle freelists in the dma-iommu api path Tom Murphy via iommu
2019-05-04 13:23 ` [RFC 5/7] iommu/dma-iommu: add wrapper for iommu_dma_free_cpu_cached_iovas Tom Murphy via iommu
2019-05-04 13:23 ` [RFC 6/7] iommu/vt-d: convert the intel iommu driver to the dma-iommu ops api Tom Murphy via iommu
2019-05-05 2:37 ` Lu Baolu
2019-05-05 17:03 ` Tom Murphy via iommu
2019-05-06 1:34 ` Lu Baolu
2019-05-04 13:23 ` Tom Murphy via iommu [this message]
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=20190504132327.27041-8-tmurphy@arista.com \
--to=iommu@lists.linux-foundation.org \
--cc=alex.williamson@redhat.com \
--cc=andy.gross@linaro.org \
--cc=david.brown@linaro.org \
--cc=dwmw2@infradead.org \
--cc=gerald.schaefer@de.ibm.com \
--cc=heiko@sntech.de \
--cc=jonathanh@nvidia.com \
--cc=kgene@kernel.org \
--cc=krzk@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=matthias.bgg@gmail.com \
--cc=murphyt7@tcd.ie \
--cc=robin.murphy@arm.com \
--cc=tglx@linutronix.de \
--cc=thierry.reding@gmail.com \
--cc=tmurphy@arista.com \
--cc=will.deacon@arm.com \
/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