From patchwork Fri Aug 9 12:13:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Georgi Djakov X-Patchwork-Id: 170908 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp9918681ile; Fri, 9 Aug 2019 05:13:34 -0700 (PDT) X-Google-Smtp-Source: APXvYqwfFWieFqdjXMXtmTNkWrnwwxSfy10D4GFLtAGxnViRVgu4F0GnbMperQOratYXWjczT954 X-Received: by 2002:a17:90a:6546:: with SMTP id f6mr9072885pjs.11.1565352814026; Fri, 09 Aug 2019 05:13:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565352814; cv=none; d=google.com; s=arc-20160816; b=w+TdaqkTiUHpfPZpRMxcJfMok/Hx9UFzMlAd0bhKmEuxA+eZyUnOGdQMrWyy6LLp6r mmwfnZaJ45DJdBV7BZ00osOJBu4sKenYKWjbj3EQObWOyZSGaWaTzZ6RLtmPeu9mIbp4 Ve5gTauOsFa2YQTA/OnKnG/7N/ns5x/28+N+45qCWxVHFr7lrlehEAmQbviPfRdFtYzt yz3XE8O16D3q70tChX2AlR3YzgB/6VvKIYRkXAcdABFY4HNmMnrh9ZHQFEe9uchuzAvq IC4YB77h28MOzRNAjWX7nphWe5aX4kKE1Tn6xBvM6WT4qJrGeWsXN3X/FJjICqHnEzLz KIkw== 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=v4HP1f9I8mZkiZqFopwmMMkehyPq4NgMHQsfAEytrfU=; b=AcAZhz4OdO7HXT6Z2R3E6kqKo/ezdlN1eRhwJVeL5A/QvQhEI0+nzpynR8XgyzahC2 8LYxyJMrQ2MO97Tuc/GVjP7EYuYsPQQ1xziABftuGSFSr8HdqsVi1mT8njjmIdkvKZC1 JDtAEz+T3H+S048dDJ/F1xXfb5AkZ3wBpHkkIRcX1wblD6oAh+z0vf9as1HPLPdkg/JB WGsEWitA1sV8ythhj41aNDdupykozLFKgDShEFw5aBTrPa3Qb++lvYxlUK5UuF9tcm7L McrO51jlgG3CYtXNmWWEJIG736lzChLrqrj6CezEj3/62dibQTc2rgpmDyQdPvf0BlTj w2LQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YNpI9pug; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-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 u9si43306951pgr.196.2019.08.09.05.13.33; Fri, 09 Aug 2019 05:13:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-arm-msm-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=YNpI9pug; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-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 S2406606AbfHIMNd (ORCPT + 16 others); Fri, 9 Aug 2019 08:13:33 -0400 Received: from mail-lf1-f66.google.com ([209.85.167.66]:35832 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2406716AbfHIMNc (ORCPT ); Fri, 9 Aug 2019 08:13:32 -0400 Received: by mail-lf1-f66.google.com with SMTP id p197so69323047lfa.2 for ; Fri, 09 Aug 2019 05:13:30 -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 :mime-version:content-transfer-encoding; bh=v4HP1f9I8mZkiZqFopwmMMkehyPq4NgMHQsfAEytrfU=; b=YNpI9pugYlzXXWEm7gvqKyZ01t+lvLxfzMQZiq59XfUVgFGPJSbUlfe4rqqKT0qjZt zP+128kHF9/RGUY6FezeDq/qvifSWqPdbxljDgOC6D0oM8xlzrh7EitXNjyYbu72NoyD G1RBLtHBAE+yXmg9p0uod0qMvwQtig15ihwTFoSKcE3N3OTQca80egF+ZDEK65CBdIXr 5zHyABz9YSHvgVqC25nm+rkOuCOP+yAb8dhnX3YrQhv1yCjgzE3VLXDeM4FZSz+hZFtn l98vNV9rA0UNUpZJAJeWj8ITArn9q0Hx5MF4ploQT5yqdCdbYb+aWSCvTBvCayZWihjb egbg== 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=v4HP1f9I8mZkiZqFopwmMMkehyPq4NgMHQsfAEytrfU=; b=hQqWf4g9xvONRwzZA0iCR0OJCy+oH7A6dTWyWlxyb4fEOu662Q8mbxhuIoQsJig8hA JyofPPpi7/xDccYp4sParo6Faw2muPrbqcRcJo4+fA1txw4pCMZR3Fn5NElrLQ7WlbGw FprL+s0tcqcNrf6U8d90zlO81qaVuJMWQ+50f7Dg5+kx/PKDDeprPH6vPPScHILqIc5r p40tx0bXOUD3Q9tYBKUys7RYMD9GCRdQcMNotvBeqoutiL5U3fgDOmoMzL0NB31FjwfE qCY81wcYAb63ZGDB0rbButwWLOQB7J1fHjF6I4bjQ7EAKvybU5R8ekWBllc4COh+e7e0 yymQ== X-Gm-Message-State: APjAAAUYpV59IORoJwXwSk19GvocOvIoF2VSZW94nC7PZYUGJVsEBW6j xW+IwKVBIRY7RqEmG9XYeyvzsw== X-Received: by 2002:ac2:54bc:: with SMTP id w28mr11690638lfk.17.1565352809592; Fri, 09 Aug 2019 05:13:29 -0700 (PDT) Received: from localhost.localdomain ([37.157.136.206]) by smtp.googlemail.com with ESMTPSA id f23sm1083425lfc.25.2019.08.09.05.13.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Aug 2019 05:13:29 -0700 (PDT) From: Georgi Djakov To: linux-pm@vger.kernel.org, evgreen@chromium.org Cc: daidavid1@codeaurora.org, vincent.guittot@linaro.org, bjorn.andersson@linaro.org, amit.kucheria@linaro.org, dianders@chromium.org, seansw@qti.qualcomm.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, georgi.djakov@linaro.org Subject: [PATCH v3 1/3] interconnect: Add support for path tags Date: Fri, 9 Aug 2019 15:13:23 +0300 Message-Id: <20190809121325.8138-2-georgi.djakov@linaro.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190809121325.8138-1-georgi.djakov@linaro.org> References: <20190809121325.8138-1-georgi.djakov@linaro.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@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 | 24 +++++++++++++++++++++++- drivers/interconnect/qcom/sdm845.c | 2 +- include/linux/interconnect-provider.h | 4 ++-- include/linux/interconnect.h | 5 +++++ 4 files changed, 31 insertions(+), 4 deletions(-) diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c index 871eb4bc4efc..251354bb7fdc 100644 --- a/drivers/interconnect/core.c +++ b/drivers/interconnect/core.c @@ -29,6 +29,7 @@ static struct dentry *icc_debugfs_dir; * @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 + * @tag: path tag (optional) * @avg_bw: an integer describing the average bandwidth in kBps * @peak_bw: an integer describing the peak bandwidth in kBps */ @@ -36,6 +37,7 @@ struct icc_req { struct hlist_node req_node; struct icc_node *node; struct device *dev; + u32 tag; u32 avg_bw; u32 peak_bw; }; @@ -204,7 +206,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, r->tag, r->avg_bw, r->peak_bw, &node->avg_bw, &node->peak_bw); return 0; @@ -385,6 +387,26 @@ 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 requests associated + * with a path, so that a different aggregation could be done based on this tag. + */ +void icc_set_tag(struct icc_path *path, u32 tag) +{ + int i; + + if (!path) + return; + + for (i = 0; i < path->num_nodes; i++) + path->reqs[i].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() 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 */