[PATCH] soc: renesas: r8a774c0-sysc: Fix initialization order of 3DG-{A,B}

[PATCH] soc: renesas: r8a774c0-sysc: Fix initialization order of 3DG-{A,B}

[Biju Das]

The workaround for the wrong hierarchy of the 3DG-{A,B} power domains on
RZ/G2E ES1.0 corrected the parent domains. However, the 3DG-{A,B} power
domains were still initialized and powered in the wrong order, causing
3DG operation to fail.

Fix this by changing the order in the table at runtime, when running on
an affected SoC.

This work is based on the work done by Geert for R-Car E3.

Fixes: f37d211c687588328 ("soc: renesas: rcar-sysc: Add r8a774c0 support")

Signed-off-by: Biju Das <biju.das@bp.renesas.com>
---
 This patch is tested with renesas-dev.
---
 drivers/soc/renesas/r8a774c0-sysc.c | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/drivers/soc/renesas/r8a774c0-sysc.c b/drivers/soc/renesas/r8a774c0-sysc.c
index e1ac4c0..11050e1 100644
--- a/drivers/soc/renesas/r8a774c0-sysc.c
+++ b/drivers/soc/renesas/r8a774c0-sysc.c
@@ -28,19 +28,6 @@ static struct rcar_sysc_area r8a774c0_areas[] __initdata = {
 	{ "3dg-b",	0x100, 1, R8A774C0_PD_3DG_B,	R8A774C0_PD_3DG_A },
 };
 
