From patchwork Thu Oct 25 05:52:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 149520 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp913772ljp; Wed, 24 Oct 2018 22:53:50 -0700 (PDT) X-Google-Smtp-Source: AJdET5de2SYyTJ2TsF96nINxwYpvg45gYKX/iiDrddIQuaoQfm8iKH0i/oGI8BFjtxtGR5Mq6YqB X-Received: by 2002:a17:902:e005:: with SMTP id ca5-v6mr178419plb.195.1540446830597; Wed, 24 Oct 2018 22:53:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540446830; cv=none; d=google.com; s=arc-20160816; b=fpuVIdH8aqafac0oQa/AO4f00srpYn28j1Xe/Jd2+5q2SJoIEAAgMpvdSiZB9VdgDv dceBOaQiqFVovB6GAbH4/YlQOg7KAQM3gHsMvTXNhmftAT9yV1xkitk78VTvO+EADbks ju3pgGL0utz/Y19bzoJ025aCdM24x8oMiJmHQB+q6T2uQcxSv4EzCwaUT7eMqlPYNQ1o 6dyTIww7rbRO8/Okdp+mqoLRMM9jvfcpH6Yq1YfM1Zc6EWoua/yhfrYK6hLgIWtrfh4j isait37hevG9e1OdQR1xLXiwSaEIMqVhPhiL/wa+rhT801axLYnBVNo+1g54ga9wRBGW 972Q== 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=YCyv0YPeiesSsQ4IoZUlYIyjO5zGVV/PfYBEjZv38ns=; b=NXm6E2VeaRtOR9v84L+GrIPKa1fzRrrZe6GR3qwSkyfJilc3g/V1i/+cO6G9bK2xbw 1t77QyynaKJqo0DWs1mse7hvbAsVq8H2VUc3W01xdxsjM5TQE/ejQbU8bEhN16EyKga9 DYvspcL4lTJADnZuCTwACyynkzmJQUbRbdupyCyQhYQYiyo2rSwzgLDUn4zVF9waHpnM I2ZFelv+kODtik+HQOkVtbXH2BZ19wFpGWs+nvy9R+V83ByM9bZLtvAJ+oW/E+PS7bNb rhMZLUDh9G8k5LIX9077o9wnyz2txcfuOTfvwQmi39y14IFQkS127Fhrwi7oprNSvkVr 7o8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Tr274oTj; 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 o7-v6si6838476pll.20.2018.10.24.22.53.50; Wed, 24 Oct 2018 22:53:50 -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=Tr274oTj; 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 S1727595AbeJYOY6 (ORCPT + 32 others); Thu, 25 Oct 2018 10:24:58 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:46327 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727531AbeJYOY5 (ORCPT ); Thu, 25 Oct 2018 10:24:57 -0400 Received: by mail-pf1-f196.google.com with SMTP id r64-v6so3626990pfb.13 for ; Wed, 24 Oct 2018 22:53:47 -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=YCyv0YPeiesSsQ4IoZUlYIyjO5zGVV/PfYBEjZv38ns=; b=Tr274oTjSRe7HrJGKcPK9ZS5P9wSPAwa2j6WXy/z51FssCnW30JuGEChZz4ZM5zJsl Js/6XCYiwcE5Idx3zJz4gzCZoPBYtsCi+mTEQp+Su0XzrNqGZ4CKx/VOXnUaOBA1TTLx YSBdMsDEC1hrzsCrpsAlXoo4L8a6IIYgekpvE= 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=YCyv0YPeiesSsQ4IoZUlYIyjO5zGVV/PfYBEjZv38ns=; b=bXIYGQWBG7sL0NRKWdnu7ZJhoQqS14M2WJAb+eZLS1BeVntSaY2CzqnpogRlORneJW mh0IAW7YHcfEfPeyr6Bsc+VY24iGMkhiruhlcme6nBMmqNqrvBJ1fcCIAY6d5I+RM+v5 VmSVZMJEa29emovZj3KR6/aRDo0pSFvLqktDsLAD5MkkTUza49lzEcEDhnYwzwtUeAKS B+pbrpBNEW3p3sYm04BLTcV1k2IL5qUyO3AII3EZy22BfndWK52Wvkkr8lpwkzlU/yy0 5oz34j9eCqxebvtYFMw7J5GDd3D3p/BkFtoD6nvwrUexBGU3nfjbDOcnn+xTF2Rgd9Mf P+mw== X-Gm-Message-State: AGRZ1gK1LXGhD3CybJb6sxro7eQ3lyIlsNTG2sOtoxt7euq7NgCMJ5xh 3/AC7o2hAx1iMULbWlTYgnaANQ== X-Received: by 2002:a62:8f:: with SMTP id 137-v6mr228758pfa.24.1540446826410; Wed, 24 Oct 2018 22:53:46 -0700 (PDT) Received: from localhost ([122.172.217.9]) by smtp.gmail.com with ESMTPSA id z2-v6sm1408294pfm.106.2018.10.24.22.53.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Oct 2018 22:53:45 -0700 (PDT) From: Viresh Kumar To: ulf.hansson@linaro.org, "Rafael J. Wysocki" , Kevin Hilman , Len Brown , Pavel Machek , Viresh Kumar , Nishanth Menon , Stephen Boyd Cc: Viresh Kumar , linux-pm@vger.kernel.org, Vincent Guittot , niklas.cassel@linaro.org, rnayak@codeaurora.org, linux-kernel@vger.kernel.org Subject: [PATCH V3 09/10] OPP: Rename and relocate of_genpd_opp_to_performance_state() Date: Thu, 25 Oct 2018 11:22:46 +0530 Message-Id: <6ac7dd52047805dc1ec211cce261aee561d10abc.1540446493.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.19.1.568.g152ad8e3369a In-Reply-To: References: 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 core already has the performance state values for each of the genpd's OPPs and there is no need to call the genpd callback again to get the performance state for the case where the end device doesn't have an OPP table and has the "required-opps" property directly in its node. This commit renames of_genpd_opp_to_performance_state() as of_get_required_opp_performance_state() and moves it to the OPP core, as it is all about OPP stuff now. Signed-off-by: Viresh Kumar --- drivers/base/power/domain.c | 48 ------------------------------------- drivers/opp/of.c | 44 ++++++++++++++++++++++++++++++++++ include/linux/pm_domain.h | 9 ------- include/linux/pm_opp.h | 5 ++++ 4 files changed, 49 insertions(+), 57 deletions(-) -- 2.19.1.568.g152ad8e3369a Reviewed-by: Ulf Hansson diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 7be8c94c6b7f..8e554e6a82a2 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -2552,54 +2552,6 @@ unsigned int pm_genpd_opp_to_performance_state(struct device *genpd_dev, } EXPORT_SYMBOL_GPL(pm_genpd_opp_to_performance_state); -/** - * of_genpd_opp_to_performance_state- Gets performance state of device's - * power domain corresponding to a DT node's "required-opps" property. - * - * @dev: Device for which the performance-state needs to be found. - * @np: DT node where the "required-opps" property is present. This can be - * the device node itself (if it doesn't have an OPP table) or a node - * within the OPP table of a device (if device has an OPP table). - * - * Returns performance state corresponding to the "required-opps" property of - * a DT node. This calls platform specific genpd->opp_to_performance_state() - * callback to translate power domain OPP to performance state. - * - * Returns performance state on success and 0 on failure. - */ -unsigned int of_genpd_opp_to_performance_state(struct device *dev, - struct device_node *np) -{ - struct generic_pm_domain *genpd; - struct dev_pm_opp *opp; - int state = 0; - - genpd = dev_to_genpd(dev); - if (IS_ERR(genpd)) - return 0; - - if (unlikely(!genpd->set_performance_state)) - return 0; - - genpd_lock(genpd); - - opp = of_dev_pm_opp_find_required_opp(&genpd->dev, np); - if (IS_ERR(opp)) { - dev_err(dev, "Failed to find required OPP: %ld\n", - PTR_ERR(opp)); - goto unlock; - } - - state = genpd->opp_to_performance_state(genpd, opp); - dev_pm_opp_put(opp); - -unlock: - genpd_unlock(genpd); - - return state; -} -EXPORT_SYMBOL_GPL(of_genpd_opp_to_performance_state); - static int __init genpd_bus_init(void) { return bus_register(&genpd_bus_type); diff --git a/drivers/opp/of.c b/drivers/opp/of.c index 4e494720ac25..0755ee307b1a 100644 --- a/drivers/opp/of.c +++ b/drivers/opp/of.c @@ -969,6 +969,50 @@ int dev_pm_opp_of_get_sharing_cpus(struct device *cpu_dev, } EXPORT_SYMBOL_GPL(dev_pm_opp_of_get_sharing_cpus); +/** + * of_get_required_opp_performance_state() - Search for required OPP and return its performance state. + * @np: Node that contains the "required-opps" property. + * @index: Index of the phandle to parse. + * + * Returns the performance state of the OPP pointed out by the "required-opps" + * property at @index in @np. + * + * Return: Positive performance state on success, otherwise 0 on errors. + */ +unsigned int of_get_required_opp_performance_state(struct device_node *np, + int index) +{ + struct dev_pm_opp *opp; + struct device_node *required_np; + struct opp_table *opp_table; + unsigned int pstate = 0; + + required_np = of_parse_required_opp(np, index); + if (!required_np) + return -ENODEV; + + opp_table = _find_table_of_opp_np(required_np); + if (IS_ERR(opp_table)) { + pr_err("%s: Failed to find required OPP table %pOF: %ld\n", + __func__, np, PTR_ERR(opp_table)); + goto put_required_np; + } + + opp = _find_opp_of_np(opp_table, required_np); + if (opp) { + pstate = opp->pstate; + dev_pm_opp_put(opp); + } + + dev_pm_opp_put_opp_table(opp_table); + +put_required_np: + of_node_put(required_np); + + return pstate; +} +EXPORT_SYMBOL_GPL(of_get_required_opp_performance_state); + /** * of_dev_pm_opp_find_required_opp() - Search for required OPP. * @dev: The device whose OPP node is referenced by the 'np' DT node. diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index 4f803f934308..642036952553 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -260,8 +260,6 @@ int of_genpd_parse_idle_states(struct device_node *dn, struct genpd_power_state **states, int *n); unsigned int pm_genpd_opp_to_performance_state(struct device *genpd_dev, struct dev_pm_opp *opp); -unsigned int of_genpd_opp_to_performance_state(struct device *dev, - struct device_node *np); int genpd_dev_pm_attach(struct device *dev); struct device *genpd_dev_pm_attach_by_id(struct device *dev, @@ -308,13 +306,6 @@ pm_genpd_opp_to_performance_state(struct device *genpd_dev, return 0; } -static inline unsigned int -of_genpd_opp_to_performance_state(struct device *dev, - struct device_node *np) -{ - return 0; -} - static inline int genpd_dev_pm_attach(struct device *dev) { return 0; diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h index 8fed222c089b..889bb347fbd9 100644 --- a/include/linux/pm_opp.h +++ b/include/linux/pm_opp.h @@ -315,6 +315,7 @@ int dev_pm_opp_of_get_sharing_cpus(struct device *cpu_dev, struct cpumask *cpuma struct device_node *dev_pm_opp_of_get_opp_desc_node(struct device *dev); struct dev_pm_opp *of_dev_pm_opp_find_required_opp(struct device *dev, struct device_node *np); struct device_node *dev_pm_opp_get_of_node(struct dev_pm_opp *opp); +unsigned int of_get_required_opp_performance_state(struct device_node *np, int index); #else static inline int dev_pm_opp_of_add_table(struct device *dev) { @@ -357,6 +358,10 @@ static inline struct device_node *dev_pm_opp_get_of_node(struct dev_pm_opp *opp) { return NULL; } +static inline unsigned int of_get_required_opp_performance_state(struct device_node *np, int index) +{ + return 0; +} #endif #endif /* __LINUX_OPP_H__ */