From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
To: Ansuel Smith <ansuelsmth@gmail.com>,
Andy Gross <agross@kernel.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>,
Sricharan R <sricharan@codeaurora.org>,
linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 4/4] clk: qcom: clk-krait: add apq/ipq8064 errata workaround
Date: Fri, 29 Apr 2022 18:00:45 +0300 [thread overview]
Message-ID: <1f013429-8a5b-47c8-a146-41bb66af3f03@linaro.org> (raw)
In-Reply-To: <20220429120108.9396-5-ansuelsmth@gmail.com>
On 29/04/2022 15:01, Ansuel Smith wrote:
> Add apq/ipq8064 errata workaround where the sec_src clock gating needs to
> be disabled during switching. To enable this set disable_sec_src_gating
> in the mux struct.
>
> Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
> ---
> drivers/clk/qcom/clk-krait.c | 16 ++++++++++++++++
> drivers/clk/qcom/clk-krait.h | 1 +
> drivers/clk/qcom/krait-cc.c | 1 +
> 3 files changed, 18 insertions(+)
>
> diff --git a/drivers/clk/qcom/clk-krait.c b/drivers/clk/qcom/clk-krait.c
> index 6c367ad6506a..4a9b3296c45b 100644
> --- a/drivers/clk/qcom/clk-krait.c
> +++ b/drivers/clk/qcom/clk-krait.c
> @@ -18,13 +18,23 @@
> static DEFINE_SPINLOCK(krait_clock_reg_lock);
>
> #define LPL_SHIFT 8
> +#define SECCLKAGD BIT(4)
> +
> static void __krait_mux_set_sel(struct krait_mux_clk *mux, int sel)
> {
> unsigned long flags;
> u32 regval;
>
> spin_lock_irqsave(&krait_clock_reg_lock, flags);
> +
> regval = krait_get_l2_indirect_reg(mux->offset);
> +
> + /* apq/ipq8064 Errata: disable sec_src clock gating during switch. */
> + if (mux->disable_sec_src_gating) {
> + regval |= SECCLKAGD;
> + krait_set_l2_indirect_reg(mux->offset, regval);
> + }
> +
> regval &= ~(mux->mask << mux->shift);
> regval |= (sel & mux->mask) << mux->shift;
> if (mux->lpl) {
> @@ -33,6 +43,12 @@ static void __krait_mux_set_sel(struct krait_mux_clk *mux, int sel)
> }
> krait_set_l2_indirect_reg(mux->offset, regval);
>
> + /* apq/ipq8064 Errata: re-enabled sec_src clock gating. */
> + if (mux->disable_sec_src_gating) {
> + regval &= ~SECCLKAGD;
> + krait_set_l2_indirect_reg(mux->offset, regval);
> + }
> +
> /* Wait for switch to complete. */
> mb();
> udelay(1);
> diff --git a/drivers/clk/qcom/clk-krait.h b/drivers/clk/qcom/clk-krait.h
> index 9120bd2f5297..f930538c539e 100644
> --- a/drivers/clk/qcom/clk-krait.h
> +++ b/drivers/clk/qcom/clk-krait.h
> @@ -15,6 +15,7 @@ struct krait_mux_clk {
> u8 safe_sel;
> u8 old_index;
> bool reparent;
> + bool disable_sec_src_gating;
>
> struct clk_hw hw;
> struct notifier_block clk_nb;
> diff --git a/drivers/clk/qcom/krait-cc.c b/drivers/clk/qcom/krait-cc.c
> index 4d4b657d33c3..0f88bf41ec6e 100644
> --- a/drivers/clk/qcom/krait-cc.c
> +++ b/drivers/clk/qcom/krait-cc.c
> @@ -138,6 +138,7 @@ krait_add_sec_mux(struct device *dev, int id, const char *s,
> mux->parent_map = sec_mux_map;
> mux->hw.init = &init;
> mux->safe_sel = 0;
> + mux->disable_sec_src_gating = true;
This has to be guarded with the of_compatible checks. Otherwise you'd
apply this errata to all Krait CPUs, not only apq/ipq8064.
At least this should be limited to krait-cc-v1 with the note that there
is no way to distinguish between platforms.
>
> init.name = kasprintf(GFP_KERNEL, "krait%s_sec_mux", s);
> if (!init.name)
--
With best wishes
Dmitry
next prev parent reply other threads:[~2022-04-29 15:00 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-29 12:01 [PATCH 0/4] Small fixes/improvement for hfpll and krait Ansuel Smith
2022-04-29 12:01 ` [PATCH 1/4] clk: qcom: clk-hfpll: use poll_timeout macro Ansuel Smith
2022-04-29 14:42 ` Dmitry Baryshkov
2022-04-29 12:01 ` [PATCH 2/4] clk: qcom: clk-krait: unlock spin after mux completion Ansuel Smith
2022-04-29 14:41 ` Dmitry Baryshkov
2022-04-29 12:01 ` [PATCH 3/4] clk: qcom: clk-krait: add hw_parent check for div2_round_rate Ansuel Smith
2022-04-29 14:53 ` Dmitry Baryshkov
2022-04-29 15:06 ` Ansuel Smith
2022-04-29 15:22 ` Dmitry Baryshkov
2022-04-29 12:01 ` [PATCH 4/4] clk: qcom: clk-krait: add apq/ipq8064 errata workaround Ansuel Smith
2022-04-29 15:00 ` Dmitry Baryshkov [this message]
2022-04-29 15:09 ` Ansuel Smith
2022-04-29 15:13 ` Dmitry Baryshkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1f013429-8a5b-47c8-a146-41bb66af3f03@linaro.org \
--to=dmitry.baryshkov@linaro.org \
--cc=agross@kernel.org \
--cc=ansuelsmth@gmail.com \
--cc=bjorn.andersson@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=sboyd@kernel.org \
--cc=sricharan@codeaurora.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).