-static void __init rcar_sysc_fix_parent(struct rcar_sysc_area *areas,
-					unsigned int num_areas, u8 id,
-					int new_parent)
-{
-	unsigned int i;
-
-	for (i = 0; i < num_areas; i++)
-		if (areas[i].isr_bit == id) {
-			areas[i].parent = new_parent;
-			return;
-		}
-}
-
 /* Fixups for RZ/G2E ES1.0 revision */
 static const struct soc_device_attribute r8a774c0[] __initconst = {
 	{ .soc_id = "r8a774c0", .revision = "ES1.0" },
@@ -50,12 +37,10 @@ static const struct soc_device_attribute r8a774c0[] __initconst = {
 static int __init r8a774c0_sysc_init(void)
 {
 	if (soc_device_match(r8a774c0)) {
-		rcar_sysc_fix_parent(r8a774c0_areas,
-				     ARRAY_SIZE(r8a774c0_areas),
-				     R8A774C0_PD_3DG_A, R8A774C0_PD_3DG_B);
-		rcar_sysc_fix_parent(r8a774c0_areas,
-				     ARRAY_SIZE(r8a774c0_areas),
-				     R8A774C0_PD_3DG_B, R8A774C0_PD_ALWAYS_ON);
+		/* Fix incorrect 3DG hierarchy */
+		swap(r8a774c0_areas[6], r8a774c0_areas[7]);
+		r8a774c0_areas[6].parent = R8A774C0_PD_ALWAYS_ON;
+		r8a774c0_areas[7].parent = R8A774C0_PD_3DG_B;
 	}
 
 	return 0;
-- 
2.7.4

Re: [PATCH] soc: renesas: r8a774c0-sysc: Fix initialization order of 3DG-{A,B}

[Simon Horman]

On Wed, Dec 12, 2018 at 12:17:11PM +0000, Biju Das wrote:
> The workaround for the wrong hierarchy of the 3DG-{A,B} power domains on
> RZ/G2E ES1.0 corrected the parent domains. However, the 3DG-{A,B} power
> domains were still initialized and powered in the wrong order, causing
> 3DG operation to fail.
> 
> Fix this by changing the order in the table at runtime, when running on
> an affected SoC.
> 
> This work is based on the work done by Geert for R-Car E3.
> 
> Fixes: f37d211c687588328 ("soc: renesas: rcar-sysc: Add r8a774c0 support")
> 
> Signed-off-by: Biju Das <biju.das@bp.renesas.com>

Thanks,

This looks fine to me but I will wait to see if there are other reviews
before applying.

Reviewed-by: Simon Horman <horms+renesas@verge.net.au>

Re: [PATCH] soc: renesas: r8a774c0-sysc: Fix initialization order of 3DG-{A,B}

[Simon Horman]

On Thu, Dec 13, 2018 at 12:18:46PM +0100, Simon Horman wrote:
> On Wed, Dec 12, 2018 at 12:17:11PM +0000, Biju Das wrote:
> > The workaround for the wrong hierarchy of the 3DG-{A,B} power domains on
> > RZ/G2E ES1.0 corrected the parent domains. However, the 3DG-{A,B} power
> > domains were still initialized and powered in the wrong order, causing
> > 3DG operation to fail.
> > 
> > Fix this by changing the order in the table at runtime, when running on
> > an affected SoC.
> > 
> > This work is based on the work done by Geert for R-Car E3.
> > 
> > Fixes: f37d211c687588328 ("soc: renesas: rcar-sysc: Add r8a774c0 support")
> > 
> > Signed-off-by: Biju Das <biju.das@bp.renesas.com>
> 
> Thanks,
> 
> This looks fine to me but I will wait to see if there are other reviews
> before applying.
> 
> Reviewed-by: Simon Horman <horms+renesas@verge.net.au>

Thanks, v2 sent.

Re: [PATCH] soc: renesas: r8a774c0-sysc: Fix initialization order of 3DG-{A,B}

[Simon Horman]

On Fri, Dec 14, 2018 at 04:59:00PM +0100, Simon Horman wrote:
> On Thu, Dec 13, 2018 at 12:18:46PM +0100, Simon Horman wrote:
> > On Wed, Dec 12, 2018 at 12:17:11PM +0000, Biju Das wrote:
> > > The workaround for the wrong hierarchy of the 3DG-{A,B} power domains on
> > > RZ/G2E ES1.0 corrected the parent domains. However, the 3DG-{A,B} power
> > > domains were still initialized and powered in the wrong order, causing
> > > 3DG operation to fail.
> > > 
> > > Fix this by changing the order in the table at runtime, when running on
> > > an affected SoC.
> > > 
> > > This work is based on the work done by Geert for R-Car E3.
> > > 
> > > Fixes: f37d211c687588328 ("soc: renesas: rcar-sysc: Add r8a774c0 support")
> > > 
> > > Signed-off-by: Biju Das <biju.das@bp.renesas.com>
> > 
> > Thanks,
> > 
> > This looks fine to me but I will wait to see if there are other reviews
> > before applying.
> > 
> > Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
> 
> Thanks, v2 sent.
> 

I don't see a v2 or any other review of this patch.
Am I missing something?

Re: [PATCH] soc: renesas: r8a774c0-sysc: Fix initialization order of 3DG-{A,B}

[Geert Uytterhoeven]

Hi Simon,

On Wed, Jan 2, 2019 at 10:40 AM Simon Horman <horms@verge.net.au> wrote:
> On Fri, Dec 14, 2018 at 04:59:00PM +0100, Simon Horman wrote:
> > On Thu, Dec 13, 2018 at 12:18:46PM +0100, Simon Horman wrote:
> > > On Wed, Dec 12, 2018 at 12:17:11PM +0000, Biju Das wrote:
> > > > The workaround for the wrong hierarchy of the 3DG-{A,B} power domains on
> > > > RZ/G2E ES1.0 corrected the parent domains. However, the 3DG-{A,B} power
> > > > domains were still initialized and powered in the wrong order, causing
> > > > 3DG operation to fail.
> > > >
> > > > Fix this by changing the order in the table at runtime, when running on
> > > > an affected SoC.
> > > >
> > > > This work is based on the work done by Geert for R-Car E3.
> > > >
> > > > Fixes: f37d211c687588328 ("soc: renesas: rcar-sysc: Add r8a774c0 support")
> > > >
> > > > Signed-off-by: Biju Das <biju.das@bp.renesas.com>
> > >
> > > Thanks,
> > >
> > > This looks fine to me but I will wait to see if there are other reviews
> > > before applying.
> > >
> > > Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
> >
> > Thanks, v2 sent.
> >
>
> I don't see a v2 or any other review of this patch.
> Am I missing something?

Presumably the "Thanks, v2 sent." reply (by you!) was a reply meant for
another thread?

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH] soc: renesas: r8a774c0-sysc: Fix initialization order of 3DG-{A,B}

[Geert Uytterhoeven]

On Wed, Dec 12, 2018 at 1:25 PM Biju Das <biju.das@bp.renesas.com> wrote:
> The workaround for the wrong hierarchy of the 3DG-{A,B} power domains on
> RZ/G2E ES1.0 corrected the parent domains. However, the 3DG-{A,B} power
> domains were still initialized and powered in the wrong order, causing
> 3DG operation to fail.
>
> Fix this by changing the order in the table at runtime, when running on
> an affected SoC.
>
> This work is based on the work done by Geert for R-Car E3.
>
> Fixes: f37d211c687588328 ("soc: renesas: rcar-sysc: Add r8a774c0 support")
>
> Signed-off-by: Biju Das <biju.das@bp.renesas.com>

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

RE: [PATCH] soc: renesas: r8a774c0-sysc: Fix initialization order of 3DG-{A,B}

[Biju Das]

Hi Simon,

Thanks for the feedback.

> -----Original Message-----
> From: linux-renesas-soc-owner@vger.kernel.org <linux-renesas-soc-
> owner@vger.kernel.org> On Behalf Of Simon Horman
> Sent: 02 January 2019 09:40
> To: Biju Das <biju.das@bp.renesas.com>
> Cc: Magnus Damm <magnus.damm@gmail.com>; linux-renesas-
> soc@vger.kernel.org; Geert Uytterhoeven <geert+renesas@glider.be>;
> Chris Paterson <Chris.Paterson2@renesas.com>; Fabrizio Castro
> <fabrizio.castro@bp.renesas.com>
> Subject: Re: [PATCH] soc: renesas: r8a774c0-sysc: Fix initialization order of
> 3DG-{A,B}
>
> On Fri, Dec 14, 2018 at 04:59:00PM +0100, Simon Horman wrote:
> > On Thu, Dec 13, 2018 at 12:18:46PM +0100, Simon Horman wrote:
> > > On Wed, Dec 12, 2018 at 12:17:11PM +0000, Biju Das wrote:
> > > > The workaround for the wrong hierarchy of the 3DG-{A,B} power
> > > > domains on RZ/G2E ES1.0 corrected the parent domains. However, the
> > > > 3DG-{A,B} power domains were still initialized and powered in the
> > > > wrong order, causing 3DG operation to fail.
> > > >
> > > > Fix this by changing the order in the table at runtime, when
> > > > running on an affected SoC.
> > > >
> > > > This work is based on the work done by Geert for R-Car E3.
> > > >
> > > > Fixes: f37d211c687588328 ("soc: renesas: rcar-sysc: Add r8a774c0
> > > > support")
> > > >
> > > > Signed-off-by: Biju Das <biju.das@bp.renesas.com>
> > >
> > > Thanks,
> > >
> > > This looks fine to me but I will wait to see if there are other
> > > reviews before applying.
> > >
> > > Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
> >
> > Thanks, v2 sent.
> >
>
> I don't see a v2 or any other review of this patch.
> Am I missing something?

I guess you have sent v2,

https://patchwork.kernel.org/patch/10731381/

based on

https://patchwork.kernel.org/patch/10726065/

regards,
Biju







Renesas Electronics Europe Ltd, Dukes Meadow, Millboard Road, Bourne End, Buckinghamshire, SL8 5FH, UK. Registered in England & Wales under Registered No. 04586709.

Re: [PATCH] soc: renesas: r8a774c0-sysc: Fix initialization order of 3DG-{A,B}

[Simon Horman]

On Wed, Jan 02, 2019 at 11:39:03AM +0100, Geert Uytterhoeven wrote:
> Hi Simon,
> 
> On Wed, Jan 2, 2019 at 10:40 AM Simon Horman <horms@verge.net.au> wrote:
> > On Fri, Dec 14, 2018 at 04:59:00PM +0100, Simon Horman wrote:
> > > On Thu, Dec 13, 2018 at 12:18:46PM +0100, Simon Horman wrote:
> > > > On Wed, Dec 12, 2018 at 12:17:11PM +0000, Biju Das wrote:
> > > > > The workaround for the wrong hierarchy of the 3DG-{A,B} power domains on
> > > > > RZ/G2E ES1.0 corrected the parent domains. However, the 3DG-{A,B} power
> > > > > domains were still initialized and powered in the wrong order, causing
> > > > > 3DG operation to fail.
> > > > >
> > > > > Fix this by changing the order in the table at runtime, when running on
> > > > > an affected SoC.
> > > > >
> > > > > This work is based on the work done by Geert for R-Car E3.
> > > > >
> > > > > Fixes: f37d211c687588328 ("soc: renesas: rcar-sysc: Add r8a774c0 support")
> > > > >
> > > > > Signed-off-by: Biju Das <biju.das@bp.renesas.com>
> > > >
> > > > Thanks,
> > > >
> > > > This looks fine to me but I will wait to see if there are other reviews
> > > > before applying.
> > > >
> > > > Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
> > >
> > > Thanks, v2 sent.
> > >
> >
> > I don't see a v2 or any other review of this patch.
> > Am I missing something?
> 
> Presumably the "Thanks, v2 sent." reply (by you!) was a reply meant for
> another thread?

On Wed, Jan 02, 2019 at 03:11:13PM +0000, Biju Das wrote:
> Hi Simon,
> 
> Thanks for the feedback.

...

> > I don't see a v2 or any other review of this patch.
> > Am I missing something?
> 
> I guess you have sent v2,
> 
> https://patchwork.kernel.org/patch/10731381/
> 
> based on
> 
> https://patchwork.kernel.org/patch/10726065/
> 
> regards,
> Biju


Thanks for clearing up my self-inflicted confusion.

I have gone ahead and applied this patch for v4.22.

Re: [PATCH] soc: renesas: r8a774c0-sysc: Fix initialization order of 3DG-{A,B}

[Geert Uytterhoeven]

Hi Simon,

On Fri, Jan 4, 2019 at 10:04 AM Simon Horman <horms@verge.net.au> wrote:
> On Wed, Jan 02, 2019 at 11:39:03AM +0100, Geert Uytterhoeven wrote:
> > On Wed, Jan 2, 2019 at 10:40 AM Simon Horman <horms@verge.net.au> wrote:
> > > On Fri, Dec 14, 2018 at 04:59:00PM +0100, Simon Horman wrote:
> > > > On Thu, Dec 13, 2018 at 12:18:46PM +0100, Simon Horman wrote:
> > > > > On Wed, Dec 12, 2018 at 12:17:11PM +0000, Biju Das wrote:
> > > > > > The workaround for the wrong hierarchy of the 3DG-{A,B} power domains on
> > > > > > RZ/G2E ES1.0 corrected the parent domains. However, the 3DG-{A,B} power
> > > > > > domains were still initialized and powered in the wrong order, causing
> > > > > > 3DG operation to fail.
> > > > > >
> > > > > > Fix this by changing the order in the table at runtime, when running on
> > > > > > an affected SoC.
> > > > > >
> > > > > > This work is based on the work done by Geert for R-Car E3.
> > > > > >
> > > > > > Fixes: f37d211c687588328 ("soc: renesas: rcar-sysc: Add r8a774c0 support")
> > > > > >
> > > > > > Signed-off-by: Biju Das <biju.das@bp.renesas.com>
> > > > >
> > > > > Thanks,
> > > > >
> > > > > This looks fine to me but I will wait to see if there are other reviews
> > > > > before applying.

> I have gone ahead and applied this patch for v4.22.

Given commit 1585124d9563da64 ("soc: renesas: rcar-sysc: Merge PM Domain
registration and linking") is in v5.0-rc1, this means the rcar-sysc driver
will bail out without this fix, not registering any PM Domains.
Sorry for not realizing this dependency before.

Hence you may want to queue it as a fix for v5.0 instead.
Or not, as we won't have a board DTS for RZ/G2E in v5.0-rc1 anyway?

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH] soc: renesas: r8a774c0-sysc: Fix initialization order of 3DG-{A,B}

[Simon Horman]

On Mon, Jan 07, 2019 at 09:34:02AM +0100, Geert Uytterhoeven wrote:
> Hi Simon,
> 
> On Fri, Jan 4, 2019 at 10:04 AM Simon Horman <horms@verge.net.au> wrote:
> > On Wed, Jan 02, 2019 at 11:39:03AM +0100, Geert Uytterhoeven wrote:
> > > On Wed, Jan 2, 2019 at 10:40 AM Simon Horman <horms@verge.net.au> wrote:
> > > > On Fri, Dec 14, 2018 at 04:59:00PM +0100, Simon Horman wrote:
> > > > > On Thu, Dec 13, 2018 at 12:18:46PM +0100, Simon Horman wrote:
> > > > > > On Wed, Dec 12, 2018 at 12:17:11PM +0000, Biju Das wrote:
> > > > > > > The workaround for the wrong hierarchy of the 3DG-{A,B} power domains on
> > > > > > > RZ/G2E ES1.0 corrected the parent domains. However, the 3DG-{A,B} power
> > > > > > > domains were still initialized and powered in the wrong order, causing
> > > > > > > 3DG operation to fail.
> > > > > > >
> > > > > > > Fix this by changing the order in the table at runtime, when running on
> > > > > > > an affected SoC.
> > > > > > >
> > > > > > > This work is based on the work done by Geert for R-Car E3.
> > > > > > >
> > > > > > > Fixes: f37d211c687588328 ("soc: renesas: rcar-sysc: Add r8a774c0 support")
> > > > > > >
> > > > > > > Signed-off-by: Biju Das <biju.das@bp.renesas.com>
> > > > > >
> > > > > > Thanks,
> > > > > >
> > > > > > This looks fine to me but I will wait to see if there are other reviews
> > > > > > before applying.
> 
> > I have gone ahead and applied this patch for v4.22.
> 
> Given commit 1585124d9563da64 ("soc: renesas: rcar-sysc: Merge PM Domain
> registration and linking") is in v5.0-rc1, this means the rcar-sysc driver
> will bail out without this fix, not registering any PM Domains.
> Sorry for not realizing this dependency before.
> 
> Hence you may want to queue it as a fix for v5.0 instead.
> Or not, as we won't have a board DTS for RZ/G2E in v5.0-rc1 anyway?

Thanks, it seems appropriate for this to be a fix for v5.0.
I've updated my branches accordingly.