diff options
author | Dmitry Osipenko <digetx@gmail.com> | 2021-03-02 14:18:00 +0100 |
---|---|---|
committer | Thierry Reding <treding@nvidia.com> | 2021-03-26 13:10:25 +0100 |
commit | ef85bb582c41524e9e68dfdbde48e519dac4ab3d (patch) | |
tree | 902b1a796398fa15674d22ea95ee473f49043aab | |
parent | soc/tegra: pmc: Provide USB sleepwalk register map (diff) | |
download | linux-ef85bb582c41524e9e68dfdbde48e519dac4ab3d.tar.xz linux-ef85bb582c41524e9e68dfdbde48e519dac4ab3d.zip |
soc/tegra: regulators: Fix locking up when voltage-spread is out of range
Fix voltage coupler lockup which happens when voltage-spread is out
of range due to a bug in the code. The max-spread requirement shall be
accounted when CPU regulator doesn't have consumers. This problem is
observed on Tegra30 Ouya game console once system-wide DVFS is enabled
in a device-tree.
Fixes: 783807436f36 ("soc/tegra: regulators: Add regulators coupler for Tegra30")
Cc: stable@vger.kernel.org
Reported-by: Peter Geis <pgwipeout@gmail.com>
Tested-by: Peter Geis <pgwipeout@gmail.com> # Ouya T30
Tested-by: Matt Merhar <mattmerhar@protonmail.com> # Ouya T30
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r-- | drivers/soc/tegra/regulators-tegra30.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/soc/tegra/regulators-tegra30.c b/drivers/soc/tegra/regulators-tegra30.c index 7f21f31de09d..0e776b20f625 100644 --- a/drivers/soc/tegra/regulators-tegra30.c +++ b/drivers/soc/tegra/regulators-tegra30.c @@ -178,7 +178,7 @@ static int tegra30_voltage_update(struct tegra_regulator_coupler *tegra, * survive the voltage drop if it's running on a higher frequency. */ if (!cpu_min_uV_consumers) - cpu_min_uV = cpu_uV; + cpu_min_uV = max(cpu_uV, cpu_min_uV); /* * Bootloader shall set up voltages correctly, but if it |