[v5,1/8] interconnect: Add generic on-chip interconnect API

Message ID 20180620121141.15403-2-georgi.djakov@linaro.org
State New
Headers show
Series
  • [v5,1/8] interconnect: Add generic on-chip interconnect API
Related show

Commit Message

Georgi Djakov June 20, 2018, 12:11 p.m.
This patch introduce a new API to get requirements and configure the
interconnect buses across the entire chipset to fit with the current
demand.

The API is using a consumer/provider-based model, where the providers are
the interconnect buses and the consumers could be various drivers.
The consumers request interconnect resources (path) between endpoints and
set the desired constraints on this data flow path. The providers receive
requests from consumers and aggregate these requests for all master-slave
pairs on that path. Then the providers configure each participating in the
topology node according to the requested data flow path, physical links and
constraints. The topology could be complicated and multi-tiered and is SoC
specific.

Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>

---
 Documentation/interconnect/interconnect.rst |  96 ++++
 drivers/Kconfig                             |   2 +
 drivers/Makefile                            |   1 +
 drivers/interconnect/Kconfig                |  10 +
 drivers/interconnect/Makefile               |   2 +
 drivers/interconnect/core.c                 | 586 ++++++++++++++++++++
 include/linux/interconnect-provider.h       | 127 +++++
 include/linux/interconnect.h                |  42 ++
 8 files changed, 866 insertions(+)
 create mode 100644 Documentation/interconnect/interconnect.rst
 create mode 100644 drivers/interconnect/Kconfig
 create mode 100644 drivers/interconnect/Makefile
 create mode 100644 drivers/interconnect/core.c
 create mode 100644 include/linux/interconnect-provider.h
 create mode 100644 include/linux/interconnect.h

Comments

Evan Green June 26, 2018, 8:57 p.m. | #1
Hi Georgi. Thanks for the new spin of this.

On Wed, Jun 20, 2018 at 5:11 AM Georgi Djakov <georgi.djakov@linaro.org> wrote:
>

> This patch introduce a new API to get requirements and configure the

> interconnect buses across the entire chipset to fit with the current

> demand.

>

> The API is using a consumer/provider-based model, where the providers are

> the interconnect buses and the consumers could be various drivers.

> The consumers request interconnect resources (path) between endpoints and

> set the desired constraints on this data flow path. The providers receive

> requests from consumers and aggregate these requests for all master-slave

> pairs on that path. Then the providers configure each participating in the

> topology node according to the requested data flow path, physical links and

> constraints. The topology could be complicated and multi-tiered and is SoC

> specific.

>

> Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>

> ---

>  Documentation/interconnect/interconnect.rst |  96 ++++

>  drivers/Kconfig                             |   2 +

>  drivers/Makefile                            |   1 +

>  drivers/interconnect/Kconfig                |  10 +

>  drivers/interconnect/Makefile               |   2 +

>  drivers/interconnect/core.c                 | 586 ++++++++++++++++++++

>  include/linux/interconnect-provider.h       | 127 +++++

>  include/linux/interconnect.h                |  42 ++

>  8 files changed, 866 insertions(+)

>  create mode 100644 Documentation/interconnect/interconnect.rst

>  create mode 100644 drivers/interconnect/Kconfig

>  create mode 100644 drivers/interconnect/Makefile

>  create mode 100644 drivers/interconnect/core.c

>  create mode 100644 include/linux/interconnect-provider.h

>  create mode 100644 include/linux/interconnect.h

>

> diff --git a/Documentation/interconnect/interconnect.rst b/Documentation/interconnect/interconnect.rst

> new file mode 100644

> index 000000000000..a1ebd83ad0a1

> --- /dev/null

> +++ b/Documentation/interconnect/interconnect.rst

> @@ -0,0 +1,96 @@

> +.. SPDX-License-Identifier: GPL-2.0

> +

> +=====================================

> +GENERIC SYSTEM INTERCONNECT SUBSYSTEM

> +=====================================

> +

> +Introduction

> +------------

> +

> +This framework is designed to provide a standard kernel interface to control

> +the settings of the interconnects on a SoC. These settings can be throughput,

> +latency and priority between multiple interconnected devices or functional

> +blocks. This can be controlled dynamically in order to save power or provide

> +maximum performance.

> +

> +The interconnect bus is a hardware with configurable parameters, which can be

> +set on a data path according to the requests received from various drivers.

> +An example of interconnect buses are the interconnects between various

> +components or functional blocks in chipsets. There can be multiple interconnects

> +on a SoC that can be multi-tiered.

> +

> +Below is a simplified diagram of a real-world SoC interconnect bus topology.

> +

> +::

> +

> + +----------------+    +----------------+

> + | HW Accelerator |--->|      M NoC     |<---------------+

> + +----------------+    +----------------+                |

> +                         |      |                    +------------+

> +  +-----+  +-------------+      V       +------+     |            |

> +  | DDR |  |                +--------+  | PCIe |     |            |

> +  +-----+  |                | Slaves |  +------+     |            |

> +    ^ ^    |                +--------+     |         |   C NoC    |

> +    | |    V                               V         |            |

> + +------------------+   +------------------------+   |            |   +-----+

> + |                  |-->|                        |-->|            |-->| CPU |

> + |                  |-->|                        |<--|            |   +-----+

> + |     Mem NoC      |   |         S NoC          |   +------------+

> + |                  |<--|                        |---------+    |

> + |                  |<--|                        |<------+ |    |   +--------+

> + +------------------+   +------------------------+       | |    +-->| Slaves |

> +   ^  ^    ^    ^          ^                             | |        +--------+

> +   |  |    |    |          |                             | V

> + +------+  |  +-----+   +-----+  +---------+   +----------------+   +--------+

> + | CPUs |  |  | GPU |   | DSP |  | Masters |-->|       P NoC    |-->| Slaves |

> + +------+  |  +-----+   +-----+  +---------+   +----------------+   +--------+

> +           |

> +       +-------+

> +       | Modem |

> +       +-------+

> +

> +Terminology

> +-----------

> +

> +Interconnect provider is the software definition of the interconnect hardware.

> +The interconnect providers on the above diagram are M NoC, S NoC, C NoC, P NoC

> +and Mem NoC.

> +

> +Interconnect node is the software definition of the interconnect hardware

> +port. Each interconnect provider consists of multiple interconnect nodes,

> +which are connected to other SoC components including other interconnect

> +providers. The point on the diagram where the CPUs connects to the memory is

> +called an interconnect node, which belongs to the Mem NoC interconnect provider.

> +

> +Interconnect endpoints are the first or the last element of the path. Every

> +endpoint is a node, but not every node is an endpoint.

> +

> +Interconnect path is everything between two endpoints including all the nodes

> +that have to be traversed to reach from a source to destination node. It may

> +include multiple master-slave pairs across several interconnect providers.

> +

> +Interconnect consumers are the entities which make use of the data paths exposed

> +by the providers. The consumers send requests to providers requesting various

> +throughput, latency and priority. Usually the consumers are device drivers, that

> +send request based on their needs. An example for a consumer is a video decoder

> +that supports various formats and image sizes.

> +

> +Interconnect providers

> +----------------------

> +

> +Interconnect provider is an entity that implements methods to initialize and

> +configure a interconnect bus hardware. The interconnect provider drivers should

> +be registered with the interconnect provider core.

> +

> +The interconnect framework provider API functions are documented in

> +.. kernel-doc:: include/linux/interconnect-provider.h

> +

> +Interconnect consumers

> +----------------------

> +

> +Interconnect consumers are the clients which use the interconnect APIs to

> +get paths between endpoints and set their bandwidth/latency/QoS requirements

> +for these interconnect paths.

> +

> +The interconnect framework consumer API functions are documented in

> +.. kernel-doc:: include/linux/interconnect.h

> diff --git a/drivers/Kconfig b/drivers/Kconfig

> index 95b9ccc08165..3ed6ede9d021 100644

> --- a/drivers/Kconfig

> +++ b/drivers/Kconfig

> @@ -217,4 +217,6 @@ source "drivers/siox/Kconfig"

>

>  source "drivers/slimbus/Kconfig"

>

> +source "drivers/interconnect/Kconfig"

> +

>  endmenu

> diff --git a/drivers/Makefile b/drivers/Makefile

> index 24cd47014657..0cca95740d9b 100644

> --- a/drivers/Makefile

> +++ b/drivers/Makefile

> @@ -185,3 +185,4 @@ obj-$(CONFIG_TEE)           += tee/

>  obj-$(CONFIG_MULTIPLEXER)      += mux/

>  obj-$(CONFIG_UNISYS_VISORBUS)  += visorbus/

>  obj-$(CONFIG_SIOX)             += siox/

> +obj-$(CONFIG_INTERCONNECT)     += interconnect/

> diff --git a/drivers/interconnect/Kconfig b/drivers/interconnect/Kconfig

> new file mode 100644

> index 000000000000..a261c7d41deb

> --- /dev/null

> +++ b/drivers/interconnect/Kconfig

> @@ -0,0 +1,10 @@

> +menuconfig INTERCONNECT

> +       tristate "On-Chip Interconnect management support"

> +       help

> +         Support for management of the on-chip interconnects.

> +

> +         This framework is designed to provide a generic interface for

> +         managing the interconnects in a SoC.

> +

> +         If unsure, say no.

> +

> diff --git a/drivers/interconnect/Makefile b/drivers/interconnect/Makefile

> new file mode 100644

> index 000000000000..97fca2e09d24

> --- /dev/null

> +++ b/drivers/interconnect/Makefile

> @@ -0,0 +1,2 @@

> +# SPDX-License-Identifier: GPL-2.0

> +obj-$(CONFIG_INTERCONNECT)             += core.o

> diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c

> new file mode 100644

> index 000000000000..e7f96fc6722e

> --- /dev/null

> +++ b/drivers/interconnect/core.c

> @@ -0,0 +1,586 @@

> +// SPDX-License-Identifier: GPL-2.0

> +/*

> + * Interconnect framework core driver

> + *

> + * Copyright (c) 2018, Linaro Ltd.

> + * Author: Georgi Djakov <georgi.djakov@linaro.org>

> + */

> +

> +#include <linux/device.h>

> +#include <linux/idr.h>

> +#include <linux/init.h>

> +#include <linux/interconnect.h>

> +#include <linux/interconnect-provider.h>

