diff mbox series

[v2,5.10.y-cip,15/15] clk: renesas: r9a07g044: Mark IA55_CLK and DMAC_ACLK critical

Message ID 20220110115348.14297-16-prabhakar.mahadev-lad.rj@bp.renesas.com (mailing list archive)
State Accepted
Delegated to: Pavel Machek
Headers show
Series Add ADC/CANFD/IIC support for RZ/G2L | expand

Commit Message

Lad Prabhakar Jan. 10, 2022, 11:53 a.m. UTC 
From: Biju Das <biju.das.jz@bp.renesas.com>

commit 664bb2e45b89cd8213e3c9772713323f75e21892 upstream.

Add IA55_CLK and DMAC_ACLK as critical clocks.

Previously it worked ok, because of a bug in clock status function
and the following patch in this series fixes the original bug.

Fixes: c3e67ad6f5a2 ("dt-bindings: clock: r9a07g044-cpg: Update clock/reset definitions")
Fixes: eb829e549ba6 ("clk: renesas: r9a07g044: Add DMAC clocks/resets")
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Link: https://lore.kernel.org/r/20210922112405.26413-1-biju.das.jz@bp.renesas.com
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
---
 drivers/clk/renesas/r9a07g044-cpg.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Biju Das Jan. 10, 2022, 2:16 p.m. UTC | #1 
Hi Pavel,

Is it possible to rearrange this patch before [1] and after [2]?

[1] https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/commit/?h=linux-5.10.y-cip&id=dcbef66029571fbada7522b2db0790e5ff054c66

[2]https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/commit/?h=linux-5.10.y-cip&id=e2568c0c7de565a5688544907422ca470844df87

Regards,
Biju

