[PATCH] clk: sunxi-ng: a100: enable MMC clock reparenting

[PATCH] clk: sunxi-ng: a100: enable MMC clock reparenting

[Cody Eksal]

While testing the MMC nodes proposed in [1], it was noted that mmc0/1
would fail to initialize, with "mmc: fatal err update clk timeout" in
the kernel logs. A closer look at the clock definitions showed that the MMC
MPs had the "CLK_SET_RATE_NO_REPARENT" flag set. No reason was given for
adding this flag in the first place, and its original purpose is unknown,
but it doesn't seem to make sense and results in severe limitations to MMC
speeds. Thus, remove this flag from the 3 MMC MPs.

[1] https://msgid.link/20241024170540.2721307-10-masterr3c0rd@epochal.quest

Fixes: fb038ce4db55 ("clk: sunxi-ng: add support for the Allwinner A100 CCU")
Cc: stable@vger.kernel.org
Signed-off-by: Cody Eksal <masterr3c0rd@epochal.quest>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
---
 drivers/clk/sunxi-ng/ccu-sun50i-a100.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/clk/sunxi-ng/ccu-sun50i-a100.c b/drivers/clk/sunxi-ng/ccu-sun50i-a100.c
index bbaa82978716..a59e420b195d 100644
--- a/drivers/clk/sunxi-ng/ccu-sun50i-a100.c
+++ b/drivers/clk/sunxi-ng/ccu-sun50i-a100.c
@@ -436,7 +436,7 @@ static SUNXI_CCU_MP_WITH_MUX_GATE_POSTDIV(mmc0_clk, "mmc0", mmc_parents, 0x830,
 					  24, 2,	/* mux */
 					  BIT(31),	/* gate */
 					  2,		/* post-div */
-					  CLK_SET_RATE_NO_REPARENT);
+					  0);
 
 static SUNXI_CCU_MP_WITH_MUX_GATE_POSTDIV(mmc1_clk, "mmc1", mmc_parents, 0x834,
 					  0, 4,		/* M */
@@ -444,7 +444,7 @@ static SUNXI_CCU_MP_WITH_MUX_GATE_POSTDIV(mmc1_clk, "mmc1", mmc_parents, 0x834,
 					  24, 2,	/* mux */
 					  BIT(31),	/* gate */
 					  2,		/* post-div */
-					  CLK_SET_RATE_NO_REPARENT);
+					  0);
 
 static SUNXI_CCU_MP_WITH_MUX_GATE_POSTDIV(mmc2_clk, "mmc2", mmc_parents, 0x838,
 					  0, 4,		/* M */
@@ -452,7 +452,7 @@ static SUNXI_CCU_MP_WITH_MUX_GATE_POSTDIV(mmc2_clk, "mmc2", mmc_parents, 0x838,
 					  24, 2,	/* mux */
 					  BIT(31),	/* gate */
 					  2,		/* post-div */
-					  CLK_SET_RATE_NO_REPARENT);
+					  0);
 
 static SUNXI_CCU_GATE(bus_mmc0_clk, "bus-mmc0", "ahb3", 0x84c, BIT(0), 0);
 static SUNXI_CCU_GATE(bus_mmc1_clk, "bus-mmc1", "ahb3", 0x84c, BIT(1), 0);
-- 
2.47.0

Re: [PATCH] clk: sunxi-ng: a100: enable MMC clock reparenting

[Chen-Yu Tsai]

On Sat, Nov 9, 2024 at 8:38 AM Cody Eksal <masterr3c0rd@epochal.quest> wrote:
>
> While testing the MMC nodes proposed in [1], it was noted that mmc0/1
> would fail to initialize, with "mmc: fatal err update clk timeout" in
> the kernel logs. A closer look at the clock definitions showed that the MMC
> MPs had the "CLK_SET_RATE_NO_REPARENT" flag set. No reason was given for
> adding this flag in the first place, and its original purpose is unknown,
> but it doesn't seem to make sense and results in severe limitations to MMC
> speeds. Thus, remove this flag from the 3 MMC MPs.
>
> [1] https://msgid.link/20241024170540.2721307-10-masterr3c0rd@epochal.quest
>
> Fixes: fb038ce4db55 ("clk: sunxi-ng: add support for the Allwinner A100 CCU")
> Cc: stable@vger.kernel.org
> Signed-off-by: Cody Eksal <masterr3c0rd@epochal.quest>
> Reviewed-by: Andre Przywara <andre.przywara@arm.com>

You should still keep the version number from the original series if
resending or increment it if changes were made.

ChenYu

