From patchwork Fri Feb 8 17:21:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Georgi Djakov X-Patchwork-Id: 157863 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2204743jaa; Fri, 8 Feb 2019 09:22:07 -0800 (PST) X-Google-Smtp-Source: AHgI3IaBn1T14q+N0erdZe0RW96Kb46ZT6e6B0d1A2uA/Mlhi3OkZ12JwYc20CCJE96+VLxUpBnZ X-Received: by 2002:a63:194f:: with SMTP id 15mr16783621pgz.192.1549646527066; Fri, 08 Feb 2019 09:22:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549646527; cv=none; d=google.com; s=arc-20160816; b=yy89gHloJ0JbfvamMgrDXd1vN7Peaa/KqsipLQV+D/yYDn0tNLWyztPT6SzN0dCfD5 urR/7sFNAd8MTilsj5VuXMFzbb2rQ6DL/N7A2OLGPN8i/0df3uEK8tucpzMdHR84axbH YDeMCyWjKH0pUxyTT7+IcTDcVj5WgWe9U7iKs1qVnXgmeyvYL7tl6PZM3nem/ILL2lv5 pEyOT8Bx7PUc4gynK/lLNF12sTPJ7k/+Cw4vsgJAAD0fNbyK5ekhLaqM9vxLq6GZEW5D ApONOUyBd7jUlO2YzyR6s5h2QQUK3OUabMnfPc+ZbO5IMr/yCezcxbY+MLBSEt1dRw54 tQlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=51b5idztAmsBLdKrAGRyeDKLK40XaiNredOFEPB/oqc=; b=stxSP9/Q8rDRpY4WrGPcugB7EFgyD9AsJZAgrRS3HBPYXIhuWV5kOWcmA5WdlQDBo5 IXso9YJgbNLRPJzpgordUWmZC5RuQehLcjv5r/YASvvgLkVMU1Oeie7hVbzdQWRusqGF 9bXsQ6cYmTibMZ/GvJkm5dnnrTEi52Soa8IBK0nTpa5dGQsm/BP2glguOt5/bgeTFq4i m3CIcPSmtG6XBs6Gsh8ylyxAUOWSR7i8a0ettcMOaPw0D5AFhGtkoBDgzV2eRAVV5Cu6 TiR8eteVYAd7bnwUz+RnGizEx7v8N1VwTn3EIIceUOy5XGLk9MHFAjPmfD1/0x2Pjjxk onyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xi0qgQmk; 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 l1si2449415pgq.157.2019.02.08.09.22.05; Fri, 08 Feb 2019 09:22:07 -0800 (PST) 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=xi0qgQmk; 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 S1727794AbfBHRV7 (ORCPT + 11 others); Fri, 8 Feb 2019 12:21:59 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:55776 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726522AbfBHRV6 (ORCPT ); Fri, 8 Feb 2019 12:21:58 -0500 Received: by mail-wm1-f68.google.com with SMTP id r17so4230589wmh.5 for ; Fri, 08 Feb 2019 09:21:57 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=51b5idztAmsBLdKrAGRyeDKLK40XaiNredOFEPB/oqc=; b=xi0qgQmkanzf5BVr+xvxJi2kcVeiXtOfM9/vbQzwle5ocH36VmOTP4v43q+2unVzH9 iqIkAgrwG2Cvx6JSqw3zVH0QQgpjqZEDpSTGEJPf+ImxTrMO+t8UMzLy7864zKm/7U83 ql4rY1U3QoYrOBLH5nLHUuF0FB8KL5jx/NYgDZ8xCKjw6s0A3zVuFBXAGaCTGVHK+R8b p/gFNDtqmlcvGgJ2/Vh5+jOuw8kQ4kHScTXlXpfmV1cpBc97IW9FW0ZynmEKq3MUB0XP wO5079nKJ8ogoU9ZolG3wndPJJiPfRZmBG2YpLmPdaNjLVgi8WoQDQQdqPBgvfASYCHq 7B/A== 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:mime-version:content-transfer-encoding; bh=51b5idztAmsBLdKrAGRyeDKLK40XaiNredOFEPB/oqc=; b=frmHwQ5OgRhJayIwt8e2DjyHfoeJM6aE/xyMldlioqSX3cg+Ce78gXkSIEg4tMb+LA AU0bq8kNX60hA8RVFpTJ7hPmt4ZwNu/JNTgX0D5HWln5XoZdzfRh8em+22Y3Mr9fDvuw +7JguxfNwls96dtmx1d4VV2mJpCLVhr3oIGiiubG1nqDpCBrmuqwDfvVLi91kSRaf9HP EA2xgY8QufffsWN2IqdY9stnl36KVrpZW/nkucC44adn8dXSlT/oLekIeV/+CjFZEWOc ++pyUPtVB0lBbop53WcjL2cP/ASjKC2qFyErF/A94+RmBBHQ6k7Vhq1U6EMq6I14AQRh AjHA== X-Gm-Message-State: AHQUAubhlx12myKTslbOX6y279EAIK6XBbX388Z7enVecVJD92TT1eAl n5fRZQdFtJ4zxfsHOeRu1jX0Lm0jjpo= X-Received: by 2002:adf:fe43:: with SMTP id m3mr16904061wrs.290.1549646516529; Fri, 08 Feb 2019 09:21:56 -0800 (PST) Received: from localhost.localdomain ([212.45.67.2]) by smtp.googlemail.com with ESMTPSA id k23sm4097150wmj.32.2019.02.08.09.21.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Feb 2019 09:21:55 -0800 (PST) From: Georgi Djakov To: linux-pm@vger.kernel.org Cc: daidavid1@codeaurora.org, vincent.guittot@linaro.org, bjorn.andersson@linaro.org, amit.kucheria@linaro.org, evgreen@chromium.org, dianders@chromium.org, seansw@qti.qualcomm.com, mturquette@baylibre.com, abailon@baylibre.com, thierry.reding@gmail.com, ksitaraman@nvidia.com, sanjayc@nvidia.com, henryc.chen@mediatek.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, georgi.djakov@linaro.org Subject: [PATCH v1 1/2] interconnect: Add support for path tags Date: Fri, 8 Feb 2019 19:21:51 +0200 Message-Id: <20190208172152.1807-2-georgi.djakov@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190208172152.1807-1-georgi.djakov@linaro.org> References: <20190208172152.1807-1-georgi.djakov@linaro.org> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Consumers may have use cases with different bandwidth requirements based on the system or driver state. The consumer driver can append a specific tag to the path and pass this information to the interconnect platform driver to do the aggregation based on this state. Introduce icc_set_tag() function that will allow the consumers to append an optional tag to each path. The aggregation of these tagged paths is platform specific. Signed-off-by: Georgi Djakov --- drivers/interconnect/core.c | 27 +++++++++++++++++++++++---- drivers/interconnect/qcom/sdm845.c | 2 +- include/linux/interconnect-provider.h | 4 ++-- include/linux/interconnect.h | 5 +++++ 4 files changed, 31 insertions(+), 7 deletions(-) diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c index 6005a1c189f6..31eacd0f5349 100644 --- a/drivers/interconnect/core.c +++ b/drivers/interconnect/core.c @@ -42,10 +42,12 @@ struct icc_req { /** * struct icc_path - interconnect path structure + * @tag: path tag (optional) * @num_nodes: number of hops (nodes) * @reqs: array of the requests applicable to this path of nodes */ struct icc_path { + u32 tag; size_t num_nodes; struct icc_req reqs[]; }; @@ -206,7 +208,7 @@ static struct icc_path *path_find(struct device *dev, struct icc_node *src, * implementing its own aggregate() function. */ -static int aggregate_requests(struct icc_node *node) +static int aggregate_requests(struct icc_node *node, u32 tag) { struct icc_provider *p = node->provider; struct icc_req *r; @@ -215,7 +217,7 @@ static int aggregate_requests(struct icc_node *node) node->peak_bw = 0; hlist_for_each_entry(r, &node->req_list, req_node) - p->aggregate(node, r->avg_bw, r->peak_bw, + p->aggregate(node, tag, r->avg_bw, r->peak_bw, &node->avg_bw, &node->peak_bw); return 0; @@ -396,6 +398,23 @@ struct icc_path *of_icc_get(struct device *dev, const char *name) } EXPORT_SYMBOL_GPL(of_icc_get); +/** + * icc_set_tag() - set an optional tag on a path + * @path: the path we want to tag + * @tag: the tag value + * + * This function allows consumers to append a tag to the path, so that a + * different aggregation could be done based on this tag. + */ +void icc_set_tag(struct icc_path *path, u32 tag) +{ + if (!path) + return; + + path->tag = tag; +} +EXPORT_SYMBOL_GPL(icc_set_tag); + /** * icc_set_bw() - set bandwidth constraints on an interconnect path * @path: reference to the path returned by icc_get() @@ -434,7 +453,7 @@ int icc_set_bw(struct icc_path *path, u32 avg_bw, u32 peak_bw) path->reqs[i].peak_bw = peak_bw; /* aggregate requests for this node */ - aggregate_requests(node); + aggregate_requests(node, path->tag); } ret = apply_constraints(path); @@ -446,7 +465,7 @@ int icc_set_bw(struct icc_path *path, u32 avg_bw, u32 peak_bw) node = path->reqs[i].node; path->reqs[i].avg_bw = old_avg; path->reqs[i].peak_bw = old_peak; - aggregate_requests(node); + aggregate_requests(node, path->tag); } apply_constraints(path); } diff --git a/drivers/interconnect/qcom/sdm845.c b/drivers/interconnect/qcom/sdm845.c index 4915b78da673..fb526004c82e 100644 --- a/drivers/interconnect/qcom/sdm845.c +++ b/drivers/interconnect/qcom/sdm845.c @@ -626,7 +626,7 @@ static void bcm_aggregate(struct qcom_icc_bcm *bcm) bcm->dirty = false; } -static int qcom_icc_aggregate(struct icc_node *node, u32 avg_bw, +static int qcom_icc_aggregate(struct icc_node *node, u32 tag, u32 avg_bw, u32 peak_bw, u32 *agg_avg, u32 *agg_peak) { size_t i; diff --git a/include/linux/interconnect-provider.h b/include/linux/interconnect-provider.h index 63caccadc2db..4ee19fd41568 100644 --- a/include/linux/interconnect-provider.h +++ b/include/linux/interconnect-provider.h @@ -45,8 +45,8 @@ struct icc_provider { struct list_head provider_list; struct list_head nodes; int (*set)(struct icc_node *src, struct icc_node *dst); - int (*aggregate)(struct icc_node *node, u32 avg_bw, u32 peak_bw, - u32 *agg_avg, u32 *agg_peak); + int (*aggregate)(struct icc_node *node, u32 tag, u32 avg_bw, + u32 peak_bw, u32 *agg_avg, u32 *agg_peak); struct icc_node* (*xlate)(struct of_phandle_args *spec, void *data); struct device *dev; int users; diff --git a/include/linux/interconnect.h b/include/linux/interconnect.h index dc25864755ba..d70a914cba11 100644 --- a/include/linux/interconnect.h +++ b/include/linux/interconnect.h @@ -30,6 +30,7 @@ struct icc_path *icc_get(struct device *dev, const int src_id, struct icc_path *of_icc_get(struct device *dev, const char *name); void icc_put(struct icc_path *path); int icc_set_bw(struct icc_path *path, u32 avg_bw, u32 peak_bw); +void icc_set_tag(struct icc_path *path, u32 tag); #else @@ -54,6 +55,10 @@ static inline int icc_set_bw(struct icc_path *path, u32 avg_bw, u32 peak_bw) return 0; } +static inline void icc_set_tag(struct icc_path *path, u32 tag) +{ +} + #endif /* CONFIG_INTERCONNECT */ #endif /* __LINUX_INTERCONNECT_H */