Commit 62feb14e authored by Jun Nie's avatar Jun Nie Committed by Georgi Djakov
Browse files

interconnect: qcom: Consolidate interconnect RPM support 



Add RPM based interconnect driver implements the set and aggregate
functionalities that translates bandwidth requests into RPM messages.
These modules provide a common set of functionalities for all
Qualcomm RPM based interconnect providers and should help reduce code
duplication when adding new providers.

Signed-off-by: default avatarJun Nie <jun.nie@linaro.org>
Link: https://lore.kernel.org/r/20201204075345.5161-2-jun.nie@linaro.org


Signed-off-by: default avatarGeorgi Djakov <georgi.djakov@linaro.org>
parent 5c8fe583

drivers/interconnect/qcom/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ qnoc-sc7180-objs := sc7180.o 
qnoc-sdm845-objs			:= sdm845.o

qnoc-sm8150-objs			:= sm8150.o

qnoc-sm8250-objs			:= sm8250.o

icc-smd-rpm-objs			:= smd-rpm.o

icc-smd-rpm-objs			:= smd-rpm.o icc-rpm.o



obj-$(CONFIG_INTERCONNECT_QCOM_BCM_VOTER) += icc-bcm-voter.o

obj-$(CONFIG_INTERCONNECT_QCOM_MSM8916) += qnoc-msm8916.o

drivers/interconnect/qcom/icc-rpm.c

0 → 100644
+191 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (C) 2020 Linaro Ltd

 */



#include <linux/clk.h>

#include <linux/device.h>

#include <linux/interconnect-provider.h>

#include <linux/io.h>

#include <linux/module.h>

#include <linux/of_device.h>

#include <linux/of_platform.h>

#include <linux/platform_device.h>

#include <linux/slab.h>



#include "smd-rpm.h"

#include "icc-rpm.h"



static int qcom_icc_set(struct icc_node *src, struct icc_node *dst)

{

	struct qcom_icc_provider *qp;

	struct qcom_icc_node *qn;

	struct icc_provider *provider;

	struct icc_node *n;

	u64 sum_bw;

	u64 max_peak_bw;

	u64 rate;

	u32 agg_avg = 0;

	u32 agg_peak = 0;

	int ret, i;



	qn = src->data;

	provider = src->provider;

	qp = to_qcom_provider(provider);



	list_for_each_entry(n, &provider->nodes, node_list)

		provider->aggregate(n, 0, n->avg_bw, n->peak_bw,

				    &agg_avg, &agg_peak);



	sum_bw = icc_units_to_bps(agg_avg);

	max_peak_bw = icc_units_to_bps(agg_peak);



	/* send bandwidth request message to the RPM processor */

	if (qn->mas_rpm_id != -1) {

		ret = qcom_icc_rpm_smd_send(QCOM_SMD_RPM_ACTIVE_STATE,

					    RPM_BUS_MASTER_REQ,

					    qn->mas_rpm_id,

					    sum_bw);

		if (ret) {

			pr_err("qcom_icc_rpm_smd_send mas %d error %d\n",

			       qn->mas_rpm_id, ret);

			return ret;

		}

	}



	if (qn->slv_rpm_id != -1) {

		ret = qcom_icc_rpm_smd_send(QCOM_SMD_RPM_ACTIVE_STATE,

					    RPM_BUS_SLAVE_REQ,

					    qn->slv_rpm_id,

					    sum_bw);

		if (ret) {

			pr_err("qcom_icc_rpm_smd_send slv error %d\n",

			       ret);

			return ret;

		}

	}



	rate = max(sum_bw, max_peak_bw);



	do_div(rate, qn->buswidth);



	if (qn->rate == rate)

		return 0;



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

		ret = clk_set_rate(qp->bus_clks[i].clk, rate);

		if (ret) {

			pr_err("%s clk_set_rate error: %d\n",

			       qp->bus_clks[i].id, ret);

			return ret;

		}

	}



	qn->rate = rate;



	return 0;

}