> ---
>  drivers/clk/sunxi-ng/ccu-sun50i-a100.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/clk/sunxi-ng/ccu-sun50i-a100.c b/drivers/clk/sunxi-ng/ccu-sun50i-a100.c
> index bbaa82978716..a59e420b195d 100644
> --- a/drivers/clk/sunxi-ng/ccu-sun50i-a100.c
> +++ b/drivers/clk/sunxi-ng/ccu-sun50i-a100.c
> @@ -436,7 +436,7 @@ static SUNXI_CCU_MP_WITH_MUX_GATE_POSTDIV(mmc0_clk, "mmc0", mmc_parents, 0x830,
>                                           24, 2,        /* mux */
>                                           BIT(31),      /* gate */
>                                           2,            /* post-div */
> -                                         CLK_SET_RATE_NO_REPARENT);
> +                                         0);
>
>  static SUNXI_CCU_MP_WITH_MUX_GATE_POSTDIV(mmc1_clk, "mmc1", mmc_parents, 0x834,
>                                           0, 4,         /* M */
> @@ -444,7 +444,7 @@ static SUNXI_CCU_MP_WITH_MUX_GATE_POSTDIV(mmc1_clk, "mmc1", mmc_parents, 0x834,
>                                           24, 2,        /* mux */
>                                           BIT(31),      /* gate */
>                                           2,            /* post-div */
> -                                         CLK_SET_RATE_NO_REPARENT);
> +                                         0);
>
>  static SUNXI_CCU_MP_WITH_MUX_GATE_POSTDIV(mmc2_clk, "mmc2", mmc_parents, 0x838,
>                                           0, 4,         /* M */
> @@ -452,7 +452,7 @@ static SUNXI_CCU_MP_WITH_MUX_GATE_POSTDIV(mmc2_clk, "mmc2", mmc_parents, 0x838,
>                                           24, 2,        /* mux */
>                                           BIT(31),      /* gate */
>                                           2,            /* post-div */
> -                                         CLK_SET_RATE_NO_REPARENT);
> +                                         0);
>
>  static SUNXI_CCU_GATE(bus_mmc0_clk, "bus-mmc0", "ahb3", 0x84c, BIT(0), 0);
>  static SUNXI_CCU_GATE(bus_mmc1_clk, "bus-mmc1", "ahb3", 0x84c, BIT(1), 0);
> --
> 2.47.0
>
>

Re: [PATCH] clk: sunxi-ng: a100: enable MMC clock reparenting

[Cody Eksal]

On 2024/11/09 12:02 pm, Chen-Yu Tsai wrote:
> You should still keep the version number from the original series if
> resending or increment it if changes were made.
Noted, sorry; still getting used to LKML norms. Since I was resubmitting just
this patch for stable, I wasn't sure what the norms were.

The contents of the patch are unchanged from my series; the only modifications
made were modifying the commit message and adding stable tags.

Thanks!
- Cody
>
> ChenYu

Re: [PATCH] clk: sunxi-ng: a100: enable MMC clock reparenting

[Chen-Yu Tsai]

On Fri, 08 Nov 2024 20:37:37 -0400, Cody Eksal wrote:
> While testing the MMC nodes proposed in [1], it was noted that mmc0/1
> would fail to initialize, with "mmc: fatal err update clk timeout" in
> the kernel logs. A closer look at the clock definitions showed that the MMC
> MPs had the "CLK_SET_RATE_NO_REPARENT" flag set. No reason was given for
> adding this flag in the first place, and its original purpose is unknown,
> but it doesn't seem to make sense and results in severe limitations to MMC
> speeds. Thus, remove this flag from the 3 MMC MPs.
> 
> [...]

Applied to clk-for-6.13 in git@github.com:linux-sunxi/linux-sunxi.git, thanks!

[1/1] clk: sunxi-ng: a100: enable MMC clock reparenting
      commit: 3fd8177f0015c32fdb0af0feab0bcf344aa74832

Best regards,
-- 
Chen-Yu Tsai <wens@csie.org>

Re: [PATCH] clk: sunxi-ng: a100: enable MMC clock reparenting

[Parthiban]

On 11/10/24 5:53 PM, Chen-Yu Tsai wrote:
> On Fri, 08 Nov 2024 20:37:37 -0400, Cody Eksal wrote:
>> While testing the MMC nodes proposed in [1], it was noted that mmc0/1
>> would fail to initialize, with "mmc: fatal err update clk timeout" in
>> the kernel logs. A closer look at the clock definitions showed that the MMC
>> MPs had the "CLK_SET_RATE_NO_REPARENT" flag set. No reason was given for
>> adding this flag in the first place, and its original purpose is unknown,
>> but it doesn't seem to make sense and results in severe limitations to MMC
>> speeds. Thus, remove this flag from the 3 MMC MPs.
>>
>> [...]
> 
> Applied to clk-for-6.13 in git@github.com:linux-sunxi/linux-sunxi.git, thanks!
> 
> [1/1] clk: sunxi-ng: a100: enable MMC clock reparenting
>       commit: 3fd8177f0015c32fdb0af0feab0bcf344aa74832
This commit is missing in 6.13-rc4. Will it be merged in the next rcX?

Thanks,
Parthiban
> 
> Best regards,

Re: [PATCH] clk: sunxi-ng: a100: enable MMC clock reparenting

[Chen-Yu Tsai]

On Fri, Dec 27, 2024 at 4:45 PM Parthiban <parthiban@linumiz.com> wrote:
>
> On 11/10/24 5:53 PM, Chen-Yu Tsai wrote:
> > On Fri, 08 Nov 2024 20:37:37 -0400, Cody Eksal wrote:
> >> While testing the MMC nodes proposed in [1], it was noted that mmc0/1
> >> would fail to initialize, with "mmc: fatal err update clk timeout" in
> >> the kernel logs. A closer look at the clock definitions showed that the MMC
> >> MPs had the "CLK_SET_RATE_NO_REPARENT" flag set. No reason was given for
> >> adding this flag in the first place, and its original purpose is unknown,
> >> but it doesn't seem to make sense and results in severe limitations to MMC
> >> speeds. Thus, remove this flag from the 3 MMC MPs.
> >>
> >> [...]
> >
> > Applied to clk-for-6.13 in git@github.com:linux-sunxi/linux-sunxi.git, thanks!
> >
> > [1/1] clk: sunxi-ng: a100: enable MMC clock reparenting
> >       commit: 3fd8177f0015c32fdb0af0feab0bcf344aa74832
> This commit is missing in 6.13-rc4. Will it be merged in the next rcX?

It looks like I tagged the wrong commit when I sent the pull request.

I'll try to send a PR for it as a fix.

ChenYu