Skip to contentSkip to conversation

interconnect: qcom: icc-rpmh: Consolidate probe functions

PATCH In review Mike Tipton 2 participants 2 messages Jun 21, 2021 – Jun 22, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 interconnect: qcom: icc-rpmh: Consolidate probe functions

The current probe/remove functions are implemented separately for each target, but they are almost identical. Replace them with common functions that can be used across all rpmh targets.

---

Aside from cleaning up minor inconsistencies and formatting, the new functions are identical to original per-target functions.

 drivers/interconnect/qcom/icc-rpmh.c | 93 ++++++++++++++++++++++++++
 drivers/interconnect/qcom/icc-rpmh.h |  2 +
 drivers/interconnect/qcom/sc7180.c   | 96 +--------------------------
 drivers/interconnect/qcom/sc7280.c   | 96 +--------------------------
 drivers/interconnect/qcom/sdm845.c   | 99 +---------------------------
 drivers/interconnect/qcom/sdx55.c    | 96 +--------------------------
 drivers/interconnect/qcom/sm8150.c   | 96 +--------------------------
 drivers/interconnect/qcom/sm8250.c   | 96 +--------------------------
 drivers/interconnect/qcom/sm8350.c   | 97 +--------------------------
 9 files changed, 109 insertions(+), 662 deletions(-)
drivers/interconnect/qcom/icc-rpmh.c +93 -0
index bf01d09dba6c..e1de186ecc78 100644
@@ -7,6 +7,7 @@
 #include <linux/interconnect-provider.h>
 #include <linux/module.h>
 #include <linux/of.h>
+#include <linux/of_device.h>
 #include <linux/slab.h>
 
 #include "bcm-voter.h"
@@ -184,4 +185,96 @@ int qcom_icc_bcm_init(struct qcom_icc_bcm *bcm, struct device *dev)
 }
 EXPORT_SYMBOL_GPL(qcom_icc_bcm_init);
 
+int qcom_icc_rpmh_probe(struct platform_device *pdev)
+{
+	const struct qcom_icc_desc *desc;
+	struct device *dev = &pdev->dev;
+	struct icc_onecell_data *data;
+	struct icc_provider *provider;
+	struct qcom_icc_node **qnodes, *qn;
+	struct qcom_icc_provider *qp;
+	struct icc_node *node;
+	size_t num_nodes, i, j;
+	int ret;
+
+	desc = of_device_get_match_data(dev);
+	if (!desc)
+		return -EINVAL;
+
+	qnodes = desc->nodes;
+	num_nodes = desc->num_nodes;
+
+	qp = devm_kzalloc(dev, sizeof(*qp), GFP_KERNEL);
+	if (!qp)
+		return -ENOMEM;
+
+	data = devm_kzalloc(dev, struct_size(data, nodes, num_nodes), GFP_KERNEL);
+	if (!data)
+		return -ENOMEM;
+
+	provider = &qp->provider;
+	provider->dev = dev;
+	provider->set = qcom_icc_set;
+	provider->pre_aggregate = qcom_icc_pre_aggregate;
+	provider->aggregate = qcom_icc_aggregate;
+	provider->xlate_extended = qcom_icc_xlate_extended;
+	INIT_LIST_HEAD(&provider->nodes);
+	provider->data = data;
+
+	qp->dev = dev;
+	qp->bcms = desc->bcms;
+	qp->num_bcms = desc->num_bcms;
+
+	qp->voter = of_bcm_voter_get(qp->dev, NULL);
+	if (IS_ERR(qp->voter))
+		return PTR_ERR(qp->voter);
+
+	ret = icc_provider_add(provider);
+	if (ret)
+		return ret;
+
+	for (i = 0; i < qp->num_bcms; i++)
+		qcom_icc_bcm_init(qp->bcms[i], dev);
+
+	for (i = 0; i < num_nodes; i++) {
+		qn = qnodes[i];
+		if (!qn)
+			continue;
+
+		node = icc_node_create(qn->id);
+		if (IS_ERR(node)) {
+			ret = PTR_ERR(node);
+			goto err;
+		}
+
+		node->name = qn->name;
+		node->data = qn;
+		icc_node_add(node, provider);
+
+		for (j = 0; j < qn->num_links; j++)
+			icc_link_create(node, qn->links[j]);
+
+		data->nodes[i] = node;
+	}
+
+	data->num_nodes = num_nodes;
+	platform_set_drvdata(pdev, qp);
+
+	return 0;
+err:
+	icc_nodes_remove(provider);
+	icc_provider_del(provider);
+	return ret;
+}
+EXPORT_SYMBOL_GPL(qcom_icc_rpmh_probe);
+
+int qcom_icc_rpmh_remove(struct platform_device *pdev)
+{
+	struct qcom_icc_provider *qp = platform_get_drvdata(pdev);
+
+	icc_nodes_remove(&qp->provider);
+	return icc_provider_del(&qp->provider);
+}
+EXPORT_SYMBOL_GPL(qcom_icc_rpmh_remove);
+
 MODULE_LICENSE("GPL v2");
drivers/interconnect/qcom/icc-rpmh.h +2 -0
index e5f61ab989e7..4bfc060529ba 100644
@@ -134,5 +134,7 @@ int qcom_icc_set(struct icc_node *src, struct icc_node *dst);
 struct icc_node_data *qcom_icc_xlate_extended(struct of_phandle_args *spec, void *data);
 int qcom_icc_bcm_init(struct qcom_icc_bcm *bcm, struct device *dev);
 void qcom_icc_pre_aggregate(struct icc_node *node);
+int qcom_icc_rpmh_probe(struct platform_device *pdev);
+int qcom_icc_rpmh_remove(struct platform_device *pdev);
 
 #endif
drivers/interconnect/qcom/sc7180.c +2 -94

108 lines not on this page · raw message

drivers/interconnect/qcom/sc7280.c +2 -94

108 lines not on this page · raw message

drivers/interconnect/qcom/sdm845.c +2 -97

111 lines not on this page · raw message

drivers/interconnect/qcom/sdx55.c +2 -94

108 lines not on this page · raw message

drivers/interconnect/qcom/sm8150.c +2 -94

108 lines not on this page · raw message

drivers/interconnect/qcom/sm8250.c +2 -94

108 lines not on this page · raw message

drivers/interconnect/qcom/sm8350.c +2 -95

109 lines not on this page · raw message

Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project