From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sowjanya Komatineni Subject: Re: [PATCH v7 07/20] clk: tegra: clk-periph: Add save and restore support Date: Thu, 1 Aug 2019 13:31:56 -0700 Message-ID: <50bad1d3-df41-d1e5-a7c7-4be9c661ed14@nvidia.com> References: <1564532424-10449-1-git-send-email-skomatineni@nvidia.com> <1564532424-10449-8-git-send-email-skomatineni@nvidia.com> <67cf6c13-688d-0305-61e2-c63c8e8b4729@nvidia.com> <550de191-f982-4544-6fbc-bf16dfeae2c6@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: 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 8/1/19 1:17 PM, Dmitry Osipenko wrote: > 01.08.2019 22:42, Sowjanya Komatineni =D0=BF=D0=B8=D1=88=D0=B5=D1=82: >> On 8/1/19 12:00 PM, Dmitry Osipenko wrote: >>> 01.08.2019 20:58, Sowjanya Komatineni =D0=BF=D0=B8=D1=88=D0=B5=D1=82: >>>> On 7/31/19 4:09 PM, Sowjanya Komatineni wrote: >>>>> On 7/31/19 3:44 AM, Dmitry Osipenko wrote: >>>>>> 31.07.2019 12:50, Dmitry Osipenko =D0=BF=D0=B8=D1=88=D0=B5=D1=82: >>>>>>> 31.07.2019 3:20, Sowjanya Komatineni =D0=BF=D0=B8=D1=88=D0=B5=D1=82= : >>>>>>>> This patch implements save and restore context for peripheral fixe= d >>>>>>>> clock ops, peripheral gate clock ops, sdmmc mux clock ops, and >>>>>>>> peripheral clock ops. >>>>>>>> >>>>>>>> During system suspend, core power goes off and looses the settings >>>>>>>> of the Tegra CAR controller registers. >>>>>>>> >>>>>>>> So during suspend entry clock and reset state of peripherals is >>>>>>>> saved >>>>>>>> and on resume they are restored to have clocks back to same rate a= nd >>>>>>>> state as before suspend. >>>>>>>> >>>>>>>> Acked-by: Thierry Reding >>>>>>>> Signed-off-by: Sowjanya Komatineni >>>>>>>> --- >>>>>>>> =C2=A0=C2=A0 drivers/clk/tegra/clk-periph-fixed.c | 33 >>>>>>>> ++++++++++++++++++++++++++++++++ >>>>>>>> =C2=A0=C2=A0 drivers/clk/tegra/clk-periph-gate.c=C2=A0 | 34 >>>>>>>> +++++++++++++++++++++++++++++++++ >>>>>>>> =C2=A0=C2=A0 drivers/clk/tegra/clk-periph.c=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 | 37 >>>>>>>> ++++++++++++++++++++++++++++++++++++ >>>>>>>> =C2=A0=C2=A0 drivers/clk/tegra/clk-sdmmc-mux.c=C2=A0=C2=A0=C2=A0 = | 28 >>>>>>>> +++++++++++++++++++++++++++ >>>>>>>> =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=C2=A0=C2=A0 |=C2=A0 6 ++++++ >>>>>>>> =C2=A0=C2=A0 5 files changed, 138 insertions(+) >>>>>>>> >>>>>>>> diff --git a/drivers/clk/tegra/clk-periph-fixed.c >>>>>>>> b/drivers/clk/tegra/clk-periph-fixed.c >>>>>>>> index c088e7a280df..21b24530fa00 100644 >>>>>>>> --- a/drivers/clk/tegra/clk-periph-fixed.c >>>>>>>> +++ b/drivers/clk/tegra/clk-periph-fixed.c >>>>>>>> @@ -60,11 +60,44 @@ tegra_clk_periph_fixed_recalc_rate(struct >>>>>>>> clk_hw *hw, >>>>>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return (unsigned long)rate; >>>>>>>> =C2=A0=C2=A0 } >>>>>>>> =C2=A0=C2=A0 +static int tegra_clk_periph_fixed_save_context(stru= ct clk_hw >>>>>>>> *hw) >>>>>>>> +{ >>>>>>>> +=C2=A0=C2=A0=C2=A0 struct tegra_clk_periph_fixed *fixed =3D >>>>>>>> to_tegra_clk_periph_fixed(hw); >>>>>>>> +=C2=A0=C2=A0=C2=A0 u32 mask =3D 1 << (fixed->num % 32); >>>>>>>> + >>>>>>>> +=C2=A0=C2=A0=C2=A0 fixed->enb_ctx =3D readl_relaxed(fixed->base + >>>>>>>> fixed->regs->enb_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 mask; >>>>>>>> +=C2=A0=C2=A0=C2=A0 fixed->rst_ctx =3D readl_relaxed(fixed->base + >>>>>>>> fixed->regs->rst_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 mask; >>>>>>>> + >>>>>>>> +=C2=A0=C2=A0=C2=A0 return 0; >>>>>>>> +} >>>>>>>> + >>>>>>>> +static void tegra_clk_periph_fixed_restore_context(struct clk_hw >>>>>>>> *hw) >>>>>>>> +{ >>>>>>>> +=C2=A0=C2=A0=C2=A0 struct tegra_clk_periph_fixed *fixed =3D >>>>>>>> to_tegra_clk_periph_fixed(hw); >>>>>>>> +=C2=A0=C2=A0=C2=A0 u32 mask =3D 1 << (fixed->num % 32); >>>>>>>> + >>>>>>>> +=C2=A0=C2=A0=C2=A0 if (fixed->enb_ctx) >>>>>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 writel_relaxed(mask, f= ixed->base + >>>>>>>> fixed->regs->enb_set_reg); >>>>>>>> +=C2=A0=C2=A0=C2=A0 else >>>>>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 writel_relaxed(mask, f= ixed->base + >>>>>>>> fixed->regs->enb_clr_reg); >>>>>>>> + >>>>>>>> +=C2=A0=C2=A0=C2=A0 udelay(2); >>>>>>>> + >>>>>>>> +=C2=A0=C2=A0=C2=A0 if (!fixed->rst_ctx) { >>>>>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 udelay(5); /* reset pr= opogation delay */ >>>>>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 writel_relaxed(mask, f= ixed->base + fixed->regs->rst_reg); >>>>>>>> +=C2=A0=C2=A0=C2=A0 } >>>>>>>> +} >>>>>>>> + >>>>>>>> =C2=A0=C2=A0 static const struct clk_ops tegra_clk_periph_fixed_o= ps =3D { >>>>>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .is_enabled =3D tegra_clk_pe= riph_fixed_is_enabled, >>>>>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .enable =3D tegra_clk_periph= _fixed_enable, >>>>>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .disable =3D tegra_clk_perip= h_fixed_disable, >>>>>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .recalc_rate =3D tegra_clk_p= eriph_fixed_recalc_rate, >>>>>>>> +=C2=A0=C2=A0=C2=A0 .save_context =3D tegra_clk_periph_fixed_save_= context, >>>>>>>> +=C2=A0=C2=A0=C2=A0 .restore_context =3D tegra_clk_periph_fixed_re= store_context, >>>>>>>> =C2=A0=C2=A0 }; >>>>>>>> =C2=A0=C2=A0 =C2=A0 struct clk *tegra_clk_register_periph_fixed(c= onst char *name, >>>>>>>> diff --git a/drivers/clk/tegra/clk-periph-gate.c >>>>>>>> b/drivers/clk/tegra/clk-periph-gate.c >>>>>>>> index 4b31beefc9fc..6ba5b08e0787 100644 >>>>>>>> --- a/drivers/clk/tegra/clk-periph-gate.c >>>>>>>> +++ b/drivers/clk/tegra/clk-periph-gate.c >>>>>>>> @@ -25,6 +25,8 @@ static DEFINE_SPINLOCK(periph_ref_lock); >>>>>>>> =C2=A0=C2=A0 =C2=A0 #define read_rst(gate) \ >>>>>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 readl_relaxed(gate->clk_base= + (gate->regs->rst_reg)) >>>>>>>> +#define write_rst_set(val, gate) \ >>>>>>>> +=C2=A0=C2=A0=C2=A0 writel_relaxed(val, gate->clk_base + (gate->re= gs->rst_set_reg)) >>>>>>>> =C2=A0=C2=A0 #define write_rst_clr(val, gate) \ >>>>>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 writel_relaxed(val, gate->cl= k_base + >>>>>>>> (gate->regs->rst_clr_reg)) >>>>>>>> =C2=A0=C2=A0 @@ -110,10 +112,42 @@ static void clk_periph_disable= (struct >>>>>>>> clk_hw *hw) >>>>>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 spin_unlock_irqrestore(&peri= ph_ref_lock, flags); >>>>>>>> =C2=A0=C2=A0 } >>>>>>>> =C2=A0=C2=A0 +static int clk_periph_gate_save_context(struct clk_= hw *hw) >>>>>>>> +{ >>>>>>>> +=C2=A0=C2=A0=C2=A0 struct tegra_clk_periph_gate *gate =3D to_clk_= periph_gate(hw); >>>>>>>> + >>>>>>>> +=C2=A0=C2=A0=C2=A0 gate->clk_state_ctx =3D read_enb(gate) & perip= h_clk_to_bit(gate); >>>>>>>> +=C2=A0=C2=A0=C2=A0 gate->rst_state_ctx =3D read_rst(gate) & perip= h_clk_to_bit(gate); >>>>>>>> + >>>>>>>> +=C2=A0=C2=A0=C2=A0 return 0; >>>>>>>> +} >>>>>>>> + >>>>>>>> +static void clk_periph_gate_restore_context(struct clk_hw *hw) >>>>>>>> +{ >>>>>>>> +=C2=A0=C2=A0=C2=A0 struct tegra_clk_periph_gate *gate =3D to_clk_= periph_gate(hw); >>>>>>>> + >>>>>>>> +=C2=A0=C2=A0=C2=A0 if (gate->clk_state_ctx) >>>>>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 write_enb_set(periph_c= lk_to_bit(gate), gate); >>>>>>>> +=C2=A0=C2=A0=C2=A0 else >>>>>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 write_enb_clr(periph_c= lk_to_bit(gate), gate); >>>>>>>> + >>>>>>>> +=C2=A0=C2=A0=C2=A0 udelay(5); >>>>>>>> + >>>>>>>> +=C2=A0=C2=A0=C2=A0 if (!(gate->flags & TEGRA_PERIPH_NO_RESET) && >>>>>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 !(gate->flags & TEGRA_= PERIPH_MANUAL_RESET)) { >>>>>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if (gate->rst_state_ct= x) >>>>>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 write_rst_set(periph_clk_to_bit(gate), gate); >>>>>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 else >>>>>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 write_rst_clr(periph_clk_to_bit(gate), gate); >>>>>>>> +=C2=A0=C2=A0=C2=A0 } >>>>>>>> +} >>>>>>>> + >>>>>>>> =C2=A0=C2=A0 const struct clk_ops tegra_clk_periph_gate_ops =3D { >>>>>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .is_enabled =3D clk_periph_i= s_enabled, >>>>>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .enable =3D clk_periph_enabl= e, >>>>>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .disable =3D clk_periph_disa= ble, >>>>>>>> +=C2=A0=C2=A0=C2=A0 .save_context =3D clk_periph_gate_save_context= , >>>>>>>> +=C2=A0=C2=A0=C2=A0 .restore_context =3D clk_periph_gate_restore_c= ontext, >>>>>>>> =C2=A0=C2=A0 }; >>>>>>>> =C2=A0=C2=A0 =C2=A0 struct clk *tegra_clk_register_periph_gate(co= nst char *name, >>>>>>>> diff --git a/drivers/clk/tegra/clk-periph.c >>>>>>>> b/drivers/clk/tegra/clk-periph.c >>>>>>>> index 58437da25156..06fb62955768 100644 >>>>>>>> --- a/drivers/clk/tegra/clk-periph.c >>>>>>>> +++ b/drivers/clk/tegra/clk-periph.c >>>>>>>> @@ -99,6 +99,37 @@ static void clk_periph_disable(struct clk_hw *h= w) >>>>>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 gate_ops->disable(gate_hw); >>>>>>>> =C2=A0=C2=A0 } >>>>>>>> =C2=A0=C2=A0 +static int clk_periph_save_context(struct clk_hw *h= w) >>>>>>>> +{ >>>>>>>> +=C2=A0=C2=A0=C2=A0 struct tegra_clk_periph *periph =3D to_clk_per= iph(hw); >>>>>>>> +=C2=A0=C2=A0=C2=A0 const struct clk_ops *gate_ops =3D periph->gat= e_ops; >>>>>>>> +=C2=A0=C2=A0=C2=A0 struct clk_hw *gate_hw =3D &periph->gate.hw; >>>>>>>> + >>>>>>>> +=C2=A0=C2=A0=C2=A0 if (!(periph->gate.flags & TEGRA_PERIPH_NO_GAT= E)) >>>>>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 gate_ops->save_context= (gate_hw); >>>>>>>> + >>>>>>>> +=C2=A0=C2=A0=C2=A0 periph->parent_ctx =3D clk_periph_get_parent(h= w); >>>>>>>> + >>>>>>>> +=C2=A0=C2=A0=C2=A0 return 0; >>>>>>>> +} >>>>>>>> + >>>>>>>> +static void clk_periph_restore_context(struct clk_hw *hw) >>>>>>>> +{ >>>>>>>> +=C2=A0=C2=A0=C2=A0 struct tegra_clk_periph *periph =3D to_clk_per= iph(hw); >>>>>>>> +=C2=A0=C2=A0=C2=A0 const struct clk_ops *gate_ops =3D periph->gat= e_ops; >>>>>>>> +=C2=A0=C2=A0=C2=A0 struct clk_hw *gate_hw =3D &periph->gate.hw; >>>>>>>> +=C2=A0=C2=A0=C2=A0 const struct clk_ops *div_ops =3D periph->div_= ops; >>>>>>>> +=C2=A0=C2=A0=C2=A0 struct clk_hw *div_hw =3D &periph->divider.hw; >>>>>>>> + >>>>>>>> +=C2=A0=C2=A0=C2=A0 clk_periph_set_parent(hw, periph->parent_ctx); >>>>>>>> + >>>>>>>> +=C2=A0=C2=A0=C2=A0 if (!(periph->gate.flags & TEGRA_PERIPH_NO_DIV= )) >>>>>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 div_ops->restore_conte= xt(div_hw); >>>>>>> Could you please point to where the divider's save_context() happen= s? >>>>>>> Because I can't see it. >>>>>> Ah, I now see that there is no need to save the dividers context >>>>>> because >>>>>> clk itself has enough info that is needed for the context's restorin= g >>>>>> (like I pointed in the review to v6). >>>>>> >>>>>> Looks like you could also implement a new clk_hw_get_parent_index() >>>>>> generic helper to get the index instead of storing it manually. >>>>> clk_periph_get_parent basically invokes existing clk_mux_ops >>>>> get_parent() which is then saved in tegra_clk_periph. >>>>> >>>>> All existing drivers are using directly get_parent() from clk_mux >>>>> which actually gets index from the register read. >>>>> >>>>> To have this more generic w.r.t save/restore context point of view, >>>>> probably instead of implementing new get_parent_index helper, I think >>>>> its better to implement save_context and restore_context to >>>>> clk_mux_ops along with creating parent_index field into clk_mux to >>>>> cache index during set_parent. >>>>> >>>>> So we just need to invoke mux_ops save_context and restore_context. >>>>> >>>> I hope its ok to add save/restore context to clk_mux_ops to be more >>>> generic w.r.t save/restore context rather than get_parent_index API. >>>> Please confirm if you agree. >>> Sounds like a good idea. I see that there is a 'restoring' helper for >>> the generic clk_gate, seems something similar could be done for the >>> clk_mux. And looks like anyway you'll need to associate the parent cloc= k >>> with the hw index in order to restore the muxing. >> by 'restoring' helper for generic clk_gate, are you referring to >> clk_gate_restore_context API? > Yes. > >> clk_gate_restore_context is API that's any clk drivers can use for >> clk_gate operation restore for custom gate clk_ops. >> >> But clk-periph is directly using generic clk_mux ops from clk_mux so I >> think we should add .restore_context to clk_mux_ops and then during >> clk-periph restore need to invoke mux_ops->restore_context. > I'm not sure whether it will be good for every driver that uses generic > clk_mux ops. Should be more flexible to have a generic helper function > that any driver could use in order to restore the clock's parent. > > The clk-periph restoring also includes case of combining divider and > parent restoring, so generic helper could be useful in that case as well. > > It also looks like you could actually use the clk_gate_restore_context() > instead of manually saving the clock's enable-state, couldn't you? ok for clk_mux, can add generic clk_mux_restore_context API rather than=20 using restore_context in clk_ops and will invoke that during clk_periph=20 restore. Reg clk_gate, looks like we cant use generic clk_gate_restore_context=20 for clk-periph as it calls enable/disable callbacks and=20 clk_periph_enable/disable in clk-periph-gate also updated refcnt and=20 depending on that actual enable/disable is set. During suspend, peripherals that are already enabled have their refcnt >=20 1, so they dont go thru enable/disable on restore if we use same=20 enable/disable callback. Also to align exact reset state along with CLK (like for case where CLK=20 is enabled but peripheral might be in reset state), implemented=20 save/restore in tegra specific tegra_clk_periph_gate_ops