From patchwork Tue Jun 18 09:17: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: 167116 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp3959336ilk; Tue, 18 Jun 2019 02:17:33 -0700 (PDT) X-Google-Smtp-Source: APXvYqxvcKzPRn5f2GYvbB8uvQLg44onVme6Jh4WIbEo9ofGQiXfQHGsSje1xQjjfo3ruQ5clEnb X-Received: by 2002:aa7:8b55:: with SMTP id i21mr11809503pfd.155.1560849453542; Tue, 18 Jun 2019 02:17:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560849453; cv=none; d=google.com; s=arc-20160816; b=yOK6YeWFxX0z4C2lTk52cCLCOJQJjvNB4FbqT/4UMvR0hjuSIVaOn4C7ngrQSyWqSZ lp7KNRquWaQ1Mamfzg9WbXqvf7sa+lY1Ue8wnCnVyHvRRkEkuludMdEblJlD8Cyc7wmY RW3826jtCOui2fAe4J3pUAVMxfIiTTo13vdE8uXL+4diLLeHYjUuSYuLMHoMeR6cO65N fWpGJbSc6mcEDsSTH9G6knlhkkrwq93tyltrTwhXGydJY4QCci31RlS2nrltGDmOadEU dmrEWUosKKkvG4y409Z7bsGaz8Ae9JSntyktVtWQSrAYu0V3xDuCvClPCPabAM3Xj3qc uSXw== 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=X77CyOq8V6IGT5ZZ23tCl9LfggHvIPpRpl4LVB41IqY18dILmWqhkdJZHpMEom2mx8 iRrFltV5gJ53YHpjh9nseJwIRQILKDieRV+xE5KB+rzxKyhv5/sxgaXB23WuzXhm5L50 3AAVoPRZW5b0LhdUzTdB/jRMMIpTMsSgUkphGMsMDxw2RLxoIIMYLE55P4ZI6gv+zXGP FpkwWbGdkTFRbg0X5xyUU4zWctp+QdgIbW52Lf+B1Q0FxDVhpPIv6yJJJEj5dKqHiv+l cw6GK6dvBEBvLm0XwE8YI0QyxQ1swxU6Rl0PNs7BV9pdIyJrsKNuevCTZYrLyRYrU0zY brAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hTpJIgPQ; 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 w32si12809780pgl.25.2019.06.18.02.17.33; Tue, 18 Jun 2019 02:17:33 -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=hTpJIgPQ; 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 S1729329AbfFRJRb (ORCPT + 15 others); Tue, 18 Jun 2019 05:17:31 -0400 Received: from mail-lj1-f194.google.com ([209.85.208.194]:37253 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728385AbfFRJRa (ORCPT ); Tue, 18 Jun 2019 05:17:30 -0400 Received: by mail-lj1-f194.google.com with SMTP id 131so12354984ljf.4 for ; Tue, 18 Jun 2019 02:17:29 -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=hTpJIgPQ5zNz0esVepuf2/qfVqsVsbN759RHRHE1HHo1wVrtnn5aeaBEUGfBkeAvc4 KrxbEEn3fgE3Tqu+QXO/KbE2eL+1RCPd6tjrmUGdVNPbZHXwwruPAgGf7LWBVcoTzdvw mzV0guv/lpW2E9O7PrjvutMEwHC377XWoVG1nJ4hE6NI/lC/7TYWJlBLYeD9/SNcOPAl C7yRn7499jKGHu1bZrYqJMakaDa8y9H49b0XpraI75jLGBAMuQKQEbyCKOea/iJZFgXE ca42qcUp0DHdJppt66qfbGtlP74lfXKCgvmiERZQAR2h+QSqySuT5+DT9X9Ynid5Sv1n gHtw== 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=T1BiRYvkamf8drOusrFA9S8cRibcX1vDW6JAXgj8ZL3pnqDy/TO7GsLk+iq822G0JA DiTdmM6rv0DuNKBRbhl23bTEDbrRQtdI/NRdpYEmjVwsKHFHqOCcLuX1iRGXj3CQGXLt m2Jj8/Eiz7RojLfifNsQDp9ff/1HnNArIDPmcoRPw9Ae72WAykAZsZVNW9f14HjMZoS5 4faI5d+kkG43Lxrh8YBqAaOh30ZxQX/B+90hWqAiZ/v2CBxI+/iOTHzs4sQr/Ccobx0w uGbhTyPFtD4PG2ZhPKOlDEEZ1M9IceqsMFdRYlnBY8jYgifBE1YcdVp8kTn2AsrYQo0C /pXA== X-Gm-Message-State: APjAAAVPvL3T0+Rk3DOWcXsoAKsLsqvs3bhRlp9jnFljfwKt6f7v4wiN zo8dx3kesQ9K2qF0Uhkd/UB7pg== X-Received: by 2002:a2e:3008:: with SMTP id w8mr26130958ljw.13.1560849448820; Tue, 18 Jun 2019 02:17:28 -0700 (PDT) Received: from localhost.localdomain ([212.45.67.2]) by smtp.googlemail.com with ESMTPSA id b9sm2497444ljj.92.2019.06.18.02.17.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Jun 2019 02:17:28 -0700 (PDT) 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, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, georgi.djakov@linaro.org Subject: [PATCH v2 1/2] interconnect: Add support for path tags Date: Tue, 18 Jun 2019 12:17:23 +0300 Message-Id: <20190618091724.28232-2-georgi.djakov@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190618091724.28232-1-georgi.djakov@linaro.org> References: <20190618091724.28232-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 */