> +#include <linux/list.h>

> +#include <linux/module.h>

> +#include <linux/mutex.h>

> +#include <linux/slab.h>

> +

> +static DEFINE_IDR(icc_idr);

> +static LIST_HEAD(icc_provider_list);

> +static DEFINE_MUTEX(icc_lock);

> +

> +/**

> + * struct icc_req - constraints that are attached to each node

> + *

> + * @req_node: entry in list of requests for the particular @node

> + * @node: the interconnect node to which this constraint applies

> + * @dev: reference to the device that sets the constraints

> + * @avg_bw: an integer describing the average bandwidth in kbps

> + * @peak_bw: an integer describing the peak bandwidth in kbps

> + */

> +struct icc_req {

> +       struct hlist_node req_node;

> +       struct icc_node *node;

> +       struct device *dev;

> +       u32 avg_bw;

> +       u32 peak_bw;

> +};

> +

> +/**

> + * struct icc_path - interconnect path structure

> + * @num_nodes: number of hops (nodes)

> + * @reqs: array of the requests applicable to this path of nodes

> + */

> +struct icc_path {

> +       size_t num_nodes;

> +       struct icc_req reqs[0];

> +};

> +

> +static struct icc_node *node_find(const int id)

> +{

> +       struct icc_node *node;

> +

> +       mutex_lock(&icc_lock);

> +       node = idr_find(&icc_idr, id);

> +       mutex_unlock(&icc_lock);


I wonder if this is too low of a level to be dealing with the lock. I
notice that everywhere you use this function, you afterwards
immediately grab the lock and do more stuff. Maybe this function
should have a comment saying it assumes the lock is already held, and
then you can grab the lock in the callers, since you're doing that
anyway.

> +

> +       return node;

> +}

> +

> +static struct icc_path *path_allocate(struct icc_node *dst, ssize_t num_nodes)

> +{

> +       struct icc_node *node = dst;

> +       struct icc_path *path;

> +       size_t i;

> +

> +       path = kzalloc(sizeof(*path) + num_nodes * sizeof(*path->reqs),

> +                      GFP_KERNEL);

> +       if (!path)

> +               return ERR_PTR(-ENOMEM);

> +

> +       path->num_nodes = num_nodes;

> +

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

> +               hlist_add_head(&path->reqs[i].req_node, &node->req_list);

> +

> +               path->reqs[i].node = node;

> +               /* reference to previous node was saved during path traversal */

> +               node = node->reverse;

> +       }

> +

> +       return path;

> +}

> +

> +static struct icc_path *path_find(struct device *dev, struct icc_node *src,

> +                                 struct icc_node *dst)

> +{


I personally prefer a comment somewhere indicating that this function
assumes icc_lock is already held. Not sure if that's conventional or
not.

> +       struct icc_node *n, *node = NULL;

> +       struct icc_provider *provider;

> +       struct list_head traverse_list;

> +       struct list_head edge_list;

> +       struct list_head visited_list;

> +       size_t i, depth = 0;

> +       bool found = false;

> +       int ret = -EPROBE_DEFER;

> +

> +       INIT_LIST_HEAD(&traverse_list);

> +       INIT_LIST_HEAD(&edge_list);

> +       INIT_LIST_HEAD(&visited_list);

> +

> +       list_add_tail(&src->search_list, &traverse_list);

> +       src->reverse = NULL;

> +

> +       do {

> +               list_for_each_entry_safe(node, n, &traverse_list, search_list) {

> +                       if (node == dst) {

> +                               found = true;

> +                               list_add(&node->search_list, &visited_list);

> +                               break;

> +                       }

> +                       for (i = 0; i < node->num_links; i++) {

> +                               struct icc_node *tmp = node->links[i];

> +

> +                               if (!tmp) {

> +                                       ret = -ENOENT;

> +                                       goto out;

> +                               }

> +

> +                               if (tmp->is_traversed)

> +                                       continue;

> +

> +                               tmp->is_traversed = true;

> +                               tmp->reverse = node;

> +                               list_add(&tmp->search_list, &edge_list);

> +                       }

> +               }

> +               if (found)

> +                       break;

> +

> +               list_splice_init(&traverse_list, &visited_list);

> +               list_splice_init(&edge_list, &traverse_list);

> +

> +               /* count the hops away from the source */

> +               depth++;

> +

> +       } while (!list_empty(&traverse_list));

> +

> +out:

> +       /* reset the traversed state */

> +       list_for_each_entry(provider, &icc_provider_list, provider_list) {

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

> +                       if (n->is_traversed)

> +                               n->is_traversed = false;


Remove the conditional, just set is_traversed to false.

> +       }

> +

> +       if (found) {

> +               struct icc_path *path = path_allocate(dst, depth);


Is the path supposed to include the source? For instance, if the dst
were a neighbor, depth would be one, so only dst would be in the path.
It seems like it might be worthwhile to have the source in there too.

> +

> +               if (IS_ERR(path))

> +                       return path;

> +

> +               /* initialize the path */

> +               for (i = 0; i < path->num_nodes; i++) {

> +                       node = path->reqs[i].node;

> +                       path->reqs[i].dev = dev;

> +                       node->provider->users++;


Should this loop live inside path_allocate? I'm unsure, but maybe at
least path->reqs[i].dev = dev, since it feels like standard
initialization of the path.

> +               }

> +               return path;

> +       }

> +

> +       return ERR_PTR(ret);

> +}

> +

> +/*

> + * We want the path to honor all bandwidth requests, so the average

> + * bandwidth requirements from each consumer are aggregated at each node

> + * and provider level. By default the average bandwidth is the sum of all

> + * averages and the peak will be the highest of all peak bandwidth requests.

> + */

> +

> +static int aggregate_requests(struct icc_node *node)

> +{

> +       struct icc_provider *p = node->provider;

> +       struct icc_req *r;

> +

> +       node->avg_bw = 0;

> +       node->peak_bw = 0;

> +

> +       hlist_for_each_entry(r, &node->req_list, req_node)

> +               p->aggregate(node, r->avg_bw, r->peak_bw,

> +                            &node->avg_bw, &node->peak_bw);

> +

> +       return 0;

> +}

> +

> +static void aggregate_provider(struct icc_provider *p)

> +{

> +       struct icc_node *n;

> +

> +       p->avg_bw = 0;

> +       p->peak_bw = 0;

> +

> +       list_for_each_entry(n, &p->nodes, node_list)

> +               p->aggregate(n, n->avg_bw, n->peak_bw,

> +                            &p->avg_bw, &p->peak_bw);

> +}

> +

> +static int apply_constraints(struct icc_path *path)

> +{

> +       struct icc_node *next, *prev = NULL;

> +       int ret = 0;

> +       int i;

> +

> +       for (i = 0; i < path->num_nodes; i++, prev = next) {

> +               struct icc_provider *p;

> +

> +               next = path->reqs[i].node;

> +               /*

> +                * Both endpoints should be valid master-slave pairs of the

> +                * same interconnect provider that will be configured.

> +                */

> +               if (!prev || next->provider != prev->provider)

> +                       continue;

> +

> +               p = next->provider;

> +

> +               aggregate_provider(p);

> +

> +               if (p->set) {

> +                       /* set the constraints */

> +                       ret = p->set(prev, next, p->avg_bw, p->peak_bw);

> +               }

> +

> +               if (ret)

> +                       goto out;

> +       }

> +out:

> +       return ret;

> +}

> +

> +/**

> + * icc_set() - set constraints on an interconnect path between two endpoints

> + * @path: reference to the path returned by icc_get()

> + * @avg_bw: average bandwidth in kbps

> + * @peak_bw: peak bandwidth in kbps

> + *

> + * This function is used by an interconnect consumer to express its own needs

> + * in terms of bandwidth for a previously requested path between two endpoints.

> + * The requests are aggregated and each node is updated accordingly. The entire

> + * path is locked by a mutex to ensure that the set() is completed.

> + * The @path can be NULL when the "interconnects" DT properties is missing,

> + * which will mean that no constraints will be set.

> + *

> + * Returns 0 on success, or an appropriate error code otherwise.

> + */

> +int icc_set(struct icc_path *path, u32 avg_bw, u32 peak_bw)

> +{

> +       struct icc_node *node;

> +       struct icc_provider *p;

> +       size_t i;

> +       int ret = 0;

> +

> +       if (!path)

> +               return 0;

> +

> +       mutex_lock(&icc_lock);

> +

> +       for (i = 0; i < path->num_nodes; i++) {

> +               node = path->reqs[i].node;

> +               p = node->provider;

> +

> +               /* update the consumer request for this path */

> +               path->reqs[i].avg_bw = avg_bw;

> +               path->reqs[i].peak_bw = peak_bw;

> +

> +               /* aggregate requests for this node */

> +               aggregate_requests(node);

> +       }

> +

> +       ret = apply_constraints(path);

> +       if (ret)

> +               pr_err("interconnect: error applying constraints (%d)", ret);

> +

> +       mutex_unlock(&icc_lock);

> +

> +       return ret;

> +}

> +EXPORT_SYMBOL_GPL(icc_set);

> +

> +/**

> + * icc_get() - return a handle for path between two endpoints

> + * @dev: the device requesting the path

> + * @src_id: source device port id

> + * @dst_id: destination device port id

> + *

> + * This function will search for a path between two endpoints and return an

> + * icc_path handle on success. Use icc_put() to release

> + * constraints when the they are not needed anymore.

> + *

> + * Return: icc_path pointer on success, or ERR_PTR() on error

> + */

> +struct icc_path *icc_get(struct device *dev, const int src_id, const int dst_id)

> +{

> +       struct icc_node *src, *dst;

> +       struct icc_path *path = ERR_PTR(-EPROBE_DEFER);

> +

> +       src = node_find(src_id);

> +       if (!src) {

> +               dev_err(dev, "%s: invalid src=%d\n", __func__, src_id);

> +               goto out;

> +       }

> +

> +       dst = node_find(dst_id);

> +       if (!dst) {

> +               dev_err(dev, "%s: invalid dst=%d\n", __func__, dst_id);

> +               goto out;

> +       }

> +

> +       mutex_lock(&icc_lock);

> +       path = path_find(dev, src, dst);

> +       mutex_unlock(&icc_lock);

> +       if (IS_ERR(path)) {

> +               dev_err(dev, "%s: invalid path=%ld\n", __func__, PTR_ERR(path));

> +               goto out;

> +       }

> +

> +out:

> +       return path;

> +}