> -----Original Message-----
> From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
> Sent: 10 January 2022 11:54
> To: cip-dev@lists.cip-project.org; Nobuhiro Iwamatsu
> <nobuhiro1.iwamatsu@toshiba.co.jp>; Pavel Machek <pavel@denx.de>
> Cc: Biju Das <biju.das.jz@bp.renesas.com>
> Subject: [PATCH v2 5.10.y-cip 15/15] clk: renesas: r9a07g044: Mark
> IA55_CLK and DMAC_ACLK critical
> 
> From: Biju Das <biju.das.jz@bp.renesas.com>
> 
> commit 664bb2e45b89cd8213e3c9772713323f75e21892 upstream.
> 
> Add IA55_CLK and DMAC_ACLK as critical clocks.
> 
> Previously it worked ok, because of a bug in clock status function and the
> following patch in this series fixes the original bug.
> 
> Fixes: c3e67ad6f5a2 ("dt-bindings: clock: r9a07g044-cpg: Update
> clock/reset definitions")
> Fixes: eb829e549ba6 ("clk: renesas: r9a07g044: Add DMAC clocks/resets")
> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> Link:
> https://jpn01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore.ker
> nel.org%2Fr%2F20210922112405.26413-1-
> biju.das.jz%40bp.renesas.com&amp;data=04%7C01%7Cbiju.das.jz%40bp.renesas.c
> om%7Caeb9b6b957aa49e6f56908d9d42fe9c4%7C53d82571da1947e49cb4625a166a4a2a%7
> C0%7C0%7C637774124514054919%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLC
> JQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&amp;sdata=wXeuDZQzzgtj
> OFIfHrsD4SATdusLeUJ6nbLvvxlnBt4%3D&amp;reserved=0
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
> ---
>  drivers/clk/renesas/r9a07g044-cpg.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/clk/renesas/r9a07g044-cpg.c
> b/drivers/clk/renesas/r9a07g044-cpg.c
> index 4c94b94c4125..1490446985e2 100644
> --- a/drivers/clk/renesas/r9a07g044-cpg.c
> +++ b/drivers/clk/renesas/r9a07g044-cpg.c
> @@ -186,6 +186,8 @@ static struct rzg2l_reset r9a07g044_resets[] = {
> 
>  static const unsigned int r9a07g044_crit_mod_clks[] __initconst = {
>  	MOD_CLK_BASE + R9A07G044_GIC600_GICCLK,
> +	MOD_CLK_BASE + R9A07G044_IA55_CLK,
> +	MOD_CLK_BASE + R9A07G044_DMAC_ACLK,
>  };
> 
>  const struct rzg2l_cpg_info r9a07g044_cpg_info = {
> --
> 2.17.1
Pavel Machek Jan. 10, 2022, 6:33 p.m. UTC | #2 
Hi!

> Is it possible to rearrange this patch before [1] and after [2]?
> 
> [1] https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/commit/?h=linux-5.10.y-cip&id=dcbef66029571fbada7522b2db0790e5ff054c66
> 
> [2]https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/commit/?h=linux-5.10.y-cip&id=e2568c0c7de565a5688544907422ca470844df87
>

Wow.

It means changing history. We usually try to avoid that, as it will
cause problems for people using git head. But we did not yet do a
release with those commits, so it is not completely out of question.

How important is that? At the very least I'll need to know that rest
of the kernel team is okay with it.

commit e2568c0c7de565a5688544907422ca470844df87
Author: Biju Das <biju.das.jz@bp.renesas.com>
Date:   Mon Dec 20 13:31:30 2021 +0000

commit dcbef66029571fbada7522b2db0790e5ff054c66
Author: Biju Das <biju.das.jz@bp.renesas.com>
Date:   Thu Dec 16 12:54:46 2021 +0000

     clk: renesas: rzg2l: Fix clk status function

Best regards,
								Pavel
Biju Das Jan. 10, 2022, 7:17 p.m. UTC | #3 
Hi Pavel,

Thanks for the feedback.

> Subject: Inserting patch into history was Re: [PATCH v2 5.10.y-cip 15/15]
> clk: renesas: r9a07g044: Mark IA55_CLK and DMAC_ACLK critical
> 
> Hi!
> 
> > Is it possible to rearrange this patch before [1] and after [2]?
> >
> > [1]
> > https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/comm
> > it/?h=linux-5.10.y-cip&id=dcbef66029571fbada7522b2db0790e5ff054c66
> >
> > [2]https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/c
> > ommit/?h=linux-5.10.y-cip&id=e2568c0c7de565a5688544907422ca470844df87
> >
> 
> Wow.
> 
> It means changing history. We usually try to avoid that, as it will cause
> problems for people using git head. But we did not yet do a release with
> those commits, so it is not completely out of question.

I thought it is simple.

Since we haven't made any release, history modification  and force pushing is not required,
as this patch will be part of upcoming release.

> 
> How important is that? 

Some how this patch, becomes out of order from our internal huge cherry-picked patchset from mainline,
which we use for testing before posting to ML.

It will stop booting after[1], without this.

Any way, this patch is going to be part of upcoming release. So History modification and
Force pushing is not required.

Regards,
Biju

At the very least I'll need to know that rest of
> the kernel team is okay with it.
> 
> commit e2568c0c7de565a5688544907422ca470844df87
> Author: Biju Das <biju.das.jz@bp.renesas.com>
> Date:   Mon Dec 20 13:31:30 2021 +0000
> 
> commit dcbef66029571fbada7522b2db0790e5ff054c66
> Author: Biju Das <biju.das.jz@bp.renesas.com>
> Date:   Thu Dec 16 12:54:46 2021 +0000
> 
>      clk: renesas: rzg2l: Fix clk status function
> 
> Best regards,
> 								Pavel
> --
> DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Jan Kiszka Jan. 10, 2022, 7:18 p.m. UTC | #4 
On 10.01.22 19:33, Pavel Machek wrote:
> Hi!
> 
>> Is it possible to rearrange this patch before [1] and after [2]?
>>
>> [1] https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/commit/?h=linux-5.10.y-cip&id=dcbef66029571fbada7522b2db0790e5ff054c66
>>
>> [2]https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/commit/?h=linux-5.10.y-cip&id=e2568c0c7de565a5688544907422ca470844df87
>>
> 
> Wow.
> 
> It means changing history. We usually try to avoid that, as it will
> cause problems for people using git head. But we did not yet do a
> release with those commits, so it is not completely out of question.
> 
> How important is that? At the very least I'll need to know that rest
> of the kernel team is okay with it.
> 
> commit e2568c0c7de565a5688544907422ca470844df87
> Author: Biju Das <biju.das.jz@bp.renesas.com>
> Date:   Mon Dec 20 13:31:30 2021 +0000
> 
> commit dcbef66029571fbada7522b2db0790e5ff054c66
> Author: Biju Das <biju.das.jz@bp.renesas.com>
> Date:   Thu Dec 16 12:54:46 2021 +0000
> 
>       clk: renesas: rzg2l: Fix clk status function
> 
> Best regards,
> 								Pavel

Patch application in unfortunate order is a very common issue in 
upstream: dependencies are missed, patches take different routes through 
different maintainer trees, bugs get fixed only after the patch was 
applied. In none of these cases, a maintainer did a force-push so far 
(to my best knowledge), why should CIP do that?

Jan
Pavel Machek Jan. 11, 2022, 11:46 a.m. UTC | #5 
Hi!

> > Subject: Inserting patch into history was Re: [PATCH v2 5.10.y-cip 15/15]
> > clk: renesas: r9a07g044: Mark IA55_CLK and DMAC_ACLK critical
> > 
> > Hi!
> > 
> > > Is it possible to rearrange this patch before [1] and after [2]?
> > >
> > > [1]
> > > https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/comm
> > > it/?h=linux-5.10.y-cip&id=dcbef66029571fbada7522b2db0790e5ff054c66
> > >
> > > [2]https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/c
> > > ommit/?h=linux-5.10.y-cip&id=e2568c0c7de565a5688544907422ca470844df87
> > >
> > 
> > Wow.
> > 
> > It means changing history. We usually try to avoid that, as it will cause
> > problems for people using git head. But we did not yet do a release with
> > those commits, so it is not completely out of question.
> 
> I thought it is simple.
> 
> Since we haven't made any release, history modification  and force pushing is not required,
> as this patch will be part of upcoming release.

Ok, good. Patches passed testing (zynqmp board has problems but they
are not kernel related) and I have pushed them.

Best regards,
								Pavel
diff mbox series

Patch

diff --git a/drivers/clk/renesas/r9a07g044-cpg.c b/drivers/clk/renesas/r9a07g044-cpg.c
index 4c94b94c4125..1490446985e2 100644
--- a/drivers/clk/renesas/r9a07g044-cpg.c
+++ b/drivers/clk/renesas/r9a07g044-cpg.c
@@ -186,6 +186,8 @@  static struct rzg2l_reset r9a07g044_resets[] = {
 
 static const unsigned int r9a07g044_crit_mod_clks[] __initconst = {
 	MOD_CLK_BASE + R9A07G044_GIC600_GICCLK,
+	MOD_CLK_BASE + R9A07G044_IA55_CLK,
+	MOD_CLK_BASE + R9A07G044_DMAC_ACLK,
 };
 
 const struct rzg2l_cpg_info r9a07g044_cpg_info = {