int qnoc_probe(struct platform_device *pdev, size_t cd_size, int cd_num,

	       const struct clk_bulk_data *cd)

{

	struct device *dev = &pdev->dev;

	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;



	/* wait for the RPM proxy */

	if (!qcom_icc_rpm_smd_available())

		return -EPROBE_DEFER;



	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;



	qp->bus_clks = devm_kmemdup(dev, cd, cd_size,

				    GFP_KERNEL);

	if (!qp->bus_clks)

		return -ENOMEM;



	qp->num_clks = cd_num;

	ret = devm_clk_bulk_get(dev, qp->num_clks, qp->bus_clks);

	if (ret)

		return ret;



	ret = clk_bulk_prepare_enable(qp->num_clks, qp->bus_clks);

	if (ret)

		return ret;



	provider = &qp->provider;

	INIT_LIST_HEAD(&provider->nodes);

	provider->dev = dev;

	provider->set = qcom_icc_set;

	provider->aggregate = icc_std_aggregate;

	provider->xlate = of_icc_xlate_onecell;

	provider->data = data;



	ret = icc_provider_add(provider);

	if (ret) {

		dev_err(dev, "error adding interconnect provider: %d\n", ret);

		clk_bulk_disable_unprepare(qp->num_clks, qp->bus_clks);

		return ret;

	}



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

		size_t j;



		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);

	clk_bulk_disable_unprepare(qp->num_clks, qp->bus_clks);

	icc_provider_del(provider);



	return ret;

}

EXPORT_SYMBOL(qnoc_probe);



int qnoc_remove(struct platform_device *pdev)

{

	struct qcom_icc_provider *qp = platform_get_drvdata(pdev);



	icc_nodes_remove(&qp->provider);

	clk_bulk_disable_unprepare(qp->num_clks, qp->bus_clks);

	return icc_provider_del(&qp->provider);

}

EXPORT_SYMBOL(qnoc_remove);

drivers/interconnect/qcom/icc-rpm.h

0 → 100644
+73 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Copyright (C) 2020 Linaro Ltd

 */



#ifndef __DRIVERS_INTERCONNECT_QCOM_ICC_RPM_H

#define __DRIVERS_INTERCONNECT_QCOM_ICC_RPM_H



#define RPM_BUS_MASTER_REQ	0x73616d62

#define RPM_BUS_SLAVE_REQ	0x766c7362



#define QCOM_MAX_LINKS 12



#define to_qcom_provider(_provider) \

	container_of(_provider, struct qcom_icc_provider, provider)



/**

 * struct qcom_icc_provider - Qualcomm specific interconnect provider

 * @provider: generic interconnect provider

 * @bus_clks: the clk_bulk_data table of bus clocks

 * @num_clks: the total number of clk_bulk_data entries

 */

struct qcom_icc_provider {

	struct icc_provider provider;

	struct clk_bulk_data *bus_clks;

	int num_clks;

};



/**

 * struct qcom_icc_node - Qualcomm specific interconnect nodes

 * @name: the node name used in debugfs

 * @id: a unique node identifier

 * @links: an array of nodes where we can go next while traversing

 * @num_links: the total number of @links

 * @buswidth: width of the interconnect between a node and the bus (bytes)

 * @mas_rpm_id:	RPM id for devices that are bus masters

 * @slv_rpm_id:	RPM id for devices that are bus slaves

 * @rate: current bus clock rate in Hz

 */

struct qcom_icc_node {

	unsigned char *name;

	u16 id;

	u16 links[QCOM_MAX_LINKS];

	u16 num_links;

	u16 buswidth;

	int mas_rpm_id;

	int slv_rpm_id;

	u64 rate;

};



struct qcom_icc_desc {

	struct qcom_icc_node **nodes;

	size_t num_nodes;

};



#define DEFINE_QNODE(_name, _id, _buswidth, _mas_rpm_id, _slv_rpm_id,	\

		     ...)						\

		static struct qcom_icc_node _name = {			\

		.name = #_name,						\

		.id = _id,						\

		.buswidth = _buswidth,					\

		.mas_rpm_id = _mas_rpm_id,				\

		.slv_rpm_id = _slv_rpm_id,				\

		.num_links = ARRAY_SIZE(((int[]){ __VA_ARGS__ })),	\

		.links = { __VA_ARGS__ },				\

	}





int qnoc_probe(struct platform_device *pdev, size_t cd_size, int cd_num,

	       const struct clk_bulk_data *cd);

int qnoc_remove(struct platform_device *pdev);



#endif

drivers/interconnect/qcom/msm8916.c

+10 −231
Original line number Diff line number Diff line
@@ -15,9 +15,7 @@ 
#include <dt-bindings/interconnect/qcom,msm8916.h>



#include "smd-rpm.h"



#define RPM_BUS_MASTER_REQ      0x73616d62

#define RPM_BUS_SLAVE_REQ       0x766c7362

#include "icc-rpm.h"



enum {

	MSM8916_BIMC_SNOC_MAS = 1,
@@ -107,67 +105,11 @@ enum { 
	MSM8916_SNOC_PNOC_SLV,

};



#define to_msm8916_provider(_provider) \

	container_of(_provider, struct msm8916_icc_provider, provider)



static const struct clk_bulk_data msm8916_bus_clocks[] = {

	{ .id = "bus" },

	{ .id = "bus_a" },

};



/**

 * struct msm8916_icc_provider - Qualcomm specific interconnect provider

 * @provider: generic interconnect provider

 * @bus_clks: the clk_bulk_data table of bus clocks

 * @num_clks: the total number of clk_bulk_data entries

 */

struct msm8916_icc_provider {

	struct icc_provider provider;

	struct clk_bulk_data *bus_clks;

	int num_clks;

};



#define MSM8916_MAX_LINKS	8



/**

 * struct msm8916_icc_node - Qualcomm specific interconnect nodes

 * @name: the node name used in debugfs

 * @id: a unique node identifier

 * @links: an array of nodes where we can go next while traversing

 * @num_links: the total number of @links

 * @buswidth: width of the interconnect between a node and the bus (bytes)

 * @mas_rpm_id:	RPM ID for devices that are bus masters

 * @slv_rpm_id:	RPM ID for devices that are bus slaves

 * @rate: current bus clock rate in Hz

 */

struct msm8916_icc_node {

	unsigned char *name;

	u16 id;

	u16 links[MSM8916_MAX_LINKS];

	u16 num_links;

	u16 buswidth;

	int mas_rpm_id;

	int slv_rpm_id;

	u64 rate;

};



struct msm8916_icc_desc {

	struct msm8916_icc_node **nodes;

	size_t num_nodes;

};



#define DEFINE_QNODE(_name, _id, _buswidth, _mas_rpm_id, _slv_rpm_id,	\

					...)				\

		static struct msm8916_icc_node _name = {		\

		.name = #_name,						\

		.id = _id,						\

		.buswidth = _buswidth,					\

		.mas_rpm_id = _mas_rpm_id,				\

		.slv_rpm_id = _slv_rpm_id,				\

		.num_links = ARRAY_SIZE(((int[]){ __VA_ARGS__ })),	\

		.links = { __VA_ARGS__ },				\

	}



DEFINE_QNODE(bimc_snoc_mas, MSM8916_BIMC_SNOC_MAS, 8, -1, -1, MSM8916_BIMC_SNOC_SLV);

DEFINE_QNODE(bimc_snoc_slv, MSM8916_BIMC_SNOC_SLV, 8, -1, -1, MSM8916_SNOC_INT_0, MSM8916_SNOC_INT_1);

DEFINE_QNODE(mas_apss, MSM8916_MASTER_AMPSS_M0, 8, -1, -1, MSM8916_SLAVE_EBI_CH0, MSM8916_BIMC_SNOC_MAS, MSM8916_SLAVE_AMPSS_L2);
@@ -254,7 +196,7 @@ DEFINE_QNODE(snoc_int_bimc, MSM8916_SNOC_INT_BIMC, 8, 101, 132, MSM8916_SNOC_BIM 
DEFINE_QNODE(snoc_pcnoc_mas, MSM8916_SNOC_PNOC_MAS, 8, -1, -1, MSM8916_SNOC_PNOC_SLV);

DEFINE_QNODE(snoc_pcnoc_slv, MSM8916_SNOC_PNOC_SLV, 8, -1, -1, MSM8916_PNOC_INT_0);



static struct msm8916_icc_node *msm8916_snoc_nodes[] = {

static struct qcom_icc_node *msm8916_snoc_nodes[] = {

	[BIMC_SNOC_SLV] = &bimc_snoc_slv,

	[MASTER_JPEG] = &mas_jpeg,

	[MASTER_MDP_PORT0] = &mas_mdp,
@@ -283,12 +225,12 @@ static struct msm8916_icc_node *msm8916_snoc_nodes[] = { 
	[SNOC_QDSS_INT] = &qdss_int,

};



static struct msm8916_icc_desc msm8916_snoc = {

static struct qcom_icc_desc msm8916_snoc = {

	.nodes = msm8916_snoc_nodes,

	.num_nodes = ARRAY_SIZE(msm8916_snoc_nodes),

};



static struct msm8916_icc_node *msm8916_bimc_nodes[] = {

static struct qcom_icc_node *msm8916_bimc_nodes[] = {

	[BIMC_SNOC_MAS] = &bimc_snoc_mas,

	[MASTER_AMPSS_M0] = &mas_apss,

	[MASTER_GRAPHICS_3D] = &mas_gfx,
@@ -300,12 +242,12 @@ static struct msm8916_icc_node *msm8916_bimc_nodes[] = { 
	[SNOC_BIMC_1_SLV] = &snoc_bimc_1_slv,

};



static struct msm8916_icc_desc msm8916_bimc = {

static struct qcom_icc_desc msm8916_bimc = {

	.nodes = msm8916_bimc_nodes,

	.num_nodes = ARRAY_SIZE(msm8916_bimc_nodes),

};



static struct msm8916_icc_node *msm8916_pcnoc_nodes[] = {

static struct qcom_icc_node *msm8916_pcnoc_nodes[] = {

	[MASTER_BLSP_1] = &mas_blsp_1,

	[MASTER_DEHR] = &mas_dehr,

	[MASTER_LPASS] = &mas_audio,
@@ -358,178 +300,15 @@ static struct msm8916_icc_node *msm8916_pcnoc_nodes[] = { 
	[SNOC_PCNOC_SLV] = &snoc_pcnoc_slv,

};



static struct msm8916_icc_desc msm8916_pcnoc = {

static struct qcom_icc_desc msm8916_pcnoc = {

	.nodes = msm8916_pcnoc_nodes,

	.num_nodes = ARRAY_SIZE(msm8916_pcnoc_nodes),

};



static int msm8916_icc_set(struct icc_node *src, struct icc_node *dst)

{

	struct msm8916_icc_provider *qp;

	struct msm8916_icc_node *qn;

	u64 sum_bw, max_peak_bw, rate;

	u32 agg_avg = 0, agg_peak = 0;

	struct icc_provider *provider;

	struct icc_node *n;

	int ret, i;



	qn = src->data;

	provider = src->provider;

	qp = to_msm8916_provider(provider);



	list_for_each_entry(n, &provider->nodes, node_list)

		provider->aggregate(n, 0, n->avg_bw, n->peak_bw,

				    &agg_avg, &agg_peak);



	sum_bw = icc_units_to_bps(agg_avg);

	max_peak_bw = icc_units_to_bps(agg_peak);



	/* send bandwidth request message to the RPM processor */

	if (qn->mas_rpm_id != -1) {

		ret = qcom_icc_rpm_smd_send(QCOM_SMD_RPM_ACTIVE_STATE,

					    RPM_BUS_MASTER_REQ,

					    qn->mas_rpm_id,

					    sum_bw);

		if (ret) {

			pr_err("qcom_icc_rpm_smd_send mas %d error %d\n",

			       qn->mas_rpm_id, ret);

			return ret;

		}

	}



	if (qn->slv_rpm_id != -1) {

		ret = qcom_icc_rpm_smd_send(QCOM_SMD_RPM_ACTIVE_STATE,

					    RPM_BUS_SLAVE_REQ,

					    qn->slv_rpm_id,

					    sum_bw);

		if (ret) {

			pr_err("qcom_icc_rpm_smd_send slv error %d\n",

			       ret);

			return ret;

		}

	}



	rate = max(sum_bw, max_peak_bw);



	do_div(rate, qn->buswidth);



	if (qn->rate == rate)

		return 0;



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

		ret = clk_set_rate(qp->bus_clks[i].clk, rate);

		if (ret) {

			pr_err("%s clk_set_rate error: %d\n",

			       qp->bus_clks[i].id, ret);

			return ret;

		}

	}



	qn->rate = rate;



	return 0;

}



static int msm8916_qnoc_probe(struct platform_device *pdev)

{

	const struct msm8916_icc_desc *desc;

	struct msm8916_icc_node **qnodes;

	struct msm8916_icc_provider *qp;

	struct device *dev = &pdev->dev;

	struct icc_onecell_data *data;

	struct icc_provider *provider;

	struct icc_node *node;

	size_t num_nodes, i;

	int ret;



	/* wait for the RPM proxy */

	if (!qcom_icc_rpm_smd_available())

		return -EPROBE_DEFER;



	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;



	qp->bus_clks = devm_kmemdup(dev, msm8916_bus_clocks,

				    sizeof(msm8916_bus_clocks), GFP_KERNEL);

	if (!qp->bus_clks)

		return -ENOMEM;



	qp->num_clks = ARRAY_SIZE(msm8916_bus_clocks);

	ret = devm_clk_bulk_get(dev, qp->num_clks, qp->bus_clks);

	if (ret)

		return ret;



	ret = clk_bulk_prepare_enable(qp->num_clks, qp->bus_clks);

	if (ret)

		return ret;



	provider = &qp->provider;

	INIT_LIST_HEAD(&provider->nodes);

	provider->dev = dev;

	provider->set = msm8916_icc_set;

	provider->aggregate = icc_std_aggregate;

	provider->xlate = of_icc_xlate_onecell;

	provider->data = data;



	ret = icc_provider_add(provider);

	if (ret) {

		dev_err(dev, "error adding interconnect provider: %d\n", ret);

		clk_bulk_disable_unprepare(qp->num_clks, qp->bus_clks);

		return ret;

	}



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

		size_t j;



		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);

	clk_bulk_disable_unprepare(qp->num_clks, qp->bus_clks);



	return ret;

}



static int msm8916_qnoc_remove(struct platform_device *pdev)

{

	struct msm8916_icc_provider *qp = platform_get_drvdata(pdev);



	icc_nodes_remove(&qp->provider);

	clk_bulk_disable_unprepare(qp->num_clks, qp->bus_clks);

	return icc_provider_del(&qp->provider);

	return qnoc_probe(pdev, sizeof(msm8916_bus_clocks),

			  ARRAY_SIZE(msm8916_bus_clocks), msm8916_bus_clocks);

}



static const struct of_device_id msm8916_noc_of_match[] = {
@@ -542,7 +321,7 @@ MODULE_DEVICE_TABLE(of, msm8916_noc_of_match); 


static struct platform_driver msm8916_noc_driver = {

	.probe = msm8916_qnoc_probe,

	.remove = msm8916_qnoc_remove,

	.remove = qnoc_remove,

	.driver = {

		.name = "qnoc-msm8916",

		.of_match_table = msm8916_noc_of_match,