Commit 789a39ad authored by Mike Tipton's avatar Mike Tipton Committed by Georgi Djakov
Browse files

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.

Signed-off-by: default avatarMike Tipton <mdtipton@codeaurora.org>
Reviewed-by: default avatarMatthias Kaehlcke <mka@chromium.org>
Link: https://lore.kernel.org/r/20210621214241.13521-1-mdtipton@codeaurora.org


Signed-off-by: default avatarGeorgi Djakov <djakov@kernel.org>
parent e73f0f0e

drivers/interconnect/qcom/icc-rpmh.c

+93 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -504,98 +504,6 @@ static struct qcom_icc_desc sc7180_system_noc = { 
	.num_bcms = ARRAY_SIZE(system_noc_bcms),

};



static int qnoc_probe(struct platform_device *pdev)

{

	const struct qcom_icc_desc *desc;

	struct icc_onecell_data *data;

	struct icc_provider *provider;

	struct qcom_icc_node **qnodes;

	struct qcom_icc_provider *qp;

	struct icc_node *node;

	size_t num_nodes, i;

	int ret;



	desc = device_get_match_data(&pdev->dev);

	if (!desc)

		return -EINVAL;



	qnodes = desc->nodes;

	num_nodes = desc->num_nodes;



	qp = devm_kzalloc(&pdev->dev, sizeof(*qp), GFP_KERNEL);

	if (!qp)

		return -ENOMEM;



	data = devm_kcalloc(&pdev->dev, num_nodes, sizeof(*node), GFP_KERNEL);

	if (!data)

		return -ENOMEM;



	provider = &qp->provider;

	provider->dev = &pdev->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 = &pdev->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) {

		dev_err(&pdev->dev, "error adding interconnect provider\n");

		return ret;

	}



	for (i = 0; i < qp->num_bcms; i++)

		qcom_icc_bcm_init(qp->bcms[i], &pdev->dev);



	for (i = 0; i < num_nodes; i++) {

		size_t j;



		if (!qnodes[i])

			continue;



		node = icc_node_create(qnodes[i]->id);

		if (IS_ERR(node)) {

			ret = PTR_ERR(node);

			goto err;

		}



		node->name = qnodes[i]->name;

		node->data = qnodes[i];

		icc_node_add(node, provider);



		for (j = 0; j < qnodes[i]->num_links; j++)

			icc_link_create(node, qnodes[i]->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;

}



static int qnoc_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);

}