> +EXPORT_SYMBOL_GPL(icc_get);

> +

> +/**

> + * icc_put() - release the reference to the icc_path

> + * @path: interconnect path

> + *

> + * Use this function to release the constraints on a path when the path is

> + * no longer needed. The constraints will be re-aggregated.

> + */

> +void icc_put(struct icc_path *path)

> +{

> +       struct icc_node *node;

> +       size_t i;

> +       int ret;

> +

> +       if (!path || WARN_ON_ONCE(IS_ERR(path)))


Why only once?

> +               return;

> +

> +       ret = icc_set(path, 0, 0);

> +       if (ret)

> +               pr_err("%s: error (%d)\n", __func__, ret);

> +

> +       mutex_lock(&icc_lock);

> +       for (i = 0; i < path->num_nodes; i++) {

> +               node = path->reqs[i].node;

> +               hlist_del(&path->reqs[i].req_node);

> +

> +               node->provider->users--;

> +       }

> +       mutex_unlock(&icc_lock);

> +

> +       kfree(path);

> +}

> +EXPORT_SYMBOL_GPL(icc_put);

> +

> +/**

> + * icc_node_create() - create a node

> + * @id: node id

> + *

> + * Return: icc_node pointer on success, or ERR_PTR() on error

> + */

> +struct icc_node *icc_node_create(int id)

> +{

> +       struct icc_node *node;

> +

> +       /* check if node already exists */

> +       node = node_find(id);

> +       if (node)

> +               goto out;

> +

> +       node = kzalloc(sizeof(*node), GFP_KERNEL);

> +       if (!node) {

> +               node = ERR_PTR(-ENOMEM);

> +               goto out;

> +       }

> +

> +       mutex_lock(&icc_lock);

> +

> +       id = idr_alloc(&icc_idr, node, id, id + 1, GFP_KERNEL);

> +       if (WARN(id < 0, "couldn't get idr")) {

> +               node = ERR_PTR(id);

> +               goto out;

> +       }

> +

> +       node->id = id;

> +

> +out:

> +       mutex_unlock(&icc_lock);

> +

> +       return node;

> +}

> +EXPORT_SYMBOL_GPL(icc_node_create);

> +

> +/**

> + * icc_node_remove() - remove a node

> + * @id: node id

> + *

> + */

> +void icc_node_remove(int id)

> +{

> +       struct icc_node *node;

> +

> +       node = node_find(id);

> +       if (node) {

> +               mutex_lock(&icc_lock);

> +               idr_remove(&icc_idr, node->id);


Should we throw a warning if there are any paths that go through this
node (ie req_list is non-empty)?

> +               mutex_unlock(&icc_lock);

> +       }

> +

> +       kfree(node);

> +}

> +EXPORT_SYMBOL_GPL(icc_node_remove);

> +

> +/**

> + * icc_link_create() - create a link between two nodes

> + * @src_id: source node id

> + * @dst_id: destination node id

> + *

> + * Create a link between two nodes. The nodes might belong to different

> + * interconnect providers and the @dst_id node might not exist (if the

> + * provider driver has not probed yet). So just create the @dst_id node

> + * and when the actual provider driver is probed, the rest of the node

> + * data is filled.

> + *

> + * Return: 0 on success, or an error code otherwise

> + */

> +int icc_link_create(struct icc_node *node, const int dst_id)

> +{

> +       struct icc_node *dst;

> +       struct icc_node **new;

> +       int ret = 0;

> +

> +       if (!node->provider)

> +               return -EINVAL;

> +

> +       dst = node_find(dst_id);

> +       if (!dst) {

> +               dst = icc_node_create(dst_id);

> +

> +               if (IS_ERR(dst)) {

> +                       ret = PTR_ERR(dst);

> +                       goto out;

> +               }

> +       }

> +

> +       mutex_lock(&icc_lock);

> +

> +       new = krealloc(node->links,

> +                      (node->num_links + 1) * sizeof(*node->links),

> +                      GFP_KERNEL);

> +       if (!new) {

> +               ret = -ENOMEM;

> +               goto out;

> +       }

> +

> +       node->links = new;

> +       node->links[node->num_links++] = dst;

> +

> +out:

> +       mutex_unlock(&icc_lock);

> +

> +       return ret;

> +}

> +EXPORT_SYMBOL_GPL(icc_link_create);

> +

> +/**

> + * icc_link_remove() - remove a link between two nodes

> + * @src: pointer to source node

> + * @dst: pointer to destination node

> + *

> + * Return: 0 on success, or an error code otherwise

> + */

> +int icc_link_remove(struct icc_node *src, struct icc_node *dst)

> +{

> +       struct icc_node **new;

> +       int ret = 0;

> +       int i, j;

> +

> +       if (IS_ERR_OR_NULL(src))

> +               return PTR_ERR(src);

> +

> +       if (IS_ERR_OR_NULL(dst))

> +               return PTR_ERR(dst);


I wonder if we should return a fixed error in these cases like
-EINVAL, rather than handing through whatever crazy value is in
src/dst.

> +

> +       mutex_lock(&icc_lock);

> +

> +       new = krealloc(src->links,

> +                      (src->num_links - 1) * sizeof(*src->links),

> +                      GFP_KERNEL);

> +       if (!new) {

> +               ret = -ENOMEM;

> +               goto out;

> +       }

> +

> +       for (i = 0, j = 0; j < src->num_links; j++) {

> +               if (src->links[j] == dst)

> +                       continue;

> +

> +               new[i++] = src->links[j];

> +       }

> +

> +       src->links = new;

> +       src->num_links--;


My understanding is that once you call realloc and it succeeds, you
must assume your old memory is gone and your new memory is only as big
as the new size you request. So you shouldn't call krealloc until
you've fixed the array up. Is the order of the links array important?
If not, you could just take the element at the end and stick it in the
slot that's being deleted. Then decrease the size and do your realloc.

> +

> +out:

> +       mutex_unlock(&icc_lock);

> +

> +       return ret;

> +}

> +EXPORT_SYMBOL_GPL(icc_link_remove);

> +

> +/**

> + * icc_node_add() - add an interconnect node to interconnect provider

> + * @node: pointer to the interconnect node

> + * @provider: pointer to the interconnect provider

> + *

> + * Return: 0 on success, or an error code otherwise

> + */

> +int icc_node_add(struct icc_node *node, struct icc_provider *provider)

> +{

> +       mutex_lock(&icc_lock);

> +

> +       node->provider = provider;

> +       list_add(&node->node_list, &provider->nodes);

> +

> +       mutex_unlock(&icc_lock);

> +

> +       return 0;

> +}

> +EXPORT_SYMBOL_GPL(icc_node_add);

> +

> +/**

> + * icc_provider_add() - add a new interconnect provider

> + * @icc_provider: the interconnect provider that will be added into topology

> + *

> + * Return: 0 on success, or an error code otherwise

> + */

> +int icc_provider_add(struct icc_provider *provider)

> +{

> +       if (WARN_ON(!provider->set))

> +               return -EINVAL;

> +

> +       mutex_init(&icc_lock);

> +

> +       INIT_LIST_HEAD(&provider->nodes);

> +       list_add(&provider->provider_list, &icc_provider_list);

> +

> +       mutex_unlock(&icc_lock);

> +

> +       dev_dbg(provider->dev, "interconnect provider added to topology\n");

> +

> +       return 0;

> +}

> +EXPORT_SYMBOL_GPL(icc_provider_add);

> +

> +/**

> + * icc_provider_del() - delete previously added interconnect provider

> + * @icc_provider: the interconnect provider that will be removed from topology

> + *

> + * Return: 0 on success, or an error code otherwise

> + */

> +int icc_provider_del(struct icc_provider *provider)

> +{

> +       mutex_lock(&icc_lock);

> +       if (provider->users) {

> +               pr_warn("interconnect provider still has %d users\n",

> +                       provider->users);

> +               mutex_unlock(&icc_lock);

> +               return -EBUSY;

> +       }

> +

> +       if (!list_empty_careful(&provider->nodes)) {

> +               pr_warn("interconnect provider still has nodes\n");

> +               mutex_unlock(&icc_lock);

> +               return -EEXIST;


How come you're returning different error codes for these two cases?
The error in both cases is effectively "you failed to clean up after
yourself", so maybe EBUSY makes sense for both of them. The pr_warn
helps to differentiate between the two for debugging.

> +       }

> +

> +       list_del(&provider->provider_list);

> +       mutex_unlock(&icc_lock);

> +

> +       return 0;

> +}

> +EXPORT_SYMBOL_GPL(icc_provider_del);

> +

> +MODULE_AUTHOR("Georgi Djakov <georgi.djakov@linaro.org");

> +MODULE_DESCRIPTION("Interconnect Driver Core");

> +MODULE_LICENSE("GPL v2");

> diff --git a/include/linux/interconnect-provider.h b/include/linux/interconnect-provider.h

> new file mode 100644

> index 000000000000..f4613c6dce4f

> --- /dev/null

> +++ b/include/linux/interconnect-provider.h

> @@ -0,0 +1,127 @@

> +/* SPDX-License-Identifier: GPL-2.0 */

> +/*

> + * Copyright (c) 2018, Linaro Ltd.

> + * Author: Georgi Djakov <georgi.djakov@linaro.org>

> + */

> +

> +#ifndef _LINUX_INTERCONNECT_PROVIDER_H

> +#define _LINUX_INTERCONNECT_PROVIDER_H

> +

> +#include <linux/interconnect.h>

> +

> +#define icc_units_to_bps(bw)  ((bw) * 1000ULL)

> +

> +struct icc_node;

> +

> +/**

> + * struct icc_provider - interconnect provider (controller) entity that might

> + * provide multiple interconnect controls

> + *

> + * @provider_list: list of the registered interconnect providers

> + * @nodes: internal list of the interconnect provider nodes

> + * @set: pointer to device specific set operation function

> + * @aggregate: pointer to device specific aggregate operation function

> + * @dev: the device this interconnect provider belongs to

> + * @users: count of active users

> + * @avg_bw: aggregated value of average bandwidth requests from all nodes

> + * @peak_bw: aggregated value of peak bandwidth requests from all nodes

> + * @data: pointer to private data

> + */

