From: "Heiko Stübner" <heiko@sntech.de>
To: Joerg Roedel <joro@8bytes.org>, Will Deacon <will@kernel.org>,
Alex Bee <knaerzche@gmail.com>
Cc: Benjamin Gaignard <benjamin.gaignard@collabora.com>,
iommu@lists.linux-foundation.org,
linux-arm-kernel@lists.infradead.org,
linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org,
Alex Bee <knaerzche@gmail.com>
Subject: Re: [PATCH] iommu/rockchip: Fix PAGE_DESC_HI_MASKs for RK3568
Date: Wed, 24 Nov 2021 11:35:43 +0100 [thread overview]
Message-ID: <2895944.ZOkXcVNkQQ@diego> (raw)
In-Reply-To: <20211124021325.858139-1-knaerzche@gmail.com>
Am Mittwoch, 24. November 2021, 03:13:25 CET schrieb Alex Bee:
> With the submission of iommu driver for RK3568 a subtle bug was
> introduced: PAGE_DESC_HI_MASK1 and PAGE_DESC_HI_MASK2 have to be
> the other way arround - that leads to random errors, especially when
> addresses beyond 32 bit are used.
>
> Fix it.
>
> Fixes: c55356c534aa ("iommu: rockchip: Add support for iommu v2")
> Signed-off-by: Alex Bee <knaerzche@gmail.com>
> ---
>
> I've found this bug, when testing the recent VOP2 submission, which is
> the first perpherial which uses iommu for RK356x. I could use it on my
> quartz64 8GB board only, when limiting the available memory to less 4GB.
>
> This patch fixes it.
>
> drivers/iommu/rockchip-iommu.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
> index 5cb260820eda..7f23ad61c094 100644
> --- a/drivers/iommu/rockchip-iommu.c
> +++ b/drivers/iommu/rockchip-iommu.c
> @@ -200,8 +200,8 @@ static inline phys_addr_t rk_dte_pt_address(u32 dte)
> #define DTE_HI_MASK2 GENMASK(7, 4)
> #define DTE_HI_SHIFT1 24 /* shift bit 8 to bit 32 */
> #define DTE_HI_SHIFT2 32 /* shift bit 4 to bit 36 */
> -#define PAGE_DESC_HI_MASK1 GENMASK_ULL(39, 36)
> -#define PAGE_DESC_HI_MASK2 GENMASK_ULL(35, 32)
> +#define PAGE_DESC_HI_MASK1 GENMASK_ULL(35, 32)
> +#define PAGE_DESC_HI_MASK2 GENMASK_ULL(39, 36)
With this change the PAGE_DESC_HI_MASK* now match the other
constants above them in what bits they access, so
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
_______________________________________________
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-11-24 10:37 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-24 2:13 [PATCH] iommu/rockchip: Fix PAGE_DESC_HI_MASKs for RK3568 Alex Bee
2021-11-24 8:25 ` Benjamin Gaignard
2021-11-24 10:35 ` Heiko Stübner [this message]
2021-11-24 12:44 ` Peter Geis
2021-11-24 16:34 ` 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=2895944.ZOkXcVNkQQ@diego \
--to=heiko@sntech.de \
--cc=benjamin.gaignard@collabora.com \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=knaerzche@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--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).