From: Jonas Karlman <jonas@kwiboo.se>
To: Robin Murphy <robin.murphy@arm.com>,
Joerg Roedel <joro@8bytes.org>, Will Deacon <will@kernel.org>,
Heiko Stuebner <heiko@sntech.de>,
Benjamin Gaignard <benjamin.gaignard@collabora.com>
Cc: iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org,
linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org,
Joerg Roedel <jroedel@suse.de>
Subject: Re: [PATCH v2 1/3] iommu: rockchip: Fix discovery table address encoding
Date: Thu, 15 Jun 2023 21:55:24 +0000 (UTC) [thread overview]
Message-ID: <76bd851f-ce85-4695-2f6c-797019f50ba6@kwiboo.se> (raw)
In-Reply-To: <81ea403e-1279-bb01-9b74-51afd6d8532b@arm.com>
On 2023-06-15 23:24, Robin Murphy wrote:
> On 2023-06-15 21:10, Jonas Karlman wrote:
>> The address to the discovery table is currently encoded using the
>> following bit layout.
>>
>> 31:12 - Address bit 31:0
>> 11: 4 - Address bit 39:32
>>
>> This is also the bit layout used by the vendor kernel.
>>
>> However, testing has shown that addresses to the discovery/page tables
>> and memory pages are all encoded using the same bit layout.
>>
>> IOMMU v1:
>> 31:12 - Address bit 31:0
>>
>> IOMMU v2:
>> 31:12 - Address bit 31:0
>> 11: 8 - Address bit 35:32
>> 7: 4 - Address bit 39:36
>>
>> Change to use the mk_dtentries ops to encode the discovery table address
>
> Nit: s/discovery/directory/g
Oops, will fix in entire series in a v3 :-)
>
>> correctly. Also update the bit layout comment for the page address.
>>
>> These changes render the dte_addr_phys and dma_addr_dte ops unused
>> and will be removed in a following patch.
>
> TBH I'd just squash that into this patch - we don't gain anything from
> leaving dead code in stable kernels, and at worst it just stands to make
> future fixes harder to backport.
Make sense, will squash them in v3.
>
>> Fixes: 227014b33f62 ("iommu: rockchip: Add internal ops to handle variants")
>> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
>> ---
>> v2:
>> - replace currently with correctly in commit message
>>
>> drivers/iommu/rockchip-iommu.c | 8 ++++----
>> 1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
>> index 4054030c3237..d46319f77e5c 100644
>> --- a/drivers/iommu/rockchip-iommu.c
>> +++ b/drivers/iommu/rockchip-iommu.c
>> @@ -278,8 +278,8 @@ static u32 rk_mk_pte(phys_addr_t page, int prot)
>> /*
>> * In v2:
>> * 31:12 - Page address bit 31:0
>> - * 11:9 - Page address bit 34:32
>> - * 8:4 - Page address bit 39:35
>> + * 11: 8 - Page address bit 35:32
>> + * 7: 4 - Page address bit 39:36
>> * 3 - Security
>> * 2 - Writable
>> * 1 - Readable
>> @@ -577,7 +577,7 @@ static void log_iova(struct rk_iommu *iommu, int index, dma_addr_t iova)
>> page_offset = rk_iova_page_offset(iova);
>>
>> mmu_dte_addr = rk_iommu_read(base, RK_MMU_DTE_ADDR);
>> - mmu_dte_addr_phys = rk_ops->dte_addr_phys(mmu_dte_addr);
>> + mmu_dte_addr_phys = rk_ops->pt_address(mmu_dte_addr);
>>
>> dte_addr_phys = mmu_dte_addr_phys + (4 * dte_index);
>> dte_addr = phys_to_virt(dte_addr_phys);
>> @@ -967,7 +967,7 @@ static int rk_iommu_enable(struct rk_iommu *iommu)
>>
>> for (i = 0; i < iommu->num_mmu; i++) {
>> rk_iommu_write(iommu->bases[i], RK_MMU_DTE_ADDR,
>> - rk_ops->dma_addr_dte(rk_domain->dt_dma));
>> + rk_ops->mk_dtentries(rk_domain->dt_dma));
>
> Hmm, this writes the RK_DTE_PT_VALID bit into the register as well -
> does that really make sense?
On v1 bit 11:0 behave as read-only and on v2 bit 3:0 behave read-only.
Writing anything to those bits read back as 0, so was safe to write
RK_DTE_PT_VALID. Should probably mention this in a comment in v3.
Regards,
Jonas
>
> Thanks,
> Robin.
>
>> rk_iommu_base_command(iommu->bases[i], RK_MMU_CMD_ZAP_CACHE);
>> rk_iommu_write(iommu->bases[i], RK_MMU_INT_MASK, RK_MMU_IRQ_MASK);
>> }
next prev parent reply other threads:[~2023-06-15 21:55 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-15 20:10 [PATCH v2 0/3] " Jonas Karlman
2023-06-15 20:10 ` [PATCH v2 1/3] " Jonas Karlman
2023-06-15 21:24 ` Robin Murphy
2023-06-15 21:55 ` Jonas Karlman [this message]
2023-06-15 20:10 ` [PATCH v2 2/3] iommu: rockchip: Remove unused variant ops Jonas Karlman
2023-06-15 20:10 ` [PATCH v2 3/3] iommu: rockchip: Allocate tables from all available memory Jonas Karlman
2023-06-15 21:25 ` Robin Murphy
2023-06-15 22:26 ` Jonas Karlman
2023-06-16 10:58 ` Robin Murphy
2023-06-17 15:30 ` Jonas Karlman
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=76bd851f-ce85-4695-2f6c-797019f50ba6@kwiboo.se \
--to=jonas@kwiboo.se \
--cc=benjamin.gaignard@collabora.com \
--cc=heiko@sntech.de \
--cc=iommu@lists.linux.dev \
--cc=joro@8bytes.org \
--cc=jroedel@suse.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=robin.murphy@arm.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
all inboxes | Powered by JetHome®