> +struct icc_provider {

> +       struct list_head        provider_list;

> +       struct list_head        nodes;

> +       int (*set)(struct icc_node *src, struct icc_node *dst,

> +                  u32 avg_bw, u32 peak_bw);

> +       int (*aggregate)(struct icc_node *node, u32 avg_bw, u32 peak_bw,

> +                        u32 *agg_avg, u32 *agg_peak);

> +       struct device           *dev;

> +       int                     users;

> +       u32                     avg_bw;

> +       u32                     peak_bw;

> +       void                    *data;

> +};

> +

> +/**

> + * struct icc_node - entity that is part of the interconnect topology

> + *

> + * @id: platform specific node id

> + * @name: node name used in debugfs

> + * @links: a list of targets pointing to where we can go next when traversing

> + * @num_links: number of links to other interconnect nodes

> + * @provider: points to the interconnect provider of this node

> + * @node_list: the list entry in the parent provider's "nodes" list

> + * @search_list: list used when walking the nodes graph

> + * @reverse: pointer to previous node when walking the nodes graph

> + * @is_traversed: flag that is used when walking the nodes graph

> + * @req_list: a list of QoS constraint requests associated with this node

> + * @avg_bw: aggregated value of average bandwidth requests from all consumers

> + * @peak_bw: aggregated value of peak bandwidth requests from all consumers

> + * @data: pointer to private data

> + */

> +struct icc_node {

> +       int                     id;

> +       const char              *name;

> +       struct icc_node         **links;

> +       size_t                  num_links;

> +

> +       struct icc_provider     *provider;

> +       struct list_head        node_list;

> +       struct list_head        orphan_list;


Is this used?

> +       struct list_head        search_list;

> +       struct icc_node         *reverse;

> +       bool                    is_traversed;

> +       struct hlist_head       req_list;

> +       u32                     avg_bw;

> +       u32                     peak_bw;

> +       void                    *data;

> +};

> +

> +#if IS_ENABLED(CONFIG_INTERCONNECT)

> +

> +struct icc_node *icc_node_create(int id);

> +void icc_node_remove(int id);

> +int icc_link_create(struct icc_node *node, const int dst_id);

> +int icc_link_remove(struct icc_node *src, struct icc_node *dst);

> +int icc_node_add(struct icc_node *node, struct icc_provider *provider);

> +int icc_provider_add(struct icc_provider *provider);

> +int icc_provider_del(struct icc_provider *provider);

> +

> +#else

> +

> +static inline struct icc_node *icc_node_create(int id)

> +{

> +       return ERR_PTR(-ENOTSUPP);

> +}

> +

> +void icc_node_remove(int id)

> +{

> +}

> +

> +static inline int icc_link_create(struct icc_node *node, const int dst_id)

> +{

> +       return -ENOTSUPP;

> +}

> +

> +int icc_link_remove(struct icc_node *src, struct icc_node *dst)

> +{

> +       return -ENOTSUPP;

> +}

> +

> +int icc_node_add(struct icc_node *node, struct icc_provider *provider)

> +{

> +       return -ENOTSUPP;

> +}

> +

> +static inline int icc_provider_add(struct icc_provider *provider)

> +{

> +       return -ENOTSUPP;

> +}

> +

> +static inline int icc_provider_del(struct icc_provider *provider)

> +{

> +       return -ENOTSUPP;

> +}

> +

> +#endif /* CONFIG_INTERCONNECT */

> +

> +#endif /* _LINUX_INTERCONNECT_PROVIDER_H */

> diff --git a/include/linux/interconnect.h b/include/linux/interconnect.h

> new file mode 100644

> index 000000000000..593215371fd6

> --- /dev/null

> +++ b/include/linux/interconnect.h

> @@ -0,0 +1,42 @@

> +/* SPDX-License-Identifier: GPL-2.0 */

> +/*

> + * Copyright (c) 2018, Linaro Ltd.

> + * Author: Georgi Djakov <georgi.djakov@linaro.org>

> + */

> +

> +#ifndef _LINUX_INTERCONNECT_H

> +#define _LINUX_INTERCONNECT_H

> +

> +#include <linux/mutex.h>

> +#include <linux/types.h>

> +

> +struct icc_path;

> +struct device;

> +

> +#if IS_ENABLED(CONFIG_INTERCONNECT)

> +

> +struct icc_path *icc_get(struct device *dev, const int src_id,

> +                        const int dst_id);

> +void icc_put(struct icc_path *path);

> +int icc_set(struct icc_path *path, u32 avg_bw, u32 peak_bw);

> +

> +#else

> +

> +static inline struct icc_path *icc_get(struct device *dev, const int src_id,

> +                                      const int dst_id)

> +{

> +       return NULL;

> +}

> +

> +static inline void icc_put(struct icc_path *path)

> +{

> +}

> +

> +static inline int icc_set(struct icc_path *path, u32 avg_bw, u32 peak_bw)

> +{

> +       return 0;


I was originally going to suggest that this should return a failure.
Then I talked myself out of it, saying that if the interconnect
framework is not compiled in, then clients should assume all their bus
needs are already met. I guess this is the correct assumption?

> +}

> +

> +#endif /* CONFIG_INTERCONNECT */

> +

> +#endif /* _LINUX_INTERCONNECT_H */
Vincent Guittot June 27, 2018, 6:19 a.m. | #2
Hi Georgi

On Wed, 20 Jun 2018 at 14:11, Georgi Djakov <georgi.djakov@linaro.org> wrote:

[snip]

> +

> +static struct icc_path *path_allocate(struct icc_node *dst, ssize_t num_nodes)

> +{

> +       struct icc_node *node = dst;

> +       struct icc_path *path;

> +       size_t i;

> +

> +       path = kzalloc(sizeof(*path) + num_nodes * sizeof(*path->reqs),


Should be (num_nodes -1) * sizeof(*path->reqs) as there is already 1
icc_req in icc_path struct

> +                      GFP_KERNEL);

> +       if (!path)

> +               return ERR_PTR(-ENOMEM);

> +

> +       path->num_nodes = num_nodes;

> +

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

> +               hlist_add_head(&path->reqs[i].req_node, &node->req_list);

> +

> +               path->reqs[i].node = node;

> +               /* reference to previous node was saved during path traversal */

> +               node = node->reverse;

> +       }

> +

> +       return path;

> +}

> +


[snip]
Georgi Djakov July 1, 2018, 11:03 a.m. | #3
Hi Evan,

Thanks for reviewing!

On 06/26/2018 11:57 PM, Evan Green wrote:
> Hi Georgi. Thanks for the new spin of this.

> 

> On Wed, Jun 20, 2018 at 5:11 AM Georgi Djakov <georgi.djakov@linaro.org> wrote:

>>

>> This patch introduce a new API to get requirements and configure the

>> interconnect buses across the entire chipset to fit with the current

>> demand.

>>

>> The API is using a consumer/provider-based model, where the providers are

>> the interconnect buses and the consumers could be various drivers.

>> The consumers request interconnect resources (path) between endpoints and

>> set the desired constraints on this data flow path. The providers receive

>> requests from consumers and aggregate these requests for all master-slave

>> pairs on that path. Then the providers configure each participating in the

>> topology node according to the requested data flow path, physical links and

>> constraints. The topology could be complicated and multi-tiered and is SoC

>> specific.


[..]

>> +

>> +static struct icc_node *node_find(const int id)

>> +{

>> +       struct icc_node *node;

>> +

>> +       mutex_lock(&icc_lock);

>> +       node = idr_find(&icc_idr, id);

>> +       mutex_unlock(&icc_lock);

> 

> I wonder if this is too low of a level to be dealing with the lock. I

> notice that everywhere you use this function, you afterwards

> immediately grab the lock and do more stuff. Maybe this function

> should have a comment saying it assumes the lock is already held, and

> then you can grab the lock in the callers, since you're doing that

> anyway.


Ok, will try to do better next time.

>> +

>> +       return node;

>> +}

>> +

>> +static struct icc_path *path_allocate(struct icc_node *dst, ssize_t num_nodes)

>> +{

>> +       struct icc_node *node = dst;

>> +       struct icc_path *path;

>> +       size_t i;

>> +

>> +       path = kzalloc(sizeof(*path) + num_nodes * sizeof(*path->reqs),

>> +                      GFP_KERNEL);

>> +       if (!path)

>> +               return ERR_PTR(-ENOMEM);

>> +

>> +       path->num_nodes = num_nodes;

>> +

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

>> +               hlist_add_head(&path->reqs[i].req_node, &node->req_list);

>> +

>> +               path->reqs[i].node = node;

>> +               /* reference to previous node was saved during path traversal */

>> +               node = node->reverse;

>> +       }

>> +

>> +       return path;

>> +}

>> +

>> +static struct icc_path *path_find(struct device *dev, struct icc_node *src,

>> +                                 struct icc_node *dst)

