[05/13] opp: Allow _set_opp() to work for non-freq devices

Message ID	2f0956ab1ed075bc8551f68921791ecbc6032f83.1611227342.git.viresh.kumar@linaro.org
State	Accepted
Commit	f0b88fa45595254fa51427bd8ca321732e2eb73d
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of linux-pm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; From: Viresh Kumar <viresh.kumar@linaro.org> To: Dmitry Osipenko <digetx@gmail.com>, Viresh Kumar <vireshk@kernel.org>, Nishanth Menon <nm@ti.com>, Stephen Boyd <sboyd@kernel.org> Cc: Viresh Kumar <viresh.kumar@linaro.org>, linux-pm@vger.kernel.org, Vincent Guittot <vincent.guittot@linaro.org>, Rafael Wysocki <rjw@rjwysocki.net>, Sibi Sankar <sibis@codeaurora.org>, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 05/13] opp: Allow _set_opp() to work for non-freq devices Date: Thu, 21 Jan 2021 16:47:45 +0530 Message-Id: <2f0956ab1ed075bc8551f68921791ecbc6032f83.1611227342.git.viresh.kumar@linaro.org> In-Reply-To: <cover.1611227342.git.viresh.kumar@linaro.org> References: <cover.1611227342.git.viresh.kumar@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	opp: Implement dev_pm_opp_set_opp() \| expand [00/13] opp: Implement dev_pm_opp_set_opp() [01/13] opp: Rename _opp_set_rate_zero() [02/13] opp: No need to check clk for errors [03/13] opp: Keep track of currently programmed OPP [04/13] opp: Split _set_opp() out of dev_pm_opp_set_rate() [05/13] opp: Allow _set_opp() to work for non-freq devices [06/13] opp: Allow _generic_set_opp_regulator() to work for non-freq devices [07/13] opp: Allow _generic_set_opp_clk_only() to work for non-freq devices [08/13] opp: Update parameters of _set_opp_custom() [09/13] opp: Implement dev_pm_opp_set_opp() [10/13] cpufreq: qcom: Migrate to dev_pm_opp_set_opp() [11/13] devfreq: tegra30: Migrate to dev_pm_opp_set_opp() [12/13] drm: msm: Migrate to dev_pm_opp_set_opp() [13/13] opp: Remove dev_pm_opp_set_bw()

Message ID

2f0956ab1ed075bc8551f68921791ecbc6032f83.1611227342.git.viresh.kumar@linaro.org

State

Accepted

Commit

f0b88fa45595254fa51427bd8ca321732e2eb73d

Headers

Received-SPF: pass (google.com: domain of linux-pm-owner@vger.kernel.org
	designates 23.128.96.18 as permitted sender)
	client-ip=23.128.96.18; 
From: Viresh Kumar <viresh.kumar@linaro.org>
To: Dmitry Osipenko <digetx@gmail.com>,
	Viresh Kumar <vireshk@kernel.org>, Nishanth Menon <nm@ti.com>,
	Stephen Boyd <sboyd@kernel.org>
Cc: Viresh Kumar <viresh.kumar@linaro.org>, linux-pm@vger.kernel.org,
	Vincent Guittot <vincent.guittot@linaro.org>,
	Rafael Wysocki <rjw@rjwysocki.net>, Sibi Sankar <sibis@codeaurora.org>,
	linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: [PATCH 05/13] opp: Allow _set_opp() to work for non-freq devices
Date: Thu, 21 Jan 2021 16:47:45 +0530
Message-Id: <2f0956ab1ed075bc8551f68921791ecbc6032f83.1611227342.git.viresh.kumar@linaro.org>
In-Reply-To: <cover.1611227342.git.viresh.kumar@linaro.org>
References: <cover.1611227342.git.viresh.kumar@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

opp: Implement dev_pm_opp_set_opp() | expand

Commit Message

Viresh Kumar Jan. 21, 2021, 11:17 a.m. UTC

The _set_opp() helper will be used for devices which don't change frequency
(like power domains, etc.) later on, prepare for that by not relying on
frequency for making decisions here.

While at it, also update the debug print to contain all relevant
information.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>

---
 drivers/opp/core.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

-- 
2.25.0.rc1.19.g042ed3e048af

diff --git a/drivers/opp/core.c b/drivers/opp/core.c
index 5313dc322bdd..64424dbd23c1 100644
--- a/drivers/opp/core.c
+++ b/drivers/opp/core.c
@@ -997,7 +997,7 @@  static int _set_opp(struct device *dev, struct opp_table *opp_table,
 {
 	struct dev_pm_opp *old_opp;
 	unsigned long old_freq;
-	int ret;
+	int scaling_down, ret;
 
 	if (unlikely(!opp))
 		return _disable_opp_table(dev, opp_table);
@@ -1015,11 +1015,17 @@  static int _set_opp(struct device *dev, struct opp_table *opp_table,
 		return 0;
 	}
 
-	dev_dbg(dev, "%s: switching OPP: %lu Hz --> %lu Hz\n", __func__,
-		old_freq, freq);
+	dev_dbg(dev, "%s: switching OPP: Freq %lu -> %lu Hz, Level %u -> %u, Bw %u -> %u\n",
+		__func__, old_freq, freq, old_opp->level, opp->level,
+		old_opp->bandwidth ? old_opp->bandwidth[0].peak : 0,
+		opp->bandwidth ? opp->bandwidth[0].peak : 0);
+
+	scaling_down = _opp_compare_key(old_opp, opp);
+	if (scaling_down == -1)
+		scaling_down = 0;
 
 	/* Scaling up? Configure required OPPs before frequency */
-	if (freq >= old_freq) {
+	if (!scaling_down) {
 		ret = _set_required_opps(dev, opp_table, opp, true);
 		if (ret)
 			return ret;
@@ -1038,7 +1044,7 @@  static int _set_opp(struct device *dev, struct opp_table *opp_table,
 	}
 
 	/* Scaling down? Configure required OPPs after frequency */
-	if (!ret && freq < old_freq) {
+	if (!ret && scaling_down) {
 		ret = _set_required_opps(dev, opp_table, opp, false);
 		if (ret)
 			dev_err(dev, "Failed to set required opps: %d\n", ret);

[05/13] opp: Allow _set_opp() to work for non-freq devices

Commit Message

Patch