From: "Heiko Stübner" <heiko@sntech.de>
To: iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org,
linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org,
Michael Riesch <michael.riesch@wolfvision.net>
Cc: Joerg Roedel <joro@8bytes.org>, Will Deacon <will@kernel.org>,
Robin Murphy <robin.murphy@arm.com>,
Benjamin Gaignard <benjamin.gaignard@collabora.com>,
Simon Xue <xxm@rock-chips.com>,
Michael Riesch <michael.riesch@wolfvision.net>
Subject: Re: [PATCH] iommu/rockchip: fix permission bits in page table entries v2
Date: Thu, 03 Nov 2022 15:52:04 +0100 [thread overview]
Message-ID: <4780234.31r3eYUQgx@diego> (raw)
In-Reply-To: <20221102063553.2464161-1-michael.riesch@wolfvision.net>
Am Mittwoch, 2. November 2022, 07:35:53 CET schrieb Michael Riesch:
> As pointed out in the corresponding downstream fix [0], the permission bits
> of the page table entries are compatible between v1 and v2 of the IOMMU.
> This is in contrast to the current mainline code that incorrectly assumes
> that the read and write permission bits are switched. Fix the permission
> bits by reusing the v1 bit defines.
>
> [0] https://github.com/rockchip-linux/kernel/commit/e3bc123a2260145e34b57454da3db0edd117eb8e
>
> Fixes: c55356c534aa ("iommu: rockchip: Add support for iommu v2")
> Signed-off-by: Michael Riesch <michael.riesch@wolfvision.net>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
> ---
> drivers/iommu/rockchip-iommu.c | 10 ++++------
> 1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
> index a3fc59b814ab..a68eadd64f38 100644
> --- a/drivers/iommu/rockchip-iommu.c
> +++ b/drivers/iommu/rockchip-iommu.c
> @@ -280,19 +280,17 @@ static u32 rk_mk_pte(phys_addr_t page, int prot)
> * 11:9 - Page address bit 34:32
> * 8:4 - Page address bit 39:35
> * 3 - Security
> - * 2 - Readable
> - * 1 - Writable
> + * 2 - Writable
> + * 1 - Readable
> * 0 - 1 if Page @ Page address is valid
> */
> -#define RK_PTE_PAGE_READABLE_V2 BIT(2)
> -#define RK_PTE_PAGE_WRITABLE_V2 BIT(1)
>
> static u32 rk_mk_pte_v2(phys_addr_t page, int prot)
> {
> u32 flags = 0;
>
> - flags |= (prot & IOMMU_READ) ? RK_PTE_PAGE_READABLE_V2 : 0;
> - flags |= (prot & IOMMU_WRITE) ? RK_PTE_PAGE_WRITABLE_V2 : 0;
> + flags |= (prot & IOMMU_READ) ? RK_PTE_PAGE_READABLE : 0;
> + flags |= (prot & IOMMU_WRITE) ? RK_PTE_PAGE_WRITABLE : 0;
>
> return rk_mk_dte_v2(page) | flags;
> }
>
_______________________________________________
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:[~2022-11-03 14:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-02 6:35 [PATCH] iommu/rockchip: fix permission bits in page table entries v2 Michael Riesch
2022-11-03 14:52 ` Heiko Stübner [this message]
2022-11-03 14:59 ` Joerg Roedel
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=4780234.31r3eYUQgx@diego \
--to=heiko@sntech.de \
--cc=benjamin.gaignard@collabora.com \
--cc=iommu@lists.linux.dev \
--cc=joro@8bytes.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=michael.riesch@wolfvision.net \
--cc=robin.murphy@arm.com \
--cc=will@kernel.org \
--cc=xxm@rock-chips.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).