From: Konrad Dybcio <konrad.dybcio@linaro.org>
To: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
Andy Gross <agross@kernel.org>,
Bjorn Andersson <andersson@kernel.org>,
Stephen Boyd <sboyd@kernel.org>,
Michael Turquette <mturquette@baylibre.com>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Taniya Das <quic_tdas@quicinc.com>
Cc: linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org,
devicetree@vger.kernel.org
Subject: Re: [PATCH v3 11/14] clk: qcom: cpu-8996: fix ACD initialization
Date: Fri, 13 Jan 2023 15:13:22 +0100 [thread overview]
Message-ID: <e59b5ca8-1618-6b63-269c-841f4cc4a2dd@linaro.org> (raw)
In-Reply-To: <20230113120544.59320-12-dmitry.baryshkov@linaro.org>
On 13.01.2023 13:05, Dmitry Baryshkov wrote:
> The vendor kernel applies different order while programming SSSCTL and
> L2ACDCR registers on power and performance clusters. However it was
> demonstrated that doing this upstream results in the board reset. Make
> both clusters use the same sequence, which fixes the reset.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
> drivers/clk/qcom/clk-cpu-8996.c | 20 ++++++++------------
> 1 file changed, 8 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/clk/qcom/clk-cpu-8996.c b/drivers/clk/qcom/clk-cpu-8996.c
> index 07d59bca741e..c471c6836c63 100644
> --- a/drivers/clk/qcom/clk-cpu-8996.c
> +++ b/drivers/clk/qcom/clk-cpu-8996.c
> @@ -475,9 +475,9 @@ static int qcom_cpu_clk_msm8996_register_clks(struct device *dev,
> return ret;
> }
>
> -#define CPU_AFINITY_MASK 0xFFF
> -#define PWRCL_CPU_REG_MASK 0x3
> -#define PERFCL_CPU_REG_MASK 0x103
> +#define CPU_CLUSTER_AFFINITY_MASK 0xf00
> +#define PWRCL_AFFINITY_MASK 0x000
> +#define PERFCL_AFFINITY_MASK 0x100
>
> #define L2ACDCR_REG 0x580ULL
> #define L2ACDTD_REG 0x581ULL
> @@ -498,21 +498,17 @@ static void qcom_cpu_clk_msm8996_acd_init(struct regmap *regmap)
> if (val == 0x00006a11)
> goto out;
>
> - hwid = read_cpuid_mpidr() & CPU_AFINITY_MASK;
> -
> kryo_l2_set_indirect_reg(L2ACDTD_REG, 0x00006a11);
> kryo_l2_set_indirect_reg(L2ACDDVMRC_REG, 0x000e0f0f);
> kryo_l2_set_indirect_reg(L2ACDSSCR_REG, 0x00000601);
>
> - if (PWRCL_CPU_REG_MASK == (hwid | PWRCL_CPU_REG_MASK)) {
> - regmap_write(regmap, PWRCL_REG_OFFSET + SSSCTL_OFFSET, 0xf);
> - kryo_l2_set_indirect_reg(L2ACDCR_REG, 0x002c5ffd);
> - }
> + kryo_l2_set_indirect_reg(L2ACDCR_REG, 0x002c5ffd);
>
> - if (PERFCL_CPU_REG_MASK == (hwid | PERFCL_CPU_REG_MASK)) {
> - kryo_l2_set_indirect_reg(L2ACDCR_REG, 0x002c5ffd);
> + hwid = read_cpuid_mpidr();
> + if ((hwid & CPU_CLUSTER_AFFINITY_MASK) == PWRCL_AFFINITY_MASK)
> + regmap_write(regmap, PWRCL_REG_OFFSET + SSSCTL_OFFSET, 0xf);
> + else
> regmap_write(regmap, PERFCL_REG_OFFSET + SSSCTL_OFFSET, 0xf);
> - }
>
> out:
> spin_unlock_irqrestore(&qcom_clk_acd_lock, flags);
next prev parent reply other threads:[~2023-01-13 14:15 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-13 12:05 [PATCH v3 00/14] clk: qcom: cpu-8996: stability fixes Dmitry Baryshkov
2023-01-13 12:05 ` [PATCH v3 01/14] dt-bindings: clock: qcom,msm8996-apcc: add sys_apcs_aux clock Dmitry Baryshkov
2023-01-13 12:05 ` [PATCH v3 02/14] clk: qcom: clk-alpha-pll: program PLL_TEST/PLL_TEST_U if required Dmitry Baryshkov
2023-01-13 14:11 ` Konrad Dybcio
2023-01-13 12:05 ` [PATCH v3 03/14] clk: qcom: cpu-8996: correct PLL programming Dmitry Baryshkov
2023-01-13 12:05 ` [PATCH v3 04/14] clk: qcom: cpu-8996: fix the init clock rate Dmitry Baryshkov
2023-01-13 14:12 ` Konrad Dybcio
2023-01-13 12:05 ` [PATCH v3 05/14] clk: qcom: cpu-8996: support using GPLL0 as SMUX input Dmitry Baryshkov
2023-01-13 12:05 ` [PATCH v3 06/14] clk: qcom: cpu-8996: skip ACD init if the setup is valid Dmitry Baryshkov
2023-01-13 12:05 ` [PATCH v3 07/14] clk: qcom: cpu-8996: simplify the cpu_clk_notifier_cb Dmitry Baryshkov
2023-01-13 12:05 ` [PATCH v3 08/14] clk: qcom: cpu-8996: setup PLLs before registering clocks Dmitry Baryshkov
2023-01-13 12:05 ` [PATCH v3 09/14] clk: qcom: cpu-8996: move qcom_cpu_clk_msm8996_acd_init call Dmitry Baryshkov
2023-01-13 12:05 ` [PATCH v3 10/14] clk: qcom: cpu-8996: fix PLL configuration sequence Dmitry Baryshkov
2023-01-13 14:12 ` Konrad Dybcio
2023-01-13 12:05 ` [PATCH v3 11/14] clk: qcom: cpu-8996: fix ACD initialization Dmitry Baryshkov
2023-01-13 14:13 ` Konrad Dybcio [this message]
2023-01-13 12:05 ` [PATCH v3 12/14] clk: qcom: cpu-8996: fix PLL clock ops Dmitry Baryshkov
2023-01-13 14:13 ` Konrad Dybcio
2023-01-13 12:05 ` [PATCH v3 13/14] clk: qcom: cpu-8996: change setup sequence to follow vendor kernel Dmitry Baryshkov
2023-01-13 12:05 ` [PATCH v3 14/14] arm64: dts: qcom: msm8996: support using GPLL0 as kryocc input Dmitry Baryshkov
2023-01-19 4:53 ` (subset) [PATCH v3 00/14] clk: qcom: cpu-8996: stability fixes Bjorn Andersson
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=e59b5ca8-1618-6b63-269c-841f4cc4a2dd@linaro.org \
--to=konrad.dybcio@linaro.org \
--cc=agross@kernel.org \
--cc=andersson@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=dmitry.baryshkov@linaro.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-clk@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=quic_tdas@quicinc.com \
--cc=robh+dt@kernel.org \
--cc=sboyd@kernel.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).