static const struct of_device_id qnoc_of_match[] = {

	{ .compatible = "qcom,sc7180-aggre1-noc",

	  .data = &sc7180_aggre1_noc},
@@ -628,8 +536,8 @@ static const struct of_device_id qnoc_of_match[] = { 
MODULE_DEVICE_TABLE(of, qnoc_of_match);



static struct platform_driver qnoc_driver = {

	.probe = qnoc_probe,

	.remove = qnoc_remove,

	.probe = qcom_icc_rpmh_probe,

	.remove = qcom_icc_rpmh_remove,

	.driver = {

		.name = "qnoc-sc7180",

		.of_match_table = qnoc_of_match,

drivers/interconnect/qcom/sc7280.c

+2 −94
Original line number Diff line number Diff line
@@ -1802,98 +1802,6 @@ static struct qcom_icc_desc sc7280_system_noc = { 
	.num_bcms = ARRAY_SIZE(system_noc_bcms),

};



static int qnoc_probe(struct platform_device *pdev)

{

	const struct qcom_icc_desc *desc;

	struct icc_onecell_data *data;

	struct icc_provider *provider;

	struct qcom_icc_node **qnodes;

	struct qcom_icc_provider *qp;

	struct icc_node *node;

	size_t num_nodes, i;

	int ret;



	desc = device_get_match_data(&pdev->dev);

	if (!desc)

		return -EINVAL;



	qnodes = desc->nodes;

	num_nodes = desc->num_nodes;



	qp = devm_kzalloc(&pdev->dev, sizeof(*qp), GFP_KERNEL);

	if (!qp)

		return -ENOMEM;



	data = devm_kcalloc(&pdev->dev, num_nodes, sizeof(*node), GFP_KERNEL);

	if (!data)

		return -ENOMEM;



	provider = &qp->provider;

	provider->dev = &pdev->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 = &pdev->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) {

		dev_err(&pdev->dev, "error adding interconnect provider\n");

		return ret;

	}



	for (i = 0; i < qp->num_bcms; i++)

		qcom_icc_bcm_init(qp->bcms[i], &pdev->dev);



	for (i = 0; i < num_nodes; i++) {

		size_t j;



		if (!qnodes[i])

			continue;



		node = icc_node_create(qnodes[i]->id);

		if (IS_ERR(node)) {

			ret = PTR_ERR(node);

			goto err;

		}



		node->name = qnodes[i]->name;

		node->data = qnodes[i];

		icc_node_add(node, provider);



		for (j = 0; j < qnodes[i]->num_links; j++)

			icc_link_create(node, qnodes[i]->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;

}



static int qnoc_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);

}



static const struct of_device_id qnoc_of_match[] = {

	{ .compatible = "qcom,sc7280-aggre1-noc",

	  .data = &sc7280_aggre1_noc},
@@ -1924,8 +1832,8 @@ static const struct of_device_id qnoc_of_match[] = { 
MODULE_DEVICE_TABLE(of, qnoc_of_match);



static struct platform_driver qnoc_driver = {

	.probe = qnoc_probe,

	.remove = qnoc_remove,

	.probe = qcom_icc_rpmh_probe,

	.remove = qcom_icc_rpmh_remove,

	.driver = {

		.name = "qnoc-sc7280",

		.of_match_table = qnoc_of_match,

drivers/interconnect/qcom/sdm845.c

+2 −97
Original line number Diff line number Diff line
@@ -440,101 +440,6 @@ static const struct qcom_icc_desc sdm845_system_noc = { 
	.num_bcms = ARRAY_SIZE(system_noc_bcms),

};



static int qnoc_probe(struct platform_device *pdev)

{

	const struct qcom_icc_desc *desc;

	struct icc_onecell_data *data;

	struct icc_provider *provider;

	struct qcom_icc_node **qnodes;

	struct qcom_icc_provider *qp;

	struct icc_node *node;

	size_t num_nodes, i;

	int ret;



	desc = device_get_match_data(&pdev->dev);

	if (!desc)

		return -EINVAL;



	qnodes = desc->nodes;

	num_nodes = desc->num_nodes;



	qp = devm_kzalloc(&pdev->dev, sizeof(*qp), GFP_KERNEL);

	if (!qp)

		return -ENOMEM;



	data = devm_kzalloc(&pdev->dev, struct_size(data, nodes, num_nodes),

			    GFP_KERNEL);

	if (!data)

		return -ENOMEM;



	provider = &qp->provider;

	provider->dev = &pdev->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 = &pdev->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)) {

		dev_err(&pdev->dev, "bcm_voter err:%ld\n", PTR_ERR(qp->voter));

		return PTR_ERR(qp->voter);

	}



	ret = icc_provider_add(provider);

	if (ret) {

		dev_err(&pdev->dev, "error adding interconnect provider\n");

		return ret;

	}



	for (i = 0; i < qp->num_bcms; i++)

		qcom_icc_bcm_init(qp->bcms[i], &pdev->dev);



	for (i = 0; i < num_nodes; i++) {

		size_t j;



		if (!qnodes[i])

			continue;



		node = icc_node_create(qnodes[i]->id);

		if (IS_ERR(node)) {

			ret = PTR_ERR(node);

			goto err;

		}



		node->name = qnodes[i]->name;

		node->data = qnodes[i];

		icc_node_add(node, provider);



		for (j = 0; j < qnodes[i]->num_links; j++)

			icc_link_create(node, qnodes[i]->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;

}



static int qnoc_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);

}



static const struct of_device_id qnoc_of_match[] = {

	{ .compatible = "qcom,sdm845-aggre1-noc",

	  .data = &sdm845_aggre1_noc},
@@ -557,8 +462,8 @@ static const struct of_device_id qnoc_of_match[] = { 
MODULE_DEVICE_TABLE(of, qnoc_of_match);



static struct platform_driver qnoc_driver = {

	.probe = qnoc_probe,

	.remove = qnoc_remove,

	.probe = qcom_icc_rpmh_probe,

	.remove = qcom_icc_rpmh_remove,

	.driver = {

		.name = "qnoc-sdm845",

		.of_match_table = qnoc_of_match,