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: 160213 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp14061818jad; Wed, 13 Mar 2019 02:00:21 -0700 (PDT) X-Google-Smtp-Source: APXvYqwKLzNG/68s8zP+VsKDkfA1vx75k+Zi9Nf+6CBjJaUBMYbSAjJGyb8/VAvoV0PCCHx8bV7s X-Received: by 2002:a63:9246:: with SMTP id s6mr38595221pgn.349.1552467621684; Wed, 13 Mar 2019 02:00:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552467621; cv=none; d=google.com; s=arc-20160816; b=xQacQk33bZQokK1gC0MlhwupM3EjQPqY3uZyo8paeGwHGwLGr6QC50hsajOeWqcPM2 +Vs3yDJlzdD2mq4gPWJ/bqHUHPn6KLus/a3Kgx/55r/wHnq+EuRFVuSSAGIqm0Ht6BXC WaGHhCa1DixyedVY2vp0+NIhXkotLATt1oqTEMHCIowZ3WuR6WwnkGjx7JEgMpBlDSS8 vLT7FqqZGCc7NI49ZDmDgl8PIoSachNx0BFLHBSpeBUnh0e0bSNFfrvrlgR+oNE0Fokh ovz4pQm4gN4h2W2RPlJv9nSgFISBacicT8DJh2TpZF1RvymHK8M4CQmSnyuGy7829vpG fpwQ== 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=lHcJMM6FgDLebAlEnMgFQKA5Nq+Rlf4DODywjzeWXvs=; b=rNOTI/I7/f+harNVcZymsOWSlfAQsFRbZ0SFGbxXpENxvkfDHszAxBHnFakylPQ13S G2cqjEbEtsUmrgWykh0mtJfKLPnEwhTnRWuGMw3ToH6I0HinfxyI+wWUR3/VlMccfVwP YmQXGajsJLfqn5IzVRM1tLUCZkVCWh4iwD88eMlrof1guIBhOvLUMm1mwHmVI/d1K3ty qrWTwx4HL7hBU3DDL8UFqudNVKHZrlDKYMDTQytc1n4oy9Z5S3dmvJ9nuoCxMX+rrKSS 8uS3LfQlTx49JMZA5K8M2FKBhb+EZYgGhParTde7ie2W6q6Y0DLyafQEVkeJyHLx677l hpnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vWswKAHX; 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 m3si10460645plt.310.2019.03.13.02.00.21; Wed, 13 Mar 2019 02:00:21 -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=vWswKAHX; 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 S1727343AbfCMJAU (ORCPT + 31 others); Wed, 13 Mar 2019 05:00:20 -0400 Received: from mail-lj1-f196.google.com ([209.85.208.196]:44447 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727313AbfCMJAR (ORCPT ); Wed, 13 Mar 2019 05:00:17 -0400 Received: by mail-lj1-f196.google.com with SMTP id q128so793995ljb.11 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=MZfujK9Jp7bb+NcjnL9pOLpFAZuLGKLPodzLm/P7i3ExdHIsGaOEKU3Yubk+U8R4FO nMxRVT1t1cGjAxl3T6X4n3pCw4YHuc4lo6ZgNmzc/xnzgP/zR5QMNKaf6bs3PhbyOAgc taNzI5p63djgjPn+d1meZIE5Y15QyopLW085/LsgMljREPq2k+0hRejgTKVkha+8JInv iybO0bnf5Yab9+HV2bBUR2bouwPkWzXxpWIKyd28YHfcRQMGdBXGHU7DMhsqajOEBnpc 7mU4IsZlzuIFDjJz+FJe7S8hSX/BkdjtvrM2B6rcNSCt/QoB1GWHB7M5sbr5J96dCyGr xwyQ== X-Gm-Message-State: APjAAAW/3QirTGcG8jcCoytKjx/LAM0X5TU8aZaGOu9PgXMPlCbVgGsf tXuyheOdTPuVCxLrAEISawTFjA== 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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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: 160214 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp14061892jad; Wed, 13 Mar 2019 02:00:25 -0700 (PDT) X-Google-Smtp-Source: APXvYqw5j3BLU07DzCOzq9zUfnCZa4r4Y1Kj+lE2v5nVWPdtmr0B0NAiO8y/2r/zT0rxS/1q3WG6 X-Received: by 2002:a17:902:5a41:: with SMTP id f1mr2353025plm.202.1552467625338; Wed, 13 Mar 2019 02:00:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552467625; cv=none; d=google.com; s=arc-20160816; b=r0k0gwAoX7Sgm78mFSR+rX9JdmAQH0ppWqygoePcOaxJlSyY4+spIWpDOwKdA+rsSc JEtZHfz2IL7uBoPrnU42bLh4pGR2KHze5uDw9nD4I1hQiboEoFCZWiG5q4H6Gb0H8mv9 RThom93tCWQ7nCj4o8OR/OYZoI8Bs2HKpVFNdvUGhPCzMtZi3btyX6vtq0p3yI/zlHAi 2tl42iQ6VGMC++SWzavq06ycPI4lkiMJEeIU4lb+YAcwBAwI+reeLtirhXAqUHUUo31B 5gUCuOuSvdTNclU283vG2sOZd7p/63dAgRBYkYGEwEVxOWUE2QaYOWRhvBIds0k/2ANd nF8A== 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=zhFevYCoUsTXnKrIe0oUFGZvHECD1lnXeInV/z6OmOY=; b=S0QeZGpUlDunC4M9faK5X0hCWyLFpkW/L2hn5QgJTG1VsPgrhwgaytCd8c/XPaWrnl N4BW6dU+CTDTb3c9Gcy3lXyq9IOIdm/30DMdIytQFB+t/1u31dlW0fMeSF1nToqzMt/j C3bq6qgc5FbNQcsiRdu7hqxAHyVPnOj6+viiMCRmA+HKyW/qmC+H/p3vAhlCANBtiUfJ cI6bzKSnLUcU9p1ft7SrEazG2P5xHNoc7DdVd3mcWvjQMvPq1E0y/EsahUh/xBoXWAU/ YJpvIuO5b3YepXA4vB9FX2bc0IVea3bjlVWv3ww+Fq1WkF9ZqjnS0qF7HvOv35VfWF0S RoWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=U0NoQAE1; 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 m3si10460645plt.310.2019.03.13.02.00.25; Wed, 13 Mar 2019 02:00: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=U0NoQAE1; 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 S1727366AbfCMJAX (ORCPT + 31 others); Wed, 13 Mar 2019 05:00:23 -0400 Received: from mail-lj1-f196.google.com ([209.85.208.196]:38469 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727332AbfCMJAV (ORCPT ); Wed, 13 Mar 2019 05:00:21 -0400 Received: by mail-lj1-f196.google.com with SMTP id x13so806850ljj.5 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=eBBBQ+cAKnXuTgkSeiogYhjDcdW6ZBqgZ6NTOczaxAB9GUnSEGr/Wmd9BLJxceEg71 r2gI9CV9rnC07eNtYQuWgJxooFXRkKzGM+kC8xhuDcDljdZr5noDodAx0A6mQcd40JTK NcGsjJdCJmugZnX7ybN9L209TMhaKOeA8BYLHbUnK3MPdYKsNpdwrftDi1S2nAvFHzXS InukOVTuIn9CQi5VEpQnn3HHcAWlYveaRk70uQEFoQpph+55byxsNfe/JJESrJHMEfZL XRd+g2bUBDtJF/qJSHPhE6cZtOD+jGrxhrLuoYwY/OmGiYY0/NH8XZAKPPLj4mvPuM2w RZew== X-Gm-Message-State: APjAAAUoc9Q6rzxOP2uUfsx+r/FjF3mYL7qXAfb4WzfdTxYilKKEPMtv DhqAKD9uNYjAFxAd4FtXpmnaRw== 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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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);