Skip to content

Commit

Permalink
i2c: tegra: Fix suspending in active runtime PM state
Browse files Browse the repository at this point in the history
I noticed that sometime I2C clock is kept enabled during suspend-resume.
This happens because runtime PM defers dynamic suspension and thus it may
happen that runtime PM is in active state when system enters into suspend.
In particular I2C controller that is used for CPU's DVFS is often kept ON
during suspend because CPU's voltage scaling happens quite often.

Fixes: 8ebf15e ("i2c: tegra: Move suspend handling to NOIRQ phase")
Cc: <stable@vger.kernel.org> # v5.4+
Tested-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
  • Loading branch information
Dmitry Osipenko authored and Wolfram Sang committed Jan 15, 2020
1 parent b3a987b commit 9f42de8
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions drivers/i2c/busses/i2c-tegra.c
Original file line number Diff line number Diff line change
Expand Up @@ -1710,9 +1710,14 @@ static int tegra_i2c_remove(struct platform_device *pdev)
static int __maybe_unused tegra_i2c_suspend(struct device *dev)
{
struct tegra_i2c_dev *i2c_dev = dev_get_drvdata(dev);
int err;

i2c_mark_adapter_suspended(&i2c_dev->adapter);

err = pm_runtime_force_suspend(dev);
if (err < 0)
return err;

return 0;
}

Expand All @@ -1733,6 +1738,10 @@ static int __maybe_unused tegra_i2c_resume(struct device *dev)
if (err)
return err;

err = pm_runtime_force_resume(dev);
if (err < 0)
return err;

i2c_mark_adapter_resumed(&i2c_dev->adapter);

return 0;
Expand Down

0 comments on commit 9f42de8

Please sign in to comment.