From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
Received: from mail-wm0-f68.google.com ([74.125.82.68]:38210 "EHLO
        mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1751107AbeCZIbB (ORCPT
        <rfc822;stable@vger.kernel.org>); Mon, 26 Mar 2018 04:31:01 -0400
Received: by mail-wm0-f68.google.com with SMTP id l16so13794310wmh.3
        for <stable@vger.kernel.org>; Mon, 26 Mar 2018 01:31:01 -0700 (PDT)
Message-ID: <1522053058.2632.2.camel@baylibre.com>
Subject: Re: FAILED: patch "[PATCH] clk: update cached phase to respect the
 fact when setting" failed to apply to 4.15-stable tree
From: Jerome Brunet <jbrunet@baylibre.com>
To: gregkh@linuxfoundation.org, shawn.lin@rock-chips.com,
        mturquette@baylibre.com, stable@vger.kernel.org
Date: Mon, 26 Mar 2018 10:30:58 +0200
In-Reply-To: <1521910653107149@kroah.com>
References: <1521910653107149@kroah.com>
Content-Type: text/plain; charset="UTF-8"
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Sender: stable-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

On Sat, 2018-03-24 at 17:57 +0100, gregkh@linuxfoundation.org wrote:
> The patch below does not apply to the 4.15-stable tree.
> If someone wants it applied there, or to any other stable or longterm
> tree, then please email the backport, including the original git commit
> id to <stable@vger.kernel.org>.

Hi Greg,

Unless I missed something, the change which introduced the issue is not part of
the 4.15 stable history which is why the fix does not apply and is not needed.

Regards
Jerome

> 
> thanks,
> 
> greg k-h
> 
> ------------------ original commit in Linus's tree ------------------
> 
> From 7f95beea36089918335eb1810ddd7ba8cf9d09cc Mon Sep 17 00:00:00 2001
> From: Shawn Lin <shawn.lin@rock-chips.com>
> Date: Thu, 8 Mar 2018 14:49:41 +0800
> Subject: [PATCH] clk: update cached phase to respect the fact when setting
>  phase
> 
> 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@vger.kernel.org>
> Cc: Jerome Brunet <jbrunet@baylibre.com>
> Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
> Reviewed-by: Jerome Brunet <jbrunet@baylibre.com>
> Tested-by: Jerome Brunet <jbrunet@baylibre.com>
> Signed-off-by: Michael Turquette <mturquette@baylibre.com>
> 
> diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
> index 0f686a9dac3e..617e56268b18 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);
>  
>