From: John Garry <john.garry@huawei.com>
To: <joro@8bytes.org>, <will@kernel.org>, <robin.murphy@arm.com>,
<baolu.lu@linux.intel.com>
Cc: linux-kernel@vger.kernel.org, sakari.ailus@linux.intel.com,
mst@redhat.com, airlied@linux.ie, gregkh@linuxfoundation.org,
jasowang@redhat.com, linuxarm@huawei.com, jonathanh@nvidia.com,
iommu@lists.linux-foundation.org, thierry.reding@gmail.com,
daniel@ffwll.ch, bingbu.cao@intel.com, digetx@gmail.com,
mchehab@kernel.org, tian.shu.qiu@intel.com
Subject: [PATCH v4 6/6] dma-iommu: Pass iova len for IOVA domain init
Date: Wed, 14 Jul 2021 18:36:43 +0800 [thread overview]
Message-ID: <1626259003-201303-7-git-send-email-john.garry@huawei.com> (raw)
In-Reply-To: <1626259003-201303-1-git-send-email-john.garry@huawei.com>
Pass the max opt iova len to init the IOVA domain, if set.
Signed-off-by: John Garry <john.garry@huawei.com>
---
drivers/iommu/dma-iommu.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c
index b540b586fe37..eee9f5f87935 100644
--- a/drivers/iommu/dma-iommu.c
+++ b/drivers/iommu/dma-iommu.c
@@ -335,6 +335,8 @@ static int iommu_dma_init_domain(struct iommu_domain *domain, dma_addr_t base,
struct iommu_dma_cookie *cookie = domain->iova_cookie;
unsigned long order, base_pfn;
struct iova_domain *iovad;
+ size_t max_opt_dma_size;
+ unsigned long iova_len = 0;
if (!cookie || cookie->type != IOMMU_DMA_IOVA_COOKIE)
return -EINVAL;
@@ -368,7 +370,16 @@ static int iommu_dma_init_domain(struct iommu_domain *domain, dma_addr_t base,
return 0;
}
- init_iova_domain(iovad, 1UL << order, base_pfn, 0);
+
+ max_opt_dma_size = iommu_group_get_max_opt_dma_size(dev->iommu_group);
+ if (max_opt_dma_size) {
+ unsigned long shift = __ffs(1UL << order);
+
+ iova_len = max_opt_dma_size >> shift;
+ iova_len = roundup_pow_of_two(iova_len);
+ }
+
+ init_iova_domain(iovad, 1UL << order, base_pfn, iova_len);
if (!cookie->fq_domain && (!dev || !dev_is_untrusted(dev)) &&
domain->ops->flush_iotlb_all && !iommu_get_dma_strict(domain)) {
--
2.26.2
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2021-07-14 10:42 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-14 10:36 [PATCH v4 0/6] iommu: Allow IOVA rcache range be configured John Garry
2021-07-14 10:36 ` [PATCH v4 1/6] iommu: Refactor iommu_group_store_type() John Garry
2021-08-02 14:46 ` Will Deacon
2021-07-14 10:36 ` [PATCH v4 2/6] iova: Allow rcache range upper limit to be flexible John Garry
2021-08-02 15:01 ` Will Deacon
2021-08-02 15:23 ` John Garry
2021-08-02 16:09 ` Robin Murphy
2021-07-14 10:36 ` [PATCH v4 3/6] iommu: Allow iommu_change_dev_def_domain() realloc default domain for same type John Garry
2021-07-14 10:36 ` [PATCH v4 4/6] iommu: Allow max opt DMA len be set for a group via sysfs John Garry
2021-07-14 10:36 ` [PATCH v4 5/6] iova: Add iova_len argument to init_iova_domain() John Garry
2021-08-02 15:06 ` Will Deacon
2021-08-02 16:06 ` John Garry
2021-08-02 16:16 ` Robin Murphy
2021-08-02 16:40 ` John Garry
2021-08-02 17:18 ` John Garry
2021-09-21 8:48 ` John Garry
2021-07-14 10:36 ` John Garry [this message]
2021-07-19 7:58 ` [PATCH v4 6/6] dma-iommu: Pass iova len for IOVA domain init Dan Carpenter
2021-07-19 9:12 ` John Garry
2021-07-19 9:32 ` Robin Murphy
2021-07-19 10:45 ` John Garry
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=1626259003-201303-7-git-send-email-john.garry@huawei.com \
--to=john.garry@huawei.com \
--cc=airlied@linux.ie \
--cc=baolu.lu@linux.intel.com \
--cc=bingbu.cao@intel.com \
--cc=daniel@ffwll.ch \
--cc=digetx@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=iommu@lists.linux-foundation.org \
--cc=jasowang@redhat.com \
--cc=jonathanh@nvidia.com \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=mchehab@kernel.org \
--cc=mst@redhat.com \
--cc=robin.murphy@arm.com \
--cc=sakari.ailus@linux.intel.com \
--cc=thierry.reding@gmail.com \
--cc=tian.shu.qiu@intel.com \
--cc=will@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;
as well as URLs for NNTP newsgroup(s).