On Thu, 2018-03-08 at 14:49 +0800, Shawn Lin wrote:
> It's found that the final phase set by driver doesn't match that of
> the output from clk_summary:
>
> dwmmc_rockchip fe310000.dwmmc: Successfully tuned phase to 346
> mmc0: new ultra high speed SDR104 SDIO card at address 0001
>
> cat /sys/kernel/debug/clk/clk_summary | grep sdio_sample
> sdio_sample 0 1 0 50000000 0 0
>
> It seems the cached core->phase isn't updated after the clk was
> registered. So fix this issue by updating the core->phase if setting
> phase successfully.
>
> Fixes: 9e4d04adeb1a ("clk: add clk_core_set_phase_nolock function")
> Cc: Stable <stable@xxxxxxxxxxxxxxx>
> Cc: Jerome Brunet <jbrunet@xxxxxxxxxxxx>
> Signed-off-by: Shawn Lin <shawn.lin@xxxxxxxxxxxxxx>
Good catch Shawn.
Actually, I have had already sent a fix for this issue
https://patchwork.kernel.org/patch/10220811/
But I think yours is better as it updates the phase only if the phase has
actually been set
Reviewed-by: Jerome Brunet <jbrunet@xxxxxxxxxxxx>
Tested-by: Jerome Brunet <jbrunet@xxxxxxxxxxxx>
> ---
>
> drivers/clk/clk.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
> index 0f686a9..617e562 100644
> --- a/drivers/clk/clk.c
> +++ b/drivers/clk/clk.c
> @@ -2309,8 +2309,11 @@ static int clk_core_set_phase_nolock(struct clk_core *core, int degrees)
>
> trace_clk_set_phase(core, degrees);
>
> - if (core->ops->set_phase)
> + if (core->ops->set_phase) {
> ret = core->ops->set_phase(core->hw, degrees);
> + if (!ret)
> + core->phase = degrees;
> + }
>
> trace_clk_set_phase_complete(core, degrees);
>