From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F042C76191 for ; Fri, 26 Jul 2019 23:16:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5524322BEF for ; Fri, 26 Jul 2019 23:16:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="rDRdRt1b" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387598AbfGZXQP (ORCPT ); Fri, 26 Jul 2019 19:16:15 -0400 Received: from mail-pg1-f202.google.com ([209.85.215.202]:46263 "EHLO mail-pg1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387486AbfGZXQL (ORCPT ); Fri, 26 Jul 2019 19:16:11 -0400 Received: by mail-pg1-f202.google.com with SMTP id u1so33939754pgr.13 for ; Fri, 26 Jul 2019 16:16:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=T5820OQQJWp4mkgZ4wnYqdAO7VH4vOloLaIe1pVCzGw=; b=rDRdRt1bV5MKFBrQ5Vd/g9xRQEItk/yUTt63T3VAu7uVPL36GV1YsP8TrEfApHh+I/ 8bbXL0HHxWc22P7SJCdgHB37BXtOuvrmLVVdFhTs9g4WwVF5r4kkPGcAt3HvF1+moaUj AwvhyzbnGzr3w0LAodKf+WzNgW6GdxboES8/O+vahxIqabu5k3uT3vhMj+LO6twVi5wc a3GSBaZN+VAKQfJIsmlTui5z8KFOr6Xz8DsB5vPuK8l9/IJFxWGnz52ZxLQgsjz6e9Zh xRpBdWT1yrSApQhHHbg/QceFEAInyPa+alLPWEBITCYKzy2EVY7851E8imHAiTa1MnVO 7nMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=T5820OQQJWp4mkgZ4wnYqdAO7VH4vOloLaIe1pVCzGw=; b=TXskm1XkMgA0P+Sr8GoVAOErF0fdRgV+FDIVLd/5Of9ugrE3mm8YFLxkKX8uho5ZKq D9Pyw20s6uZc72PXl9H043H+//4BWXudEtEeJSHVEF9wVZ5qvPTgB3lYi+ZJCCqoIs7K 6kBglCoLoNxVDxnI83VPU+r5NGoMp9jaFG9MYYxIMCujoBmBFoi0SADpQjvW+0QcU0eq tPYsLbmsmlPajO+EjBN4zkySJzHqbj+d9RrGK703UNJiendCJUcih2X1YMYp0eOBRVoP W3U8WQ+sUbp50BFh8b+kJTlbhsFCNf59MEtCRQNEc8QLLCRuB63jBGjCiY3d1hLbI/U4 v7iQ== X-Gm-Message-State: APjAAAWSZs8McvSuDStqH84L0T7+QnT7WKzFIwh8gXlqNI1fXYWbQdVw moWPKqQqERkfMy0z3/o3mcSr9Aa2NYAsD4I= X-Google-Smtp-Source: APXvYqxvxCZ+h9e26rxDg8g/fbMxJWTK7jGlZs1GjHC9J00BqtPAYG3+n9U0MLf3JudpR+bNpSlJ2Y8Og3j2Btw= X-Received: by 2002:a63:520f:: with SMTP id g15mr89389221pgb.28.1564182970293; Fri, 26 Jul 2019 16:16:10 -0700 (PDT) Date: Fri, 26 Jul 2019 16:15:56 -0700 In-Reply-To: <20190726231558.175130-1-saravanak@google.com> Message-Id: <20190726231558.175130-3-saravanak@google.com> Mime-Version: 1.0 References: <20190726231558.175130-1-saravanak@google.com> X-Mailer: git-send-email 2.22.0.709.g102302147b-goog Subject: [PATCH v4 2/3] OPP: Add support for bandwidth OPP tables From: Saravana Kannan To: Rob Herring , Mark Rutland , Viresh Kumar , Nishanth Menon , Stephen Boyd , "Rafael J. Wysocki" Cc: Saravana Kannan , Georgi Djakov , vincent.guittot@linaro.org, seansw@qti.qualcomm.com, daidavid1@codeaurora.org, adharmap@codeaurora.org, Rajendra Nayak , sibis@codeaurora.org, bjorn.andersson@linaro.org, evgreen@chromium.org, kernel-team@android.com, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Not all devices quantify their performance points in terms of frequency. Devices like interconnects quantify their performance points in terms of bandwidth. We need a way to represent these bandwidth levels in OPP. So, add support for parsing bandwidth OPPs from DT. Signed-off-by: Saravana Kannan --- drivers/opp/of.c | 41 ++++++++++++++++++++++++++++++++--------- drivers/opp/opp.h | 4 +++- 2 files changed, 35 insertions(+), 10 deletions(-) diff --git a/drivers/opp/of.c b/drivers/opp/of.c index b313aca9894f..ac73512f4416 100644 --- a/drivers/opp/of.c +++ b/drivers/opp/of.c @@ -523,6 +523,35 @@ void dev_pm_opp_of_remove_table(struct device *dev) } EXPORT_SYMBOL_GPL(dev_pm_opp_of_remove_table); +static int _read_opp_key(struct dev_pm_opp *new_opp, struct device_node *np) +{ + int ret; + u64 rate; + u32 bw; + + ret = of_property_read_u64(np, "opp-hz", &rate); + if (!ret) { + /* + * Rate is defined as an unsigned long in clk API, and so + * casting explicitly to its type. Must be fixed once rate is 64 + * bit guaranteed in clk API. + */ + new_opp->rate = (unsigned long)rate; + return 0; + } + + ret = of_property_read_u32(np, "opp-peak-KBps", &bw); + if (ret) + return ret; + new_opp->rate = (unsigned long) bw; + + ret = of_property_read_u32(np, "opp-avg-KBps", &bw); + if (!ret) + new_opp->avg_bw = (unsigned long) bw; + + return 0; +} + /** * _opp_add_static_v2() - Allocate static OPPs (As per 'v2' DT bindings) * @opp_table: OPP table @@ -560,22 +589,16 @@ static struct dev_pm_opp *_opp_add_static_v2(struct opp_table *opp_table, if (!new_opp) return ERR_PTR(-ENOMEM); - ret = of_property_read_u64(np, "opp-hz", &rate); + ret = _read_opp_key(new_opp, np); if (ret < 0) { /* "opp-hz" is optional for devices like power domains. */ if (!opp_table->is_genpd) { - dev_err(dev, "%s: opp-hz not found\n", __func__); + dev_err(dev, "%s: opp-hz or opp-peak-bw not found\n", + __func__); goto free_opp; } rate_not_available = true; - } else { - /* - * Rate is defined as an unsigned long in clk API, and so - * casting explicitly to its type. Must be fixed once rate is 64 - * bit guaranteed in clk API. - */ - new_opp->rate = (unsigned long)rate; } of_property_read_u32(np, "opp-level", &new_opp->level); diff --git a/drivers/opp/opp.h b/drivers/opp/opp.h index 01a500e2c40a..6bb238af9cac 100644 --- a/drivers/opp/opp.h +++ b/drivers/opp/opp.h @@ -56,7 +56,8 @@ extern struct list_head opp_tables; * @turbo: true if turbo (boost) OPP * @suspend: true if suspend OPP * @pstate: Device's power domain's performance state. - * @rate: Frequency in hertz + * @rate: Frequency in hertz OR Peak bandwidth in kilobytes per second + * @avg_bw: Average bandwidth in kilobytes per second * @level: Performance level * @supplies: Power supplies voltage/current values * @clock_latency_ns: Latency (in nanoseconds) of switching to this OPP's @@ -78,6 +79,7 @@ struct dev_pm_opp { bool suspend; unsigned int pstate; unsigned long rate; + unsigned long avg_bw; unsigned int level; struct dev_pm_opp_supply *supplies; -- 2.22.0.709.g102302147b-goog