Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp497293ybi; Thu, 13 Jun 2019 21:19:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqzfH6hUyLnRhDrPrHyYjBllXFVb9RkcySHHKFt5Sh0O4uMdcawd+cEVLTU/SsCzb1a2xBPW X-Received: by 2002:a17:902:da4:: with SMTP id 33mr31410758plv.209.1560485992691; Thu, 13 Jun 2019 21:19:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560485992; cv=none; d=google.com; s=arc-20160816; b=qh+ZrQduWn22KBnnIa55ykQ0ia0ufjySo6+cCaHeBebgN+fwmyvs8WEeWilPa5q5DN LRn+gLyka04rtrstcdI/W5K62r2es75KXlPcf7sflT/48G8X1phbzHQFJap22slel7J8 9OeDdDmOZUVNclTBRFHPSBQE1hs5TtjD+QcGbTzxa7vLz6Vu06MUJCDOmLtD1HTifIqu E89mcKAKhE/VpJFT87FbY91f5UVHsB7znQNo8cuRb8nrWP+mq1i+GWayuSmpqK05SdDa svbNpmUvJ8x8st77MSx1aSmkLINte8Wt+1IVLqA/42wJWIwkmh9u97HkGN34a9g1Yb/7 G9Zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:dkim-signature; bh=qdT885hM1gH99LBPR29/QhPlOeEng+ZQVjJx3w/T2/A=; b=ACDJKptheAtpZ89eXgdhp3/PY834DO2rmsmCtDK/FntFRgWlLdDY5sKsHuft7mK1c1 TDSL+H7Rvr4wmziSB8sSbJo2RyrgcvEdZpRwt6lxpCukSO7yCItPp75Mm7tn3iMY8Jim wOIwh2+1ParAQw84uu0yaH6FZxO6rHgee2Rlh74Qu1MshtV1bhEFJtl2IvREGlcvPJaV 52vnb9OmwdrVND59NSkHqXGQT7NXDYkG+MKL+PSPwCsouNmr+a1y8FePfv+x2QLpewLm vVmj5xp5vdxPH4+9drB0snTyfZkgKhpT0e1ycoSgBxttE5j/QmGlWKdvG+z7SdxqTqU9 IkcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=Dibo09Bp; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b9si1407758pgq.253.2019.06.13.21.19.37; Thu, 13 Jun 2019 21:19:52 -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=@google.com header.s=20161025 header.b=Dibo09Bp; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726455AbfFNESK (ORCPT + 99 others); Fri, 14 Jun 2019 00:18:10 -0400 Received: from mail-qk1-f202.google.com ([209.85.222.202]:35060 "EHLO mail-qk1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726380AbfFNESH (ORCPT ); Fri, 14 Jun 2019 00:18:07 -0400 Received: by mail-qk1-f202.google.com with SMTP id 5so1015314qki.2 for ; Thu, 13 Jun 2019 21:18:06 -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=qdT885hM1gH99LBPR29/QhPlOeEng+ZQVjJx3w/T2/A=; b=Dibo09Bp3kWBRUtDeP7IlyAc8I0wb5LIZgKw4P/3gbfzowHYQkp8KvALWATtiLifF/ OgCNRHwq7V+KkgVUnp2yHEc5qXgQOOZOU05XPJf5NBPt7CFtICrUUykTd+lcCKR2SeaH K8ap0c9N6Jtz99rLRSHAmXzVlbK7jOXBUJEHtsxFtyGsBLyuM5VIeZva8JKgYA23JX/N V86388Avy5hjadcoyqZyv0uUZa1C2g5SS1ewUTpb96wNgW5h0/gF+cwveNdnSk4KmXt2 AK0RwUJDKxDAAnSfec6Xw2aoL5IOX9brzOp4yMwqt66AqibDVqTYNc91iTNpUHDOSazs wxZg== 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=qdT885hM1gH99LBPR29/QhPlOeEng+ZQVjJx3w/T2/A=; b=sFACYBGhzpQFKg2nXVLSWaFf1Ic/hfKKgevVPkc/2jhXtq7NDlrN7A7G2KpY9hrHAD HEjmlU1IApBpwmYFlGdxQ874LzcLoxc8akAl45GLauA2+TjJk7acq/moRuMvvB842lK5 Vir6+X/8B1SPyNtJLb7rrk05QxfzjbXchV0OjMtg5zf35o1qLJsblR+bB4/EcWgvh8t1 crFV8t/ZCgdNky8aAh+TKauXwq9GbzG89jsJHv3bsIyv9YP+D+mFYon+2j+Hp+cTbqIf rh2LAFGCH6/jAtXdyriIGhU2CuGYOL8+lHh5TH9ouv42uD1Q7qHOaLO6khXMw3CSHN7K RwyA== X-Gm-Message-State: APjAAAVrrJcc5Eq2rnVHhf+uHPquVBYsG3otyX4gnJ4LSUIYVzy66m/g ql4jhJivlkXSXteTZ8iYNHDReZhcPNxNDH0= X-Received: by 2002:ac8:4619:: with SMTP id p25mr46145520qtn.73.1560485886113; Thu, 13 Jun 2019 21:18:06 -0700 (PDT) Date: Thu, 13 Jun 2019 21:17:31 -0700 In-Reply-To: <20190614041733.120807-1-saravanak@google.com> Message-Id: <20190614041733.120807-10-saravanak@google.com> Mime-Version: 1.0 References: <20190614041733.120807-1-saravanak@google.com> X-Mailer: git-send-email 2.22.0.rc2.383.gf4fbbf30c2-goog Subject: [PATCH v2 09/11] interconnect: Add OPP table support for interconnects From: Saravana Kannan To: Georgi Djakov , Rob Herring , Mark Rutland , Viresh Kumar , Nishanth Menon , Stephen Boyd , "Rafael J. Wysocki" , MyungJoo Ham , Kyungmin Park , Chanwoo Choi Cc: Saravana Kannan , Rajendra Nayak , Jordan Crouse , 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, 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 Interconnect paths can have different performance points. Now that OPP framework supports bandwidth OPP tables, add OPP table support for interconnects. Devices can use the interconnect-opp-table DT property to specify OPP tables for interconnect paths. And the driver can obtain the OPP table for an interconnect path by calling icc_get_opp_table(). Signed-off-by: Saravana Kannan --- drivers/interconnect/core.c | 27 ++++++++++++++++++++++++++- include/linux/interconnect.h | 7 +++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c index 871eb4bc4efc..881bac80bc1e 100644 --- a/drivers/interconnect/core.c +++ b/drivers/interconnect/core.c @@ -47,6 +47,7 @@ struct icc_req { */ struct icc_path { size_t num_nodes; + struct opp_table *opp_table; struct icc_req reqs[]; }; @@ -313,7 +314,7 @@ struct icc_path *of_icc_get(struct device *dev, const char *name) { struct icc_path *path = ERR_PTR(-EPROBE_DEFER); struct icc_node *src_node, *dst_node; - struct device_node *np = NULL; + struct device_node *np = NULL, *opp_node; struct of_phandle_args src_args, dst_args; int idx = 0; int ret; @@ -381,10 +382,34 @@ struct icc_path *of_icc_get(struct device *dev, const char *name) dev_err(dev, "%s: invalid path=%ld\n", __func__, PTR_ERR(path)); mutex_unlock(&icc_lock); + opp_node = of_parse_phandle(np, "interconnect-opp-table", idx); + if (opp_node) { + path->opp_table = dev_pm_opp_of_find_table_from_node(opp_node); + of_node_put(opp_node); + } + + return path; } EXPORT_SYMBOL_GPL(of_icc_get); +/** + * icc_get_opp_table() - Get the OPP table that corresponds to a path + * @path: reference to the path returned by icc_get() + * + * This function will return the OPP table that corresponds to a path handle. + * If the interconnect API is disabled, NULL is returned and the consumer + * drivers will still build. Drivers are free to handle this specifically, but + * they don't have to. + * + * Return: opp_table pointer on success. NULL is returned when the API is + * disabled or the OPP table is missing. + */ +struct opp_table *icc_get_opp_table(struct icc_path *path) +{ + return path->opp_table; +} + /** * icc_set_bw() - set bandwidth constraints on an interconnect path * @path: reference to the path returned by icc_get() diff --git a/include/linux/interconnect.h b/include/linux/interconnect.h index dc25864755ba..0c0bc55f0e89 100644 --- a/include/linux/interconnect.h +++ b/include/linux/interconnect.h @@ -9,6 +9,7 @@ #include #include +#include /* macros for converting to icc units */ #define Bps_to_icc(x) ((x) / 1000) @@ -28,6 +29,7 @@ struct device; struct icc_path *icc_get(struct device *dev, const int src_id, const int dst_id); struct icc_path *of_icc_get(struct device *dev, const char *name); +struct opp_table *icc_get_opp_table(struct icc_path *path); void icc_put(struct icc_path *path); int icc_set_bw(struct icc_path *path, u32 avg_bw, u32 peak_bw); @@ -49,6 +51,11 @@ static inline void icc_put(struct icc_path *path) { } +static inline struct opp_table *icc_get_opp_table(struct icc_path *path) +{ + return NULL; +} + static inline int icc_set_bw(struct icc_path *path, u32 avg_bw, u32 peak_bw) { return 0; -- 2.22.0.rc2.383.gf4fbbf30c2-goog