* [PATCH] iommu/rockchip: Fix PAGE_DESC_HI_MASKs for RK3568
@ 2021-11-24 2:13 Alex Bee
2021-11-24 8:25 ` Benjamin Gaignard
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Alex Bee @ 2021-11-24 2:13 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Heiko Stuebner
Cc: Benjamin Gaignard, iommu, linux-arm-kernel, linux-rockchip,
linux-kernel, 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)
static inline phys_addr_t rk_dte_pt_address_v2(u32 dte)
{
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] iommu/rockchip: Fix PAGE_DESC_HI_MASKs for RK3568
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
2021-11-24 16:34 ` Joerg Roedel
2 siblings, 0 replies; 5+ messages in thread
From: Benjamin Gaignard @ 2021-11-24 8:25 UTC (permalink / raw)
To: Alex Bee, Joerg Roedel, Will Deacon, Heiko Stuebner
Cc: iommu, linux-arm-kernel, linux-rockchip, linux-kernel
Le 24/11/2021 à 03:13, Alex Bee a écrit :
> 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>
Thanks for the fix.
Reviewed-by: Benjamin Gaignard <benjamin.gaignard@collabora.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)
>
> static inline phys_addr_t rk_dte_pt_address_v2(u32 dte)
> {
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] iommu/rockchip: Fix PAGE_DESC_HI_MASKs for RK3568
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
2021-11-24 12:44 ` Peter Geis
2021-11-24 16:34 ` Joerg Roedel
2 siblings, 1 reply; 5+ messages in thread
From: Heiko Stübner @ 2021-11-24 10:35 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Alex Bee
Cc: Benjamin Gaignard, iommu, linux-arm-kernel, linux-rockchip,
linux-kernel, Alex Bee
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>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] iommu/rockchip: Fix PAGE_DESC_HI_MASKs for RK3568
2021-11-24 10:35 ` Heiko Stübner
@ 2021-11-24 12:44 ` Peter Geis
0 siblings, 0 replies; 5+ messages in thread
From: Peter Geis @ 2021-11-24 12:44 UTC (permalink / raw)
To: Heiko Stübner
Cc: Joerg Roedel, Will Deacon, Alex Bee, Benjamin Gaignard, iommu,
arm-mail-list, open list:ARM/Rockchip SoC...,
Linux Kernel Mailing List
On Wed, Nov 24, 2021 at 5:36 AM Heiko Stübner <heiko@sntech.de> wrote:
>
> 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>
>
>
Tested on the quartz64-a board with the experimental vop2 driver,
confirmed it fixed the issue.
Tested-by: Peter Geis <pgwipeout@gmail.com>
>
>
>
> _______________________________________________
> Linux-rockchip mailing list
> Linux-rockchip@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] iommu/rockchip: Fix PAGE_DESC_HI_MASKs for RK3568
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
@ 2021-11-24 16:34 ` Joerg Roedel
2 siblings, 0 replies; 5+ messages in thread
From: Joerg Roedel @ 2021-11-24 16:34 UTC (permalink / raw)
To: Alex Bee
Cc: Will Deacon, Heiko Stuebner, Benjamin Gaignard, iommu,
linux-arm-kernel, linux-rockchip, linux-kernel
On Wed, Nov 24, 2021 at 03:13:25AM +0100, Alex Bee wrote:
> 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>
Applied for v5.16, thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-11-24 16:34 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2021-11-24 12:44 ` Peter Geis
2021-11-24 16:34 ` Joerg Roedel
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).