>> +{

> 

> I personally prefer a comment somewhere indicating that this function

> assumes icc_lock is already held. Not sure if that's conventional or

> not.

> 


Right, Rob and Matthias have also provided useful feedback on this! Thanks!

[..]

>> +       /* reset the traversed state */

>> +       list_for_each_entry(provider, &icc_provider_list, provider_list) {

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

>> +                       if (n->is_traversed)

>> +                               n->is_traversed = false;

> 

> Remove the conditional, just set is_traversed to false.

> 


Agree.

>> +       }

>> +

>> +       if (found) {

>> +               struct icc_path *path = path_allocate(dst, depth);

> 

> Is the path supposed to include the source? For instance, if the dst

> were a neighbor, depth would be one, so only dst would be in the path.

> It seems like it might be worthwhile to have the source in there too.


Agree that it would be logical to include the complete path. Will fix
the depth.

>> +

>> +               if (IS_ERR(path))

>> +                       return path;

>> +

>> +               /* initialize the path */

>> +               for (i = 0; i < path->num_nodes; i++) {

>> +                       node = path->reqs[i].node;

>> +                       path->reqs[i].dev = dev;

>> +                       node->provider->users++;

> 

> Should this loop live inside path_allocate? I'm unsure, but maybe at

> least path->reqs[i].dev = dev, since it feels like standard

> initialization of the path.

> 


Ok, will move it and also change the function name from path_allocate()
to path_init().

>> +

>> +/**

>> + * icc_put() - release the reference to the icc_path

>> + * @path: interconnect path

>> + *

>> + * Use this function to release the constraints on a path when the path is

>> + * no longer needed. The constraints will be re-aggregated.

>> + */

>> +void icc_put(struct icc_path *path)

>> +{

>> +       struct icc_node *node;

>> +       size_t i;

>> +       int ret;

>> +

>> +       if (!path || WARN_ON_ONCE(IS_ERR(path)))

> 

> Why only once?

> 


Will change to WARN_ON.

[..]

>> +void icc_node_remove(int id)

>> +{

>> +       struct icc_node *node;

>> +

>> +       node = node_find(id);

>> +       if (node) {

>> +               mutex_lock(&icc_lock);

>> +               idr_remove(&icc_idr, node->id);

> 

> Should we throw a warning if there are any paths that go through this

> node (ie req_list is non-empty)?

> 


Sounds good, will do it.
>> +               mutex_unlock(&icc_lock);

>> +       }

>> +

>> +       kfree(node);

>> +}

>> +EXPORT_SYMBOL_GPL(icc_node_remove);


[..]

>> +/**

>> + * icc_link_remove() - remove a link between two nodes

>> + * @src: pointer to source node

>> + * @dst: pointer to destination node

>> + *

>> + * Return: 0 on success, or an error code otherwise

>> + */

>> +int icc_link_remove(struct icc_node *src, struct icc_node *dst)

>> +{

>> +       struct icc_node **new;

>> +       int ret = 0;

>> +       int i, j;

>> +

>> +       if (IS_ERR_OR_NULL(src))

>> +               return PTR_ERR(src);

>> +

>> +       if (IS_ERR_OR_NULL(dst))

>> +               return PTR_ERR(dst);

> 

> I wonder if we should return a fixed error in these cases like

> -EINVAL, rather than handing through whatever crazy value is in

> src/dst.


Ok, agree.

>> +

>> +       mutex_lock(&icc_lock);

>> +

>> +       new = krealloc(src->links,

>> +                      (src->num_links - 1) * sizeof(*src->links),

>> +                      GFP_KERNEL);

>> +       if (!new) {

>> +               ret = -ENOMEM;

>> +               goto out;

>> +       }

>> +

>> +       for (i = 0, j = 0; j < src->num_links; j++) {

>> +               if (src->links[j] == dst)

>> +                       continue;

>> +

>> +               new[i++] = src->links[j];

>> +       }

>> +

>> +       src->links = new;

>> +       src->num_links--;

> 

> My understanding is that once you call realloc and it succeeds, you

> must assume your old memory is gone and your new memory is only as big

> as the new size you request. So you shouldn't call krealloc until

> you've fixed the array up. Is the order of the links array important?

> If not, you could just take the element at the end and stick it in the

> slot that's being deleted. Then decrease the size and do your realloc.


Sorry, this was obviously untested. Your suggestions is good.

[..]

>> +

>> +/**

>> + * icc_provider_del() - delete previously added interconnect provider

>> + * @icc_provider: the interconnect provider that will be removed from topology

>> + *

>> + * Return: 0 on success, or an error code otherwise

>> + */

>> +int icc_provider_del(struct icc_provider *provider)

>> +{

>> +       mutex_lock(&icc_lock);

>> +       if (provider->users) {

>> +               pr_warn("interconnect provider still has %d users\n",

>> +                       provider->users);

>> +               mutex_unlock(&icc_lock);

>> +               return -EBUSY;

>> +       }

>> +

>> +       if (!list_empty_careful(&provider->nodes)) {

>> +               pr_warn("interconnect provider still has nodes\n");

>> +               mutex_unlock(&icc_lock);

>> +               return -EEXIST;

> 

> How come you're returning different error codes for these two cases?

> The error in both cases is effectively "you failed to clean up after

> yourself", so maybe EBUSY makes sense for both of them. The pr_warn

> helps to differentiate between the two for debugging.


Ok.

>> +       }

>> +

>> +       list_del(&provider->provider_list);

>> +       mutex_unlock(&icc_lock);

>> +

>> +       return 0;

>> +}

>> +EXPORT_SYMBOL_GPL(icc_provider_del);

>> +


[..]

>> +struct icc_node {

>> +       int                     id;

>> +       const char              *name;

>> +       struct icc_node         **links;

>> +       size_t                  num_links;

>> +

>> +       struct icc_provider     *provider;

>> +       struct list_head        node_list;

>> +       struct list_head        orphan_list;

> 

> Is this used?


Ah, I thought I had already removed it!

>> +       struct list_head        search_list;

>> +       struct icc_node         *reverse;

>> +       bool                    is_traversed;

>> +       struct hlist_head       req_list;

>> +       u32                     avg_bw;

>> +       u32                     peak_bw;

>> +       void                    *data;

>> +};

>> +


[..]

>> +static inline int icc_set(struct icc_path *path, u32 avg_bw, u32 peak_bw)

>> +{

>> +       return 0;

> 

> I was originally going to suggest that this should return a failure.

> Then I talked myself out of it, saying that if the interconnect

> framework is not compiled in, then clients should assume all their bus

> needs are already met. I guess this is the correct assumption?


Yes, exactly!

Thanks,
Georgi
Georgi Djakov July 1, 2018, 11:06 a.m. | #4
Hi Matthias,

Thanks for reviewing!

On 06/27/2018 02:34 AM, Matthias Kaehlcke wrote:
> Hi Georgi,

> 

> On Wed, Jun 20, 2018 at 03:11:34PM +0300, Georgi Djakov wrote:

>> This patch introduce a new API to get requirements and configure the

> 

> nit: s/introduce/introduces/


Thanks!

[..]

>> +	if (found) {

>> +		struct icc_path *path = path_allocate(dst, depth);

>> +

>> +		if (IS_ERR(path))

>> +			return path;

>> +

>> +		/* initialize the path */

>> +		for (i = 0; i < path->num_nodes; i++) {

>> +			node = path->reqs[i].node;

>> +			path->reqs[i].dev = dev;

>> +			node->provider->users++;

> 

> nit: doing the assignment of path->reqs[i].dev before assiging 'node'

> or after incrementing the 'users' would slightly improve readability.


Ok, will re-factor this a bit.

>> +static int apply_constraints(struct icc_path *path)

>> +{

>> +	struct icc_node *next, *prev = NULL;

>> +	int ret = 0;

>> +	int i;

>> +

>> +	for (i = 0; i < path->num_nodes; i++, prev = next) {

>> +		struct icc_provider *p;

>> +

>> +		next = path->reqs[i].node;

>> +		/*

>> +		 * Both endpoints should be valid master-slave pairs of the

>> +		 * same interconnect provider that will be configured.

>> +		 */

>> +		if (!prev || next->provider != prev->provider)

>> +			continue;

>> +

>> +		p = next->provider;

>> +

>> +		aggregate_provider(p);

>> +

>> +		if (p->set) {

>> +			/* set the constraints */

>> +			ret = p->set(prev, next, p->avg_bw, p->peak_bw);

>> +		}

> 

> remove curly brackets

> 

> EDIT: actually the condition can be removed, icc_provider_add() fails

> when p->set is NULL.


Agree!

> 

>> +int icc_set(struct icc_path *path, u32 avg_bw, u32 peak_bw)

>> +{

>> +	struct icc_node *node;

>> +	struct icc_provider *p;

>> +	size_t i;

>> +	int ret = 0;

> 

> initialization is not necessary

> 


Ok.

>> +struct icc_path *icc_get(struct device *dev, const int src_id, const int dst_id)

>> +{

>> +	struct icc_node *src, *dst;

>> +	struct icc_path *path = ERR_PTR(-EPROBE_DEFER);

>> +

>> +	src = node_find(src_id);

>> +	if (!src) {

>> +		dev_err(dev, "%s: invalid src=%d\n", __func__, src_id);

>> +		goto out;

>> +	}

>> +

>> +	dst = node_find(dst_id);

>> +	if (!dst) {

>> +		dev_err(dev, "%s: invalid dst=%d\n", __func__, dst_id);

>> +		goto out;

>> +	}

>> +

>> +	mutex_lock(&icc_lock);

>> +	path = path_find(dev, src, dst);

>> +	mutex_unlock(&icc_lock);

>> +	if (IS_ERR(path)) {

>> +		dev_err(dev, "%s: invalid path=%ld\n", __func__, PTR_ERR(path));

>> +		goto out;

> 

> this goto isn't really needed


Ok.

>> +struct icc_node *icc_node_create(int id)

>> +{

>> +	struct icc_node *node;

>> +

>> +	/* check if node already exists */

>> +	node = node_find(id);

>> +	if (node)

>> +		goto out;

>> +

>> +	node = kzalloc(sizeof(*node), GFP_KERNEL);

>> +	if (!node) {

>> +		node = ERR_PTR(-ENOMEM);

>> +		goto out;

>> +	}

>> +

>> +	mutex_lock(&icc_lock);

>> +

>> +	id = idr_alloc(&icc_idr, node, id, id + 1, GFP_KERNEL);

>> +	if (WARN(id < 0, "couldn't get idr")) {

> 

> kfree(node);


Thanks!

>> +int icc_node_add(struct icc_node *node, struct icc_provider *provider)

>> +{

>> +	mutex_lock(&icc_lock);

>> +

>> +	node->provider = provider;

>> +	list_add(&node->node_list, &provider->nodes);

>> +

>> +	mutex_unlock(&icc_lock);

>> +

>> +	return 0;

>> +}

> 

> The function returns always 0. Should probably be void so callers

> don't add pointless checks of the return value.


Agree, will change it!

>> +int icc_provider_add(struct icc_provider *provider)

>> +{

>> +	if (WARN_ON(!provider->set))

>> +		return -EINVAL;

>> +

>> +	mutex_init(&icc_lock);

> 

> Shouldn't this be mutex_lock()?


Yes, right!

>> +int icc_provider_del(struct icc_provider *provider)

>> +{

>> +	mutex_lock(&icc_lock);

>> +	if (provider->users) {

>> +		pr_warn("interconnect provider still has %d users\n",

>> +			provider->users);

>> +		mutex_unlock(&icc_lock);

>> +		return -EBUSY;

>> +	}

>> +

>> +	if (!list_empty_careful(&provider->nodes)) {

>> +		pr_warn("interconnect provider still has nodes\n");

>> +		mutex_unlock(&icc_lock);

>> +		return -EEXIST;

>> +	}

> 

> Could this be just list_empty()? If I didn't miss something icc_lock

> is held in all paths that change p->nodes (assuming that all changes

> should be done through the interfaces in this file).


It could be. Will update it. I just always want to be careful!

> Actually this check will always fail if icc_node_add() was called for

> this provider, it doesn't seem nodes are ever removed.

> 


The provider driver is responsible for the node removal.

Thanks,
Georgi
Vincent Guittot July 2, 2018, 7:23 a.m. | #5
On Sun, 1 Jul 2018 at 13:09, Georgi Djakov <georgi.djakov@linaro.org> wrote:
>

> Hi Vincent,

>

> On 27.06.18 г. 9:19, Vincent Guittot wrote:

> > Hi Georgi

> >

> > On Wed, 20 Jun 2018 at 14:11, Georgi Djakov <georgi.djakov@linaro.org> wrote:

> >

> > [snip]

> >

> >> +

> >> +static struct icc_path *path_allocate(struct icc_node *dst, ssize_t num_nodes)

> >> +{

> >> +       struct icc_node *node = dst;

> >> +       struct icc_path *path;

> >> +       size_t i;

> >> +

> >> +       path = kzalloc(sizeof(*path) + num_nodes * sizeof(*path->reqs),

> >

> > Should be (num_nodes -1) * sizeof(*path->reqs) as there is already 1

> > icc_req in icc_path struct

>

> reqs[] is a flexible array member and it's size is not included in

> sizeof(*path)


ah yes, my eyes saw "struct icc_req reqs[0];"  but my brain was
reading "struct icc_req reqs[1]"

Sorry for the noise

>

> Thanks,

> Georgi

>

> >> +                      GFP_KERNEL);

> >> +       if (!path)

> >> +               return ERR_PTR(-ENOMEM);

> >> +

> >> +       path->num_nodes = num_nodes;

> >> +

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

> >> +               hlist_add_head(&path->reqs[i].req_node, &node->req_list);

> >> +

> >> +               path->reqs[i].node = node;

> >> +               /* reference to previous node was saved during path traversal */

> >> +               node = node->reverse;

> >> +       }

> >> +

> >> +       return path;

> >> +}

> >> +

> >

> > [snip]

> >

>

Patch

diff --git a/Documentation/interconnect/interconnect.rst b/Documentation/interconnect/interconnect.rst
new file mode 100644
index 000000000000..a1ebd83ad0a1
--- /dev/null
+++ b/Documentation/interconnect/interconnect.rst
@@ -0,0 +1,96 @@ 
+.. SPDX-License-Identifier: GPL-2.0
+
+=====================================
+GENERIC SYSTEM INTERCONNECT SUBSYSTEM
+=====================================
+
+Introduction
+------------
+
+This framework is designed to provide a standard kernel interface to control
+the settings of the interconnects on a SoC. These settings can be throughput,
+latency and priority between multiple interconnected devices or functional
+blocks. This can be controlled dynamically in order to save power or provide
+maximum performance.
+
+The interconnect bus is a hardware with configurable parameters, which can be
+set on a data path according to the requests received from various drivers.
+An example of interconnect buses are the interconnects between various
+components or functional blocks in chipsets. There can be multiple interconnects
+on a SoC that can be multi-tiered.
+
+Below is a simplified diagram of a real-world SoC interconnect bus topology.
+
+::
+
+ +----------------+    +----------------+
+ | HW Accelerator |--->|      M NoC     |<---------------+
+ +----------------+    +----------------+                |
+                         |      |                    +------------+
+  +-----+  +-------------+      V       +------+     |            |
+  | DDR |  |                +--------+  | PCIe |     |            |
+  +-----+  |                | Slaves |  +------+     |            |
+    ^ ^    |                +--------+     |         |   C NoC    |
+    | |    V                               V         |            |
+ +------------------+   +------------------------+   |            |   +-----+
+ |                  |-->|                        |-->|            |-->| CPU |
+ |                  |-->|                        |<--|            |   +-----+
+ |     Mem NoC      |   |         S NoC          |   +------------+
+ |                  |<--|                        |---------+    |
+ |                  |<--|                        |<------+ |    |   +--------+
+ +------------------+   +------------------------+       | |    +-->| Slaves |
+   ^  ^    ^    ^          ^                             | |        +--------+
+   |  |    |    |          |                             | V
+ +------+  |  +-----+   +-----+  +---------+   +----------------+   +--------+
+ | CPUs |  |  | GPU |   | DSP |  | Masters |-->|       P NoC    |-->| Slaves |
+ +------+  |  +-----+   +-----+  +---------+   +----------------+   +--------+
+           |
+       +-------+
+       | Modem |
+       +-------+
+
+Terminology
+-----------
+
+Interconnect provider is the software definition of the interconnect hardware.
+The interconnect providers on the above diagram are M NoC, S NoC, C NoC, P NoC
+and Mem NoC.
+
+Interconnect node is the software definition of the interconnect hardware
+port. Each interconnect provider consists of multiple interconnect nodes,
+which are connected to other SoC components including other interconnect
+providers. The point on the diagram where the CPUs connects to the memory is
+called an interconnect node, which belongs to the Mem NoC interconnect provider.
+
+Interconnect endpoints are the first or the last element of the path. Every
+endpoint is a node, but not every node is an endpoint.
+
+Interconnect path is everything between two endpoints including all the nodes
+that have to be traversed to reach from a source to destination node. It may
+include multiple master-slave pairs across several interconnect providers.
+
+Interconnect consumers are the entities which make use of the data paths exposed
+by the providers. The consumers send requests to providers requesting various
+throughput, latency and priority. Usually the consumers are device drivers, that
+send request based on their needs. An example for a consumer is a video decoder
+that supports various formats and image sizes.
+
+Interconnect providers
+----------------------
+
+Interconnect provider is an entity that implements methods to initialize and
+configure a interconnect bus hardware. The interconnect provider drivers should
+be registered with the interconnect provider core.
+
+The interconnect framework provider API functions are documented in
+.. kernel-doc:: include/linux/interconnect-provider.h
+
+Interconnect consumers
+----------------------
+
+Interconnect consumers are the clients which use the interconnect APIs to
+get paths between endpoints and set their bandwidth/latency/QoS requirements
+for these interconnect paths.
+
+The interconnect framework consumer API functions are documented in
+.. kernel-doc:: include/linux/interconnect.h
diff --git a/drivers/Kconfig b/drivers/Kconfig
index 95b9ccc08165..3ed6ede9d021 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -217,4 +217,6 @@  source "drivers/siox/Kconfig"
 
 source "drivers/slimbus/Kconfig"
 
+source "drivers/interconnect/Kconfig"
+
 endmenu
diff --git a/drivers/Makefile b/drivers/Makefile
index 24cd47014657..0cca95740d9b 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -185,3 +185,4 @@  obj-$(CONFIG_TEE)		+= tee/
 obj-$(CONFIG_MULTIPLEXER)	+= mux/
 obj-$(CONFIG_UNISYS_VISORBUS)	+= visorbus/
 obj-$(CONFIG_SIOX)		+= siox/
+obj-$(CONFIG_INTERCONNECT)	+= interconnect/
diff --git a/drivers/interconnect/Kconfig b/drivers/interconnect/Kconfig
new file mode 100644
index 000000000000..a261c7d41deb
--- /dev/null
+++ b/drivers/interconnect/Kconfig
@@ -0,0 +1,10 @@ 
+menuconfig INTERCONNECT
+	tristate "On-Chip Interconnect management support"
+	help
+	  Support for management of the on-chip interconnects.
+
+	  This framework is designed to provide a generic interface for
+	  managing the interconnects in a SoC.
+
+	  If unsure, say no.
+
diff --git a/drivers/interconnect/Makefile b/drivers/interconnect/Makefile
new file mode 100644
index 000000000000..97fca2e09d24
--- /dev/null
+++ b/drivers/interconnect/Makefile
@@ -0,0 +1,2 @@ 
+# SPDX-License-Identifier: GPL-2.0
+obj-$(CONFIG_INTERCONNECT)		+= core.o
diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c
new file mode 100644
index 000000000000..e7f96fc6722e
--- /dev/null
+++ b/drivers/interconnect/core.c
@@ -0,0 +1,586 @@ 
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Interconnect framework core driver
+ *
+ * Copyright (c) 2018, Linaro Ltd.
+ * Author: Georgi Djakov <georgi.djakov@linaro.org>
+ */
+
+#include <linux/device.h>
+#include <linux/idr.h>
+#include <linux/init.h>
+#include <linux/interconnect.h>
+#include <linux/interconnect-provider.h>
+#include <linux/list.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/slab.h>
+
+static DEFINE_IDR(icc_idr);
+static LIST_HEAD(icc_provider_list);
+static DEFINE_MUTEX(icc_lock);
+
+/**
+ * struct icc_req - constraints that are attached to each node
+ *
+ * @req_node: entry in list of requests for the particular @node
+ * @node: the interconnect node to which this constraint applies
+ * @dev: reference to the device that sets the constraints
+ * @avg_bw: an integer describing the average bandwidth in kbps
+ * @peak_bw: an integer describing the peak bandwidth in kbps
+ */
+struct icc_req {
+	struct hlist_node req_node;
+	struct icc_node *node;
+	struct device *dev;
+	u32 avg_bw;
+	u32 peak_bw;
+};
+
+/**
+ * struct icc_path - interconnect path structure
+ * @num_nodes: number of hops (nodes)
+ * @reqs: array of the requests applicable to this path of nodes
+ */
+struct icc_path {
+	size_t num_nodes;
+	struct icc_req reqs[0];
+};
+
+static struct icc_node *node_find(const int id)
+{
+	struct icc_node *node;
+
+	mutex_lock(&icc_lock);
+	node = idr_find(&icc_idr, id);
+	mutex_unlock(&icc_lock);
+
+	return node;
+}
+
+static struct icc_path *path_allocate(struct icc_node *dst, ssize_t num_nodes)
+{
+	struct icc_node *node = dst;
+	struct icc_path *path;
+	size_t i;
+
+	path = kzalloc(sizeof(*path) + num_nodes * sizeof(*path->reqs),
+		       GFP_KERNEL);
+	if (!path)
+		return ERR_PTR(-ENOMEM);
+
+	path->num_nodes = num_nodes;
+
+	for (i = 0; i < num_nodes; i++) {
+		hlist_add_head(&path->reqs[i].req_node, &node->req_list);
+
+		path->reqs[i].node = node;
+		/* reference to previous node was saved during path traversal */
+		node = node->reverse;
+	}
+
+	return path;
+}
+
+static struct icc_path *path_find(struct device *dev, struct icc_node *src,
+				  struct icc_node *dst)
+{
+	struct icc_node *n, *node = NULL;
+	struct icc_provider *provider;
+	struct list_head traverse_list;
+	struct list_head edge_list;
+	struct list_head visited_list;
+	size_t i, depth = 0;
+	bool found = false;
+	int ret = -EPROBE_DEFER;
+
+	INIT_LIST_HEAD(&traverse_list);
+	INIT_LIST_HEAD(&edge_list);
+	INIT_LIST_HEAD(&visited_list);
+
+	list_add_tail(&src->search_list, &traverse_list);
+	src->reverse = NULL;
+
+	do {
+		list_for_each_entry_safe(node, n, &traverse_list, search_list) {
+			if (node == dst) {
+				found = true;
+				list_add(&node->search_list, &visited_list);
+				break;
+			}
+			for (i = 0; i < node->num_links; i++) {
+				struct icc_node *tmp = node->links[i];
+
+				if (!tmp) {
+					ret = -ENOENT;
+					goto out;
+				}
+
+				if (tmp->is_traversed)
+					continue;
+
+				tmp->is_traversed = true;
+				tmp->reverse = node;
+				list_add(&tmp->search_list, &edge_list);
+			}
+		}
+		if (found)
+			break;
+
+		list_splice_init(&traverse_list, &visited_list);
+		list_splice_init(&edge_list, &traverse_list);
+
+		/* count the hops away from the source */
+		depth++;
+
+	} while (!list_empty(&traverse_list));
+
+out:
+	/* reset the traversed state */
+	list_for_each_entry(provider, &icc_provider_list, provider_list) {
+		list_for_each_entry(n, &provider->nodes, node_list)
+			if (n->is_traversed)
+				n->is_traversed = false;
+	}
+
+	if (found) {
+		struct icc_path *path = path_allocate(dst, depth);
+
+		if (IS_ERR(path))
+			return path;
+
+		/* initialize the path */
+		for (i = 0; i < path->num_nodes; i++) {
+			node = path->reqs[i].node;
+			path->reqs[i].dev = dev;
+			node->provider->users++;
+		}
+		return path;
+	}
+
+	return ERR_PTR(ret);
+}
+
+/*
+ * We want the path to honor all bandwidth requests, so the average
+ * bandwidth requirements from each consumer are aggregated at each node
+ * and provider level. By default the average bandwidth is the sum of all
+ * averages and the peak will be the highest of all peak bandwidth requests.
+ */
+
+static int aggregate_requests(struct icc_node *node)
+{
+	struct icc_provider *p = node->provider;
+	struct icc_req *r;
+
+	node->avg_bw = 0;
+	node->peak_bw = 0;
+
+	hlist_for_each_entry(r, &node->req_list, req_node)
+		p->aggregate(node, r->avg_bw, r->peak_bw,
+			     &node->avg_bw, &node->peak_bw);
+
+	return 0;
+}
+
+static void aggregate_provider(struct icc_provider *p)
+{
+	struct icc_node *n;
+
+	p->avg_bw = 0;
+	p->peak_bw = 0;
+
+	list_for_each_entry(n, &p->nodes, node_list)
+		p->aggregate(n, n->avg_bw, n->peak_bw,
+			     &p->avg_bw, &p->peak_bw);
+}
+
+static int apply_constraints(struct icc_path *path)
+{
+	struct icc_node *next, *prev = NULL;
+	int ret = 0;
+	int i;
+
+	for (i = 0; i < path->num_nodes; i++, prev = next) {
+		struct icc_provider *p;
+
+		next = path->reqs[i].node;
+		/*
+		 * Both endpoints should be valid master-slave pairs of the
+		 * same interconnect provider that will be configured.
+		 */
+		if (!prev || next->provider != prev->provider)
+			continue;
+
+		p = next->provider;
+
+		aggregate_provider(p);
+
+		if (p->set) {
+			/* set the constraints */
+			ret = p->set(prev, next, p->avg_bw, p->peak_bw);
+		}
+
+		if (ret)
+			goto out;
+	}
+out:
+	return ret;
+}
+
+/**
+ * icc_set() - set constraints on an interconnect path between two endpoints
+ * @path: reference to the path returned by icc_get()
+ * @avg_bw: average bandwidth in kbps
+ * @peak_bw: peak bandwidth in kbps
+ *
+ * This function is used by an interconnect consumer to express its own needs
+ * in terms of bandwidth for a previously requested path between two endpoints.
+ * The requests are aggregated and each node is updated accordingly. The entire
+ * path is locked by a mutex to ensure that the set() is completed.
+ * The @path can be NULL when the "interconnects" DT properties is missing,
+ * which will mean that no constraints will be set.
+ *
+ * Returns 0 on success, or an appropriate error code otherwise.
+ */
+int icc_set(struct icc_path *path, u32 avg_bw, u32 peak_bw)
+{
+	struct icc_node *node;
+	struct icc_provider *p;
+	size_t i;
+	int ret = 0;
+
+	if (!path)
+		return 0;
+
+	mutex_lock(&icc_lock);
+
+	for (i = 0; i < path->num_nodes; i++) {
+		node = path->reqs[i].node;
+		p = node->provider;
+
+		/* update the consumer request for this path */
+		path->reqs[i].avg_bw = avg_bw;
+		path->reqs[i].peak_bw = peak_bw;
+
+		/* aggregate requests for this node */
+		aggregate_requests(node);
+	}
+
+	ret = apply_constraints(path);
+	if (ret)
+		pr_err("interconnect: error applying constraints (%d)", ret);
+
+	mutex_unlock(&icc_lock);
+
+	return ret;
+}
+EXPORT_SYMBOL_GPL(icc_set);
+
+/**
+ * icc_get() - return a handle for path between two endpoints
+ * @dev: the device requesting the path
+ * @src_id: source device port id
+ * @dst_id: destination device port id
+ *
+ * This function will search for a path between two endpoints and return an
+ * icc_path handle on success. Use icc_put() to release
+ * constraints when the they are not needed anymore.
+ *
+ * Return: icc_path pointer on success, or ERR_PTR() on error
+ */
+struct icc_path *icc_get(struct device *dev, const int src_id, const int dst_id)
+{
+	struct icc_node *src, *dst;
+	struct icc_path *path = ERR_PTR(-EPROBE_DEFER);
+
+	src = node_find(src_id);
+	if (!src) {
+		dev_err(dev, "%s: invalid src=%d\n", __func__, src_id);
+		goto out;
+	}
+
+	dst = node_find(dst_id);
+	if (!dst) {
+		dev_err(dev, "%s: invalid dst=%d\n", __func__, dst_id);
+		goto out;
+	}
+
+	mutex_lock(&icc_lock);
+	path = path_find(dev, src, dst);
+	mutex_unlock(&icc_lock);
+	if (IS_ERR(path)) {
+		dev_err(dev, "%s: invalid path=%ld\n", __func__, PTR_ERR(path));
+		goto out;
+	}
+
+out:
+	return path;
+}
+EXPORT_SYMBOL_GPL(icc_get);
+
+/**
+ * icc_put() - release the reference to the icc_path
+ * @path: interconnect path
+ *
+ * Use this function to release the constraints on a path when the path is
+ * no longer needed. The constraints will be re-aggregated.
+ */
+void icc_put(struct icc_path *path)
+{
+	struct icc_node *node;
+	size_t i;
+	int ret;
+
+	if (!path || WARN_ON_ONCE(IS_ERR(path)))
+		return;
+
+	ret = icc_set(path, 0, 0);
+	if (ret)
+		pr_err("%s: error (%d)\n", __func__, ret);
+
+	mutex_lock(&icc_lock);
+	for (i = 0; i < path->num_nodes; i++) {
+		node = path->reqs[i].node;
+		hlist_del(&path->reqs[i].req_node);
+
+		node->provider->users--;
+	}
+	mutex_unlock(&icc_lock);
+
+	kfree(path);
+}
+EXPORT_SYMBOL_GPL(icc_put);
+
+/**
+ * icc_node_create() - create a node
+ * @id: node id
+ *
+ * Return: icc_node pointer on success, or ERR_PTR() on error
+ */
+struct icc_node *icc_node_create(int id)
+{
+	struct icc_node *node;
+
+	/* check if node already exists */
+	node = node_find(id);
+	if (node)
+		goto out;
+
+	node = kzalloc(sizeof(*node), GFP_KERNEL);
+	if (!node) {
+		node = ERR_PTR(-ENOMEM);
+		goto out;
+	}
+
+	mutex_lock(&icc_lock);
+
+	id = idr_alloc(&icc_idr, node, id, id + 1, GFP_KERNEL);
+	if (WARN(id < 0, "couldn't get idr")) {
+		node = ERR_PTR(id);
+		goto out;
+	}
+
+	node->id = id;
+
+out:
+	mutex_unlock(&icc_lock);
+
+	return node;
+}
+EXPORT_SYMBOL_GPL(icc_node_create);
+
+/**
+ * icc_node_remove() - remove a node
+ * @id: node id
+ *
+ */
+void icc_node_remove(int id)
+{
+	struct icc_node *node;
+
+	node = node_find(id);
+	if (node) {
+		mutex_lock(&icc_lock);
+		idr_remove(&icc_idr, node->id);
+		mutex_unlock(&icc_lock);
+	}
+
+	kfree(node);
+}
+EXPORT_SYMBOL_GPL(icc_node_remove);
+
+/**
+ * icc_link_create() - create a link between two nodes
+ * @src_id: source node id
+ * @dst_id: destination node id
+ *
+ * Create a link between two nodes. The nodes might belong to different
+ * interconnect providers and the @dst_id node might not exist (if the
+ * provider driver has not probed yet). So just create the @dst_id node
+ * and when the actual provider driver is probed, the rest of the node
+ * data is filled.
+ *
+ * Return: 0 on success, or an error code otherwise
+ */
+int icc_link_create(struct icc_node *node, const int dst_id)
+{
+	struct icc_node *dst;
+	struct icc_node **new;
+	int ret = 0;
+
+	if (!node->provider)
+		return -EINVAL;
+
+	dst = node_find(dst_id);
+	if (!dst) {
+		dst = icc_node_create(dst_id);
+
+		if (IS_ERR(dst)) {
+			ret = PTR_ERR(dst);
+			goto out;
+		}
+	}
+
+	mutex_lock(&icc_lock);
+
+	new = krealloc(node->links,
+		       (node->num_links + 1) * sizeof(*node->links),
+		       GFP_KERNEL);
+	if (!new) {
+		ret = -ENOMEM;
+		goto out;
+	}
+
+	node->links = new;
+	node->links[node->num_links++] = dst;
+
+out:
+	mutex_unlock(&icc_lock);
+
+	return ret;
+}
+EXPORT_SYMBOL_GPL(icc_link_create);
+
+/**
+ * icc_link_remove() - remove a link between two nodes
+ * @src: pointer to source node
+ * @dst: pointer to destination node
+ *
+ * Return: 0 on success, or an error code otherwise
+ */
+int icc_link_remove(struct icc_node *src, struct icc_node *dst)
+{
+	struct icc_node **new;
+	int ret = 0;
+	int i, j;
+
+	if (IS_ERR_OR_NULL(src))
+		return PTR_ERR(src);
+
+	if (IS_ERR_OR_NULL(dst))
+		return PTR_ERR(dst);
+
+	mutex_lock(&icc_lock);
+
+	new = krealloc(src->links,
+		       (src->num_links - 1) * sizeof(*src->links),
+		       GFP_KERNEL);
+	if (!new) {
+		ret = -ENOMEM;
+		goto out;
+	}
+
+	for (i = 0, j = 0; j < src->num_links; j++) {
+		if (src->links[j] == dst)
+			continue;
+
+		new[i++] = src->links[j];
+	}
+
+	src->links = new;
+	src->num_links--;
+
+out:
+	mutex_unlock(&icc_lock);
+
+	return ret;
+}
+EXPORT_SYMBOL_GPL(icc_link_remove);
+
+/**
+ * icc_node_add() - add an interconnect node to interconnect provider
+ * @node: pointer to the interconnect node
+ * @provider: pointer to the interconnect provider
+ *
+ * Return: 0 on success, or an error code otherwise
+ */
+int icc_node_add(struct icc_node *node, struct icc_provider *provider)
+{
+	mutex_lock(&icc_lock);
+
+	node->provider = provider;
+	list_add(&node->node_list, &provider->nodes);
+
+	mutex_unlock(&icc_lock);
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(icc_node_add);
+
+/**
+ * icc_provider_add() - add a new interconnect provider
+ * @icc_provider: the interconnect provider that will be added into topology
+ *
+ * Return: 0 on success, or an error code otherwise
+ */
+int icc_provider_add(struct icc_provider *provider)
+{
+	if (WARN_ON(!provider->set))
+		return -EINVAL;
+
+	mutex_init(&icc_lock);
+
+	INIT_LIST_HEAD(&provider->nodes);
+	list_add(&provider->provider_list, &icc_provider_list);
+
+	mutex_unlock(&icc_lock);
+
+	dev_dbg(provider->dev, "interconnect provider added to topology\n");
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(icc_provider_add);
+
+/**
+ * icc_provider_del() - delete previously added interconnect provider
+ * @icc_provider: the interconnect provider that will be removed from topology
+ *
+ * Return: 0 on success, or an error code otherwise
+ */
+int icc_provider_del(struct icc_provider *provider)
+{
+	mutex_lock(&icc_lock);
+	if (provider->users) {
+		pr_warn("interconnect provider still has %d users\n",
+			provider->users);
+		mutex_unlock(&icc_lock);
+		return -EBUSY;
+	}
+
+	if (!list_empty_careful(&provider->nodes)) {
+		pr_warn("interconnect provider still has nodes\n");
+		mutex_unlock(&icc_lock);
+		return -EEXIST;
+	}
+
+	list_del(&provider->provider_list);
+	mutex_unlock(&icc_lock);
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(icc_provider_del);
+
+MODULE_AUTHOR("Georgi Djakov <georgi.djakov@linaro.org");
+MODULE_DESCRIPTION("Interconnect Driver Core");
+MODULE_LICENSE("GPL v2");
diff --git a/include/linux/interconnect-provider.h b/include/linux/interconnect-provider.h
new file mode 100644
index 000000000000..f4613c6dce4f
--- /dev/null
+++ b/include/linux/interconnect-provider.h
@@ -0,0 +1,127 @@ 
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (c) 2018, Linaro Ltd.
+ * Author: Georgi Djakov <georgi.djakov@linaro.org>
+ */
+
+#ifndef _LINUX_INTERCONNECT_PROVIDER_H
+#define _LINUX_INTERCONNECT_PROVIDER_H
+
+#include <linux/interconnect.h>
+
+#define icc_units_to_bps(bw)  ((bw) * 1000ULL)
+
+struct icc_node;
+
+/**
+ * struct icc_provider - interconnect provider (controller) entity that might
+ * provide multiple interconnect controls
+ *
+ * @provider_list: list of the registered interconnect providers
+ * @nodes: internal list of the interconnect provider nodes
+ * @set: pointer to device specific set operation function
+ * @aggregate: pointer to device specific aggregate operation function
+ * @dev: the device this interconnect provider belongs to
+ * @users: count of active users
+ * @avg_bw: aggregated value of average bandwidth requests from all nodes
+ * @peak_bw: aggregated value of peak bandwidth requests from all nodes
+ * @data: pointer to private data
+ */
+struct icc_provider {
+	struct list_head	provider_list;
+	struct list_head	nodes;
+	int (*set)(struct icc_node *src, struct icc_node *dst,
+		   u32 avg_bw, u32 peak_bw);
+	int (*aggregate)(struct icc_node *node, u32 avg_bw, u32 peak_bw,
+			 u32 *agg_avg, u32 *agg_peak);
+	struct device		*dev;
+	int			users;
+	u32			avg_bw;
+	u32			peak_bw;
+	void			*data;
+};
+
+/**
+ * struct icc_node - entity that is part of the interconnect topology
+ *
+ * @id: platform specific node id
+ * @name: node name used in debugfs
+ * @links: a list of targets pointing to where we can go next when traversing
+ * @num_links: number of links to other interconnect nodes
+ * @provider: points to the interconnect provider of this node
+ * @node_list: the list entry in the parent provider's "nodes" list
+ * @search_list: list used when walking the nodes graph
+ * @reverse: pointer to previous node when walking the nodes graph
+ * @is_traversed: flag that is used when walking the nodes graph
+ * @req_list: a list of QoS constraint requests associated with this node
+ * @avg_bw: aggregated value of average bandwidth requests from all consumers
+ * @peak_bw: aggregated value of peak bandwidth requests from all consumers
+ * @data: pointer to private data
+ */
+struct icc_node {
+	int			id;
+	const char              *name;
+	struct icc_node		**links;
+	size_t			num_links;
+
+	struct icc_provider	*provider;
+	struct list_head	node_list;
+	struct list_head	orphan_list;
+	struct list_head	search_list;
+	struct icc_node		*reverse;
+	bool			is_traversed;
+	struct hlist_head	req_list;
+	u32			avg_bw;
+	u32			peak_bw;
+	void			*data;
+};
+
+#if IS_ENABLED(CONFIG_INTERCONNECT)
+
+struct icc_node *icc_node_create(int id);
+void icc_node_remove(int id);
+int icc_link_create(struct icc_node *node, const int dst_id);
+int icc_link_remove(struct icc_node *src, struct icc_node *dst);
+int icc_node_add(struct icc_node *node, struct icc_provider *provider);
+int icc_provider_add(struct icc_provider *provider);
+int icc_provider_del(struct icc_provider *provider);
+
+#else
+
+static inline struct icc_node *icc_node_create(int id)
+{
+	return ERR_PTR(-ENOTSUPP);
+}
+
+void icc_node_remove(int id)
+{
+}
+
+static inline int icc_link_create(struct icc_node *node, const int dst_id)
+{
+	return -ENOTSUPP;
+}
+
+int icc_link_remove(struct icc_node *src, struct icc_node *dst)
+{
+	return -ENOTSUPP;
+}
+
+int icc_node_add(struct icc_node *node, struct icc_provider *provider)
+{
+	return -ENOTSUPP;
+}
+
+static inline int icc_provider_add(struct icc_provider *provider)
+{
+	return -ENOTSUPP;
+}
+
+static inline int icc_provider_del(struct icc_provider *provider)
+{
+	return -ENOTSUPP;
+}
+
+#endif /* CONFIG_INTERCONNECT */
+
+#endif /* _LINUX_INTERCONNECT_PROVIDER_H */
diff --git a/include/linux/interconnect.h b/include/linux/interconnect.h
new file mode 100644
index 000000000000..593215371fd6
--- /dev/null
+++ b/include/linux/interconnect.h
@@ -0,0 +1,42 @@ 
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (c) 2018, Linaro Ltd.
+ * Author: Georgi Djakov <georgi.djakov@linaro.org>
+ */
+
+#ifndef _LINUX_INTERCONNECT_H
+#define _LINUX_INTERCONNECT_H
+
+#include <linux/mutex.h>
+#include <linux/types.h>
+
+struct icc_path;
+struct device;
+
+#if IS_ENABLED(CONFIG_INTERCONNECT)
+
+struct icc_path *icc_get(struct device *dev, const int src_id,
+			 const int dst_id);
+void icc_put(struct icc_path *path);
+int icc_set(struct icc_path *path, u32 avg_bw, u32 peak_bw);
+
+#else
+
+static inline struct icc_path *icc_get(struct device *dev, const int src_id,
+				       const int dst_id)
+{
+	return NULL;
+}
+
+static inline void icc_put(struct icc_path *path)
+{
+}
+
+static inline int icc_set(struct icc_path *path, u32 avg_bw, u32 peak_bw)
+{
+	return 0;
+}
+
+#endif /* CONFIG_INTERCONNECT */
+
+#endif /* _LINUX_INTERCONNECT_H */