From patchwork Fri Sep 8 17:18:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Georgi Djakov X-Patchwork-Id: 112097 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp593859qgf; Fri, 8 Sep 2017 10:19:11 -0700 (PDT) X-Received: by 10.99.95.148 with SMTP id t142mr3802145pgb.321.1504891151376; Fri, 08 Sep 2017 10:19:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504891151; cv=none; d=google.com; s=arc-20160816; b=vX+b/lFLCj3sYasBRswIs5eupdmgjaxVaYEHftAzWxU5Xw/7QN/mCYWGB1sCtEQWrj HuzYdsSm8rMC4PEx/brllYobu++YDnaPeMrG8HtJJ5is/qqCc8rpm5TXWMISNsxxWdGW S77g4ib2ixNovDJNJFF5cnSmUMoWN8UHDjI/oktYPUqCuiSOYrTc3S6pn1Ycl9m0XNOA BCUN0+rdci8kUeP90clbkN3zgQ3TrzbZEylYsmnwdWNWh+e40tGAZ5z76W4jbsQXcySR 2vEsQ1cemjVYQxb4yzUepZ052LanlFkQXDeK0P6/EyV1fR+z6VGE/2rArffek5e4lsqu dLtA== 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=tc+0jQ1gUpKjDZ9SpYQaGPQgoXJSZfY2ILmMkEaEVx0=; b=RsHOcrJJHUkEJdFRehOHBpJetpeDnzAadWBB1TpbNYU/RojxKO6mgLoo0Z9tb9+N49 ti3RqYI6HX2JxnOaF6UdvSr5Pz5+EACM17zGavh/GDAkomd7ZUNASuI65v7W9jpiDylV 4LmwXuYwai8QQ32qdJcHsnXs+7BQpjpDMSyF4/+rwqg5eHp3cjsHy/rH+JccWxoaXLKC Of4UtHHq7LwV8SPEzQFxHf66WOCVu1t83MHVPRASHuqTcwb5OHqNvKPuPeh2jF0lwLrZ o+NKv5DxprB2zps153kaP5ansHahfBrmaLeM09Toh5kZQ90phyVd8Nd40ICcPftA2tm6 w2/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LOmdFpl9; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 m3si1804824pgc.774.2017.09.08.10.19.11; Fri, 08 Sep 2017 10:19:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=LOmdFpl9; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 S1756684AbdIHRTI (ORCPT + 26 others); Fri, 8 Sep 2017 13:19:08 -0400 Received: from mail-wm0-f50.google.com ([74.125.82.50]:46284 "EHLO mail-wm0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756669AbdIHRTE (ORCPT ); Fri, 8 Sep 2017 13:19:04 -0400 Received: by mail-wm0-f50.google.com with SMTP id i189so8619720wmf.1 for ; Fri, 08 Sep 2017 10:19:03 -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=tc+0jQ1gUpKjDZ9SpYQaGPQgoXJSZfY2ILmMkEaEVx0=; b=LOmdFpl9KcC8ozav2WMY3dx+kCWzfT4WDKcp875QjMvouuLp0PXnYZ0lZ33KXNm5Dz TbpBaFscNX8GjEYb1sqMY3YYELZhQFmNBErGBkZkiJ2A8I3VsVrmBmOSsaW0CmtZaTb5 EVqJFLLQO4c2diOne5Km4T6GnxZP4QgptAFWY= 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=tc+0jQ1gUpKjDZ9SpYQaGPQgoXJSZfY2ILmMkEaEVx0=; b=FWLdpFG+WdUgGa6UdKiK9DB7orChkDet9AgbjD2VTd5VzUaMPc/8zUhvfsJwFQOEBY 11py/YKnurDhHzPSXTmPDHRK+OYyGC5HkQsn6jlzn9qHD3/sll1VzC+OSIz6/GEuJQx5 Mr3C8cHpyt64E1VHtPADt3f6A8lMDcXKxV0+2sWmFtGT5KkQ5rnm7J/ckdX8tVDPPLQk Cwt6/PpXlT3ZQP1fpSUyQ4HSldQt6jz8hT3+cksofGKiZmfMfjQ9eeLh4n6ResoB3Pph JK/fRn0h1Ey34s7tqRYU5vFfA+u8oeRtjKLbd9lGo3+9WN2qUr7QwGHBAPR8qXSRBIxi ONeA== X-Gm-Message-State: AHPjjUiQGwvall/KmIU3a1GaMQE6KWliySlXBTcRUMiILVVCpf6PWLyn 3N3//DgUkX7A48pY X-Google-Smtp-Source: ADKCNb4SkVLf3/vtTJ8IKSdgCRUiX7O2SlBj29o3aZAu+Uu1GLPOtlmwrSxZVeRD5BJk128WjaCnfw== X-Received: by 10.80.135.138 with SMTP id a10mr2728863eda.112.1504891142787; Fri, 08 Sep 2017 10:19:02 -0700 (PDT) Received: from mms-0441.qualcomm.mm-sol.com ([212.45.67.2]) by smtp.googlemail.com with ESMTPSA id i6sm865817edk.45.2017.09.08.10.19.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Sep 2017 10:19:02 -0700 (PDT) From: Georgi Djakov To: linux-pm@vger.kernel.org, gregkh@linuxfoundation.org Cc: rjw@rjwysocki.net, robh+dt@kernel.org, khilman@baylibre.com, mturquette@baylibre.com, vincent.guittot@linaro.org, skannan@codeaurora.org, sboyd@codeaurora.org, andy.gross@linaro.org, seansw@qti.qualcomm.com, davidai@quicinc.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, mark.rutland@arm.com, lorenzo.pieralisi@arm.com, georgi.djakov@linaro.org Subject: [PATCH v3 1/3] interconnect: Add generic on-chip interconnect API Date: Fri, 8 Sep 2017 20:18:28 +0300 Message-Id: <20170908171830.13813-2-georgi.djakov@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170908171830.13813-1-georgi.djakov@linaro.org> References: <20170908171830.13813-1-georgi.djakov@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 | 93 +++++++ drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/interconnect/Kconfig | 10 + drivers/interconnect/Makefile | 1 + drivers/interconnect/interconnect.c | 382 ++++++++++++++++++++++++++++ include/linux/interconnect-consumer.h | 73 ++++++ include/linux/interconnect-provider.h | 119 +++++++++ 8 files changed, 681 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/interconnect.c create mode 100644 include/linux/interconnect-consumer.h create mode 100644 include/linux/interconnect-provider.h diff --git a/Documentation/interconnect/interconnect.rst b/Documentation/interconnect/interconnect.rst new file mode 100644 index 000000000000..b057e9c12d70 --- /dev/null +++ b/Documentation/interconnect/interconnect.rst @@ -0,0 +1,93 @@ +===================================== +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. 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 on 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 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 endpoits 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 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 driver 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-consumer.h diff --git a/drivers/Kconfig b/drivers/Kconfig index 505c676fa9c7..930ecde654d5 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -208,4 +208,6 @@ source "drivers/tee/Kconfig" source "drivers/mux/Kconfig" +source "drivers/interconnect/Kconfig" + endmenu diff --git a/drivers/Makefile b/drivers/Makefile index dfdcda00bfe3..a114b679bb5b 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -182,3 +182,4 @@ obj-$(CONFIG_FPGA) += fpga/ obj-$(CONFIG_FSI) += fsi/ obj-$(CONFIG_TEE) += tee/ obj-$(CONFIG_MULTIPLEXER) += mux/ +obj-$(CONFIG_INTERCONNECT) += interconnect/ diff --git a/drivers/interconnect/Kconfig b/drivers/interconnect/Kconfig new file mode 100644 index 000000000000..1e50e951cdc1 --- /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..d9da6a6c3560 --- /dev/null +++ b/drivers/interconnect/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_INTERCONNECT) += interconnect.o diff --git a/drivers/interconnect/interconnect.c b/drivers/interconnect/interconnect.c new file mode 100644 index 000000000000..94e2a9f01545 --- /dev/null +++ b/drivers/interconnect/interconnect.c @@ -0,0 +1,382 @@ +/* + * Copyright (c) 2017, Linaro Ltd. + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and + * may be copied, distributed, and modified under those terms. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +static DEFINE_MUTEX(interconnect_provider_list_mutex); +static LIST_HEAD(interconnect_provider_list); + +/** + * struct interconnect_path - interconnect path structure + * @num_nodes: number of hops (nodes) + * @reqs: array of the requests applicable to this path of nodes + */ +struct interconnect_path { + size_t num_nodes; + struct interconnect_req reqs[0]; +}; + +static struct interconnect_node *node_find(const char *dev_id, int con_id) +{ + struct interconnect_node *node = ERR_PTR(-EPROBE_DEFER); + struct icp *icp; + + mutex_lock(&interconnect_provider_list_mutex); + + list_for_each_entry(icp, &interconnect_provider_list, icp_list) { + struct interconnect_node *n; + + list_for_each_entry(n, &icp->nodes, icn_list) { + if (!strcmp(n->dev_id, dev_id) && n->con_id == con_id) { + node = n; + goto out; + } + } + } + +out: + mutex_unlock(&interconnect_provider_list_mutex); + + return node; +} + +static struct interconnect_path *path_allocate(struct interconnect_node *node, + ssize_t num_nodes) +{ + struct interconnect_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; + node = node->reverse; + } + + return path; +} + +static struct interconnect_path *path_find(struct interconnect_node *src, + struct interconnect_node *dst) +{ + struct interconnect_node *node = NULL; + struct list_head traverse_list; + struct list_head edge_list; + struct list_head tmp_list; + size_t i, number = 1; + bool found = false; + + INIT_LIST_HEAD(&traverse_list); + INIT_LIST_HEAD(&edge_list); + INIT_LIST_HEAD(&tmp_list); + + list_add_tail(&src->search_list, &traverse_list); + + do { + list_for_each_entry(node, &traverse_list, search_list) { + if (node == dst) { + found = true; + list_add(&node->search_list, &tmp_list); + break; + } + for (i = 0; i < node->num_links; i++) { + struct interconnect_node *tmp = node->links[i]; + + if (!tmp) { + WARN_ON(1); + return ERR_PTR(-ENOENT); + } + + if (tmp->is_traversed) + continue; + + tmp->is_traversed = true; + tmp->reverse = node; + list_add_tail(&tmp->search_list, &edge_list); + } + } + if (found) + break; + + list_splice_init(&traverse_list, &tmp_list); + list_splice_init(&edge_list, &traverse_list); + + /* count the number of nodes */ + number++; + + } while (!list_empty(&traverse_list)); + + /* reset the traversed state */ + list_for_each_entry(node, &tmp_list, search_list) { + node->is_traversed = false; + } + + if (found) + return path_allocate(dst, number); + + return ERR_PTR(-EPROBE_DEFER); +} + +static int path_init(struct interconnect_path *path) +{ + struct interconnect_node *node; + size_t i; + + for (i = 0; i < path->num_nodes; i++) { + node = path->reqs[i].node; + + mutex_lock(&node->icp->lock); + node->icp->users++; + mutex_unlock(&node->icp->lock); + } + + return 0; +} + +static void interconnect_aggregate_icn(struct interconnect_node *node) +{ + struct interconnect_req *r; + u32 avg_bw = 0; + u32 peak_bw = 0; + + hlist_for_each_entry(r, &node->req_list, req_node) { + /* sum(averages) and max(peaks) */ + avg_bw += r->avg_bw; + peak_bw = max(peak_bw, r->peak_bw); + } + + node->creq.avg_bw = avg_bw; + node->creq.peak_bw = peak_bw; +} + +static void interconnect_aggregate_icp(struct icp *icp) +{ + struct interconnect_node *n; + u32 avg_bw = 0; + u32 peak_bw = 0; + + /* aggregate for the interconnect provider */ + list_for_each_entry(n, &icp->nodes, icn_list) { + /* sum the average and max the peak */ + avg_bw += n->creq.avg_bw; + peak_bw = max(peak_bw, n->creq.peak_bw); + } + + /* save the aggregated values */ + icp->creq.avg_bw = avg_bw; + icp->creq.peak_bw = peak_bw; +} + +/** + * interconnect_set() - set constraints on a path between two endpoints + * @path: reference to the path returned by interconnect_get() + * @creq: request from the consumer, containing its requirements + * + * This function is used by an interconnect consumer to express its own needs + * in term of bandwidth and QoS for a previously requested path between two + * endpoints. The requests are aggregated and each node is updated accordingly. + * + * Returns 0 on success, or an approproate error code otherwise. + */ +int interconnect_set(struct interconnect_path *path, + struct interconnect_creq *creq) +{ + struct interconnect_node *next, *prev = NULL; + size_t i; + int ret = 0; + + for (i = 0; i < path->num_nodes; i++, prev = next) { + next = path->reqs[i].node; + + /* + * Both endpoints should be valid and master-slave pairs of + * the same interconnect provider that will be configured. + */ + if (!next || !prev) + continue; + if (next->icp != prev->icp) + continue; + + mutex_lock(&next->icp->lock); + + /* update the consumer request for this path */ + path->reqs[i].avg_bw = creq->avg_bw; + path->reqs[i].peak_bw = creq->peak_bw; + + /* aggregate all requests */ + interconnect_aggregate_icn(next); + interconnect_aggregate_icp(next->icp); + + if (next->icp->ops->set) { + /* commit the aggregated constraints */ + ret = next->icp->ops->set(prev, next, &next->icp->creq); + } + + mutex_unlock(&next->icp->lock); + if (ret) + goto out; + } + +out: + return ret; +} + +/** + * interconnect_get() - return a handle for path between two endpoints + * @sdev: source device identifier + * @sid: source device port id + * @ddev: destination device identifier + * @did: destination device port id + * + * This function will search for a path between two endpoints and return an + * interconnect_path handle on success. Use interconnect_put() to release + * constraints when the they are not needed anymore. + * + * Return: interconnect_path pointer on success, or ERR_PTR() on error + */ +struct interconnect_path *interconnect_get(const char *sdev, const int sid, + const char *ddev, const int did) +{ + struct interconnect_node *src, *dst; + struct interconnect_path *path; + int ret; + + src = node_find(sdev, sid); + if (IS_ERR(src)) + return ERR_CAST(src); + + dst = node_find(ddev, did); + if (IS_ERR(dst)) + return ERR_CAST(dst); + + /* TODO: cache the path */ + path = path_find(src, dst); + if (IS_ERR(path)) { + pr_err("error finding path between %p and %p (%ld)\n", + src, dst, PTR_ERR(path)); + return path; + } + + ret = path_init(path); + if (ret) + return ERR_PTR(ret); + + return path; +} +EXPORT_SYMBOL_GPL(interconnect_get); + +/** + * interconnect_put() - release the reference to the interconnect_path + * + * @path: interconnect path + * + * Use this function to release the path and free the memory when setting + * constraints on the path is no longer needed. + */ +void interconnect_put(struct interconnect_path *path) +{ + struct interconnect_creq creq = { 0, 0 }; + struct interconnect_node *node; + size_t i; + int ret; + + if (!path || WARN_ON_ONCE(IS_ERR(path))) + return; + + for (i = 0; i < path->num_nodes; i++) { + node = path->reqs[i].node; + + /* + * Remove the constraints from the path, + * update the nodes and free the memory + */ + ret = interconnect_set(path, &creq); + if (ret) + pr_err("%s error %d\n", __func__, ret); + + mutex_lock(&node->icp->lock); + node->icp->users--; + mutex_unlock(&node->icp->lock); + } + + kfree(path); +} +EXPORT_SYMBOL_GPL(interconnect_put); + +/** + * interconnect_add_provider() - add a new interconnect provider + * @icp: the interconnect provider that will be added into topology + * + * Return: 0 on success, or an error code otherwise + */ +int interconnect_add_provider(struct icp *icp) +{ + if (!icp) + return -EINVAL; + + if (!icp->ops->set) { + dev_err(icp->dev, "%s: .set is not implemented\n", __func__); + return -EINVAL; + } + + mutex_lock(&interconnect_provider_list_mutex); + mutex_init(&icp->lock); + list_add(&icp->icp_list, &interconnect_provider_list); + mutex_unlock(&interconnect_provider_list_mutex); + + dev_info(icp->dev, "interconnect provider is added to topology\n"); + + return 0; +} +EXPORT_SYMBOL_GPL(interconnect_add_provider); + +/** + * interconnect_del_provider() - delete previously added interconnect provider + * @icp: the interconnect provider that will be removed from topology + * + * Return: 0 on success, or an error code otherwise + */ +int interconnect_del_provider(struct icp *icp) +{ + mutex_lock(&icp->lock); + if (icp->users) { + mutex_unlock(&icp->lock); + return -EBUSY; + } + mutex_unlock(&icp->lock); + + mutex_lock(&interconnect_provider_list_mutex); + list_del(&icp->icp_list); + mutex_unlock(&interconnect_provider_list_mutex); + + return 0; +} +EXPORT_SYMBOL_GPL(interconnect_del_provider); + +MODULE_AUTHOR("Georgi Djakov + +/** + * struct icp_ops - platform specific callback operations for interconnect + * providers that will be called from drivers + * + * @set: set constraints on interconnect + */ +struct icp_ops { + int (*set)(struct interconnect_node *src, struct interconnect_node *dst, + struct interconnect_creq *creq); +}; + +/** + * struct icp - interconnect provider (controller) entity that might + * provide multiple interconnect controls + * + * @icp_list: list of the registered interconnect providers + * @nodes: internal list of the interconnect provider nodes + * @ops: pointer to device specific struct icp_ops + * @dev: the device this interconnect provider belongs to + * @lock: a lock to protect creq and users + * @creq: the actual state of constraints for this interconnect provider + * @users: count of active users + * @data: pointer to private data + */ +struct icp { + struct list_head icp_list; + struct list_head nodes; + const struct icp_ops *ops; + struct device *dev; + struct mutex lock; + struct interconnect_creq creq; + int users; + void *data; +}; + +/** + * struct interconnect_node - entity that is part of the interconnect topology + * + * @links: links to other interconnect nodes + * @num_links: number of links to other interconnect nodes + * @icp: points to the interconnect provider of this node + * @icn_list: list of interconnect nodes + * @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 + * @creq: aggregated values of all constraint requests + * @dev_id: device id + * @con_id: connection id + */ +struct interconnect_node { + struct interconnect_node **links; + size_t num_links; + + struct icp *icp; + struct list_head icn_list; + struct list_head search_list; + struct interconnect_node *reverse; + bool is_traversed; + struct hlist_head req_list; + struct interconnect_creq creq; + + const char *dev_id; + int con_id; +}; + +/** + * struct interconnect_req - constraints that are attached to each node + * + * @req_node: the linked list node + * @node: the interconnect node to which this constraint applies + * @avg_bw: an integer describing the average bandwidth in kbps + * @peak_bw: an integer describing the peak bandwidth in kbps + */ +struct interconnect_req { + struct hlist_node req_node; + struct interconnect_node *node; + u32 avg_bw; + u32 peak_bw; +}; + +#if IS_ENABLED(CONFIG_INTERCONNECT) + +int interconnect_add_provider(struct icp *icp); +int interconnect_del_provider(struct icp *icp); + +#else + +static inline int interconnect_add_provider(struct icp *icp) +{ + return -ENOTSUPP; +} + +static inline int interconnect_del_provider(struct icp *icp) +{ + return -ENOTSUPP; +} + +#endif /* CONFIG_INTERCONNECT */ + +#endif /* _LINUX_INTERCONNECT_PROVIDER_H */ From patchwork Fri Sep 8 17:18:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Georgi Djakov X-Patchwork-Id: 112098 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp594087qgf; Fri, 8 Sep 2017 10:19:25 -0700 (PDT) X-Received: by 10.98.61.156 with SMTP id x28mr3842416pfj.295.1504891165770; Fri, 08 Sep 2017 10:19:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504891165; cv=none; d=google.com; s=arc-20160816; b=KRUGOxZNuQiMdj6+B+cboBQB0FIhDGDpkxve8WzYAMCdDLtJ738YPl9brl7hCnhrb/ iA8ClF1dZ7i5Hh2xGdHKsPkhIPyyHJh0DGTPr5mc7foqWkzACliUsfb/Ka2yeYAb4stc LeL7bCi2V7KurPeSa3fxyaBKir8b/PfmTSPXmT/z5oRh48jDdfXOqBaS2kh6hBJBsQn/ qEBLlphmiUj26dob1nFgCPUjiTj02gLXw7Vc8Lswo+E7NGAYjdS3z2lWpd4wWI9ej0B6 5jlip/eOkagYdQoB4y9+H2NCpxAUWb2QjX06igXymI/+RXcCG82UDmjkWLTLZag7EWE1 F0OQ== 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=9LoRUT3YfoM+KzkmrP2i5Wcn2IROejkFjrV1/imgC3g=; b=eTPWp8Zky/NgJNBKKraM3oU4ZdIyKseoCUovQjpaUB824iInYHWvKO2KmVhX6E6smm yF/ZKd5zGx38M+yB0GW3u+RHEPFHNJEJ1x/S7mGUL7x2TUgcshxQ89uQRhN90/Lxux6k x7Fxg3GXQBkoUkaeN3fHZFlIe/KLIB8mZwyv+3yzdDX2nFvwrQZHZn51uxiYHms+4P24 bqHZVFO5yD93enmZAP58bk+LcDphG6dvCRRBEk70c5POMcPx1xYqvQj8vTGnlclg+pNr +kT0EPyqjwuSVZg0YvvzFWRONUbjHJd/wIFQRqpJLnLi9SF8q2Lu+FWJbBDo0sm8Lbpe d0FA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JXGLju1L; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 l9si1788745pgn.541.2017.09.08.10.19.25; Fri, 08 Sep 2017 10:19:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=JXGLju1L; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 S1756702AbdIHRTV (ORCPT + 26 others); Fri, 8 Sep 2017 13:19:21 -0400 Received: from mail-wm0-f53.google.com ([74.125.82.53]:46400 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756685AbdIHRTP (ORCPT ); Fri, 8 Sep 2017 13:19:15 -0400 Received: by mail-wm0-f53.google.com with SMTP id i189so8622275wmf.1 for ; Fri, 08 Sep 2017 10:19:15 -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=9LoRUT3YfoM+KzkmrP2i5Wcn2IROejkFjrV1/imgC3g=; b=JXGLju1LvBdWZY6uzw7iv4RDEWFN6dZnbTSX9lFaK4wOF7UdodFJ00ILJjQRgXr3dT FqAMC2f6xd43JV5rWIhuUkZOoyeY7pdjdimvs9xPP4N3VQ33arwV4jJ75oxvsqEuFfzY 9zA6sgyv+5yPaFakjiPUNhD6trR+343pHkhcc= 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=9LoRUT3YfoM+KzkmrP2i5Wcn2IROejkFjrV1/imgC3g=; b=WaL6Z2rvLl9S9JC5vwK+KprHJ4ohEnMU+thW4XHKNHLTrcq0n20BGURqszxl14u7Zc XfI8nGGkGRfb9VRZ2Ylg2kXnnBb6n91uDAuLPVpWxtWH/zDWOxpnUDqmQLVZn5YbODpq QKP++8L62OJA4JMYh0/Ij8Hnmwv1YVzwDIu9bM7kkkOTbx7sc1kVtLi4vz/YoUNa41Bz 9/hk+z1LY1XdRiP/QoGrB7r3qbbVlzOEzbvXU/VM+Pyygl3EfihBMa+1prTxZ69/c6nx p7+HzaZkqBpANiZtYKFf12jgeNpf3B12jFytrnVcwvZUs564T4RLXLPixOVfxW3Dyuvo WHuQ== X-Gm-Message-State: AHPjjUjmeWFQzq6RNbf4vDZJT6yNz/EJSaCJRAlt1wcg1lPT12z7Ov3q zTu9ODKxHQDyilCN X-Google-Smtp-Source: ADKCNb6yV8aXcHg5g6vAH+XGiM5JFwV2TTB4bEFmDRDNHss8Qs7Qe/scLrzd73f9yydZ0WVyAacE6w== X-Received: by 10.80.150.196 with SMTP id z4mr2704580eda.161.1504891154552; Fri, 08 Sep 2017 10:19:14 -0700 (PDT) Received: from mms-0441.qualcomm.mm-sol.com ([212.45.67.2]) by smtp.googlemail.com with ESMTPSA id i6sm865817edk.45.2017.09.08.10.19.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Sep 2017 10:19:13 -0700 (PDT) From: Georgi Djakov To: linux-pm@vger.kernel.org, gregkh@linuxfoundation.org Cc: rjw@rjwysocki.net, robh+dt@kernel.org, khilman@baylibre.com, mturquette@baylibre.com, vincent.guittot@linaro.org, skannan@codeaurora.org, sboyd@codeaurora.org, andy.gross@linaro.org, seansw@qti.qualcomm.com, davidai@quicinc.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, mark.rutland@arm.com, lorenzo.pieralisi@arm.com, georgi.djakov@linaro.org, Steven Rostedt , Ingo Molnar Subject: [RFC v3 2/3] interconnect: Add basic event tracing Date: Fri, 8 Sep 2017 20:18:29 +0300 Message-Id: <20170908171830.13813-3-georgi.djakov@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170908171830.13813-1-georgi.djakov@linaro.org> References: <20170908171830.13813-1-georgi.djakov@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add basic tracepoints in interconnect_set() so we can trace the performance and the operations which configure the hardware. Signed-off-by: Georgi Djakov Cc: Steven Rostedt Cc: Ingo Molnar --- drivers/interconnect/interconnect.c | 7 ++++++ include/trace/events/interconnect.h | 45 +++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 include/trace/events/interconnect.h diff --git a/drivers/interconnect/interconnect.c b/drivers/interconnect/interconnect.c index 94e2a9f01545..4a016f3bedc3 100644 --- a/drivers/interconnect/interconnect.c +++ b/drivers/interconnect/interconnect.c @@ -33,6 +33,9 @@ struct interconnect_path { struct interconnect_req reqs[0]; }; +#define CREATE_TRACE_POINTS +#include + static struct interconnect_node *node_find(const char *dev_id, int con_id) { struct interconnect_node *node = ERR_PTR(-EPROBE_DEFER); @@ -209,6 +212,8 @@ int interconnect_set(struct interconnect_path *path, size_t i; int ret = 0; + trace_interconnect_set(path); + for (i = 0; i < path->num_nodes; i++, prev = next) { next = path->reqs[i].node; @@ -242,6 +247,8 @@ int interconnect_set(struct interconnect_path *path, } out: + trace_interconnect_set_complete(path); + return ret; } diff --git a/include/trace/events/interconnect.h b/include/trace/events/interconnect.h new file mode 100644 index 000000000000..c4a72163873c --- /dev/null +++ b/include/trace/events/interconnect.h @@ -0,0 +1,45 @@ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM interconnect + +#if !defined(_TRACE_INTERCONNECT_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_INTERCONNECT_H + +#include + +struct interconnect_path; + +DECLARE_EVENT_CLASS(interconnect_path, + + TP_PROTO(struct interconnect_path *path), + + TP_ARGS(path), + + TP_STRUCT__entry( + __field(struct interconnect_path *, path) + ), + + TP_fast_assign( + __entry->path = path; + ), + + TP_printk("INTERCONNECT: %p", __entry->path) +); + +DEFINE_EVENT(interconnect_path, interconnect_set, + + TP_PROTO(struct interconnect_path *path), + + TP_ARGS(path) +); + +DEFINE_EVENT(interconnect_path, interconnect_set_complete, + + TP_PROTO(struct interconnect_path *path), + + TP_ARGS(path) +); + +#endif /* _TRACE_INTERCONNECT_H */ + +/* This part must be outside protection */ +#include From patchwork Fri Sep 8 17:18:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Georgi Djakov X-Patchwork-Id: 112099 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp594159qgf; Fri, 8 Sep 2017 10:19:29 -0700 (PDT) X-Received: by 10.84.129.131 with SMTP id b3mr4307672plb.337.1504891168946; Fri, 08 Sep 2017 10:19:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504891168; cv=none; d=google.com; s=arc-20160816; b=dsy5scjd3I/VTne7/wAA2dWXeHyhZrG5z7YeWzYThvR4WTcDOsSbQ57FhGr94YOa+d L9jjkuiWNjY0A/beYk1wroy6UommmFcUDq6gjlIX/ewV+OFS922h983HF3QOBZjWMknV MOPXC7Gi+rAoLhBCyvqWqHuhSV8LPczVdflmsuj9QbRIHzUPX2sJHJi09mKRsebpK34X x0MpPKfenxlgakrLVC7Beb1/B+WbIOAMbhibJtHnvfgGnKd4QzdI8tkPDhjISJNYJhpZ bC9QqX9h/4m4ZWIT82SNTpb7YPi7JMdlkRI6TazmWKlTTSUZZ/LN0gcJAx5m0ENl9M4l ZB6w== 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=unwI8UZRplVtFWTUKvCmfGT/eNSzrJEbgCe69jAnpf4=; b=udpQv7DEsZvCbSKnFJy8u2+VnNjf2/1iMsJeIs9AWYu5EUPngvfyEA1U/MxN/QBiVD ECEcNsFWpuL8nbmz+ZPryn1duSpVHK8obbSZNiLErFcfoponJHFwMq3CuMbqbY/BZDLw ItN2exQmDoydw3zyhLTKxdD0u6O19wgPAy0NXZiSdRhJ/Q7jgpflMKh422A1KTktH+IF aYeZOUU3I2rMrbR4ertKk6i8xWSAD1bcUeVQRn2PwzqJhkvOpYb5Lyt0ek3MJDMAR1g6 RbNyaWYTXkZxduGd5HVk/reR+XCPBIe5Q1oHENliq2T5166K9f2xmJyTenBt86XCHsB5 NGtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=c0Q9rzuo; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 l9si1788745pgn.541.2017.09.08.10.19.28; Fri, 08 Sep 2017 10:19:28 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=c0Q9rzuo; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 S1756721AbdIHRT0 (ORCPT + 26 others); Fri, 8 Sep 2017 13:19:26 -0400 Received: from mail-wm0-f52.google.com ([74.125.82.52]:46467 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756703AbdIHRTW (ORCPT ); Fri, 8 Sep 2017 13:19:22 -0400 Received: by mail-wm0-f52.google.com with SMTP id i189so8623730wmf.1 for ; Fri, 08 Sep 2017 10:19:21 -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=unwI8UZRplVtFWTUKvCmfGT/eNSzrJEbgCe69jAnpf4=; b=c0Q9rzuoz5pcjOZ2oUbIJVjgvvlxv/7DqadbWqq7BZoKPktlClbwrdLmnJGHD1wV5W Yg/L5ulxHNIG9PThhpKaMlwS6yusscJVurrI76w0BESrbRLTuT8NbDoRXfc3olcPAhra eSKjpnnSEjoL2Wx8RD+rJEF15SjgSj7/6uJVE= 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=unwI8UZRplVtFWTUKvCmfGT/eNSzrJEbgCe69jAnpf4=; b=CBPKBY9zVYaBAQxqKzgf+uiGvGZZ4mb61l99wAxj2b7K1XeteVypKRXwjAm3hqQ0DR wPoA3VgmEFVQOvM//egz7qNbLChwSCVTEKM+ZMLK5dkSvqxCitXM0AcWE69fEYTjL8UB 6M3sBNpINYVw2fnEM1Ih8rQhZ0aHDWpv91q/TrIXcGcdZvS9N/fytvkMYcLNGKJe/IVg sa33yQErBG90Ue3+zkbgoJehiYgQMtjeCtnnj44cCfFehdNFRGi8YLOtr1nE0giV23Vr aEpRquycabReTTC9lEwCH8h2DrqRiow3UdEMIuNj+CntC1796Y0YO5q0mTDrAfHFq/RX ohPA== X-Gm-Message-State: AHPjjUiDhO/HpKuGYg2MjdIze2R8RB8w3oUmepkMTHSOAZ0IafuoIcgE KnvQ8lWXN6DA5x+l X-Google-Smtp-Source: ADKCNb5Gg5XTGhHtih81DCxyzieuq0NVeagRA14O4jT6na4EG9PhmRdqIuo6OpkuFk2G+SRnStIchg== X-Received: by 10.80.219.203 with SMTP id s11mr2723523edk.84.1504891161068; Fri, 08 Sep 2017 10:19:21 -0700 (PDT) Received: from mms-0441.qualcomm.mm-sol.com ([212.45.67.2]) by smtp.googlemail.com with ESMTPSA id i6sm865817edk.45.2017.09.08.10.19.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Sep 2017 10:19:20 -0700 (PDT) From: Georgi Djakov To: linux-pm@vger.kernel.org, gregkh@linuxfoundation.org Cc: rjw@rjwysocki.net, robh+dt@kernel.org, khilman@baylibre.com, mturquette@baylibre.com, vincent.guittot@linaro.org, skannan@codeaurora.org, sboyd@codeaurora.org, andy.gross@linaro.org, seansw@qti.qualcomm.com, davidai@quicinc.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, mark.rutland@arm.com, lorenzo.pieralisi@arm.com, georgi.djakov@linaro.org Subject: [PATCH v3 3/3] interconnect: Add Qualcomm msm8916 interconnect provider driver Date: Fri, 8 Sep 2017 20:18:30 +0300 Message-Id: <20170908171830.13813-4-georgi.djakov@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170908171830.13813-1-georgi.djakov@linaro.org> References: <20170908171830.13813-1-georgi.djakov@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add driver for the Qualcomm interconnect buses found in msm8916 based platforms. This patch contains only a partial topology to make reviewing easier. Signed-off-by: Georgi Djakov --- drivers/interconnect/Kconfig | 5 + drivers/interconnect/Makefile | 1 + drivers/interconnect/qcom/Kconfig | 11 + drivers/interconnect/qcom/Makefile | 1 + drivers/interconnect/qcom/interconnect_msm8916.c | 375 +++++++++++++++++++++++ include/linux/interconnect/qcom-msm8916.h | 92 ++++++ 6 files changed, 485 insertions(+) create mode 100644 drivers/interconnect/qcom/Kconfig create mode 100644 drivers/interconnect/qcom/Makefile create mode 100644 drivers/interconnect/qcom/interconnect_msm8916.c create mode 100644 include/linux/interconnect/qcom-msm8916.h diff --git a/drivers/interconnect/Kconfig b/drivers/interconnect/Kconfig index 1e50e951cdc1..b123a76e2f9d 100644 --- a/drivers/interconnect/Kconfig +++ b/drivers/interconnect/Kconfig @@ -8,3 +8,8 @@ menuconfig INTERCONNECT If unsure, say no. +if INTERCONNECT + +source "drivers/interconnect/qcom/Kconfig" + +endif diff --git a/drivers/interconnect/Makefile b/drivers/interconnect/Makefile index d9da6a6c3560..62a01de24aeb 100644 --- a/drivers/interconnect/Makefile +++ b/drivers/interconnect/Makefile @@ -1 +1,2 @@ obj-$(CONFIG_INTERCONNECT) += interconnect.o +obj-$(CONFIG_INTERCONNECT_QCOM) += qcom/ diff --git a/drivers/interconnect/qcom/Kconfig b/drivers/interconnect/qcom/Kconfig new file mode 100644 index 000000000000..86465dc37bd4 --- /dev/null +++ b/drivers/interconnect/qcom/Kconfig @@ -0,0 +1,11 @@ +config INTERCONNECT_QCOM + bool "Qualcomm Network-on-Chip interconnect drivers" + depends on INTERCONNECT + depends on ARCH_QCOM || COMPILE_TEST + default y + +config INTERCONNECT_QCOM_MSM8916 + tristate "Qualcomm MSM8916 interconnect driver" + depends on INTERCONNECT_QCOM + help + This is a driver for the Qualcomm Network-on-Chip on msm8916-based platforms. diff --git a/drivers/interconnect/qcom/Makefile b/drivers/interconnect/qcom/Makefile new file mode 100644 index 000000000000..0831080e1100 --- /dev/null +++ b/drivers/interconnect/qcom/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_INTERCONNECT_QCOM_MSM8916) += interconnect_msm8916.o diff --git a/drivers/interconnect/qcom/interconnect_msm8916.c b/drivers/interconnect/qcom/interconnect_msm8916.c new file mode 100644 index 000000000000..9b001e100974 --- /dev/null +++ b/drivers/interconnect/qcom/interconnect_msm8916.c @@ -0,0 +1,375 @@ +/* + * Copyright (C) 2017 Linaro Ltd + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define to_qcom_icp(_icp) \ + container_of(_icp, struct qcom_interconnect_provider, icp) +#define to_qcom_node(_node) \ + container_of(_node, struct qcom_interconnect_node, node) + +enum qcom_bus_type { + QCOM_BUS_TYPE_NOC = 0, + QCOM_BUS_TYPE_MEM, +}; + +struct qcom_interconnect_provider { + struct icp icp; + void __iomem *base; + struct clk *bus_clk; + struct clk *bus_a_clk; + u32 base_offset; + u32 qos_offset; + enum qcom_bus_type type; +}; + +struct qcom_interconnect_node { + struct interconnect_node node; + unsigned char *name; + struct interconnect_node *links[8]; + u16 id; + u16 num_links; + u16 port; + u16 buswidth; + u64 rate; +}; + +static struct qcom_interconnect_node snoc_int_0; +static struct qcom_interconnect_node snoc_int_1; +static struct qcom_interconnect_node snoc_int_bimc; +static struct qcom_interconnect_node snoc_bimc_0_mas; +static struct qcom_interconnect_node pnoc_snoc_slv; + +static struct qcom_interconnect_node snoc_bimc_0_slv; +static struct qcom_interconnect_node slv_ebi_ch0; + +static struct qcom_interconnect_node pnoc_int_1; +static struct qcom_interconnect_node mas_pnoc_sdcc_1; +static struct qcom_interconnect_node mas_pnoc_sdcc_2; +static struct qcom_interconnect_node pnoc_snoc_mas; + +struct qcom_interconnect_desc { + struct qcom_interconnect_node **nodes; + size_t num_nodes; +}; + +static struct qcom_interconnect_node snoc_int_0 = { + .id = 10004, + .name = "snoc-int-0", +#if 0 + .links = { &snoc_pnoc_mas.node }, + .num_links = 1, +#endif + .buswidth = 8, +}; + +static struct qcom_interconnect_node snoc_int_1 = { + .id = 10005, + .name = "snoc-int-1", +#if 0 + .links = { &slv_apss.node, &slv_cats_0.node, &slv_cats_1.node }, + .num_links = 3, +#endif + .buswidth = 8, +}; + +static struct qcom_interconnect_node snoc_int_bimc = { + .id = 10006, + .name = "snoc-bimc", + .links = { &snoc_bimc_0_mas.node }, + .num_links = 1, + .buswidth = 8, +}; + +static struct qcom_interconnect_node snoc_bimc_0_mas = { + .id = 10007, + .name = "snoc-bimc-0-mas", + .links = { &snoc_bimc_0_slv.node }, + .num_links = 1, + .buswidth = 8, +}; + +static struct qcom_interconnect_node pnoc_snoc_slv = { + .id = 10011, + .name = "snoc-pnoc", + .links = { &snoc_int_0.node, &snoc_int_bimc.node, &snoc_int_1.node }, + .num_links = 3, + .buswidth = 8, +}; + +static struct qcom_interconnect_node *msm8916_snoc_nodes[] = { + [SNOC_INT_0] = &snoc_int_0, + [SNOC_INT_1] = &snoc_int_1, + [SNOC_INT_BIMC] = &snoc_int_bimc, + [SNOC_BIMC_0_MAS] = &snoc_bimc_0_mas, + [PNOC_SNOC_SLV] = &pnoc_snoc_slv, +}; + +static struct qcom_interconnect_desc msm8916_snoc = { + .nodes = msm8916_snoc_nodes, + .num_nodes = ARRAY_SIZE(msm8916_snoc_nodes), +}; + +static struct qcom_interconnect_node snoc_bimc_0_slv = { + .id = 10025, + .name = "snoc_bimc_0_slv", + .links = { &slv_ebi_ch0.node }, + .num_links = 1, + .buswidth = 8, +}; + +static struct qcom_interconnect_node slv_ebi_ch0 = { + .id = 512, + .name = "slv-ebi-ch0", + .buswidth = 8, +}; + +static struct qcom_interconnect_node *msm8916_bimc_nodes[] = { + [SNOC_BIMC_0_SLV] = &snoc_bimc_0_slv, + [SLV_EBI_CH0] = &slv_ebi_ch0, +}; + +static struct qcom_interconnect_desc msm8916_bimc = { + .nodes = msm8916_bimc_nodes, + .num_nodes = ARRAY_SIZE(msm8916_bimc_nodes), +}; + +static struct qcom_interconnect_node pnoc_int_1 = { + .id = 10013, + .name = "pnoc-int-1", + .links = { &pnoc_snoc_mas.node }, + .num_links = 1, + .buswidth = 8, +}; + +static struct qcom_interconnect_node mas_pnoc_sdcc_1 = { + .id = 78, + .name = "mas-pnoc-sdcc-1", + .links = { &pnoc_int_1.node }, + .num_links = 1, + .port = 7, + .buswidth = 8, +}; + +static struct qcom_interconnect_node mas_pnoc_sdcc_2 = { + .id = 81, + .name = "mas-pnoc-sdcc-2", + .links = { &pnoc_int_1.node }, + .num_links = 1, + .port = 8, + .buswidth = 8, +}; + +static struct qcom_interconnect_node pnoc_snoc_mas = { + .id = 10010, + .name = "pnoc-snoc-mas", + .links = { &pnoc_snoc_slv.node }, + .num_links = 1, + .buswidth = 8, +}; + +static struct qcom_interconnect_node *msm8916_pnoc_nodes[] = { + [PNOC_INT_1] = &pnoc_int_1, + [MAS_PNOC_SDCC_1] = &mas_pnoc_sdcc_1, + [MAS_PNOC_SDCC_2] = &mas_pnoc_sdcc_2, + [PNOC_SNOC_MAS] = &pnoc_snoc_mas, +}; + +static struct qcom_interconnect_desc msm8916_pnoc = { + .nodes = msm8916_pnoc_nodes, + .num_nodes = ARRAY_SIZE(msm8916_pnoc_nodes), +}; + +static int qcom_interconnect_init(struct interconnect_node *node) +{ + struct qcom_interconnect_node *qn = to_qcom_node(node); + + /* populate default values */ + if (!qn->buswidth) + qn->buswidth = 8; + + /* TODO: init qos and priority */ + + return 0; +} + +static int qcom_interconnect_set(struct interconnect_node *src, + struct interconnect_node *dst, + struct interconnect_creq *creq) +{ + struct qcom_interconnect_provider *qicp; + struct qcom_interconnect_node *qn; + struct interconnect_node *node; + struct icp *icp; + u64 rate = 0; + int ret = 0; + + if (!src && !dst) + return -ENODEV; + + if (!src) + node = dst; + else + node = src; + + qn = to_qcom_node(node); + icp = qn->node.icp; + qicp = to_qcom_icp(node->icp); + + rate = max(icp->creq.avg_bw, icp->creq.peak_bw); + + do_div(rate, qn->buswidth); + + if (qn->rate != rate) { + ret = clk_set_rate(qicp->bus_clk, rate); + if (ret) { + pr_err("set clk rate %lld error %d\n", rate, ret); + return ret; + } + + ret = clk_set_rate(qicp->bus_a_clk, rate); + if (ret) { + pr_err("set clk rate %lld error %d\n", rate, ret); + return ret; + } + + qn->rate = rate; + } + + return ret; +} + +struct interconnect_onecell_data { + struct interconnect_node **nodes; + unsigned int num_nodes; +}; + +static const struct icp_ops qcom_ops = { + .set = qcom_interconnect_set, +}; + +static int qnoc_probe(struct platform_device *pdev) +{ + struct qcom_interconnect_provider *qicp; + struct icp *icp; + struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; + struct resource *res; + void __iomem *base; + struct clk *bus_clk, *bus_a_clk; + size_t num_nodes, i; + const struct qcom_interconnect_desc *desc; + struct qcom_interconnect_node **qnodes; + u32 type, base_offset, qos_offset; + + desc = of_device_get_match_data(&pdev->dev); + if (!desc) + return -EINVAL; + + qnodes = desc->nodes; + num_nodes = desc->num_nodes; + + qicp = devm_kzalloc(dev, sizeof(*qicp), GFP_KERNEL); + if (!qicp) + return -ENOMEM; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + base = devm_ioremap_resource(dev, res); + if (IS_ERR(base)) + return PTR_ERR(base); + + bus_clk = devm_clk_get(&pdev->dev, "bus_clk"); + if (IS_ERR(bus_clk)) + return PTR_ERR(bus_clk); + bus_a_clk = devm_clk_get(&pdev->dev, "bus_a_clk"); + if (IS_ERR(bus_a_clk)) + return PTR_ERR(bus_a_clk); + + of_property_read_u32(np, "type", &type); + of_property_read_u32(np, "base-offset", &base_offset); + of_property_read_u32(np, "qos-offset", &qos_offset); + + qicp->base = base; + qicp->type = type; + qicp->base_offset = base_offset; + qicp->qos_offset = qos_offset; + qicp->bus_clk = bus_clk; + qicp->bus_a_clk = bus_a_clk; + icp = &qicp->icp; + icp->dev = dev; + icp->ops = &qcom_ops; + INIT_LIST_HEAD(&icp->nodes); + + for (i = 0; i < num_nodes; i++) { + struct interconnect_node *node; + int ret; + size_t j; + + if (!qnodes[i]) + continue; + + node = &qnodes[i]->node; + node->dev_id = kstrdup_const(qnodes[i]->name, GFP_KERNEL); + node->con_id = qnodes[i]->id; + node->icp = icp; + node->num_links = qnodes[i]->num_links; + node->links = devm_kcalloc(dev, node->num_links, + sizeof(*node->links), GFP_KERNEL); + if (!node->links) + return -ENOMEM; + + /* populate links */ + for (j = 0; j < node->num_links; j++) + node->links[j] = qnodes[i]->links[j]; + + /* add the node to interconnect provider */ + list_add_tail(&node->icn_list, &icp->nodes); + dev_dbg(&pdev->dev, "registered node %p %s %d\n", node, + node->dev_id, node->con_id); + + ret = qcom_interconnect_init(node); + if (ret) + dev_err(&pdev->dev, "node init error (%d)\n", ret); + } + + return interconnect_add_provider(icp); +} + +static const struct of_device_id qnoc_of_match[] = { + { .compatible = "qcom,msm8916-pnoc", .data = &msm8916_pnoc }, + { .compatible = "qcom,msm8916-snoc", .data = &msm8916_snoc }, + { .compatible = "qcom,msm8916-bimc", .data = &msm8916_bimc }, + { }, +}; +MODULE_DEVICE_TABLE(of, qnoc_of_match); + +static struct platform_driver qnoc_driver = { + .probe = qnoc_probe, + .driver = { + .name = "qnoc-msm8916", + .of_match_table = qnoc_of_match, + }, +}; +module_platform_driver(qnoc_driver); +MODULE_AUTHOR("Georgi Djakov "); +MODULE_DESCRIPTION("Qualcomm msm8916 NoC driver"); +MODULE_LICENSE("GPL v2"); diff --git a/include/linux/interconnect/qcom-msm8916.h b/include/linux/interconnect/qcom-msm8916.h new file mode 100644 index 000000000000..355582a09bea --- /dev/null +++ b/include/linux/interconnect/qcom-msm8916.h @@ -0,0 +1,92 @@ +#ifndef __LINUX_INTERCONNECT_QCOM_NOC_H +#define __LINUX_INTERCONNECT_QCOM_NOC_H + +#define MAS_VIDEO 0 +#define MAS_JPEG 1 +#define MAS_VFE 2 +#define MAS_MDP 3 +#define MAS_QDSS_BAM 4 +#define MAS_SNOC_CFG 5 +#define MAS_QDSS_ETR 6 +#define MM_INT_0 7 +#define MM_INT_1 8 +#define MM_INT_2 9 +#define MM_INT_BIMC 10 +#define SNOC_INT_0 11 +#define SNOC_INT_1 12 +#define SNOC_INT_BIMC 13 +#define SNOC_BIMC_0_MAS 14 +#define SNOC_BIMC_1_MAS 15 +#define QDSS_INT 16 +#define BIMC_SNOC_SLV 17 +#define SNOC_PNOC_MAS 18 +#define PNOC_SNOC_SLV 19 +#define SLV_SRVC_SNOC 20 +#define SLV_QDSS_STM 21 +#define SLV_IMEM 22 +#define SLV_APSS 23 +#define SLV_CATS_0 24 +#define SLV_CATS_1 25 + +#define MAS_APPS 0 +#define MAS_TCU0 1 +#define MAS_TCU1 2 +#define MAS_GFX 3 +#define BIMC_SNOC_MAS 4 +#define SNOC_BIMC_0_SLV 5 +#define SNOC_BIMC_1_SLV 6 +#define SLV_EBI_CH0 7 +#define SLV_APPS_L2 8 + +#define SNOC_PNOC_SLV 0 +#define PNOC_INT_0 1 +#define PNOC_INT_1 2 +#define PNOC_M_0 3 +#define PNOC_M_1 4 +#define PNOC_S_0 5 +#define PNOC_S_1 6 +#define PNOC_S_2 7 +#define PNOC_S_3 8 +#define PNOC_S_4 9 +#define PNOC_S_8 10 +#define PNOC_S_9 11 +#define SLV_IMEM_CFG 12 +#define SLV_CRYPTO_0_CFG 13 +#define SLV_MSG_RAM 14 +#define SLV_PDM 15 +#define SLV_PRNG 16 +#define SLV_CLK_CTL 17 +#define SLV_MSS 18 +#define SLV_TLMM 19 +#define SLV_TCSR 20 +#define SLV_SECURITY 21 +#define SLV_SPDM 22 +#define SLV_PNOC_CFG 23 +#define SLV_PMIC_ARB 24 +#define SLV_BIMC_CFG 25 +#define SLV_BOOT_ROM 26 +#define SLV_MPM 27 +#define SLV_QDSS_CFG 28 +#define SLV_RBCPR_CFG 29 +#define SLV_SNOC_CFG 30 +#define SLV_DEHR_CFG 31 +#define SLV_VENUS_CFG 32 +#define SLV_DISPLAY_CFG 33 +#define SLV_CAMERA_CFG 34 +#define SLV_USB_HS 35 +#define SLV_SDCC_1 36 +#define SLV_BLSP_1 37 +#define SLV_SDCC_2 38 +#define SLV_GFX_CFG 39 +#define SLV_AUDIO 40 +#define MAS_BLSP_1 41 +#define MAS_SPDM 42 +#define MAS_DEHR 43 +#define MAS_AUDIO 44 +#define MAS_USB_HS 45 +#define MAS_PNOC_CRYPTO_0 46 +#define MAS_PNOC_SDCC_1 47 +#define MAS_PNOC_SDCC_2 48 +#define PNOC_SNOC_MAS 49 + +#endif