From: Jeffrey Hugo <quic_jhugo@quicinc.com>
To: Konrad Dybcio <konrad.dybcio@linaro.org>,
Andy Gross <agross@kernel.org>,
Bjorn Andersson <andersson@kernel.org>,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>, Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Conor Dooley <conor+dt@kernel.org>,
Taniya Das <tdas@codeaurora.org>
Cc: Marijn Suijten <marijn.suijten@somainline.org>,
<linux-arm-msm@vger.kernel.org>, <linux-clk@vger.kernel.org>,
<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 3/9] clk: qcom: gcc-msm8998: Control MMSS and GPUSS GPLL0 outputs properly
Date: Thu, 22 Jun 2023 08:55:50 -0600 [thread overview]
Message-ID: <e880bad8-4fcb-97c1-ec9c-9122e1b550e6@quicinc.com> (raw)
In-Reply-To: <20230622-topic-8998clk-v1-3-5b7a0d6e98b1@linaro.org>
On 6/22/2023 5:57 AM, Konrad Dybcio wrote:
> Up until now, we've been relying on some non-descript hardware magic
> to pinkypromise turn the clocks on for us. While new SoCs shine with
> that feature, MSM8998 can not always be fully trusted.
>
> Register the MMSS and GPUSS GPLL0 legs with the CCF to allow for manual
> enable voting.
>
> Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
> ---
> drivers/clk/qcom/gcc-msm8998.c | 58 ++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 58 insertions(+)
>
> diff --git a/drivers/clk/qcom/gcc-msm8998.c b/drivers/clk/qcom/gcc-msm8998.c
> index be024f8093c5..cccb19cae481 100644
> --- a/drivers/clk/qcom/gcc-msm8998.c
> +++ b/drivers/clk/qcom/gcc-msm8998.c
> @@ -25,6 +25,9 @@
> #include "reset.h"
> #include "gdsc.h"
>
> +#define GCC_MMSS_MISC 0x0902C
> +#define GCC_GPU_MISC 0x71028
> +
> static struct pll_vco fabia_vco[] = {
> { 250000000, 2000000000, 0 },
> { 125000000, 1000000000, 1 },
> @@ -1367,6 +1370,22 @@ static struct clk_branch gcc_boot_rom_ahb_clk = {
> },
> };
>
> +static struct clk_branch gcc_mmss_gpll0_div_clk = {
> + .halt_check = BRANCH_HALT_DELAY,
> + .clkr = {
> + .enable_reg = 0x5200c,
> + .enable_mask = BIT(0),
> + .hw.init = &(struct clk_init_data){
> + .name = "gcc_mmss_gpll0_div_clk",
> + .parent_hws = (const struct clk_hw *[]) {
> + &gpll0_out_main.clkr.hw,
> + },
> + .num_parents = 1,
> + .ops = &clk_branch2_ops,
> + },
> + },
> +};
> +
> static struct clk_branch gcc_mmss_gpll0_clk = {
> .halt_check = BRANCH_HALT_DELAY,
> .clkr = {
> @@ -1395,6 +1414,38 @@ static struct clk_branch gcc_mss_gpll0_div_clk_src = {
> },
> };
>
> +static struct clk_branch gcc_gpu_gpll0_div_clk = {
> + .halt_check = BRANCH_HALT_DELAY,
> + .clkr = {
> + .enable_reg = 0x5200c,
> + .enable_mask = BIT(3),
> + .hw.init = &(struct clk_init_data){
> + .name = "gcc_gpu_gpll0_div_clk",
> + .parent_hws = (const struct clk_hw *[]) {
> + &gpll0_out_main.clkr.hw,
> + },
> + .num_parents = 1,
> + .ops = &clk_branch2_ops,
> + },
> + },
> +};
> +
> +static struct clk_branch gcc_gpu_gpll0_clk = {
> + .halt_check = BRANCH_HALT_DELAY,
> + .clkr = {
> + .enable_reg = 0x5200c,
> + .enable_mask = BIT(4),
> + .hw.init = &(struct clk_init_data){
> + .name = "gcc_gpu_gpll0_clk",
> + .parent_hws = (const struct clk_hw *[]) {
> + &gpll0_out_main.clkr.hw,
> + },
> + .num_parents = 1,
> + .ops = &clk_branch2_ops,
> + },
> + },
> +};
> +
> static struct clk_branch gcc_blsp1_ahb_clk = {
> .halt_reg = 0x17004,
> .halt_check = BRANCH_HALT_VOTED,
> @@ -3080,6 +3131,9 @@ static struct clk_regmap *gcc_msm8998_clocks[] = {
> [AGGRE2_SNOC_NORTH_AXI] = &aggre2_snoc_north_axi_clk.clkr,
> [SSC_XO] = &ssc_xo_clk.clkr,
> [SSC_CNOC_AHBS_CLK] = &ssc_cnoc_ahbs_clk.clkr,
> + [GCC_MMSS_GPLL0_DIV_CLK] = &gcc_mmss_gpll0_div_clk.clkr,
> + [GCC_GPU_GPLL0_DIV_CLK] = &gcc_gpu_gpll0_div_clk.clkr,
> + [GCC_GPU_GPLL0_CLK] = &gcc_gpu_gpll0_clk.clkr,
> };
>
> static struct gdsc *gcc_msm8998_gdscs[] = {
> @@ -3235,6 +3289,10 @@ static int gcc_msm8998_probe(struct platform_device *pdev)
> if (ret)
> return ret;
>
> + /* Disable the GPLL0 active input to MMSS and GPU via MISC registers */
> + regmap_write(regmap, GCC_MMSS_MISC, 0x10003);
> + regmap_write(regmap, GCC_GPU_MISC, 0x10003);
I wonder, does this disrupt a handoff of an active display from the
bootloader to Linux?
next prev parent reply other threads:[~2023-06-22 14:57 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-22 11:57 [PATCH 0/9] MSM8998 clk cleanups and fixups Konrad Dybcio
2023-06-22 11:57 ` [PATCH 1/9] dt-bindings: clk: qcom,gcc-msm8998: Add missing GPU/MMSS GPLL0 legs Konrad Dybcio
2023-06-22 14:41 ` Jeffrey Hugo
2023-06-23 16:40 ` Krzysztof Kozlowski
2023-06-22 11:57 ` [PATCH 2/9] dt-bindings: clock: qcom,mmcc: Add GPLL0_DIV for MSM8998 Konrad Dybcio
2023-06-22 14:47 ` Jeffrey Hugo
2023-06-22 14:54 ` Rob Herring
2023-06-23 16:40 ` Krzysztof Kozlowski
2023-06-22 11:57 ` [PATCH 3/9] clk: qcom: gcc-msm8998: Control MMSS and GPUSS GPLL0 outputs properly Konrad Dybcio
2023-06-22 14:55 ` Jeffrey Hugo [this message]
2023-06-22 15:05 ` Konrad Dybcio
2023-06-22 15:19 ` Jeffrey Hugo
2023-06-26 15:46 ` Jeffrey Hugo
2023-06-22 11:57 ` [PATCH 4/9] clk: qcom: mmcc-msm8998: Properly consume GPLL0 inputs Konrad Dybcio
2023-06-22 15:03 ` Jeffrey Hugo
2023-06-22 11:57 ` [PATCH 5/9] clk: qcom: gpucc-msm8998: Use the correct GPLL0 leg with old DTs Konrad Dybcio
2023-06-22 15:03 ` Jeffrey Hugo
2023-06-22 11:57 ` [PATCH 6/9] clk: qcom: gcc-msm8998: Don't check halt bit on some branch clks Konrad Dybcio
2023-06-22 11:59 ` Konrad Dybcio
2023-06-22 15:04 ` Jeffrey Hugo
2023-06-22 11:57 ` [PATCH 7/9] clk: qcom: gcc-msm8998: Don't poke at some BIMC GPU clocks Konrad Dybcio
2023-06-23 14:25 ` Jeffrey Hugo
2023-06-22 11:57 ` [PATCH 8/9] arm64: dts: qcom: msm8998: Use the correct GPLL0 leg for GPUCC Konrad Dybcio
2023-06-23 14:26 ` Jeffrey Hugo
2023-06-22 11:57 ` [PATCH 9/9] arm64: dts: qcom: msm8998: Use the correct GPLL0_DIV leg for MMCC Konrad Dybcio
2023-06-23 14:27 ` Jeffrey Hugo
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=e880bad8-4fcb-97c1-ec9c-9122e1b550e6@quicinc.com \
--to=quic_jhugo@quicinc.com \
--cc=agross@kernel.org \
--cc=andersson@kernel.org \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=konrad.dybcio@linaro.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marijn.suijten@somainline.org \
--cc=mturquette@baylibre.com \
--cc=robh+dt@kernel.org \
--cc=sboyd@kernel.org \
--cc=tdas@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
all inboxes | Powered by JetHome®