From patchwork Wed Mar 13 09:00:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Georgi Djakov X-Patchwork-Id: 10850813 X-Patchwork-Delegate: viresh.linux@gmail.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AE16E1390 for ; Wed, 13 Mar 2019 09:00:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9B96929A52 for ; Wed, 13 Mar 2019 09:00:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8D5F529AD2; Wed, 13 Mar 2019 09:00:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 28C8829AD5 for ; Wed, 13 Mar 2019 09:00:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727322AbfCMJAT (ORCPT ); Wed, 13 Mar 2019 05:00:19 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:35284 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726829AbfCMJAR (ORCPT ); Wed, 13 Mar 2019 05:00:17 -0400 Received: by mail-lj1-f195.google.com with SMTP id t13so816584lji.2 for ; Wed, 13 Mar 2019 02:00:16 -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=lHcJMM6FgDLebAlEnMgFQKA5Nq+Rlf4DODywjzeWXvs=; b=vWswKAHXEEdZwuDu2xor1PGDVaWEP4TgY2ZFWfmaxFp8U9sbe7V5+ynpf2FEkxOffF fzRH362M2E8yK3bvtYNY65ARdTaqH6/YGa3TGbJox/M5l0ij+LYweaJRhX+3yLQ1ke0V bEV+u87ZwbD2DttsshVum+KH1khwKlMIVVDYvIApnvP18HwRqLAuU7eZU0YDGyN/UUyG RjHy9PolSrw/sbY+B57Yc0hqZmXwGEO1j4I5a0YtIxZDEHQAaohrRFoB/LRnLD0IiV2Y cH4ntM4wukNeLnPtyvmcZ7Rw8alTqdnCPmst8u9LTO2Z/+GEjK8vuYKeeczSG+wZ2Tw/ Cydw== 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=lHcJMM6FgDLebAlEnMgFQKA5Nq+Rlf4DODywjzeWXvs=; b=i/svc31OplwznT/Vz1Iar4wuav+uzdDVJMkBRLleOjhoL99zjEJ4VTvMFhv4rgAR9/ E6hh/YrKbFf2qsoYtCVUQdmKXxuqQvUlPfFNwdzI6lk5AAo6gQG8maVgRzXSRZH7Lpch zHNjso+sQqx5qe6fvckqHsRchaYCSVWn9WmM3Nnu760KltlFy2yg/55WjDLH3+ZEA03e En0GXV8SXF93JcDqPDwtbed4ZtDxiqfez5SFwcq20QGxkfT3dJGQGfzFttj6xfMcbwNY 3yH3K//Tk3KRsaFpU2l5DRnmuO4p7CH7pOXje1f2uNI/GPs1gJLKaLMbHz2VS7ljkuP4 3Cow== X-Gm-Message-State: APjAAAXtarTzRGBjc9ygb6kucVnsQ2kr6lNcukqv6IugmjAgqywUx9Xk /g+FJmh1dH8gq4LDs82nWPVAxQ== X-Google-Smtp-Source: APXvYqwIVCUShTBhRuD7dAo4SFoLQqkhxG95gQNOa4aZODMLn5oya3Zoh6vETGzXkhXQMHXdPisr/g== X-Received: by 2002:a2e:8694:: with SMTP id l20mr22380772lji.152.1552467615852; Wed, 13 Mar 2019 02:00:15 -0700 (PDT) Received: from localhost.localdomain ([212.45.67.2]) by smtp.googlemail.com with ESMTPSA id u15sm1701986lja.73.2019.03.13.02.00.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Mar 2019 02:00:14 -0700 (PDT) From: Georgi Djakov To: vireshk@kernel.org, sboyd@kernel.org, nm@ti.com, robh+dt@kernel.org, mark.rutland@arm.com, rjw@rjwysocki.net Cc: jcrouse@codeaurora.org, vincent.guittot@linaro.org, bjorn.andersson@linaro.org, amit.kucheria@linaro.org, seansw@qti.qualcomm.com, daidavid1@codeaurora.org, evgreen@chromium.org, sibis@codeaurora.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, georgi.djakov@linaro.org Subject: [PATCH 1/4] dt-bindings: opp: Introduce opp-bw-MBs bindings Date: Wed, 13 Mar 2019 11:00:07 +0200 Message-Id: <20190313090010.20534-2-georgi.djakov@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190313090010.20534-1-georgi.djakov@linaro.org> References: <20190313090010.20534-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 X-Virus-Scanned: ClamAV using ClamSMTP In addition to frequency and voltage, some devices may have bandwidth requirements for their interconnect throughput - for example a CPU or GPU may also need to increase or decrease their bandwidth to DDR memory based on the current operating performance point. Extend the OPP tables with additional property to describe the bandwidth needs of a device. The average and peak bandwidth values depend on the hardware and its properties. Signed-off-by: Georgi Djakov --- Documentation/devicetree/bindings/opp/opp.txt | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/Documentation/devicetree/bindings/opp/opp.txt b/Documentation/devicetree/bindings/opp/opp.txt index 76b6c79604a5..fa598264615f 100644 --- a/Documentation/devicetree/bindings/opp/opp.txt +++ b/Documentation/devicetree/bindings/opp/opp.txt @@ -129,6 +129,9 @@ Optional properties: - opp-microamp-: Named opp-microamp property. Similar to opp-microvolt- property, but for microamp instead. +- opp-bw-MBs: The interconnect bandwidth is specified with an array containing + the two integer values for average and peak bandwidth in megabytes per second. + - opp-level: A value representing the performance level of the device, expressed as a 32-bit integer. @@ -546,3 +549,45 @@ Example 6: opp-microvolt-, opp-microamp-: }; }; }; + +Example 7: opp-bw-MBs: +(example: average and peak bandwidth values are defined for each OPP and the +interconnect between CPU and DDR memory is scaled together with CPU frequency) + +/ { + cpus { + CPU0: cpu@0 { + compatible = "arm,cortex-a53", "arm,armv8"; + ... + operating-points-v2 = <&cpu_opp_table>; + /* path between the CPU and DDR memory */ + interconnects = <&rpm_bimc MASTER_AMPSS_M0 + &rpm_bimc SLAVE_EBI_CH0>; + }; + }; + + cpu_opp_table: cpu_opp_table { + compatible = "operating-points-v2"; + opp-shared; + + opp-200000000 { + opp-hz = /bits/ 64 <200000000>; + /* 457 MB/s average and 1525 MB/s peak bandwidth */ + opp-bw-MBs = <457 1525>; + }; + opp-400000000 { + opp-hz = /bits/ 64 <400000000>; + /* 915 MB/s average and 3051 MB/s peak bandwidth */ + opp-bw-MBs = <915 3051>; + }; + opp-800000000 { + opp-hz = /bits/ 64 <800000000>; + /* 1830 MB/s average and 6103 MB/s peak bandwidth */ + opp-bw-MBs = <1830 6103>; + }; + opp-998400000 { + opp-hz = /bits/ 64 <998400000>; + /* 2282 MB/s average and 7614 MB/s peak bandwidth */ + opp-bw-MBs = <2284 7614>; + }; + }; From patchwork Wed Mar 13 09:00:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Georgi Djakov X-Patchwork-Id: 10850807 X-Patchwork-Delegate: viresh.linux@gmail.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4C67B1669 for ; Wed, 13 Mar 2019 09:00:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 39A1829A52 for ; Wed, 13 Mar 2019 09:00:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2C3E429AD5; Wed, 13 Mar 2019 09:00:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 61C8429AD2 for ; Wed, 13 Mar 2019 09:00:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727354AbfCMJAW (ORCPT ); Wed, 13 Mar 2019 05:00:22 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:36384 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727330AbfCMJAV (ORCPT ); Wed, 13 Mar 2019 05:00:21 -0400 Received: by mail-lj1-f195.google.com with SMTP id v10so817322lji.3 for ; Wed, 13 Mar 2019 02:00:19 -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=zhFevYCoUsTXnKrIe0oUFGZvHECD1lnXeInV/z6OmOY=; b=U0NoQAE1rR2jpG5MwyyZKfkfQKR6xE5Rd4/w9dDhDv10qtf3Rw9N1i1KbP0QJJ+XvD tUg95cFcxFnv4dw0zuWP528Gqcr5+Alh5+SuxTQSvkBd+MDVWlyl+ytFS5vQjvXwXu6C 4jIqDYVQijLop1yo8WJXa6vemosaBoVyRB47nIROuwJww9U+igUw6gDfvT/VJNn1KTLj 5pCpcdD9onBhuOdJXFk+aOSF6d4dljpxf478+jSik1raUbB5P0roZ+YpmKeEeSaJIyyP cRTq5tFwby+fnEj7q40cZBOlFwdSXSpOf7g946Rq5yrZCHYy4NKs8sKi8h4n+SMt63hS 6krA== 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=zhFevYCoUsTXnKrIe0oUFGZvHECD1lnXeInV/z6OmOY=; b=TTlHBC9PSzforcqxTLd7j1M6WKBflNDeceNmgD6Uq9B8/mbJ6jbkmTAlHyMbhB3w2/ fvTSIYXULHAkGKgaNRl5ebeeR1MUG1JR2kuAWWORYdOeyBp1PVuFa/fumbCg/PJ4UPev /wk+6+oaJDgsiJe+Rio2wvXOYU2oMUFqNSutwmpNwwc55Igs/Y6dWuZMjuDNG9lPu6en UgrkvBfsfeA9/1zgsPDBdre+U2LkUmBGiwL6lWZwuXomCJ7iZ+BcTZWjOcoh1iQZZ/JP YZZ2rVIYD7pbABRxgrvNOFfAcu6iHJMbC+Ul/M9Jo8WX34TPsGDnvFBGs2xw7/RsJ1Tv 60tg== X-Gm-Message-State: APjAAAVT7oXNQVPvNS3GfrhAqZ1hbSsyjELNAhqGkRPo57bDzBUokC2u lzOvCNvhnFAL/gxzLhczb+6Qaw== X-Google-Smtp-Source: APXvYqyDs9ZIvENt3V0xXCjw7+Yf3lFbjOD5pmJNzXjFLKJW+kuXRCc4fOoAazfEUcfvxu/rU5TweA== X-Received: by 2002:a2e:719:: with SMTP id 25mr22507673ljh.122.1552467618197; Wed, 13 Mar 2019 02:00:18 -0700 (PDT) Received: from localhost.localdomain ([212.45.67.2]) by smtp.googlemail.com with ESMTPSA id u15sm1701986lja.73.2019.03.13.02.00.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Mar 2019 02:00:17 -0700 (PDT) From: Georgi Djakov To: vireshk@kernel.org, sboyd@kernel.org, nm@ti.com, robh+dt@kernel.org, mark.rutland@arm.com, rjw@rjwysocki.net Cc: jcrouse@codeaurora.org, vincent.guittot@linaro.org, bjorn.andersson@linaro.org, amit.kucheria@linaro.org, seansw@qti.qualcomm.com, daidavid1@codeaurora.org, evgreen@chromium.org, sibis@codeaurora.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, georgi.djakov@linaro.org Subject: [PATCH 2/4] OPP: Add support for parsing the interconnect bandwidth Date: Wed, 13 Mar 2019 11:00:08 +0200 Message-Id: <20190313090010.20534-3-georgi.djakov@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190313090010.20534-1-georgi.djakov@linaro.org> References: <20190313090010.20534-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 X-Virus-Scanned: ClamAV using ClamSMTP The OPP bindings now support bandwidth values, so add support to parse it from device tree and store it into the new dev_pm_opp_icc_bw struct, which is part of the dev_pm_opp. Also add and export the dev_pm_opp_set_path() and dev_pm_opp_put_path() helpers, to set (and release) an interconnect path to a device. The bandwidth of this path will be updated when the OPPs are switched. Signed-off-by: Georgi Djakov --- drivers/opp/core.c | 67 ++++++++++++++++++++++++++++++++++++++++++ drivers/opp/of.c | 44 +++++++++++++++++++++++++++ drivers/opp/opp.h | 6 ++++ include/linux/pm_opp.h | 14 +++++++++ 4 files changed, 131 insertions(+) diff --git a/drivers/opp/core.c b/drivers/opp/core.c index e06a0ab05ad6..4b019cecaa07 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -1645,6 +1646,72 @@ void dev_pm_opp_put_clkname(struct opp_table *opp_table) } EXPORT_SYMBOL_GPL(dev_pm_opp_put_clkname); +/** + * dev_pm_opp_set_path() - Set interconnect path for a device + * @dev: Device for which interconnect path is being set. + * @name: Interconnect path name or NULL. + * + * This must be called before any OPPs are initialized for the device. + */ +struct opp_table *dev_pm_opp_set_path(struct device *dev, const char *name) +{ + struct opp_table *opp_table; + int ret; + + opp_table = dev_pm_opp_get_opp_table(dev); + if (!opp_table) + return ERR_PTR(-ENOMEM); + + /* This should be called before OPPs are initialized */ + if (WARN_ON(!list_empty(&opp_table->opp_list))) { + ret = -EBUSY; + goto err; + } + + /* Another CPU that shares the OPP table has set the path */ + if (opp_table->path) + return opp_table; + + /* Find interconnect path for the device */ + opp_table->path = of_icc_get(dev, name); + if (IS_ERR(opp_table->path)) { + ret = PTR_ERR(opp_table->clk); + if (ret != -EPROBE_DEFER) { + dev_err(dev, "%s: Couldn't find path: %d\n", __func__, + ret); + } + goto err; + } + + return opp_table; + +err: + dev_pm_opp_put_opp_table(opp_table); + + return ERR_PTR(ret); +} +EXPORT_SYMBOL_GPL(dev_pm_opp_set_path); + +/** + * dev_pm_opp_put_path() - Release interconnect path resources + * @opp_table: OPP table returned from dev_pm_opp_set_path(). + */ +void dev_pm_opp_put_path(struct opp_table *opp_table) +{ + if (!opp_table->path) + goto put_opp_table; + + /* Make sure there are no concurrent readers while updating opp_table */ + WARN_ON(!list_empty(&opp_table->opp_list)); + + icc_put(opp_table->path); + opp_table->path = NULL; + +put_opp_table: + dev_pm_opp_put_opp_table(opp_table); +} +EXPORT_SYMBOL_GPL(dev_pm_opp_put_path); + /** * dev_pm_opp_register_set_opp_helper() - Register custom set OPP helper * @dev: Device for which the helper is getting registered. diff --git a/drivers/opp/of.c b/drivers/opp/of.c index 1779f2c93291..96fb7fdda8c7 100644 --- a/drivers/opp/of.c +++ b/drivers/opp/of.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -526,6 +527,45 @@ static int opp_parse_supplies(struct dev_pm_opp *opp, struct device *dev, return ret; } +static int opp_parse_icc_bw(struct dev_pm_opp *opp, struct device *dev, + struct opp_table *opp_table) +{ + struct property *prop = NULL; + char name[NAME_MAX]; + int count; + u32 avg = 0; + u32 peak = 0; + + /* Search for "opp-bw-MBs" */ + sprintf(name, "opp-bw-MBs"); + prop = of_find_property(opp->np, name, NULL); + + /* Missing property is not a problem */ + if (!prop) { + dev_dbg(dev, "%s: Missing opp-bw-MBs\n", __func__); + return 0; + } + + count = of_property_count_u32_elems(opp->np, name); + if (count != 2) { + dev_err(dev, "%s: Invalid number of elements in %s property\n", + __func__, name); + return -EINVAL; + } + + opp->bandwidth = kzalloc(sizeof(*opp->bandwidth), GFP_KERNEL); + if (!opp->bandwidth) + return -ENOMEM; + + of_property_read_u32_index(opp->np, name, 0, &avg); + of_property_read_u32_index(opp->np, name, 1, &peak); + + opp->bandwidth->avg = MBps_to_icc(avg); + opp->bandwidth->peak = MBps_to_icc(peak); + + return 0; +} + /** * dev_pm_opp_of_remove_table() - Free OPP table entries created from static DT * entries @@ -619,6 +659,10 @@ static struct dev_pm_opp *_opp_add_static_v2(struct opp_table *opp_table, if (ret) goto free_required_opps; + ret = opp_parse_icc_bw(new_opp, dev, opp_table); + if (ret) + goto free_required_opps; + if (opp_table->is_genpd) new_opp->pstate = pm_genpd_opp_to_performance_state(dev, new_opp); diff --git a/drivers/opp/opp.h b/drivers/opp/opp.h index 4458175aa661..b4287d065c24 100644 --- a/drivers/opp/opp.h +++ b/drivers/opp/opp.h @@ -24,6 +24,7 @@ struct clk; struct regulator; +struct icc_path; /* Lock to allow exclusive modification to the device and opp lists */ extern struct mutex opp_table_lock; @@ -62,6 +63,7 @@ extern struct list_head opp_tables; * @rate: Frequency in hertz * @level: Performance level * @supplies: Power supplies voltage/current values + * @bandwidth: Interconnect bandwidth values * @clock_latency_ns: Latency (in nanoseconds) of switching to this OPP's * frequency from any other OPP's frequency. * @required_opps: List of OPPs that are required by this OPP. @@ -85,6 +87,8 @@ struct dev_pm_opp { struct dev_pm_opp_supply *supplies; + struct dev_pm_opp_icc_bw *bandwidth; + unsigned long clock_latency_ns; struct dev_pm_opp **required_opps; @@ -152,6 +156,7 @@ enum opp_table_access { * property). * @genpd_performance_state: Device's power domain support performance state. * @is_genpd: Marks if the OPP table belongs to a genpd. + * @path: Interconnect path handle * @set_opp: Platform specific set_opp callback * @set_opp_data: Data to be passed to set_opp callback * @dentry: debugfs dentry pointer of the real device directory (not links). @@ -196,6 +201,7 @@ struct opp_table { int regulator_count; bool genpd_performance_state; bool is_genpd; + struct icc_path *path; int (*set_opp)(struct dev_pm_set_opp_data *data); struct dev_pm_set_opp_data *set_opp_data; diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h index 900359342965..5edce71a15d6 100644 --- a/include/linux/pm_opp.h +++ b/include/linux/pm_opp.h @@ -43,6 +43,18 @@ struct dev_pm_opp_supply { unsigned long u_amp; }; +/** + * struct dev_pm_opp_icc_bw - Interconnect bandwidth values + * @avg: Average bandwidth corresponding to this OPP (in icc units) + * @peak: Peak bandwidth corresponding to this OPP (in icc units) + * + * This structure stores the bandwidth values for a single interconnect path. + */ +struct dev_pm_opp_icc_bw { + u32 avg; + u32 peak; +}; + /** * struct dev_pm_opp_info - OPP freq/voltage/current values * @rate: Target clk rate in hz @@ -127,6 +139,8 @@ struct opp_table *dev_pm_opp_set_regulators(struct device *dev, const char * con void dev_pm_opp_put_regulators(struct opp_table *opp_table); struct opp_table *dev_pm_opp_set_clkname(struct device *dev, const char * name); void dev_pm_opp_put_clkname(struct opp_table *opp_table); +struct opp_table *dev_pm_opp_set_path(struct device *dev, const char *name); +void dev_pm_opp_put_path(struct opp_table *opp_table); struct opp_table *dev_pm_opp_register_set_opp_helper(struct device *dev, int (*set_opp)(struct dev_pm_set_opp_data *data)); void dev_pm_opp_unregister_set_opp_helper(struct opp_table *opp_table); struct opp_table *dev_pm_opp_set_genpd_virt_dev(struct device *dev, struct device *virt_dev, int index); From patchwork Wed Mar 13 09:00:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Georgi Djakov X-Patchwork-Id: 10850799 X-Patchwork-Delegate: viresh.linux@gmail.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D22E91669 for ; Wed, 13 Mar 2019 09:00:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BEFB928C1D for ; Wed, 13 Mar 2019 09:00:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B2D20299E1; Wed, 13 Mar 2019 09:00:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5C6A928C1D for ; Wed, 13 Mar 2019 09:00:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727332AbfCMJA1 (ORCPT ); Wed, 13 Mar 2019 05:00:27 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:40444 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727348AbfCMJAX (ORCPT ); Wed, 13 Mar 2019 05:00:23 -0400 Received: by mail-lj1-f195.google.com with SMTP id w6so804408ljd.7 for ; Wed, 13 Mar 2019 02:00: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 :mime-version:content-transfer-encoding; bh=9gFFJDf2YnnW41mbrUGLhQnv9x8YWw9okQzyBd4EYFU=; b=jMKInlTbt1kLgeuLKDe1amgKHzJijr6f5OIpO20OyvgkfgsGFPnJBf+y9RYwcTwOWp RSMMny0yclfzx9rhkKAM0DE4N2KIqEt+MeGSe+EybjdQ7/um9Aq+qwJ/5Dj5hLXZ9eVz wCvKQ2Kdna0pdjPTg49jZt06SR5Img4H2vK36R85kcNZlz0Ea5dTHlt/d+cy9J8yWfpZ ZVKB8PHcjom6Wbt/de+T18MQw4P9JQ1WyQ7HyppLQ7ScMyO4hwzhVb2GhNkU9hTw3+K3 Sm6weatOipRzmxgWAfm5eq/x9cvj2aG474sTl0mo5zi5Gcet+AA/b4KMktKMVL/m4wDm 8JBg== 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=9gFFJDf2YnnW41mbrUGLhQnv9x8YWw9okQzyBd4EYFU=; b=ZrvhxUjqh6VRvIYMr3/SELaqUdgyOdSHnjnBeAOwX/QnqWPk8zCu8G+bI1BgBXQBXS qjya5LlCagR9Pp+zwyzf7DwJemY7acf1ZGuea+vcKd42SWPZ4f6H24G5480WTsUteUUp hv8rZiq7cD/vJmXfB3j84wK9EoTh+VGLiMdk8VzTQNAP81aV3WFugP00fjh5LuGkT9gg j4MaLEHk4aRRT9NdanKh1yyEl0YvXIXnC2fDdNY344DyNxRzaYtNsdo4vLiq0t8628Vb mycALM+3xsOPh0XBb0CsOqv8hmZh4cpG95KrTcZjJW/P34q3jTnZsrbutYem8DuXRfmR zvhQ== X-Gm-Message-State: APjAAAXlOoCTd5VikatOnfXDGLmHL6roZzTRvp2e85WRbvXBYFSyP/iw 4HQBE4hMO7oi3HMjfeEKUG87DQ== X-Google-Smtp-Source: APXvYqwIXkMGOo68z7kFcseQc3iUz+MeychrjygBb8vF2llh1M8u7cMuBjgZiH7jH8KbVIemdtrL0w== X-Received: by 2002:a2e:8986:: with SMTP id c6mr543791lji.146.1552467620690; Wed, 13 Mar 2019 02:00:20 -0700 (PDT) Received: from localhost.localdomain ([212.45.67.2]) by smtp.googlemail.com with ESMTPSA id u15sm1701986lja.73.2019.03.13.02.00.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Mar 2019 02:00:19 -0700 (PDT) From: Georgi Djakov To: vireshk@kernel.org, sboyd@kernel.org, nm@ti.com, robh+dt@kernel.org, mark.rutland@arm.com, rjw@rjwysocki.net Cc: jcrouse@codeaurora.org, vincent.guittot@linaro.org, bjorn.andersson@linaro.org, amit.kucheria@linaro.org, seansw@qti.qualcomm.com, daidavid1@codeaurora.org, evgreen@chromium.org, sibis@codeaurora.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, georgi.djakov@linaro.org Subject: [PATCH 3/4] OPP: Update the bandwidth on OPP frequency changes Date: Wed, 13 Mar 2019 11:00:09 +0200 Message-Id: <20190313090010.20534-4-georgi.djakov@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190313090010.20534-1-georgi.djakov@linaro.org> References: <20190313090010.20534-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 X-Virus-Scanned: ClamAV using ClamSMTP If the OPP bandwidth values are populated, we want to switch also the interconnect bandwidth in addition to frequency and voltage. Signed-off-by: Georgi Djakov --- drivers/opp/core.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/opp/core.c b/drivers/opp/core.c index 4b019cecaa07..99e7c4cf6c34 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -781,6 +781,10 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq) ret = _generic_set_opp_clk_only(dev, clk, old_freq, freq); } + if (!ret && !IS_ERR_OR_NULL(opp_table->path) && opp->bandwidth) + icc_set_bw(opp_table->path, opp->bandwidth->avg, + opp->bandwidth->peak); + /* Scaling down? Configure required OPPs after frequency */ if (!ret && freq < old_freq) { ret = _set_required_opps(dev, opp_table, opp); From patchwork Wed Mar 13 09:00:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Georgi Djakov X-Patchwork-Id: 10850803 X-Patchwork-Delegate: viresh.linux@gmail.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C34761390 for ; Wed, 13 Mar 2019 09:00:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AFD0528C1D for ; Wed, 13 Mar 2019 09:00:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A400729A12; Wed, 13 Mar 2019 09:00:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4BF8028E46 for ; Wed, 13 Mar 2019 09:00:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727349AbfCMJA2 (ORCPT ); Wed, 13 Mar 2019 05:00:28 -0400 Received: from mail-lj1-f194.google.com ([209.85.208.194]:37049 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726814AbfCMJAZ (ORCPT ); Wed, 13 Mar 2019 05:00:25 -0400 Received: by mail-lj1-f194.google.com with SMTP id a17so813369ljd.4 for ; Wed, 13 Mar 2019 02:00:24 -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=lRuCf454mnzXB+DyjyFfFPdMgMq/C5zdWzQg4oC5VkU=; b=inRvYdF2URJMHy6DjIr+GhGLMU3P1FzqcqtEDRK4JChuFpTLPGpOXtV+RO7/5dckAL jpeGejyWeb/QXvr0zUbCfzv5imaWuFE8wlhpWlFxqC8uX5ShsK5sWeKiHgO8TEXRm1kj mqT+DHt8hKej3THaZPN8rbwK1rMZYmYkyAGrcCnAMoqRxxNnJykTIdVW1fQYmKs7gZln +R0hIrYLWqWlsKlY0LeNuBvvrVJQKFJR6/+GH7XKRikBbsWDbg1AqOKFIRinz1/qSmVm WCvKsymK5Mv7aT4QBueq3B5eBZpjEXka9bfjlOqe7cbZPc4fU+Dto10G8lkRcRDJdQtd 6YGg== 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=lRuCf454mnzXB+DyjyFfFPdMgMq/C5zdWzQg4oC5VkU=; b=kJc9avm0HiYQ8Jz0FIxIdTfCOhC9Ng/zaeCbJZOt1rM2MuQ6EIuLIbloxaIcvXSTHI Nn9l6VdUfHhJxF4gu0Wp/agjYMCZScRrvKsLEQrYa3qPRfeyNEB7LLbsFV6fPYG43o4C CbxMb2XV7GsHYTZQogYQU0RE5yxa22m5o5vZ7htmfbzwGZ2j0qc0XpEqwUQseCGucrur Ps+NGr0Spa1woAQbI0oQkDzrXakDiUDWox22w0id05ZBxhTlNUszB1wHztuDc/bBt/F0 bEX19Ru9dmKCvonbQDLbSj+xEQfJXO4mZ991OhZGjNh9dT4b9YSXfIJKWn8Y+icGbCZk x46A== X-Gm-Message-State: APjAAAW2q1B6/6H9XmmaQELxFPG0cXSLgFKB1Dh/mbpQG2DyzZQvrT80 V2CiZNGgtDt/jfGr6k6OP3IcXw== X-Google-Smtp-Source: APXvYqy+0kI5lN5r3CDxfcKdZ5X2ac9IRFzw80Mxsj4mGpyXAGd5SfKIalXwYLiag6G79eZLggdkjA== X-Received: by 2002:a2e:8585:: with SMTP id b5mr22362278lji.125.1552467623334; Wed, 13 Mar 2019 02:00:23 -0700 (PDT) Received: from localhost.localdomain ([212.45.67.2]) by smtp.googlemail.com with ESMTPSA id u15sm1701986lja.73.2019.03.13.02.00.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Mar 2019 02:00:22 -0700 (PDT) From: Georgi Djakov To: vireshk@kernel.org, sboyd@kernel.org, nm@ti.com, robh+dt@kernel.org, mark.rutland@arm.com, rjw@rjwysocki.net Cc: jcrouse@codeaurora.org, vincent.guittot@linaro.org, bjorn.andersson@linaro.org, amit.kucheria@linaro.org, seansw@qti.qualcomm.com, daidavid1@codeaurora.org, evgreen@chromium.org, sibis@codeaurora.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, georgi.djakov@linaro.org Subject: [PATCH 4/4] cpufreq: dt: Add support for interconnect bandwidth scaling Date: Wed, 13 Mar 2019 11:00:10 +0200 Message-Id: <20190313090010.20534-5-georgi.djakov@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190313090010.20534-1-georgi.djakov@linaro.org> References: <20190313090010.20534-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 X-Virus-Scanned: ClamAV using ClamSMTP In addition to clocks and regulators, some devices can scale the bandwidth of their on-chip interconnect - for example between CPU and DDR memory. Add support for that, so that platforms which support it can make use of it. Signed-off-by: Georgi Djakov --- drivers/cpufreq/cpufreq-dt.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c index e58bfcb1169e..30fed0fc266d 100644 --- a/drivers/cpufreq/cpufreq-dt.c +++ b/drivers/cpufreq/cpufreq-dt.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -100,6 +101,7 @@ static int resources_available(void) struct device *cpu_dev; struct regulator *cpu_reg; struct clk *cpu_clk; + struct icc_path *cpu_path; int ret = 0; const char *name; @@ -126,6 +128,19 @@ static int resources_available(void) clk_put(cpu_clk); + cpu_path = of_icc_get(cpu_dev, NULL); + ret = PTR_ERR_OR_ZERO(cpu_path); + if (ret) { + if (ret == -EPROBE_DEFER) + dev_dbg(cpu_dev, "defer icc path: %d\n", ret); + else + dev_err(cpu_dev, "failed to get icc path: %d\n", ret); + + return ret; + } + + icc_put(cpu_path); + name = find_supply_name(cpu_dev); /* Platform doesn't require regulator */ if (!name) @@ -205,10 +220,18 @@ static int cpufreq_init(struct cpufreq_policy *policy) } } + opp_table = dev_pm_opp_set_path(cpu_dev, NULL); + if (IS_ERR(opp_table)) { + ret = PTR_ERR(opp_table); + dev_err(cpu_dev, "Failed to set interconnect path for cpu%d: %d\n", + policy->cpu, ret); + goto out_put_regulator; + } + priv = kzalloc(sizeof(*priv), GFP_KERNEL); if (!priv) { ret = -ENOMEM; - goto out_put_regulator; + goto out_put_path; } priv->reg_name = name; @@ -288,6 +311,8 @@ static int cpufreq_init(struct cpufreq_policy *policy) if (priv->have_static_opps) dev_pm_opp_of_cpumask_remove_table(policy->cpus); kfree(priv); +out_put_path: + dev_pm_opp_put_path(opp_table); out_put_regulator: if (name) dev_pm_opp_put_regulators(opp_table);