From patchwork Wed Jun 20 12:11:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Georgi Djakov X-Patchwork-Id: 139320 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp713048lji; Wed, 20 Jun 2018 05:13:32 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLjQobHb8TzVJBm8MCg5k3PJTblddOh/zobS+x1QkfuOcpAjt/6+BT+khQp+mLl5s3Tw1Dj X-Received: by 2002:a62:c0cb:: with SMTP id g72-v6mr22424925pfk.226.1529496811905; Wed, 20 Jun 2018 05:13:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529496811; cv=none; d=google.com; s=arc-20160816; b=n8jgnLxb7vy4ffb+1NSBRGLyjS8A2oZM8dDOIN9fmYKvSMccAoi3JVQZO3wjPjlG4h kvnh/dlY08ieO+ZhuC2jTeOc000oD/W6OQIPCxFfAUE4OMWKyluhuEXK5sWG5fSz0O76 rxnp5F/t+IRboMggG7YVsqVrePmvcbIcYhFrHNaOSZEI6mX7hmJQRQrqGpa1uI0LdA57 xMqQNcJjUuUKFDss5jDDbAbcH+QsZ2ejEaQitY7PLgS7DOUOL2QiNNlCW6RUEVDWfecV TVQT0yt8VS4fAkn270ox1PCYvIVh0h2VWajUzDK5Zr8ZpZLvk6GsPTPPxKlVptXqZjZA b0Jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=n4sE0lbtmDcgWS/ypmjwVPQdLxaoW24h+pZA52eS6gU=; b=gtUjQaKyBNYk2sRZogQM9qObBH2DCvzhP+NR3WAxi/9FY9lVBz5UuJuoojgNGTaQxr o01Gvq+Lb2W8QL0PuvpNST67d+85FcJO63/TxCRdX3hzY8vn3hYvbjWENp855fGMW/Pi naTdh3B9w8jOXewwKnzaH3kaVoifknthpaslSea+mLOX6NB/H36rYHYNgXkQrdmcrLst GLuQW0ckOG/69Hh9w2jgA/+Rc0tqG9aFW1OGWpBKCmB5t+oCQ3kMVoG72Ig2gnbSoMGl ocE6NNnXRX46oI7IczXqSjWPnpKsxnEVIeNeAwEOFlFFAyotecwKamT4dk7Cf1DZIz7M 3Khw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Hhh6vM80; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e4-v6si1848335pgs.476.2018.06.20.05.13.31; Wed, 20 Jun 2018 05:13:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Hhh6vM80; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753619AbeFTMLv (ORCPT + 10 others); Wed, 20 Jun 2018 08:11:51 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:33198 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752725AbeFTMLs (ORCPT ); Wed, 20 Jun 2018 08:11:48 -0400 Received: by mail-wm0-f68.google.com with SMTP id z6-v6so22530091wma.0 for ; Wed, 20 Jun 2018 05:11:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=n4sE0lbtmDcgWS/ypmjwVPQdLxaoW24h+pZA52eS6gU=; b=Hhh6vM80I4C9aOfoSOTnO6StEqEm+PKPbgoCdcjTMuH1kRIZRm8Xq1Gw1fkHE/wQse nAilHLBkgPH9DPK/wgQQW4x2H87n2l0q890FV02Ixs5RxgRgPF8TiWVszWREuMM50FV8 jMZZ62jMyT6ZPlN20PYE6yycAaozddgC9QoqM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=n4sE0lbtmDcgWS/ypmjwVPQdLxaoW24h+pZA52eS6gU=; b=nIFRGIDIgLKcn6qiSzlAgZQ0xcJPtTB0vTJfvDhXGqqjPh7jRzzwaXtGA8a1Sezn1s OLCXqssN2PPD3ZL1VhaqIPUnQS0u2MTBDb06qTAwHimkU64SOzKm6sel6a/VLrG6uO+8 jTk1XefdUfOnU4heKTiXxUXxek2OCU/ZwB8boaNuxKYQ7DSUQDexAoG7na/rJE6VuFXr OxxLs48C3WBm81kx+BBzUi4E5Tg3DMWk2daT/qFPtKEIgTcrG41EIIKlqtqAuCpOhbbi Wk+1zQEvgY3b6HTaASDW95yA1NYJunajxd3gMDfzqh6nz8lu2sfUxUzOEyp6iZSlsaFF LWVA== X-Gm-Message-State: APt69E2vu6xeXOwASKhRynpgCnPyS55COaq1YQUFt2g92owGX1aniFVc U22omZU4Nu3q0he9X5AwJK7KNMOcGUM= X-Received: by 2002:a1c:e594:: with SMTP id c142-v6mr1555557wmh.161.1529496705898; Wed, 20 Jun 2018 05:11:45 -0700 (PDT) Received: from localhost.localdomain ([212.45.67.2]) by smtp.googlemail.com with ESMTPSA id e14-v6sm1656483wmh.17.2018.06.20.05.11.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Jun 2018 05:11:45 -0700 (PDT) From: Georgi Djakov To: linux-pm@vger.kernel.org, gregkh@linuxfoundation.org Cc: rjw@rjwysocki.net, robh+dt@kernel.org, mturquette@baylibre.com, khilman@baylibre.com, vincent.guittot@linaro.org, skannan@codeaurora.org, bjorn.andersson@linaro.org, amit.kucheria@linaro.org, seansw@qti.qualcomm.com, daidavid1@codeaurora.org, evgreen@chromium.org, mark.rutland@arm.com, lorenzo.pieralisi@arm.com, abailon@baylibre.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, georgi.djakov@linaro.org Subject: [PATCH v5 1/8] interconnect: Add generic on-chip interconnect API Date: Wed, 20 Jun 2018 15:11:34 +0300 Message-Id: <20180620121141.15403-2-georgi.djakov@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180620121141.15403-1-georgi.djakov@linaro.org> References: <20180620121141.15403-1-georgi.djakov@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org 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 --- 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 + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +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 + */ + +#ifndef _LINUX_INTERCONNECT_PROVIDER_H +#define _LINUX_INTERCONNECT_PROVIDER_H + +#include + +#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 + */ + +#ifndef _LINUX_INTERCONNECT_H +#define _LINUX_INTERCONNECT_H + +#include +#include + +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 */ From patchwork Wed Jun 20 12:11:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Georgi Djakov X-Patchwork-Id: 139315 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp711572lji; Wed, 20 Jun 2018 05:12:06 -0700 (PDT) X-Google-Smtp-Source: ADUXVKL9qwBxV4ZT86WywSg5Uh1amk//5mQdue7TPijw1w+fzMJLlipeZUKK7+gA0b5nVgU3VVzB X-Received: by 2002:a62:da07:: with SMTP id c7-v6mr22479656pfh.106.1529496725996; Wed, 20 Jun 2018 05:12:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529496725; cv=none; d=google.com; s=arc-20160816; b=x4Am7/US2SY0CNZ+juBFBkvzOzWYz2EpiD5acLQYKIOYGvgYf3o2K/L2rs1rKLipDT bAfOJOVZpamcaRN3UPoGeISGfLwQAYx3G28PoSo9d8FUVcCgXjb3sZ/8VnQ5xq4hn/Vs z8P2QlzFN9xB0Yl58ft7QIGlhGq08wR7ryWblkuzh3mt7VWg4CelOzUKbHQgFlWvTzdA 5BoaAZCTrfudZbIEGYxPaycoAdpPiVgK3yctk/Zu1s12ZisG0Y5mF2K1bArf0cuq5IBh akHBHAnqhIldbIMVUu+RNMko/Pg5x6B0zVWdpWVC/mICWku3u4QLg8EVGD7ZozooiKYL SKHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=5E3iJBFFrio7tuGSnWOLbi/y66jhJ612NEom6Tcob3A=; b=iblZ/hPFUy0gxn13BF9Uu4Q58eFAp8/KLA5FALKbzHUdO0gwPNPGMznR9A4DsDXqGU Fotm7ea8GIcb4sz8FvjksUhXOq6n4u+rYjDbwIJqQ6AaCAp67FFYa9y+flccEx866M4w NGSPcRfuGsmZuY3Fqmk2epDj1boIlJMA0PJeZk838oYmj3/3hAJb76fGwvBBMj6rXFX1 Yf01K7q+s7idrX6kvK7GKcPUq4X8bdf57BxynqsEM62vYQzumonA/gW2OWX98tac8gOs I73e2mI0S4VB19u+8T1KE0802s4y5+8KwcJg84zlgP4+PTFCbDkqHWVe1R2sUs7kSzCx rGog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OIXjf1ze; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s25-v6si1697670pgd.188.2018.06.20.05.12.05; Wed, 20 Jun 2018 05:12:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OIXjf1ze; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753972AbeFTMMC (ORCPT + 10 others); Wed, 20 Jun 2018 08:12:02 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:33216 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753882AbeFTML7 (ORCPT ); Wed, 20 Jun 2018 08:11:59 -0400 Received: by mail-wm0-f66.google.com with SMTP id z6-v6so22530717wma.0 for ; Wed, 20 Jun 2018 05:11:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5E3iJBFFrio7tuGSnWOLbi/y66jhJ612NEom6Tcob3A=; b=OIXjf1zeSod9R6cDfvXQ4qE1VQhZoGYaUWJ7evQIMPuUNOmHSeIc+oIEQwB3C8Ahnk bpmi88vYtpS4Gdj9jP81RFOeskO/2yJ/hiq/SBIBKvmgpPfRs81x1wpfxIzdpAWV1XW7 XEumiJfCI+AXzxjY1lvsxRRcKixc4nUUxLi5E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5E3iJBFFrio7tuGSnWOLbi/y66jhJ612NEom6Tcob3A=; b=Gk/p2qjnacJwadmx0DFytYIDqup8D3ayYOsXZZLW4qhYsKnHr9Gy5coNVwEUsR+CW8 KxS1khLDePMqs4d6FjvNAoLmgIogdzBbNVOeofKaKNkIFj4uMRENEJfZEUDLcG8wQmRB 6GAe7aJBxjKljznYeltxuw1rceKaXk+L1gNsbF+dv51tRucKbXg9Il4FlNUfXeDwbON2 FetWkzH861rhL4NRajklYCW5CMyAJkxqZyCM5a73WQJ/GoYqNxblFUqkXBfZHPQNvpbn 8zZSyZBuF2cPAlJwk/A2njfAzjQ8A3gISIlDa9QCsX9K5q1tu7bsECfLYrDt5r5lvQzq KU8g== X-Gm-Message-State: APt69E2wT7hwBPlFwYX3H82S6g8gKAAIUaue9KAbnx4Vr+NvzSQxdL+/ M45sy8mm6fML9QRQIY0nxrNX2zVzkT8= X-Received: by 2002:a1c:5f82:: with SMTP id t124-v6mr1435580wmb.147.1529496717923; Wed, 20 Jun 2018 05:11:57 -0700 (PDT) Received: from localhost.localdomain ([212.45.67.2]) by smtp.googlemail.com with ESMTPSA id e14-v6sm1656483wmh.17.2018.06.20.05.11.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Jun 2018 05:11:57 -0700 (PDT) From: Georgi Djakov To: linux-pm@vger.kernel.org, gregkh@linuxfoundation.org Cc: rjw@rjwysocki.net, robh+dt@kernel.org, mturquette@baylibre.com, khilman@baylibre.com, vincent.guittot@linaro.org, skannan@codeaurora.org, bjorn.andersson@linaro.org, amit.kucheria@linaro.org, seansw@qti.qualcomm.com, daidavid1@codeaurora.org, evgreen@chromium.org, mark.rutland@arm.com, lorenzo.pieralisi@arm.com, abailon@baylibre.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, georgi.djakov@linaro.org Subject: [PATCH v5 8/8] interconnect: Allow endpoints translation via DT Date: Wed, 20 Jun 2018 15:11:41 +0300 Message-Id: <20180620121141.15403-9-georgi.djakov@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180620121141.15403-1-georgi.djakov@linaro.org> References: <20180620121141.15403-1-georgi.djakov@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Currently we support only platform data for specifying the interconnect endpoints. As now the endpoints are hard-coded into the consumer driver this may lead to complications when a single driver is used by multiple SoCs, which may have different interconnect topology. To avoid cluttering the consumer drivers, introduce a translation function to help us get the board specific interconnect data from device-tree. Signed-off-by: Georgi Djakov --- drivers/interconnect/core.c | 62 ++++++++++++++++++++++++++++++++++++ include/linux/interconnect.h | 7 ++++ 2 files changed, 69 insertions(+) diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c index dafc001ce758..2f07807ca4b4 100644 --- a/drivers/interconnect/core.c +++ b/drivers/interconnect/core.c @@ -16,6 +16,7 @@ #include #include #include +#include #include static DEFINE_IDR(icc_idr); @@ -306,6 +307,67 @@ static int apply_constraints(struct icc_path *path) return ret; } +struct icc_path *of_icc_get(struct device *dev, const char *name) +{ + struct device_node *np = NULL; + struct of_phandle_args src_args, dst_args; + u32 src_id, dst_id; + int idx = 0; + int ret; + + if (!dev || !dev->of_node) + return ERR_PTR(-ENODEV); + + np = dev->of_node; + + /* + * When the consumer DT node do not have "interconnects" property + * return a NULL path to skip setting constraints. + */ + if (!of_find_property(np, "interconnects", NULL)) + return NULL; + + /* + * We use a combination of phandle and specifier for endpoint. For now + * lets support only global ids and extend this is the future if needed + * without breaking DT compatibility. + */ + if (name) { + idx = of_property_match_string(np, "interconnect-names", name); + if (idx < 0) + return ERR_PTR(idx); + } + + ret = of_parse_phandle_with_args(np, "interconnects", + "#interconnect-cells", idx * 2, + &src_args); + if (ret) + return ERR_PTR(ret); + + of_node_put(src_args.np); + + if (!src_args.args_count || src_args.args_count > 1) + return ERR_PTR(-EINVAL); + + src_id = src_args.args[0]; + + ret = of_parse_phandle_with_args(np, "interconnects", + "#interconnect-cells", idx * 2 + 1, + &dst_args); + if (ret) + return ERR_PTR(ret); + + of_node_put(dst_args.np); + + if (!dst_args.args_count || dst_args.args_count > 1) + return ERR_PTR(-EINVAL); + + dst_id = dst_args.args[0]; + + return icc_get(dev, src_id, dst_id); +} +EXPORT_SYMBOL_GPL(of_icc_get); + /** * icc_set() - set constraints on an interconnect path between two endpoints * @path: reference to the path returned by icc_get() diff --git a/include/linux/interconnect.h b/include/linux/interconnect.h index 593215371fd6..ae6744da9bc2 100644 --- a/include/linux/interconnect.h +++ b/include/linux/interconnect.h @@ -17,6 +17,7 @@ struct device; struct icc_path *icc_get(struct device *dev, const int src_id, const int dst_id); +struct icc_path *of_icc_get(struct device *dev, const char *name); void icc_put(struct icc_path *path); int icc_set(struct icc_path *path, u32 avg_bw, u32 peak_bw); @@ -28,6 +29,12 @@ static inline struct icc_path *icc_get(struct device *dev, const int src_id, return NULL; } +static inline struct icc_path *of_icc_get(struct device *dev, + const char *name) +{ + return NULL; +} + static inline void icc_put(struct icc_path *path) { }