Skip to content

Commit

Permalink
PM / Domains: Avoid infinite loops in attach/detach code
Browse files Browse the repository at this point in the history
If pm_genpd_{add,remove}_device() keeps on failing with -EAGAIN, we end
up with an infinite loop in genpd_dev_pm_{at,de}tach().

This may happen due to a genpd.prepared_count imbalance.  This is a bug
elsewhere, but it will result in a system lock up, possibly during
reboot of an otherwise functioning system.

To avoid this, put a limit on the maximum number of loop iterations,
using an exponential back-off mechanism.  If the limit is reached, the
operation will just fail.  An error message is already printed.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Geert Uytterhoeven authored and Rafael J. Wysocki committed Jul 6, 2015
1 parent d770e55 commit 93af5e9
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions drivers/base/power/domain.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* This file is released under the GPLv2.
*/

#include <linux/delay.h>
#include <linux/kernel.h>
#include <linux/io.h>
#include <linux/platform_device.h>
Expand All @@ -19,6 +20,8 @@
#include <linux/suspend.h>
#include <linux/export.h>

#define GENPD_RETRY_MAX_MS 250 /* Approximate */

#define GENPD_DEV_CALLBACK(genpd, type, callback, dev) \
({ \
type (*__routine)(struct device *__d); \
Expand Down Expand Up @@ -2131,6 +2134,7 @@ EXPORT_SYMBOL_GPL(of_genpd_get_from_provider);
static void genpd_dev_pm_detach(struct device *dev, bool power_off)
{
struct generic_pm_domain *pd;
unsigned int i;
int ret = 0;

pd = pm_genpd_lookup_dev(dev);
Expand All @@ -2139,10 +2143,12 @@ static void genpd_dev_pm_detach(struct device *dev, bool power_off)

dev_dbg(dev, "removing from PM domain %s\n", pd->name);

while (1) {
for (i = 1; i < GENPD_RETRY_MAX_MS; i <<= 1) {
ret = pm_genpd_remove_device(pd, dev);
if (ret != -EAGAIN)
break;

mdelay(i);
cond_resched();
}

Expand Down Expand Up @@ -2183,6 +2189,7 @@ int genpd_dev_pm_attach(struct device *dev)
{
struct of_phandle_args pd_args;
struct generic_pm_domain *pd;
unsigned int i;
int ret;

if (!dev->of_node)
Expand Down Expand Up @@ -2218,10 +2225,12 @@ int genpd_dev_pm_attach(struct device *dev)

dev_dbg(dev, "adding to PM domain %s\n", pd->name);

while (1) {
for (i = 1; i < GENPD_RETRY_MAX_MS; i <<= 1) {
ret = pm_genpd_add_device(pd, dev);
if (ret != -EAGAIN)
break;

mdelay(i);
cond_resched();
}

Expand Down

0 comments on commit 93af5e9

Please sign in to comment.