From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sowjanya Komatineni Subject: Re: [PATCH V5 11/18] clk: tegra210: Add support for Tegra210 clocks Date: Mon, 15 Jul 2019 20:00:57 -0700 Message-ID: <932d4d50-120c-9191-6a9a-23bf9c96633b@nvidia.com> References: <1561687972-19319-1-git-send-email-skomatineni@nvidia.com> <1561687972-19319-12-git-send-email-skomatineni@nvidia.com> <3938092a-bbc7-b304-641d-31677539598d@nvidia.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: quoted-printable Return-path: In-Reply-To: <3938092a-bbc7-b304-641d-31677539598d@nvidia.com> Content-Language: en-US Sender: linux-kernel-owner@vger.kernel.org To: Dmitry Osipenko , thierry.reding@gmail.com, jonathanh@nvidia.com, tglx@linutronix.de, jason@lakedaemon.net, marc.zyngier@arm.com, linus.walleij@linaro.org, stefan@agner.ch, mark.rutland@arm.com Cc: pdeschrijver@nvidia.com, pgaikwad@nvidia.com, sboyd@kernel.org, linux-clk@vger.kernel.org, linux-gpio@vger.kernel.org, jckuo@nvidia.com, josephl@nvidia.com, talho@nvidia.com, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, mperttunen@nvidia.com, spatra@nvidia.com, robh+dt@kernel.org, devicetree@vger.kernel.org List-Id: devicetree@vger.kernel.org On 7/15/19 5:35 PM, Sowjanya Komatineni wrote: > > On 7/14/19 2:41 PM, Dmitry Osipenko wrote: >> 13.07.2019 8:54, Sowjanya Komatineni =D0=BF=D0=B8=D1=88=D0=B5=D1=82: >>> On 6/29/19 8:10 AM, Dmitry Osipenko wrote: >>>> 28.06.2019 5:12, Sowjanya Komatineni =D0=BF=D0=B8=D1=88=D0=B5=D1=82: >>>>> This patch adds system suspend and resume support for Tegra210 >>>>> clocks. >>>>> >>>>> All the CAR controller settings are lost on suspend when core power >>>>> goes off. >>>>> >>>>> This patch has implementation for saving and restoring all the PLLs >>>>> and clocks context during system suspend and resume to have the >>>>> clocks back to same state for normal operation. >>>>> >>>>> Acked-by: Thierry Reding >>>>> Signed-off-by: Sowjanya Komatineni >>>>> --- >>>>> =C2=A0=C2=A0 drivers/clk/tegra/clk-tegra210.c | 115 >>>>> ++++++++++++++++++++++++++++++++++++++- >>>>> =C2=A0=C2=A0 drivers/clk/tegra/clk.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 |=C2=A0 14 +++++ >>>>> =C2=A0=C2=A0 drivers/clk/tegra/clk.h=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 |=C2=A0=C2=A0 1 + >>>>> =C2=A0=C2=A0 3 files changed, 127 insertions(+), 3 deletions(-) >>>>> >>>>> diff --git a/drivers/clk/tegra/clk-tegra210.c >>>>> b/drivers/clk/tegra/clk-tegra210.c >>>>> index 1c08c53482a5..1b839544e086 100644 >>>>> --- a/drivers/clk/tegra/clk-tegra210.c >>>>> +++ b/drivers/clk/tegra/clk-tegra210.c >>>>> @@ -9,10 +9,12 @@ >>>>> =C2=A0=C2=A0 #include >>>>> =C2=A0=C2=A0 #include >>>>> =C2=A0=C2=A0 #include >>>>> +#include >>>>> =C2=A0=C2=A0 #include >>>>> =C2=A0=C2=A0 #include >>>>> =C2=A0=C2=A0 #include >>>>> =C2=A0=C2=A0 #include >>>>> +#include >>>>> =C2=A0=C2=A0 #include >>>>> =C2=A0=C2=A0 #include >>>>> =C2=A0=C2=A0 #include >>>>> @@ -20,6 +22,7 @@ >>>>> =C2=A0=C2=A0 #include >>>>> =C2=A0=C2=A0 =C2=A0 #include "clk.h" >>>>> +#include "clk-dfll.h" >>>>> =C2=A0=C2=A0 #include "clk-id.h" >>>>> =C2=A0=C2=A0 =C2=A0 /* >>>>> @@ -225,6 +228,7 @@ >>>>> =C2=A0=C2=A0 =C2=A0 #define CLK_RST_CONTROLLER_RST_DEV_Y_SET 0x2a8 >>>>> =C2=A0=C2=A0 #define CLK_RST_CONTROLLER_RST_DEV_Y_CLR 0x2ac >>>>> +#define CPU_SOFTRST_CTRL 0x380 >>>>> =C2=A0=C2=A0 =C2=A0 #define LVL2_CLK_GATE_OVRA 0xf8 >>>>> =C2=A0=C2=A0 #define LVL2_CLK_GATE_OVRC 0x3a0 >>>>> @@ -2820,6 +2824,7 @@ static int tegra210_enable_pllu(void) >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 struct tegra_clk_pll_freq_table = *fentry; >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 struct tegra_clk_pll pllu; >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 u32 reg; >>>>> +=C2=A0=C2=A0=C2=A0 int ret; >>>>> =C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 for (fentry =3D pll_u_fre= q_table; fentry->input_rate;=20 >>>>> fentry++) { >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if (fent= ry->input_rate =3D=3D pll_ref_freq) >>>>> @@ -2847,10 +2852,10 @@ static int tegra210_enable_pllu(void) >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 fence_udelay(1, clk_base); >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 reg |=3D PLL_ENABLE; >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 writel(reg, clk_base + PLLU_BASE= ); >>>>> +=C2=A0=C2=A0=C2=A0 fence_udelay(1, clk_base); >>>>> =C2=A0=C2=A0 -=C2=A0=C2=A0=C2=A0 readl_relaxed_poll_timeout_atomic(cl= k_base + PLLU_BASE, reg, >>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 reg & PLL_BASE= _LOCK, 2, 1000); >>>>> -=C2=A0=C2=A0=C2=A0 if (!(reg & PLL_BASE_LOCK)) { >>>>> +=C2=A0=C2=A0=C2=A0 ret =3D tegra210_wait_for_mask(&pllu, PLLU_BASE, = PLL_BASE_LOCK); >>>>> +=C2=A0=C2=A0=C2=A0 if (ret) { >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pr_err("= Timed out waiting for PLL_U to lock\n"); >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return -= ETIMEDOUT; >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 } >>>>> @@ -3283,6 +3288,103 @@ static void tegra210_disable_cpu_clock(u32=20 >>>>> cpu) >>>>> =C2=A0=C2=A0 } >>>>> =C2=A0=C2=A0 =C2=A0 #ifdef CONFIG_PM_SLEEP >>>>> +static u32 cpu_softrst_ctx[3]; >>>>> +static struct platform_device *dfll_pdev; >>>>> +#define car_readl(_base, _off) readl_relaxed(clk_base + (_base) + >>>>> ((_off) * 4)) >>>>> +#define car_writel(_val, _base, _off) \ >>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 writel_relaxed(_val, clk_= base + (_base) + ((_off) * 4)) >>>>> + >>>>> +static int tegra210_clk_suspend(void) >>>>> +{ >>>>> +=C2=A0=C2=A0=C2=A0 unsigned int i; >>>>> +=C2=A0=C2=A0=C2=A0 struct device_node *node; >>>>> + >>>>> +=C2=A0=C2=A0=C2=A0 tegra_cclkg_burst_policy_save_context(); >>>>> + >>>>> +=C2=A0=C2=A0=C2=A0 if (!dfll_pdev) { >>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 node =3D of_find_compatib= le_node(NULL, NULL, >>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 "nvidia,tegra210-dfll"); >>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if (node) >>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 d= fll_pdev =3D of_find_device_by_node(node); >>>>> + >>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 of_node_put(node); >>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if (!dfll_pdev) >>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 p= r_err("dfll node not found. no suspend for dfll\n"); >>>>> +=C2=A0=C2=A0=C2=A0 } >>>>> + >>>>> +=C2=A0=C2=A0=C2=A0 if (dfll_pdev) >>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 tegra_dfll_suspend(dfll_p= dev); >>>>> + >>>>> +=C2=A0=C2=A0=C2=A0 /* Enable PLLP_OUT_CPU after dfll suspend */ >>>>> +=C2=A0=C2=A0=C2=A0 tegra_clk_set_pllp_out_cpu(true); >>>>> + >>>>> +=C2=A0=C2=A0=C2=A0 tegra_sclk_cclklp_burst_policy_save_context(); >>>>> + >>>>> +=C2=A0=C2=A0=C2=A0 clk_save_context(); >>>>> + >>>>> +=C2=A0=C2=A0=C2=A0 for (i =3D 0; i < ARRAY_SIZE(cpu_softrst_ctx); i+= +) >>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 cpu_softrst_ctx[i] =3D ca= r_readl(CPU_SOFTRST_CTRL, i); >>>>> + >>>>> +=C2=A0=C2=A0=C2=A0 return 0; >>>>> +} >>>>> + >>>>> +static void tegra210_clk_resume(void) >>>>> +{ >>>>> +=C2=A0=C2=A0=C2=A0 unsigned int i; >>>>> +=C2=A0=C2=A0=C2=A0 struct clk_hw *parent; >>>>> +=C2=A0=C2=A0=C2=A0 struct clk *clk; >>>>> + >>>>> +=C2=A0=C2=A0=C2=A0 /* >>>>> +=C2=A0=C2=A0=C2=A0=C2=A0 * clk_restore_context restores clocks as pe= r the clock tree. >>>>> +=C2=A0=C2=A0=C2=A0=C2=A0 * >>>>> +=C2=A0=C2=A0=C2=A0=C2=A0 * dfllCPU_out is first in the clock tree to= get restored and it >>>>> +=C2=A0=C2=A0=C2=A0=C2=A0 * involves programming DFLL controller alon= g with restoring=20 >>>>> CPUG >>>>> +=C2=A0=C2=A0=C2=A0=C2=A0 * clock burst policy. >>>>> +=C2=A0=C2=A0=C2=A0=C2=A0 * >>>>> +=C2=A0=C2=A0=C2=A0=C2=A0 * DFLL programming needs dfll_ref and dfll_= soc peripheral=20 >>>>> clocks >>>>> +=C2=A0=C2=A0=C2=A0=C2=A0 * to be restores which are part ofthe perip= heral clocks. >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ^ white-space >> >> Please use spellchecker to avoid typos. >> >>>>> +=C2=A0=C2=A0=C2=A0=C2=A0 * So, peripheral clocks restore should happ= en prior to dfll=20 >>>>> clock >>>>> +=C2=A0=C2=A0=C2=A0=C2=A0 * restore. >>>>> +=C2=A0=C2=A0=C2=A0=C2=A0 */ >>>>> + >>>>> +=C2=A0=C2=A0=C2=A0 tegra_clk_osc_resume(clk_base); >>>>> +=C2=A0=C2=A0=C2=A0 for (i =3D 0; i < ARRAY_SIZE(cpu_softrst_ctx); i+= +) >>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 car_writel(cpu_softrst_ct= x[i], CPU_SOFTRST_CTRL, i); >>>>> + >>>>> +=C2=A0=C2=A0=C2=A0 /* restore all plls and peripheral clocks */ >>>>> +=C2=A0=C2=A0=C2=A0 tegra210_init_pllu(); >>>>> +=C2=A0=C2=A0=C2=A0 clk_restore_context(); >>>>> + >>>>> +=C2=A0=C2=A0=C2=A0 fence_udelay(5, clk_base); >>>>> + >>>>> +=C2=A0=C2=A0=C2=A0 /* resume SCLK and CPULP clocks */ >>>>> +=C2=A0=C2=A0=C2=A0 tegra_sclk_cpulp_burst_policy_restore_context(); >>>>> + >>>>> +=C2=A0=C2=A0=C2=A0 /* >>>>> +=C2=A0=C2=A0=C2=A0=C2=A0 * restore CPUG clocks: >>>>> +=C2=A0=C2=A0=C2=A0=C2=A0 * - enable DFLL in open loop mode >>>>> +=C2=A0=C2=A0=C2=A0=C2=A0 * - switch CPUG to DFLL clock source >>>>> +=C2=A0=C2=A0=C2=A0=C2=A0 * - close DFLL loop >>>>> +=C2=A0=C2=A0=C2=A0=C2=A0 * - sync PLLX state >>>>> +=C2=A0=C2=A0=C2=A0=C2=A0 */ >>>>> +=C2=A0=C2=A0=C2=A0 if (dfll_pdev) >>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 tegra_dfll_resume(dfll_pd= ev, false); >>>>> + >>>>> +=C2=A0=C2=A0=C2=A0 tegra_cclkg_burst_policy_restore_context(); >>>>> +=C2=A0=C2=A0=C2=A0 fence_udelay(2, clk_base); >>>>> + >>>>> +=C2=A0=C2=A0=C2=A0 if (dfll_pdev) >>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 tegra_dfll_resume(dfll_pd= ev, true); >>>>> + >>>>> +=C2=A0=C2=A0=C2=A0 parent =3D >>>>> clk_hw_get_parent(__clk_get_hw(clks[TEGRA210_CLK_CCLK_G])); >>>>> +=C2=A0=C2=A0=C2=A0 clk =3D clks[TEGRA210_CLK_PLL_X]; >>>>> +=C2=A0=C2=A0=C2=A0 if (parent !=3D __clk_get_hw(clk)) >>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 tegra_clk_sync_state_pll(= __clk_get_hw(clk)); >>>>> + >>>>> +=C2=A0=C2=A0=C2=A0 /* Disable PLL_OUT_CPU after DFLL resume */ >>>>> +=C2=A0=C2=A0=C2=A0 tegra_clk_set_pllp_out_cpu(false); >>>>> +} >>>>> + >>>>> =C2=A0=C2=A0 static void tegra210_cpu_clock_suspend(void) >>>>> =C2=A0=C2=A0 { >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 /* switch coresite to clk_m, sav= e off original source */ >>>>> @@ -3298,6 +3400,11 @@ static void tegra210_cpu_clock_resume(void) >>>>> =C2=A0=C2=A0 } >>>>> =C2=A0=C2=A0 #endif >>>>> =C2=A0=C2=A0 +static struct syscore_ops tegra_clk_syscore_ops =3D { >>>>> +=C2=A0=C2=A0=C2=A0 .suspend =3D tegra210_clk_suspend, >>>>> +=C2=A0=C2=A0=C2=A0 .resume =3D tegra210_clk_resume, >>>>> +}; >>>>> + >>>>> =C2=A0=C2=A0 static struct tegra_cpu_car_ops tegra210_cpu_car_ops =3D= { >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .wait_for_reset=C2=A0=C2=A0=C2= =A0 =3D tegra210_wait_cpu_in_reset, >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .disable_clock=C2=A0=C2=A0=C2=A0= =3D tegra210_disable_cpu_clock, >>>>> @@ -3583,5 +3690,7 @@ static void __init tegra210_clock_init(struct >>>>> device_node *np) >>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 tegra210_mbist_clk_init(); >>>>> =C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 tegra_cpu_car_ops =3D &te= gra210_cpu_car_ops; >>>>> + >>>>> +=C2=A0=C2=A0=C2=A0 register_syscore_ops(&tegra_clk_syscore_ops); >>>>> =C2=A0=C2=A0 } >>>> Is it really worthwhile to use syscore_ops for suspend/resume given >>>> that drivers for >>>> won't resume before the CLK driver anyway? Are there any other options >>>> for CLK >>>> suspend/resume? >>>> >>>> I'm also not sure whether PM runtime API could be used at all in the >>>> context of >>>> syscore_ops .. >>>> >>>> Secondly, what about to use generic clk_save_context() / >>>> clk_restore_context() >>>> helpers for the suspend-resume? It looks to me that some other >>>> essential (and proper) >>>> platform driver (soc/tegra/? PMC?) should suspend-resume the clocks >>>> using the generic >>>> CLK Framework API. >>> Clock resume should happen very early to restore peripheral and cpu >>> clocks very early than peripheral drivers resume happens. >> If all peripheral drivers properly requested all of the necessary clocks >> and CLK driver was a platform driver, then I guess the probe should have >> been naturally ordered. But that's not very achievable with the >> currently available infrastructure in the kernel, so I'm not arguing >> that the clocks should be explicitly resumed before the users. >> >>> this patch series uses clk_save_context and clk_restore_context for >>> corresponding divider, pll, pllout.. save and restore context. >> Now I see that indeed this API is utilized in this patch, thank you for >> the clarification. >> >>> But as there is dependency on dfll resume and cpu and pllx clocks >>> restore, couldnt use clk_save_context and clk_restore_context for dfll. >>> >>> So implemented recommended dfll resume sequence in main Tegra210 clock >>> driver along with invoking clk_save_context/clk_restore_context where >>> all other clocks save/restore happens as per clock tree traversal. >> Could you please clarify what part of peripherals clocks is required for >> DFLL's restore? Couldn't DFLL driver be changed to avoid that quirkness >> and thus to make DFLL driver suspend/resume the clock? > > DFLL source ref_clk and soc_clk need to be restored prior to dfll. > > I see dfllCPU_out parent to CCLK_G first in the clock tree and=20 > dfll_ref and dfll_soc peripheral clocks are not resumed by the time=20 > dfll resume happens first. > > ref_clk and soc_clk source is from pll_p and clock tree has these=20 > registered under pll_p which happens later. > > tegra210_clock_init registers in order plls, peripheral clocks,=20 > super_clk init for cclk_g during clock driver probe and dfll probe and=20 > register happens later. > One more thing, CLDVFS peripheral clock enable is also needed to be=20 enabled to program DFLL Controller and all peripheral clock context is=20 restored only after their PLL sources are restored. DFLL restore involves dfll source clock resume along with CLDVFS=20 periheral clock enable and reset