Commit a4501bac authored by Rajendra Nayak's avatar Rajendra Nayak Committed by Viresh Kumar
Browse files

opp: Enable resources again if they were disabled earlier 



dev_pm_opp_set_rate() can now be called with freq = 0 in order
to either drop performance or bandwidth votes or to disable
regulators on platforms which support them.

In such cases, a subsequent call to dev_pm_opp_set_rate() with
the same frequency ends up returning early because 'old_freq == freq'

Instead make it fall through and put back the dropped performance
and bandwidth votes and/or enable back the regulators.

Cc: v5.3+ <stable@vger.kernel.org> # v5.3+
Fixes: cd7ea582 ("opp: Make dev_pm_opp_set_rate() handle freq = 0 to drop performance votes")
Reported-by: default avatarSajida Bhanu <sbhanu@codeaurora.org>
Reviewed-by: default avatarSibi Sankar <sibis@codeaurora.org>
Reported-by: default avatarMatthias Kaehlcke <mka@chromium.org>
Tested-by: default avatarMatthias Kaehlcke <mka@chromium.org>
Reviewed-by: default avatarStephen Boyd <sboyd@kernel.org>
Signed-off-by: default avatarRajendra Nayak <rnayak@codeaurora.org>
[ Viresh: Don't skip clk_set_rate() and massaged changelog ]
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent d4ec88d2

drivers/opp/core.c

+7 −4
Original line number Diff line number Diff line
@@ -934,11 +934,14 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq) 


	/* Return early if nothing to do */

	if (old_freq == freq) {

		if (!opp_table->required_opp_tables && !opp_table->regulators &&

		    !opp_table->paths) {

			dev_dbg(dev, "%s: old/new frequencies (%lu Hz) are same, nothing to do\n",

				__func__, freq);

			ret = 0;

			goto put_opp_table;

		}

	}



	/*

	 * For IO devices which require an OPP on some platforms/SoCs