From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
To: Andy Gross <agross@kernel.org>,
Bjorn Andersson <andersson@kernel.org>,
Konrad Dybcio <konrad.dybcio@linaro.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: [PATCH v3 4/8] clk: qcom: cbf-msm8996: scale CBF clock according to the CPUfreq
Date: Fri, 20 Jan 2023 08:14:13 +0200 [thread overview]
Message-ID: <20230120061417.2623751-5-dmitry.baryshkov@linaro.org> (raw)
In-Reply-To: <20230120061417.2623751-1-dmitry.baryshkov@linaro.org>
Turn CBF into the interconnect provider. Scale CBF frequency (bandwidth)
according to CPU frequencies.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
drivers/clk/qcom/clk-cbf-8996.c | 143 +++++++++++++++++++++++++++++++-
1 file changed, 142 insertions(+), 1 deletion(-)
diff --git a/drivers/clk/qcom/clk-cbf-8996.c b/drivers/clk/qcom/clk-cbf-8996.c
index 9cde0e660228..b049b4f7b270 100644
--- a/drivers/clk/qcom/clk-cbf-8996.c
+++ b/drivers/clk/qcom/clk-cbf-8996.c
@@ -5,11 +5,14 @@
#include <linux/bitfield.h>
#include <linux/clk.h>
#include <linux/clk-provider.h>
+#include <linux/interconnect-provider.h>
#include <linux/of.h>
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/regmap.h>
+#include <dt-bindings/interconnect/qcom,msm8996-cbf.h>
+
#include "clk-alpha-pll.h"
#include "clk-regmap.h"
@@ -225,6 +228,133 @@ static const struct regmap_config cbf_msm8996_regmap_config = {
.val_format_endian = REGMAP_ENDIAN_LITTLE,
};
+#ifdef CONFIG_INTERCONNECT
+struct qcom_msm8996_cbf_icc_provider {
+ struct icc_provider provider;
+ struct clk *clk;
+};
+
+#define to_qcom_cbf_provider(_provider) \
+ container_of(_provider, struct qcom_msm8996_cbf_icc_provider, provider)
+
+enum {
+ CBF_MASTER_NODE = 2000,
+ CBF_SLAVE_NODE
+};
+
+#define CBF_NUM_NODES 2
+
+static int qcom_msm8996_cbf_set(struct icc_node *src, struct icc_node *dst)
+{
+ struct qcom_msm8996_cbf_icc_provider *qp;
+
+ qp = to_qcom_cbf_provider(src->provider);
+
+ return clk_set_rate(qp->clk, icc_units_to_bps(dst->peak_bw));
+}
+
+static int qcom_msm8996_cbf_icc_get_bw(struct icc_node *node, u32 *avg, u32 *peak)
+{
+ struct qcom_msm8996_cbf_icc_provider *qp;
+
+ qp = to_qcom_cbf_provider(node->provider);
+ *peak = clk_get_rate(qp->clk) / 1000ULL;
+
+ return 0;
+}
+
+static int qcom_msm8996_cbf_icc_register(struct platform_device *pdev, struct clk_hw *cbf_hw)
+{
+ struct device *dev = &pdev->dev;
+ struct qcom_msm8996_cbf_icc_provider *qp;
+ struct icc_provider *provider;
+ struct icc_onecell_data *data;
+ struct icc_node *node;
+ struct clk *clk;
+ int ret;
+
+ clk = devm_clk_hw_get_clk(dev, cbf_hw, "cbf");
+ if (IS_ERR(clk))
+ return PTR_ERR(clk);
+
+ data = devm_kzalloc(dev, struct_size(data, nodes, CBF_NUM_NODES), GFP_KERNEL);
+ if (!data)
+ return -ENOMEM;
+
+ data->num_nodes = CBF_NUM_NODES;
+
+ qp = devm_kzalloc(dev, sizeof(*qp), GFP_KERNEL);
+ if (!qp)
+ return -ENOMEM;
+
+ qp->clk = clk;
+
+ provider = &qp->provider;
+ provider->dev = dev;
+ provider->get_bw = qcom_msm8996_cbf_icc_get_bw;
+ provider->set = qcom_msm8996_cbf_set;
+ provider->aggregate = icc_std_aggregate;
+ provider->xlate = of_icc_xlate_onecell;
+ INIT_LIST_HEAD(&provider->nodes);
+ provider->data = data;
+
+ ret = icc_provider_add(provider);
+ if (ret) {
+ dev_err(dev, "error adding interconnect provider\n");
+ return ret;
+ }
+
+ node = icc_node_create(CBF_MASTER_NODE);
+ if (IS_ERR(node)) {
+ ret = PTR_ERR(node);
+ goto err;
+ }
+
+ node->name = "cbf_master";
+ icc_node_add(node, provider);
+ icc_link_create(node, CBF_SLAVE_NODE);
+ data->nodes[MASTER_CBF_M4M] = node;
+
+ node = icc_node_create(CBF_SLAVE_NODE);
+ if (IS_ERR(node)) {
+ ret = PTR_ERR(node);
+ goto err;
+ }
+
+ node->name = "cbf_slave";
+ icc_node_add(node, provider);
+ data->nodes[SLAVE_CBF_M4M] = node;
+
+ platform_set_drvdata(pdev, provider);
+
+ return 0;
+
+err:
+ icc_nodes_remove(provider);
+ icc_provider_del(provider);
+
+ return ret;
+}
+
+static int qcom_msm8996_cbf_icc_remove(struct platform_device *pdev)
+{
+ struct icc_provider *provider = platform_get_drvdata(pdev);
+
+ icc_nodes_remove(provider);
+ icc_provider_del(provider);
+
+ return 0;
+}
+#else
+static int qcom_msm8996_cbf_icc_register(struct platform_device *pdev)
+{
+ dev_warn(&pdev->dev, "interconnects support is disabled, CBF clock is fixed\n");
+
+ return 0;
+}
+#define qcom_msm8996_cbf_icc_remove(pdev) (0)
+#endif
+
static int qcom_msm8996_cbf_probe(struct platform_device *pdev)
{
void __iomem *base;
@@ -283,7 +413,16 @@ static int qcom_msm8996_cbf_probe(struct platform_device *pdev)
if (ret)
return ret;
- return devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get, &cbf_mux.clkr.hw);
+ ret = devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get, &cbf_mux.clkr.hw);
+ if (ret)
+ return ret;
+
+ return qcom_msm8996_cbf_icc_register(pdev, &cbf_mux.clkr.hw);
+}
+
+static int qcom_msm8996_cbf_remove(struct platform_device *pdev)
+{
+ return qcom_msm8996_cbf_icc_remove(pdev);
}
static const struct of_device_id qcom_msm8996_cbf_match_table[] = {
@@ -294,9 +433,11 @@ MODULE_DEVICE_TABLE(of, qcom_msm8996_cbf_match_table);
static struct platform_driver qcom_msm8996_cbf_driver = {
.probe = qcom_msm8996_cbf_probe,
+ .remove = qcom_msm8996_cbf_remove,
.driver = {
.name = "qcom-msm8996-cbf",
.of_match_table = qcom_msm8996_cbf_match_table,
+ .sync_state = icc_sync_state,
},
};
--
2.39.0
next prev parent reply other threads:[~2023-01-20 6:14 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-20 6:14 [PATCH v3 0/8] clk: qcom: msm8996: add support for the CBF clock Dmitry Baryshkov
2023-01-20 6:14 ` [PATCH v3 1/8] dt-bindings: clock: qcom,msm8996-cbf: Describe the MSM8996 CBF clock controller Dmitry Baryshkov
2023-01-20 6:14 ` [PATCH v3 2/8] dt-bindints: interconnect/msm8996-cbf: add defines to be used by CBF Dmitry Baryshkov
2023-01-20 8:05 ` Krzysztof Kozlowski
2023-01-20 6:14 ` [PATCH v3 3/8] clk: qcom: add msm8996 Core Bus Framework (CBF) support Dmitry Baryshkov
2023-01-20 6:14 ` Dmitry Baryshkov [this message]
2023-01-20 11:13 ` [PATCH v3 4/8] clk: qcom: cbf-msm8996: scale CBF clock according to the CPUfreq Konrad Dybcio
2023-01-20 22:11 ` Stephen Boyd
2023-01-20 22:53 ` Dmitry Baryshkov
2023-01-25 21:40 ` Stephen Boyd
2023-01-26 8:20 ` Dmitry Baryshkov
2023-01-27 18:19 ` Dmitry Baryshkov
2023-01-20 6:14 ` [PATCH v3 5/8] clk: qcom: smd-rpm: provide RPM_SMD_XO_CLK_SRC on MSM8996 platform Dmitry Baryshkov
2023-01-20 6:14 ` [PATCH v3 6/8] arm64: qcom: dts: msm8996 switch from RPM_SMD_BB_CLK1 to RPM_SMD_XO_CLK_SRC Dmitry Baryshkov
2023-01-20 6:14 ` [PATCH v3 7/8] arm64: dts: qcom: msm8996: add CBF device entry Dmitry Baryshkov
2023-01-20 11:14 ` Konrad Dybcio
2023-01-20 6:14 ` [PATCH v3 8/8] arm64: dts: qcom: msm8996: scale CBF clock according to the CPUfreq Dmitry Baryshkov
2023-01-20 15:08 ` [PATCH v3 0/8] clk: qcom: msm8996: add support for the CBF clock Simon Glass
2023-01-20 22:18 ` Dmitry Baryshkov
2023-01-20 22:22 ` Simon Glass
2023-01-20 22:34 ` Konrad Dybcio
2023-02-09 4:22 ` (subset) " 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=20230120061417.2623751-5-dmitry.baryshkov@linaro.org \
--to=dmitry.baryshkov@linaro.org \
--cc=agross@kernel.org \
--cc=andersson@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=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).