From: Ansuel Smith <ansuelsmth@gmail.com>
To: Rob Herring <robh+dt@kernel.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Andy Gross <agross@kernel.org>,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>,
Ansuel Smith <ansuelsmth@gmail.com>,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org
Subject: [PATCH v5 11/18] clk: qcom: krait-cc: force sec_mux to QSB
Date: Mon, 21 Mar 2022 16:38:48 +0100 [thread overview]
Message-ID: <20220321153855.12082-12-ansuelsmth@gmail.com> (raw)
In-Reply-To: <20220321153855.12082-1-ansuelsmth@gmail.com>
Now that we have converted every driver to parent_data, it was
notice that the bootloader can't really leave the system in a
strange state where l2 or the cpu0/1 can be sourced in a number of ways
for example cpu1 sourcing out of qsb, l2 sourcing out of pxo.
To correctly reset the mux and the HFPLL force the sec_mux to QSB.
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
---
drivers/clk/qcom/krait-cc.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/drivers/clk/qcom/krait-cc.c b/drivers/clk/qcom/krait-cc.c
index 5f98ee1c3681..299eb4c81d96 100644
--- a/drivers/clk/qcom/krait-cc.c
+++ b/drivers/clk/qcom/krait-cc.c
@@ -15,6 +15,8 @@
#include "clk-krait.h"
+#define QSB_RATE 1
+
static unsigned int sec_mux_map[] = {
2,
0,
@@ -181,6 +183,13 @@ krait_add_sec_mux(struct device *dev, struct clk *qsb, int id,
if (ret)
clk = ERR_PTR(ret);
+ /*
+ * Force the sec_mux to be set to QSB rate.
+ * This is needed to correctly set the parents and
+ * to later reset mux and HFPLL to a known freq.
+ */
+ clk_set_rate(clk, QSB_RATE);
+
err_clk:
if (unique_aux)
kfree(parent_name);
@@ -378,7 +387,7 @@ static int krait_cc_probe(struct platform_device *pdev)
*/
cur_rate = clk_get_rate(l2_pri_mux_clk);
aux_rate = 384000000;
- if (cur_rate == 1) {
+ if (cur_rate == QSB_RATE) {
dev_info(dev, "L2 @ QSB rate. Forcing new rate.\n");
cur_rate = aux_rate;
}
@@ -389,7 +398,7 @@ static int krait_cc_probe(struct platform_device *pdev)
for_each_possible_cpu(cpu) {
clk = clks[cpu];
cur_rate = clk_get_rate(clk);
- if (cur_rate == 1) {
+ if (cur_rate == QSB_RATE) {
dev_info(dev, "CPU%d @ QSB rate. Forcing new rate.\n", cpu);
cur_rate = aux_rate;
}
--
2.34.1
next prev parent reply other threads:[~2022-03-21 16:09 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-21 15:38 [PATCH v5 00/18] Modernize rest of the krait drivers Ansuel Smith
2022-03-21 15:38 ` [PATCH v5 01/18] clk: introduce clk_hw_get_index_of_parent new API Ansuel Smith
2022-03-21 15:38 ` [PATCH v5 02/18] clk: qcom: gcc-ipq806x: skip pxo/cxo fixed clk if already present Ansuel Smith
2022-03-21 15:38 ` [PATCH v5 03/18] clk: qcom: gcc-ipq806x: add PXO_SRC in clk table Ansuel Smith
2022-03-21 15:38 ` [PATCH v5 04/18] clk: qcom: clk-hfpll: use poll_timeout macro Ansuel Smith
2022-03-21 15:38 ` [PATCH v5 05/18] clk: qcom: kpss-xcc: convert to parent data API Ansuel Smith
2022-03-21 15:38 ` [PATCH v5 06/18] clk: qcom: clk-krait: unlock spin after mux completion Ansuel Smith
2022-03-21 15:38 ` [PATCH v5 07/18] clk: qcom: clk-krait: add hw_parent check for div2_round_rate Ansuel Smith
2022-03-21 15:38 ` [PATCH v5 08/18] clk: qcom: krait-cc: convert to parent_data API Ansuel Smith
2022-03-21 15:38 ` [PATCH v5 09/18] clk: qcom: krait-cc: drop pr_info and register qsb only if needed Ansuel Smith
2022-03-21 15:38 ` [PATCH v5 10/18] clk: qcom: krait-cc: drop hardcoded safe_sel Ansuel Smith
2022-03-21 15:38 ` Ansuel Smith [this message]
2022-03-21 15:38 ` [PATCH v5 12/18] clk: qcom: clk-krait: add apq/ipq8064 errata workaround Ansuel Smith
2022-03-21 15:38 ` [PATCH v5 13/18] clk: qcom: clk-krait: add enable disable ops Ansuel Smith
2022-03-21 15:38 ` [PATCH v5 14/18] dt-bindings: clock: Convert qcom,krait-cc to yaml Ansuel Smith
2022-03-21 21:51 ` Rob Herring
2022-03-21 15:38 ` [PATCH v5 15/18] dt-bindings: clock: Add L2 clocks to qcom,krait-cc Documentation Ansuel Smith
2022-03-21 21:50 ` Rob Herring
2022-03-21 21:31 ` Ansuel Smith
2022-03-21 15:38 ` [PATCH v5 16/18] ARM: dts: qcom: qcom-ipq8064: add missing krait-cc compatible and clocks Ansuel Smith
2022-03-21 15:38 ` [PATCH v5 17/18] dt-bindings: arm: msm: Convert kpss-acc driver Documentation to yaml Ansuel Smith
2022-03-21 15:38 ` [PATCH v5 18/18] dt-bindings: arm: msm: Convert kpss-gcc " Ansuel Smith
2022-03-21 19:18 ` Rob Herring
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=20220321153855.12082-12-ansuelsmth@gmail.com \
--to=ansuelsmth@gmail.com \
--cc=agross@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=devicetree@vger.kernel.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=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).