github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 06:25:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

PM / Domains: Keep the pd status during system PM phases

Browse Source 
If a PM domain is powered off before system suspend,
we hope do nothing in system runtime suspend noirq phase
and system runtime resume noirq phase.

Change-Id: Id72b1f92e10449c48006aced0d49612637402210
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
This commit is contained in:
Elaine Zhang 2017-01-12 16:12:31 +08:00 committed by Tao Huang
parent c92c266bd4
commit d68dc25527
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/base/power/domain.c
View File

@ -1003,8 +1003,10 @@ static int genpd_prepare(struct device *dev)
genpd_lock(genpd);
if (genpd->prepared_count++ == 0)
if (genpd->prepared_count++ == 0) {
genpd->suspended_count = 0;
genpd->suspend_power_off = genpd->status == GPD_STATE_POWER_OFF;
}
genpd_unlock(genpd);
@ -1046,7 +1048,8 @@ static int genpd_finish_suspend(struct device *dev, bool poweroff)
if (ret)
return ret;
if (dev->power.wakeup_path && genpd_is_active_wakeup(genpd))
if (genpd->suspend_power_off ||
(dev->power.wakeup_path && genpd_is_active_wakeup(genpd)))
return 0;
if (genpd->dev_ops.stop && genpd->dev_ops.start &&
@ -1100,7 +1103,8 @@ static int genpd_resume_noirq(struct device *dev)
if (IS_ERR(genpd))
return -EINVAL;
if (dev->power.wakeup_path && genpd_is_active_wakeup(genpd))
if (genpd->suspend_power_off ||
(dev->power.wakeup_path && genpd_is_active_wakeup(genpd)))
return pm_generic_resume_noirq(dev);
genpd_lock(genpd);

1
include/linux/pm_domain.h
View File

@ -67,6 +67,7 @@ struct generic_pm_domain {
unsigned int suspended_count; /* System suspend device counter */
unsigned int prepared_count; /* Suspend counter of prepared devices */
unsigned int performance_state; /* Aggregated max performance state */
bool suspend_power_off; /* Power status before system suspend */
int (*power_off)(struct generic_pm_domain *domain);
int (*power_on)(struct generic_pm_domain *domain);
unsigned int (*opp_to_performance_state)(struct generic_pm_domain *genpd,