clk: vf610: improve handling case that cpu frequency can't be changed
Subsystems (3)
PATCH 1/1 clk: vf610: improve handling case that cpu frequency can't be changed
Currently we get a nasty error message if the cpu clock can't be
changed:
DDRC is clocked by PLL1, can't switch CPU clockinitcall vf610_switch_cpu_clock+0x1/0x198 failed: Invalid argument
So let's do the following:
- factor out the check from vf610_switch_cpu_clock_to_500mhz() and vf610_switch_cpu_clock_to_400mhz
- if clock can't be changed, don't treat it as an error
- don't call clock notifier chain if clock can't be changed
- add trailing newline to the warning message
--- drivers/clk/imx/clk-vf610.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-)
drivers/clk/imx/clk-vf610.c +18 -15
@@ -459,26 +459,30 @@ enum { DDRMC_CR117_AXI0_FITYPEREG_SYNC = 0b01 << 16, }; -static int vf610_switch_cpu_clock_to_500mhz (void ) +static bool vf610_cpu_clk_changeable (void ) { -int ret; -/* * When switching A5 CPU to 500Mhz we expect DDRC to be * clocked by PLL2_PFD2 and the system to be configured in * asynchronous mode. -* -* We also can't just use default PFD1 output of PLL1 due to -* Errata e6235, so we have to re-clock the PLL itself and use -* its output to clock the CPU directly. */ -if (clk_get_parent (clk[VF610_CLK_DDR_SEL ]) != clk[VF610_CLK_PLL2_PFD2 ]) { -pr_warn ("DDRC is clocked by PLL1, can't switch CPU clock" ); -return -EINVAL ; +pr_warn ("DDRC is clocked by PLL1, can't switch CPU clock\n" ); +return false; } +return true; +} + +static int vf610_switch_cpu_clock_to_500mhz (void ) +{ +int ret; +/* +* We can't just use default PFD1 output of PLL1 due to +* Errata e6235, so we have to re-clock the PLL itself and use +* its output to clock the CPU directly. +* * Code below alters the frequency of PLL1, and doing so would * require us to wait for PLL1 lock before proceeding to * select it as a clock source again.
@@ -533,11 +537,6 @@ static int vf610_switch_cpu_clock_to_400mhz(void)uint32_t cr117;void *__iomem ddrmc =IOMEM (VF610_DDR_BASE_ADDR ); -if (clk_get_parent (clk[VF610_CLK_DDR_SEL ]) != clk[VF610_CLK_PLL2_PFD2 ]) { -pr_warn ("DDRC is clocked by PLL1, can't switch CPU clock" ); -return -EINVAL ; - } - ret =clk_set_parent (clk[VF610_CLK_PLL2_PFD_SEL ], clk[VF610_CLK_PLL2_PFD2 ]);if (ret <0 ) { pr_crit("Unable to re-parent '%s'\n",
@@ -595,10 +594,14 @@ static int vf610_switch_cpu_clock(void)return 0 ;case VF610_SPEED_500 : +if (!vf610_cpu_clk_changeable ()) +return 0 ; ret =vf610_switch_cpu_clock_to_500mhz ();break ;case VF610_SPEED_400 : +if (!vf610_cpu_clk_changeable ()) +return 0 ; ret =vf610_switch_cpu_clock_to_400mhz ();break ; }
Signature · 7 lines
2.21.0 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Quoted 5 lines · Heiner Kallweit
Currently we get a nasty error message if the cpu clock can't be
changed:
DDRC is clocked by PLL1, can't switch CPU clockinitcallvf610_switch_cpu_clock+0x1/0x198failed: Invalid argument
Quoted 8 lines
So let's do the following:
- factor out the check fromvf610_switch_cpu_clock_to_500mhz()andvf610_switch_cpu_clock_to_400mhz
- if clock can't be changed, don't treat it as an error
- don't call clock notifier chain if clock can't be changed
- add trailing newline to the warning messageSigned-off-by Heiner Kallweit <[email protected]>
Minor nit: it might've been a bit simpler to create vf610_cpu_clk_unchangable(), so you wouldn't have to invert the result in every usecase.
Regardless the code is fine as is as, so:
Thanks,
Andrey Smirnov
_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
Quoted 11 lines · Heiner Kallweit
Currently we get a nasty error message if the cpu clock can't be
changed:
DDRC is clocked by PLL1, can't switch CPU clockinitcallvf610_switch_cpu_clock+0x1/0x198failed: Invalid argumentSo let's do the following:
- factor out the check fromvf610_switch_cpu_clock_to_500mhz()andvf610_switch_cpu_clock_to_400mhz
- if clock can't be changed, don't treat it as an error
- don't call clock notifier chain if clock can't be changed
- add trailing newline to the warning message
Quoted 4 lines
Signed-off-by Heiner Kallweit <[email protected]>--- drivers/clk/imx/clk-vf610.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-)
Applied, thanks
Sascha
Signature · 9 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox