subject:"\[PATCH v4 5\/7\] interconnect\: qcom\: Add msm8916 interconnect provider driver"

Re: [PATCH v4 5/7] interconnect: qcom: Add msm8916 interconnect provider driver

2018-06-06 Thread Georgi Djakov

Hi Amit,

On 25.05.18 г. 11:27, Amit Kucheria wrote:
> On Fri, Mar 9, 2018 at 11:09 PM, Georgi Djakov  
> wrote:
>> Add driver for the Qualcomm interconnect buses found in msm8916 based
>> platforms.
>>
>> Signed-off-by: Georgi Djakov 
>> ---
>>  drivers/interconnect/Kconfig|   5 +
>>  drivers/interconnect/Makefile   |   1 +
>>  drivers/interconnect/qcom/Kconfig   |  11 +
>>  drivers/interconnect/qcom/Makefile  |   2 +
>>  drivers/interconnect/qcom/msm8916.c | 482 
>> 
>>  include/linux/interconnect/qcom.h   | 350 ++
>>  6 files changed, 851 insertions(+)
>>  create mode 100644 drivers/interconnect/qcom/Kconfig
>>  create mode 100644 drivers/interconnect/qcom/msm8916.c
>>  create mode 100644 include/linux/interconnect/qcom.h

[..]

>> +#define DEFINE_QNODE(_name, _id, _port, _buswidth, _ap_owned,  \
>> +   _mas_rpm_id, _slv_rpm_id, _qos_mode,\
>> +   _numlinks, ...) \
>> +   static struct qcom_icc_node _name = {   \
>> +   .id = _id,  \
>> +   .name = #_name, \
>> +   .port = _port,  \
>> +   .buswidth = _buswidth,  \
>> +   .qos_mode = _qos_mode,  \
>> +   .ap_owned = _ap_owned,  \
>> +   .mas_rpm_id = _mas_rpm_id,  \
>> +   .slv_rpm_id = _slv_rpm_id,  \
>> +   .num_links = _numlinks, \
>> +   .links = { __VA_ARGS__ },   \
>> +   }
> 
> Move this macro definition just above its use below.
> 

Ok.

>> +enum qcom_qos_mode {
>> +   QCOM_QOS_MODE_BYPASS = 0,
>> +   QCOM_QOS_MODE_FIXED,
>> +   QCOM_QOS_MODE_MAX,
>> +};
>> +
>> +struct qcom_icc_provider {
>> +   struct icc_provider provider;
>> +   void __iomem*base;
>> +   struct clk  *bus_clk;
>> +   struct clk  *bus_a_clk;
>> +};
>> +
>> +#define MSM8916_MAX_LINKS  8
>> +
>> +/**
>> + * struct qcom_icc_node - Qualcomm specific interconnect nodes
>> + * @name: the node name used in debugfs
>> + * @links: an array of nodes where we can go next while traversing
>> + * @id: a unique node identifier
>> + * @num_links: the total number of @links
>> + * @port: the offset index into the masters QoS register space
>> + * @buswidth: width of the interconnect between a node and the bus
> 
> units?

Will add.

[..]

>> +static int qcom_icc_init(struct icc_node *node)
>> +{
>> +   struct qcom_icc_provider *qp = to_qcom_provider(node->provider);
>> +   /* TODO: init qos and priority */
>> +
> 
> No need to set_rate here before enabling the clock?

Yes, i am planing to initially set the bus clocks at max rate. The rate
would be adjusted as soon as the consumers start placing requests.

> 
>> +   clk_prepare_enable(qp->bus_clk);
>> +   clk_prepare_enable(qp->bus_a_clk);
>> +
>> +   return 0;
>> +}
>> +
>> +static int qcom_icc_set(struct icc_node *src, struct icc_node *dst,
>> +   u32 avg, u32 peak)
>> +{
>> +   struct qcom_icc_provider *qp;
>> +   struct qcom_icc_node *qn;
>> +   struct icc_node *node;
>> +   struct icc_provider *provider;
>> +   u64 avg_bw;
>> +   u64 peak_bw;
>> +   u64 rate = 0;
>> +   int ret = 0;
>> +
>> +   if (!src)
>> +   node = dst;
>> +   else
>> +   node = src;
>> +
>> +   qn = node->data;
>> +   provider = node->provider;
>> +   qp = to_qcom_provider(node->provider);
>> +
>> +   /* convert from kbps to bps */
>> +   avg_bw = avg * 1000ULL;
>> +   peak_bw = peak * 1000ULL;
>> +
> 
> Since the core uses kbps and various SoC HW might use bps (or other
> units), perhaps consider providing a macro in the core header such as:
> 
> #define icc_units_to_bps(bw)  (bw * 1000ULL)
> 
> and then move this conversion to the top of the function where you
> define the variable
> 
> u64 avg_bw = icc_units_to_bps(avg);
> u64 peak_bw = icc_units_to_bps(peak);
> 
> Since other drivers will end up copying this driver, it might help
> prevent silly errors in the drivers and has a side-effect of allowing
> the core to change internal units w/o any driver changes down the
> line, if needed.

Ok, i am fine with this.

Thanks,
Georgi

Re: [PATCH v4 5/7] interconnect: qcom: Add msm8916 interconnect provider driver

2018-06-06 Thread Georgi Djakov

Hi Evan,

On 12.05.18 г. 0:29, Evan Green wrote:
> Hi Georgi,
> 
> On Fri, Mar 9, 2018 at 1:11 PM Georgi Djakov 
> wrote:
> 
>> Add driver for the Qualcomm interconnect buses found in msm8916 based
>> platforms.
> 
>> Signed-off-by: Georgi Djakov 
>> ---
>>drivers/interconnect/Kconfig|   5 +
>>drivers/interconnect/Makefile   |   1 +
>>drivers/interconnect/qcom/Kconfig   |  11 +
>>drivers/interconnect/qcom/Makefile  |   2 +
>>drivers/interconnect/qcom/msm8916.c | 482
> 
>>include/linux/interconnect/qcom.h   | 350 ++
>>6 files changed, 851 insertions(+)
>>create mode 100644 drivers/interconnect/qcom/Kconfig
>>create mode 100644 drivers/interconnect/qcom/msm8916.c
>>create mode 100644 include/linux/interconnect/qcom.h
> ...
>> diff --git a/drivers/interconnect/qcom/msm8916.c
> b/drivers/interconnect/qcom/msm8916.c
>> new file mode 100644
>> index ..d5b54f8261c8
>> --- /dev/null
>> +++ b/drivers/interconnect/qcom/msm8916.c
> ...
>> +static int qnoc_probe(struct platform_device *pdev)
>> +{
>> +   const struct qcom_icc_desc *desc;
>> +   struct qcom_icc_node **qnodes;
>> +   struct qcom_icc_provider *qp;
>> +   struct resource *res;
>> +   struct icc_provider *provider;
>> +   size_t num_nodes, i;
>> +   int ret;
>> +
>> +   /* wait for RPM */
>> +   if (!qcom_icc_rpm_smd_available())
>> +   return -EPROBE_DEFER;
>> +
>> +   desc = of_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;
>> +
>> +   res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>> +   qp->base = devm_ioremap_resource(&pdev->dev, res);
>> +   if (IS_ERR(qp->base))
>> +   return PTR_ERR(qp->base);
>> +
>> +   qp->bus_clk = devm_clk_get(&pdev->dev, "bus_clk");
>> +   if (IS_ERR(qp->bus_clk))
>> +   return PTR_ERR(qp->bus_clk);
>> +
>> +   qp->bus_a_clk = devm_clk_get(&pdev->dev, "bus_a_clk");
>> +   if (IS_ERR(qp->bus_a_clk))
>> +   return PTR_ERR(qp->bus_a_clk);
>> +
>> +   provider = &qp->provider;
>> +   provider->dev = &pdev->dev;
>> +   provider->set = &qcom_icc_set;
>> +   INIT_LIST_HEAD(&provider->nodes);
>> +   provider->data = qp;
>> +
>> +   ret = icc_add_provider(provider);
>> +   if (ret) {
>> +   dev_err(&pdev->dev, "error adding interconnect
> provider\n");
>> +   return ret;
>> +   }
>> +
>> +   for (i = 0; i < num_nodes; i++) {
>> +   struct icc_node *node;
>> +   int ret;
>> +   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);
>> +
>> +   dev_dbg(&pdev->dev, "registered node %p %s %d\n", node,
>> +   qnodes[i]->name, node->id);
>> +
>> +   /* populate links */
>> +   for (j = 0; j < qnodes[i]->num_links; j++)
>> +   if (qnodes[i]->links[j])
>> +   icc_link_create(node,
> qnodes[i]->links[j]);
>> +
>> +   ret = qcom_icc_init(node);
>> +   if (ret)
>> +   dev_err(&pdev->dev, "%s init error (%d)\n",
> node->name,
>> +   ret);
> 
> Don't you want to call qcom_icc_init before icc_link_create? As soon as
> icc_link_create is called, the node is connected to the graph, and
> qcom_icc_set can be called.
> 

I agree.

>> +   }
>> +
>> +   platform_set_drvdata(pdev, provider);
>> +
>> +   return ret;
>> +err:
>> +   icc_del_provider(provider);
>> +   return ret;
>> +}
>> +
>> +static int qnoc_remove(struct platform_device *pdev)
>> +{
>> +   struct icc_provider *provider = platform_get_drvdata(pdev);
>> +
>> +   icc_del_provider(provider);
> 
> Presumably in the framework nodes and links ought to get cleaned up
> somewhere too, right? As it is now, the devm code frees provider when this
> device is removed, even though provider is still very connected in the
> graph via the nodes and links.

Sorry, this part is incomplete. Will implement the rest of the cleanup code.

>> +
>> +   return 0;
>> +}
>> +
>> +static const struct of_device_id qnoc_of_match[] = {
>> +   { .compatible = "qcom,msm8916-pnoc", .data = &msm8916_pnoc },
>> +   { .compatible = "qcom,msm8916-snoc", .data = &msm8916_snoc },
>> +   { .compatible = "qcom,msm8916-bimc", .data

Re: [PATCH v4 5/7] interconnect: qcom: Add msm8916 interconnect provider driver

2018-05-25 Thread Amit Kucheria

On Fri, Mar 9, 2018 at 11:09 PM, Georgi Djakov  wrote:
> Add driver for the Qualcomm interconnect buses found in msm8916 based
> platforms.
>
> Signed-off-by: Georgi Djakov 
> ---
>  drivers/interconnect/Kconfig|   5 +
>  drivers/interconnect/Makefile   |   1 +
>  drivers/interconnect/qcom/Kconfig   |  11 +
>  drivers/interconnect/qcom/Makefile  |   2 +
>  drivers/interconnect/qcom/msm8916.c | 482 
> 
>  include/linux/interconnect/qcom.h   | 350 ++
>  6 files changed, 851 insertions(+)
>  create mode 100644 drivers/interconnect/qcom/Kconfig
>  create mode 100644 drivers/interconnect/qcom/msm8916.c
>  create mode 100644 include/linux/interconnect/qcom.h
>
> diff --git a/drivers/interconnect/Kconfig b/drivers/interconnect/Kconfig
> index a261c7d41deb..07a8276fa35a 100644
> --- a/drivers/interconnect/Kconfig
> +++ b/drivers/interconnect/Kconfig
> @@ -8,3 +8,8 @@ menuconfig INTERCONNECT
>
>   If unsure, say no.
>
> +if INTERCONNECT
> +
> +source "drivers/interconnect/qcom/Kconfig"
> +
> +endif
> diff --git a/drivers/interconnect/Makefile b/drivers/interconnect/Makefile
> index 5edf0ae80818..5971b811c2d7 100644
> --- a/drivers/interconnect/Makefile
> +++ b/drivers/interconnect/Makefile
> @@ -1 +1,2 @@
>  obj-$(CONFIG_INTERCONNECT) += core.o
> +obj-$(CONFIG_INTERCONNECT_QCOM)+= qcom/
> diff --git a/drivers/interconnect/qcom/Kconfig 
> b/drivers/interconnect/qcom/Kconfig
> new file mode 100644
> index ..86465dc37bd4
> --- /dev/null
> +++ b/drivers/interconnect/qcom/Kconfig
> @@ -0,0 +1,11 @@
> +config INTERCONNECT_QCOM
> +   bool "Qualcomm Network-on-Chip interconnect drivers"
> +   depends on INTERCONNECT
> +   depends on ARCH_QCOM || COMPILE_TEST
> +   default y
> +
> +config INTERCONNECT_QCOM_MSM8916
> +   tristate "Qualcomm MSM8916 interconnect driver"
> +   depends on INTERCONNECT_QCOM
> +   help
> + This is a driver for the Qualcomm Network-on-Chip on msm8916-based 
> platforms.
> diff --git a/drivers/interconnect/qcom/Makefile 
> b/drivers/interconnect/qcom/Makefile
> index 095bdef1ee6e..a0c13a25e8db 100644
> --- a/drivers/interconnect/qcom/Makefile
> +++ b/drivers/interconnect/qcom/Makefile
> @@ -1 +1,3 @@
>  obj-y += smd-rpm.o
> +
> +obj-$(CONFIG_INTERCONNECT_QCOM_MSM8916) += msm8916.o
> diff --git a/drivers/interconnect/qcom/msm8916.c 
> b/drivers/interconnect/qcom/msm8916.c
> new file mode 100644
> index ..d5b54f8261c8
> --- /dev/null
> +++ b/drivers/interconnect/qcom/msm8916.c
> @@ -0,0 +1,482 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright (C) 2018 Linaro Ltd
> + * Author: Georgi Djakov 
> + */
> +
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +
> +#include "smd-rpm.h"
> +
> +#define RPM_MASTER_FIELD_BW0x7762
> +#define RPM_BUS_MASTER_REQ  0x73616d62
> +#define RPM_BUS_SLAVE_REQ   0x766c7362
> +
> +#define to_qcom_provider(_provider) \
> +   container_of(_provider, struct qcom_icc_provider, provider)
> +
> +#define DEFINE_QNODE(_name, _id, _port, _buswidth, _ap_owned,  \
> +   _mas_rpm_id, _slv_rpm_id, _qos_mode,\
> +   _numlinks, ...) \
> +   static struct qcom_icc_node _name = {   \
> +   .id = _id,  \
> +   .name = #_name, \
> +   .port = _port,  \
> +   .buswidth = _buswidth,  \
> +   .qos_mode = _qos_mode,  \
> +   .ap_owned = _ap_owned,  \
> +   .mas_rpm_id = _mas_rpm_id,  \
> +   .slv_rpm_id = _slv_rpm_id,  \
> +   .num_links = _numlinks, \
> +   .links = { __VA_ARGS__ },   \
> +   }

Move this macro definition just above its use below.

> +enum qcom_qos_mode {
> +   QCOM_QOS_MODE_BYPASS = 0,
> +   QCOM_QOS_MODE_FIXED,
> +   QCOM_QOS_MODE_MAX,
> +};
> +
> +struct qcom_icc_provider {
> +   struct icc_provider provider;
> +   void __iomem*base;
> +   struct clk  *bus_clk;
> +   struct clk  *bus_a_clk;
> +};
> +
> +#define MSM8916_MAX_LINKS  8
> +
> +/**
> + * struct qcom_icc_node - Qualcomm specific interconnect nodes
> + * @name: the node name used in debugfs
> + * @links: an array of nodes where we can go next while traversing
> + * @id: a unique node identifier
> + * @num_links: the total number of @links
> + * @port: the offset index into the masters QoS register spac

Re: [PATCH v4 5/7] interconnect: qcom: Add msm8916 interconnect provider driver

2018-05-11 Thread Evan Green

Hi Georgi,

On Fri, Mar 9, 2018 at 1:11 PM Georgi Djakov 
wrote:

> Add driver for the Qualcomm interconnect buses found in msm8916 based
> platforms.

> Signed-off-by: Georgi Djakov 
> ---
>drivers/interconnect/Kconfig|   5 +
>drivers/interconnect/Makefile   |   1 +
>drivers/interconnect/qcom/Kconfig   |  11 +
>drivers/interconnect/qcom/Makefile  |   2 +
>drivers/interconnect/qcom/msm8916.c | 482

>include/linux/interconnect/qcom.h   | 350 ++
>6 files changed, 851 insertions(+)
>create mode 100644 drivers/interconnect/qcom/Kconfig
>create mode 100644 drivers/interconnect/qcom/msm8916.c
>create mode 100644 include/linux/interconnect/qcom.h
...
> diff --git a/drivers/interconnect/qcom/msm8916.c
b/drivers/interconnect/qcom/msm8916.c
> new file mode 100644
> index ..d5b54f8261c8
> --- /dev/null
> +++ b/drivers/interconnect/qcom/msm8916.c
...
> +static int qnoc_probe(struct platform_device *pdev)
> +{
> +   const struct qcom_icc_desc *desc;
> +   struct qcom_icc_node **qnodes;
> +   struct qcom_icc_provider *qp;
> +   struct resource *res;
> +   struct icc_provider *provider;
> +   size_t num_nodes, i;
> +   int ret;
> +
> +   /* wait for RPM */
> +   if (!qcom_icc_rpm_smd_available())
> +   return -EPROBE_DEFER;
> +
> +   desc = of_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;
> +
> +   res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> +   qp->base = devm_ioremap_resource(&pdev->dev, res);
> +   if (IS_ERR(qp->base))
> +   return PTR_ERR(qp->base);
> +
> +   qp->bus_clk = devm_clk_get(&pdev->dev, "bus_clk");
> +   if (IS_ERR(qp->bus_clk))
> +   return PTR_ERR(qp->bus_clk);
> +
> +   qp->bus_a_clk = devm_clk_get(&pdev->dev, "bus_a_clk");
> +   if (IS_ERR(qp->bus_a_clk))
> +   return PTR_ERR(qp->bus_a_clk);
> +
> +   provider = &qp->provider;
> +   provider->dev = &pdev->dev;
> +   provider->set = &qcom_icc_set;
> +   INIT_LIST_HEAD(&provider->nodes);
> +   provider->data = qp;
> +
> +   ret = icc_add_provider(provider);
> +   if (ret) {
> +   dev_err(&pdev->dev, "error adding interconnect
provider\n");
> +   return ret;
> +   }
> +
> +   for (i = 0; i < num_nodes; i++) {
> +   struct icc_node *node;
> +   int ret;
> +   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);
> +
> +   dev_dbg(&pdev->dev, "registered node %p %s %d\n", node,
> +   qnodes[i]->name, node->id);
> +
> +   /* populate links */
> +   for (j = 0; j < qnodes[i]->num_links; j++)
> +   if (qnodes[i]->links[j])
> +   icc_link_create(node,
qnodes[i]->links[j]);
> +
> +   ret = qcom_icc_init(node);
> +   if (ret)
> +   dev_err(&pdev->dev, "%s init error (%d)\n",
node->name,
> +   ret);

Don't you want to call qcom_icc_init before icc_link_create? As soon as
icc_link_create is called, the node is connected to the graph, and
qcom_icc_set can be called.

> +   }
> +
> +   platform_set_drvdata(pdev, provider);
> +
> +   return ret;
> +err:
> +   icc_del_provider(provider);
> +   return ret;
> +}
> +
> +static int qnoc_remove(struct platform_device *pdev)
> +{
> +   struct icc_provider *provider = platform_get_drvdata(pdev);
> +
> +   icc_del_provider(provider);

Presumably in the framework nodes and links ought to get cleaned up
somewhere too, right? As it is now, the devm code frees provider when this
device is removed, even though provider is still very connected in the
graph via the nodes and links.

> +
> +   return 0;
> +}
> +
> +static const struct of_device_id qnoc_of_match[] = {
> +   { .compatible = "qcom,msm8916-pnoc", .data = &msm8916_pnoc },
> +   { .compatible = "qcom,msm8916-snoc", .data = &msm8916_snoc },
> +   { .compatible = "qcom,msm8916-bimc", .data = &msm8916_bimc },
> +   { },
> +};
> +MODULE_DEVICE_TABLE(of, qnoc_of_match);
> +
> +static struct platform_driver qnoc_driver = {
> +   .probe = qnoc_probe,
> +   .remove = qnoc_remove,
> +   .driver = {
> +   .name = "qnoc-msm8916",
> +   .of_match_table = qn

[PATCH v4 5/7] interconnect: qcom: Add msm8916 interconnect provider driver

2018-04-12 Thread Georgi Djakov

Hi Matthias,

On 04/06/2018 01:58 AM, Matthias Kaehlcke wrote:
> On Fri, Mar 09, 2018 at 11:09:56PM +0200, Georgi Djakov wrote:
>> Add driver for the Qualcomm interconnect buses found in msm8916 based
>> platforms.
>>
>> Signed-off-by: Georgi Djakov 
>> ---
>>  drivers/interconnect/Kconfig|   5 +
>>  drivers/interconnect/Makefile   |   1 +
>>  drivers/interconnect/qcom/Kconfig   |  11 +
>>  drivers/interconnect/qcom/Makefile  |   2 +
>>  drivers/interconnect/qcom/msm8916.c | 482 
>> 
>>  include/linux/interconnect/qcom.h   | 350 ++
>>  6 files changed, 851 insertions(+)
>>  create mode 100644 drivers/interconnect/qcom/Kconfig
>>  create mode 100644 drivers/interconnect/qcom/msm8916.c
>>  create mode 100644 include/linux/interconnect/qcom.h
>>

[..]

>> +
>> +DEFINE_QNODE(mas_video, 63, 8, 16, 1, -1, -1, QCOM_QOS_MODE_BYPASS, 2, 
>> 1, 10002);
> 
> IIUC this should be something like:
> 
> +DEFINE_QNODE(mas_video, MASTER_VIDEO_P0, MASTER_ADM_PORT1, 16, 1, -1,
> -1, QCOM_QOS_MODE_BYPASS, 2, SNOC_MM_INT_0, SNOC_MM_INT_2);
> 
> and similar for the other nodes.
>

Yes, exactly.

>> +DEFINE_QNODE(mas_jpeg, 62, 6, 16, 1, -1, -1, QCOM_QOS_MODE_BYPASS, 2, 
>> 1, 10002);
>> +DEFINE_QNODE(mas_vfe, 29, 9, 16, 1, -1, -1, QCOM_QOS_MODE_BYPASS, 2, 10001, 
>> 10002);
>> +DEFINE_QNODE(mas_mdp, 22, 7, 16, 1, -1, -1, QCOM_QOS_MODE_BYPASS, 2, 1, 
>> 10002);
>> +DEFINE_QNODE(mas_qdss_bam, 53, 11, 16, 1, -1, -1, QCOM_QOS_MODE_FIXED, 1, 
>> 10009);
>> +DEFINE_QNODE(mas_snoc_cfg, 54, 0, 16, 0, 20, -1, QCOM_QOS_MODE_BYPASS, 1, 
>> 10009);
>> +DEFINE_QNODE(mas_qdss_etr, 60, 10, 16, 1, -1, -1, QCOM_QOS_MODE_FIXED, 1, 
>> 10009);
>> +DEFINE_QNODE(mm_int_0, 1, 0, 16, 1, -1, -1, QCOM_QOS_MODE_FIXED, 1, 
>> 10003);
>> +DEFINE_QNODE(mm_int_1, 10001, 0, 16, 1, -1, -1, QCOM_QOS_MODE_FIXED, 1, 
>> 10003);
>> +DEFINE_QNODE(mm_int_2, 10002, 0, 16, 1, -1, -1, QCOM_QOS_MODE_FIXED, 1, 
>> 10004);
>> +DEFINE_QNODE(mm_int_bimc, 10003, 0, 16, 1, -1, -1, QCOM_QOS_MODE_FIXED, 1, 
>> 10008);
>> +DEFINE_QNODE(snoc_int_0, 10004, 0, 8, 0, 99, 130, QCOM_QOS_MODE_FIXED, 3, 
>> 588, 519, 10027);
>> +DEFINE_QNODE(snoc_int_1, 10005, 0, 8, 0, 100, 131, QCOM_QOS_MODE_FIXED, 3, 
>> 517, 663, 664);
>> +DEFINE_QNODE(snoc_int_bimc, 10006, 0, 8, 0, 101, 132, QCOM_QOS_MODE_FIXED, 
>> 1, 10007);
>> +DEFINE_QNODE(snoc_bimc_0_mas, 10007, 0, 8, 0, 3, -1, QCOM_QOS_MODE_FIXED, 
>> 1, 10025);
>> +DEFINE_QNODE(snoc_bimc_1_mas, 10008, 0, 16, 1, -1, -1, QCOM_QOS_MODE_FIXED, 
>> 1, 10026);
>> +DEFINE_QNODE(qdss_int, 10009, 0, 8, 1, -1, -1, QCOM_QOS_MODE_FIXED, 2, 
>> 10004, 10006);
>> +DEFINE_QNODE(bimc_snoc_slv, 10017, 0, 8, 1, -1, -1, QCOM_QOS_MODE_FIXED, 2, 
>> 10004, 10005);
>> +DEFINE_QNODE(snoc_pnoc_mas, 10027, 0, 8, 0, -1, -1, QCOM_QOS_MODE_FIXED, 1, 
>> 10028);
>> +DEFINE_QNODE(pnoc_snoc_slv, 10011, 0, 8, 0, -1, 45, QCOM_QOS_MODE_FIXED, 3, 
>> 10004, 10006, 10005);
>> +DEFINE_QNODE(slv_srvc_snoc, 587, 0, 8, 0, -1, 29, QCOM_QOS_MODE_FIXED, 0, 
>> 0);
>> +DEFINE_QNODE(slv_qdss_stm, 588, 0, 4, 0, -1, 30, QCOM_QOS_MODE_FIXED, 0, 0);
>> +DEFINE_QNODE(slv_imem, 519, 0, 8, 0, -1, 26, QCOM_QOS_MODE_FIXED, 0, 0);
>> +DEFINE_QNODE(slv_apss, 517, 0, 4, 0, -1, 20, QCOM_QOS_MODE_FIXED, 0, 0);
>> +DEFINE_QNODE(slv_cats_0, 663, 0, 16, 0, -1, 106, QCOM_QOS_MODE_FIXED, 0, 0);
>> +DEFINE_QNODE(slv_cats_1, 664, 0, 8, 0, -1, 107, QCOM_QOS_MODE_FIXED, 0, 0);
>> +DEFINE_QNODE(mas_apss, 1, 0, 8, 1, -1, -1, QCOM_QOS_MODE_FIXED, 3, 512, 
>> 10016, 514);
>> +DEFINE_QNODE(mas_tcu0, 104, 5, 8, 1, -1, -1, QCOM_QOS_MODE_FIXED, 3, 512, 
>> 10016, 514);
>> +DEFINE_QNODE(mas_tcu1, 105, 6, 8, 1, -1, -1, QCOM_QOS_MODE_FIXED, 3, 512, 
>> 10016, 514);
>> +DEFINE_QNODE(mas_gfx, 26, 2, 8, 1, -1, -1, QCOM_QOS_MODE_FIXED, 3, 512, 
>> 10016, 514);
>> +DEFINE_QNODE(bimc_snoc_mas, 10016, 0, 8, 1, -1, -1, QCOM_QOS_MODE_FIXED, 1, 
>> 10017);
>> +DEFINE_QNODE(snoc_bimc_0_slv, 10025, 0, 8, 0, -1, 24, QCOM_QOS_MODE_FIXED, 
>> 1, 512);
>> +DEFINE_QNODE(snoc_bimc_1_slv, 10026, 0, 8, 1, -1, -1, QCOM_QOS_MODE_FIXED, 
>> 1, 512);
>> +DEFINE_QNODE(slv_ebi_ch0, 512, 0, 8, 0, -1, 0, QCOM_QOS_MODE_FIXED, 0, 0);
>> +DEFINE_QNODE(slv_apps_l2, 514, 0, 8, 0, -1, -1, QCOM_QOS_MODE_FIXED, 0, 0);
>> +DEFINE_QNODE(snoc_pnoc_slv, 10028, 0, 8, 0, -1, -1, QCOM_QOS_MODE_FIXED, 1, 
>> 10012);
>> +DEFINE_QNODE(pnoc_int_0, 10012, 0, 8, 0, -1, -1, QCOM_QOS_MODE_FIXED, 8, 
>> 10010, 10018, 10019, 10020, 10021, 10022, 10023, 10024);
>> +DEFINE_QNODE(pnoc_int_1, 10013, 0, 8, 0, -1, -1, QCOM_QOS_MODE_FIXED, 1, 
>> 10010);
>> +DEFINE_QNODE(pnoc_m_0, 10014, 0, 8, 0, -1, -1, QCOM_QOS_MODE_FIXED, 1, 
>> 10012);
>> +DEFINE_QNODE(pnoc_m_1, 10015, 0, 8, 0, -1, -1, QCOM_QOS_MODE_FIXED, 1, 
>> 10010);
>> +DEFINE_QNODE(pnoc_s_0, 10018, 0, 8, 0, -1, -1, QCOM_QOS_MODE_FIXED, 5, 620, 
>> 624, 579, 622, 521);
>> +DEFINE_QNODE(pnoc_s_1, 10019, 0, 8, 0, -1, -1, QCOM_QOS_MODE_FIXED, 5, 627, 
>> 625, 535, 577, 618);
>> +DEFINE_QNODE(pnoc_s_2, 10020, 0, 8, 0, -1, -1, QCOM_QOS_MOD

Re: [PATCH v4 5/7] interconnect: qcom: Add msm8916 interconnect provider driver

2018-04-05 Thread Matthias Kaehlcke

On Fri, Mar 09, 2018 at 11:09:56PM +0200, Georgi Djakov wrote:
> Add driver for the Qualcomm interconnect buses found in msm8916 based
> platforms.
> 
> Signed-off-by: Georgi Djakov 
> ---
>  drivers/interconnect/Kconfig|   5 +
>  drivers/interconnect/Makefile   |   1 +
>  drivers/interconnect/qcom/Kconfig   |  11 +
>  drivers/interconnect/qcom/Makefile  |   2 +
>  drivers/interconnect/qcom/msm8916.c | 482 
> 
>  include/linux/interconnect/qcom.h   | 350 ++
>  6 files changed, 851 insertions(+)
>  create mode 100644 drivers/interconnect/qcom/Kconfig
>  create mode 100644 drivers/interconnect/qcom/msm8916.c
>  create mode 100644 include/linux/interconnect/qcom.h
> 
> diff --git a/drivers/interconnect/Kconfig b/drivers/interconnect/Kconfig
> index a261c7d41deb..07a8276fa35a 100644
> --- a/drivers/interconnect/Kconfig
> +++ b/drivers/interconnect/Kconfig
> @@ -8,3 +8,8 @@ menuconfig INTERCONNECT
>  
> If unsure, say no.
>  
> +if INTERCONNECT
> +
> +source "drivers/interconnect/qcom/Kconfig"
> +
> +endif
> diff --git a/drivers/interconnect/Makefile b/drivers/interconnect/Makefile
> index 5edf0ae80818..5971b811c2d7 100644
> --- a/drivers/interconnect/Makefile
> +++ b/drivers/interconnect/Makefile
> @@ -1 +1,2 @@
>  obj-$(CONFIG_INTERCONNECT)   += core.o
> +obj-$(CONFIG_INTERCONNECT_QCOM)  += qcom/
> diff --git a/drivers/interconnect/qcom/Kconfig 
> b/drivers/interconnect/qcom/Kconfig
> new file mode 100644
> index ..86465dc37bd4
> --- /dev/null
> +++ b/drivers/interconnect/qcom/Kconfig
> @@ -0,0 +1,11 @@
> +config INTERCONNECT_QCOM
> + bool "Qualcomm Network-on-Chip interconnect drivers"
> + depends on INTERCONNECT
> + depends on ARCH_QCOM || COMPILE_TEST
> + default y
> +
> +config INTERCONNECT_QCOM_MSM8916
> + tristate "Qualcomm MSM8916 interconnect driver"
> + depends on INTERCONNECT_QCOM
> + help
> +   This is a driver for the Qualcomm Network-on-Chip on msm8916-based 
> platforms.
> diff --git a/drivers/interconnect/qcom/Makefile 
> b/drivers/interconnect/qcom/Makefile
> index 095bdef1ee6e..a0c13a25e8db 100644
> --- a/drivers/interconnect/qcom/Makefile
> +++ b/drivers/interconnect/qcom/Makefile
> @@ -1 +1,3 @@
>  obj-y += smd-rpm.o
> +
> +obj-$(CONFIG_INTERCONNECT_QCOM_MSM8916) += msm8916.o
> diff --git a/drivers/interconnect/qcom/msm8916.c 
> b/drivers/interconnect/qcom/msm8916.c
> new file mode 100644
> index ..d5b54f8261c8
> --- /dev/null
> +++ b/drivers/interconnect/qcom/msm8916.c
> @@ -0,0 +1,482 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright (C) 2018 Linaro Ltd
> + * Author: Georgi Djakov 
> + */
> +
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +
> +#include "smd-rpm.h"
> +
> +#define RPM_MASTER_FIELD_BW  0x7762
> +#define RPM_BUS_MASTER_REQ  0x73616d62
> +#define RPM_BUS_SLAVE_REQ   0x766c7362
> +
> +#define to_qcom_provider(_provider) \
> + container_of(_provider, struct qcom_icc_provider, provider)
> +
> +#define DEFINE_QNODE(_name, _id, _port, _buswidth, _ap_owned,
> \
> + _mas_rpm_id, _slv_rpm_id, _qos_mode,\
> + _numlinks, ...) \
> + static struct qcom_icc_node _name = {   \
> + .id = _id,  \
> + .name = #_name, \
> + .port = _port,  \
> + .buswidth = _buswidth,  \
> + .qos_mode = _qos_mode,  \
> + .ap_owned = _ap_owned,  \
> + .mas_rpm_id = _mas_rpm_id,  \
> + .slv_rpm_id = _slv_rpm_id,  \
> + .num_links = _numlinks, \
> + .links = { __VA_ARGS__ },   \
> + }
> +
> +enum qcom_qos_mode {
> + QCOM_QOS_MODE_BYPASS = 0,
> + QCOM_QOS_MODE_FIXED,
> + QCOM_QOS_MODE_MAX,
> +};
> +
> +struct qcom_icc_provider {
> + struct icc_provider provider;
> + void __iomem*base;
> + struct clk  *bus_clk;
> + struct clk  *bus_a_clk;
> +};
> +
> +#define MSM8916_MAX_LINKS8
> +
> +/**
> + * struct qcom_icc_node - Qualcomm specific interconnect nodes
> + * @name: the node name used in debugfs
> + * @links: an array of nodes where we can go next while traversing
> + * @id: a unique node identifier
> + * @num_links: the total number of @links
> + * @port: the offset index into the masters QoS register space
> + * @buswidth: width of the interconnect between a node and the bus
> + * @ap_owned: the AP CP

[PATCH v4 5/7] interconnect: qcom: Add msm8916 interconnect provider driver

2018-03-09 Thread Georgi Djakov

Add driver for the Qualcomm interconnect buses found in msm8916 based
platforms.

Signed-off-by: Georgi Djakov 
---
 drivers/interconnect/Kconfig|   5 +
 drivers/interconnect/Makefile   |   1 +
 drivers/interconnect/qcom/Kconfig   |  11 +
 drivers/interconnect/qcom/Makefile  |   2 +
 drivers/interconnect/qcom/msm8916.c | 482 
 include/linux/interconnect/qcom.h   | 350 ++
 6 files changed, 851 insertions(+)
 create mode 100644 drivers/interconnect/qcom/Kconfig
 create mode 100644 drivers/interconnect/qcom/msm8916.c
 create mode 100644 include/linux/interconnect/qcom.h

diff --git a/drivers/interconnect/Kconfig b/drivers/interconnect/Kconfig
index a261c7d41deb..07a8276fa35a 100644
--- a/drivers/interconnect/Kconfig
+++ b/drivers/interconnect/Kconfig
@@ -8,3 +8,8 @@ menuconfig INTERCONNECT
 
  If unsure, say no.
 
+if INTERCONNECT
+
+source "drivers/interconnect/qcom/Kconfig"
+
+endif
diff --git a/drivers/interconnect/Makefile b/drivers/interconnect/Makefile
index 5edf0ae80818..5971b811c2d7 100644
--- a/drivers/interconnect/Makefile
+++ b/drivers/interconnect/Makefile
@@ -1 +1,2 @@
 obj-$(CONFIG_INTERCONNECT) += core.o
+obj-$(CONFIG_INTERCONNECT_QCOM)+= qcom/
diff --git a/drivers/interconnect/qcom/Kconfig 
b/drivers/interconnect/qcom/Kconfig
new file mode 100644
index ..86465dc37bd4
--- /dev/null
+++ b/drivers/interconnect/qcom/Kconfig
@@ -0,0 +1,11 @@
+config INTERCONNECT_QCOM
+   bool "Qualcomm Network-on-Chip interconnect drivers"
+   depends on INTERCONNECT
+   depends on ARCH_QCOM || COMPILE_TEST
+   default y
+
+config INTERCONNECT_QCOM_MSM8916
+   tristate "Qualcomm MSM8916 interconnect driver"
+   depends on INTERCONNECT_QCOM
+   help
+ This is a driver for the Qualcomm Network-on-Chip on msm8916-based 
platforms.
diff --git a/drivers/interconnect/qcom/Makefile 
b/drivers/interconnect/qcom/Makefile
index 095bdef1ee6e..a0c13a25e8db 100644
--- a/drivers/interconnect/qcom/Makefile
+++ b/drivers/interconnect/qcom/Makefile
@@ -1 +1,3 @@
 obj-y += smd-rpm.o
+
+obj-$(CONFIG_INTERCONNECT_QCOM_MSM8916) += msm8916.o
diff --git a/drivers/interconnect/qcom/msm8916.c 
b/drivers/interconnect/qcom/msm8916.c
new file mode 100644
index ..d5b54f8261c8
--- /dev/null
+++ b/drivers/interconnect/qcom/msm8916.c
@@ -0,0 +1,482 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2018 Linaro Ltd
+ * Author: Georgi Djakov 
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include "smd-rpm.h"
+
+#define RPM_MASTER_FIELD_BW0x7762
+#define RPM_BUS_MASTER_REQ  0x73616d62
+#define RPM_BUS_SLAVE_REQ   0x766c7362
+
+#define to_qcom_provider(_provider) \
+   container_of(_provider, struct qcom_icc_provider, provider)
+
+#define DEFINE_QNODE(_name, _id, _port, _buswidth, _ap_owned,  \
+   _mas_rpm_id, _slv_rpm_id, _qos_mode,\
+   _numlinks, ...) \
+   static struct qcom_icc_node _name = {   \
+   .id = _id,  \
+   .name = #_name, \
+   .port = _port,  \
+   .buswidth = _buswidth,  \
+   .qos_mode = _qos_mode,  \
+   .ap_owned = _ap_owned,  \
+   .mas_rpm_id = _mas_rpm_id,  \
+   .slv_rpm_id = _slv_rpm_id,  \
+   .num_links = _numlinks, \
+   .links = { __VA_ARGS__ },   \
+   }
+
+enum qcom_qos_mode {
+   QCOM_QOS_MODE_BYPASS = 0,
+   QCOM_QOS_MODE_FIXED,
+   QCOM_QOS_MODE_MAX,
+};
+
+struct qcom_icc_provider {
+   struct icc_provider provider;
+   void __iomem*base;
+   struct clk  *bus_clk;
+   struct clk  *bus_a_clk;
+};
+
+#define MSM8916_MAX_LINKS  8
+
+/**
+ * struct qcom_icc_node - Qualcomm specific interconnect nodes
+ * @name: the node name used in debugfs
+ * @links: an array of nodes where we can go next while traversing
+ * @id: a unique node identifier
+ * @num_links: the total number of @links
+ * @port: the offset index into the masters QoS register space
+ * @buswidth: width of the interconnect between a node and the bus
+ * @ap_owned: the AP CPU does the writing to QoS registers
+ * @rpm: reference to the RPM SMD driver
+ * @qos_mode: QoS mode for ap_owned resources
+ * @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 cloc

Re: [PATCH v4 5/7] interconnect: qcom: Add msm8916 interconnect provider driver

Re: [PATCH v4 5/7] interconnect: qcom: Add msm8916 interconnect provider driver

Re: [PATCH v4 5/7] interconnect: qcom: Add msm8916 interconnect provider driver

Re: [PATCH v4 5/7] interconnect: qcom: Add msm8916 interconnect provider driver

[PATCH v4 5/7] interconnect: qcom: Add msm8916 interconnect provider driver

Re: [PATCH v4 5/7] interconnect: qcom: Add msm8916 interconnect provider driver

[PATCH v4 5/7] interconnect: qcom: Add msm8916 interconnect provider driver

7 matches

Site Navigation

Mail list logo

Footer information