From: Will Deacon <will@kernel.org>
To: "Isaac J. Manjarres" <isaacm@codeaurora.org>
Cc: iommu@lists.linux-foundation.org,
linux-arm-kernel@lists.infradead.org, robin.murphy@arm.com,
pratikp@codeaurora.org, baolu.lu@linux.intel.com
Subject: Re: [RFC PATCH v3 06/12] iommu: Split 'addr_merge' argument to iommu_pgsize() into separate parts
Date: Tue, 6 Apr 2021 12:53:56 +0100 [thread overview]
Message-ID: <20210406115355.GC13747@willie-the-truck> (raw)
In-Reply-To: <20210405191112.28192-7-isaacm@codeaurora.org>
On Mon, Apr 05, 2021 at 12:11:06PM -0700, Isaac J. Manjarres wrote:
> From: Will Deacon <will@kernel.org>
>
> The 'addr_merge' parameter to iommu_pgsize() is a fabricated address
> intended to describe the alignment requirements to consider when
> choosing an appropriate page size. On the iommu_map() path, this address
> is the logical OR of the virtual and physical addresses.
>
> Subsequent improvements to iommu_pgsize() will need to check the
> alignment of the virtual and physical components of 'addr_merge'
> independently, so pass them in as separate parameters and reconstruct
> 'addr_merge' locally.
>
> No functional change.
>
> Signed-off-by: Will Deacon <will@kernel.org>
> Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>
> ---
> drivers/iommu/iommu.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
> index 9006397b6604..a3bbf7e310b0 100644
> --- a/drivers/iommu/iommu.c
> +++ b/drivers/iommu/iommu.c
> @@ -2357,12 +2357,13 @@ phys_addr_t iommu_iova_to_phys(struct iommu_domain *domain, dma_addr_t iova)
> }
> EXPORT_SYMBOL_GPL(iommu_iova_to_phys);
>
> -static size_t iommu_pgsize(struct iommu_domain *domain,
> - unsigned long addr_merge, size_t size)
> +static size_t iommu_pgsize(struct iommu_domain *domain, unsigned long iova,
> + phys_addr_t paddr, size_t size)
> {
> unsigned int pgsize_idx;
> unsigned long pgsizes;
> size_t pgsize;
> + phys_addr_t addr_merge = paddr | iova;
Huh, so this was 'unsigned long' before and, given that the pgsize_bitmap
on the domain is also unsigned long, then I think that's fine. So using
that would mean you don't need GENMASK_ULL for this guy either.
Will
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-04-06 11:58 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20210405191112.28192-1-isaacm@codeaurora.org>
[not found] ` <20210405191112.28192-3-isaacm@codeaurora.org>
2021-04-06 1:48 ` [RFC PATCH v3 02/12] iommu: Add an unmap_pages() op for IOMMU drivers Lu Baolu
[not found] ` <20210405191112.28192-6-isaacm@codeaurora.org>
2021-04-06 11:50 ` [RFC PATCH v3 05/12] iommu: Use bitmap to calculate page size in iommu_pgsize() Will Deacon
[not found] ` <20210405191112.28192-7-isaacm@codeaurora.org>
2021-04-06 11:53 ` Will Deacon [this message]
[not found] ` <20210405191112.28192-4-isaacm@codeaurora.org>
2021-04-06 11:57 ` [RFC PATCH v3 03/12] iommu/io-pgtable: Introduce map_pages() as a page table op Will Deacon
[not found] ` <75a5d309498b8b41b5e24a2d9d36e78f@codeaurora.org>
2021-04-07 9:54 ` Will Deacon
[not found] ` <20210405191112.28192-5-isaacm@codeaurora.org>
2021-04-06 1:49 ` [RFC PATCH v3 04/12] iommu: Add a map_pages() op for IOMMU drivers Lu Baolu
2021-04-06 11:58 ` Will Deacon
[not found] ` <20210405191112.28192-10-isaacm@codeaurora.org>
2021-04-06 12:15 ` [RFC PATCH v3 09/12] iommu/io-pgtable-arm: Implement arm_lpae_unmap_pages() Will Deacon
[not found] ` <8f78f5d051c9d40981fc6868c9245cd3@codeaurora.org>
2021-04-07 9:57 ` Will Deacon
[not found] ` <20210405191112.28192-12-isaacm@codeaurora.org>
2021-04-06 12:19 ` [RFC PATCH v3 11/12] iommu/arm-smmu: Implement the unmap_pages() IOMMU driver callback Will Deacon
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=20210406115355.GC13747@willie-the-truck \
--to=will@kernel.org \
--cc=baolu.lu@linux.intel.com \
--cc=iommu@lists.linux-foundation.org \
--cc=isaacm@codeaurora.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=pratikp@codeaurora.org \
--cc=robin.murphy@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;
as well as URLs for NNTP newsgroup(s).