* [PATCH 1/3] ARM / shmobile: Use genpd_queue_power_off_work()
2011-07-13 21:52 [PATCH 0/3] PM / Domains / shmobile fixes Rafael J. Wysocki
@ 2011-07-13 21:54 ` Rafael J. Wysocki
2011-07-13 21:55 ` [PATCH 2/3] PM / Domains: Take .power_off() error code into account Rafael J. Wysocki
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Rafael J. Wysocki @ 2011-07-13 21:54 UTC (permalink / raw)
To: Linux PM mailing list; +Cc: LKML, Paul Mundt, Magnus Damm, linux-sh
From: Rafael J. Wysocki <rjw@sisk.pl>
Make pd_power_down_a3rv() use genpd_queue_power_off_work() to queue
up the powering off of the A4LC domain to avoid queuing it up when
it is pending.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
arch/arm/mach-shmobile/pm-sh7372.c | 2 +-
drivers/base/power/domain.c | 2 +-
include/linux/pm_domain.h | 2 ++
3 files changed, 4 insertions(+), 2 deletions(-)
Index: linux-2.6/arch/arm/mach-shmobile/pm-sh7372.c
=================================--- linux-2.6.orig/arch/arm/mach-shmobile/pm-sh7372.c
+++ linux-2.6/arch/arm/mach-shmobile/pm-sh7372.c
@@ -107,7 +107,7 @@ static int pd_power_down_a3rv(struct gen
/* try to power down A4LC after A3RV is requested off */
pm_genpd_poweron(&sh7372_a4lc.genpd);
- queue_work(pm_wq, &sh7372_a4lc.genpd.power_off_work);
+ genpd_queue_power_off_work(&sh7372_a4lc.genpd);
return ret;
}
Index: linux-2.6/drivers/base/power/domain.c
=================================--- linux-2.6.orig/drivers/base/power/domain.c
+++ linux-2.6/drivers/base/power/domain.c
@@ -222,7 +222,7 @@ static bool genpd_abort_poweroff(struct
* Queue up the execution of pm_genpd_poweroff() unless it's already been done
* before.
*/
-static void genpd_queue_power_off_work(struct generic_pm_domain *genpd)
+void genpd_queue_power_off_work(struct generic_pm_domain *genpd)
{
if (!work_pending(&genpd->power_off_work))
queue_work(pm_wq, &genpd->power_off_work);
Index: linux-2.6/include/linux/pm_domain.h
=================================--- linux-2.6.orig/include/linux/pm_domain.h
+++ linux-2.6/include/linux/pm_domain.h
@@ -73,6 +73,7 @@ extern void pm_genpd_init(struct generic
struct dev_power_governor *gov, bool is_off);
extern int pm_genpd_poweron(struct generic_pm_domain *genpd);
extern void pm_genpd_poweroff_unused(void);
+extern void genpd_queue_power_off_work(struct generic_pm_domain *genpd);
#else
static inline int pm_genpd_add_device(struct generic_pm_domain *genpd,
struct device *dev)
@@ -101,6 +102,7 @@ static inline int pm_genpd_poweron(struc
return -ENOSYS;
}
static inline void pm_genpd_poweroff_unused(void) {}
+static inline void genpd_queue_power_off_work(struct generic_pm_domain *gpd) {}
#endif
#endif /* _LINUX_PM_DOMAIN_H */
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 2/3] PM / Domains: Take .power_off() error code into account
2011-07-13 21:52 [PATCH 0/3] PM / Domains / shmobile fixes Rafael J. Wysocki
2011-07-13 21:54 ` [PATCH 1/3] ARM / shmobile: Use genpd_queue_power_off_work() Rafael J. Wysocki
@ 2011-07-13 21:55 ` Rafael J. Wysocki
2011-07-13 21:56 ` [PATCH 3/3] ARM / shmobile: Return -EBUSY from A4LC power off if A3RV is active Rafael J. Wysocki
2011-07-14 2:10 ` [PATCH 0/3] PM / Domains / shmobile fixes Magnus Damm
3 siblings, 0 replies; 6+ messages in thread
From: Rafael J. Wysocki @ 2011-07-13 21:55 UTC (permalink / raw)
To: Linux PM mailing list; +Cc: LKML, Paul Mundt, Magnus Damm, linux-sh
From: Rafael J. Wysocki <rjw@sisk.pl>
Currently pm_genpd_poweroff() discards error codes returned by
the PM domain's .power_off() callback, because it's safer to always
regard the domain as inaccessible to drivers after a failing
.power_off(). Still, there are situations in which the low-level
code may want to indicate that it doesn't want to power off the
domain, so allow it to do that by returning -EBUSY from .power_off().
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
drivers/base/power/domain.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
Index: linux-2.6/drivers/base/power/domain.c
=================================--- linux-2.6.orig/drivers/base/power/domain.c
+++ linux-2.6/drivers/base/power/domain.c
@@ -312,8 +312,16 @@ static int pm_genpd_poweroff(struct gene
}
}
- if (genpd->power_off)
- genpd->power_off(genpd);
+ if (genpd->power_off) {
+ ret = genpd->power_off(genpd);
+ if (ret = -EBUSY) {
+ genpd_set_active(genpd);
+ if (parent)
+ genpd_release_lock(parent);
+
+ goto out;
+ }
+ }
genpd->status = GPD_STATE_POWER_OFF;
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 3/3] ARM / shmobile: Return -EBUSY from A4LC power off if A3RV is active
2011-07-13 21:52 [PATCH 0/3] PM / Domains / shmobile fixes Rafael J. Wysocki
2011-07-13 21:54 ` [PATCH 1/3] ARM / shmobile: Use genpd_queue_power_off_work() Rafael J. Wysocki
2011-07-13 21:55 ` [PATCH 2/3] PM / Domains: Take .power_off() error code into account Rafael J. Wysocki
@ 2011-07-13 21:56 ` Rafael J. Wysocki
2011-07-14 2:10 ` [PATCH 0/3] PM / Domains / shmobile fixes Magnus Damm
3 siblings, 0 replies; 6+ messages in thread
From: Rafael J. Wysocki @ 2011-07-13 21:56 UTC (permalink / raw)
To: Linux PM mailing list; +Cc: LKML, Paul Mundt, Magnus Damm, linux-sh
From: Rafael J. Wysocki <rjw@sisk.pl>
Since the A4LC should only be powered off if the A3RV is off, make
the A4LC's power down routine return -EBUSY if A3RV is not off to
indicate to the core that it doesn't want to power off the domain in
that case. This will cause the core to regard A4LC as active, so
the pm_genpd_poweron() in pd_power_down_a3rv() is not necessary any
more.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
arch/arm/mach-shmobile/pm-sh7372.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Index: linux-2.6/arch/arm/mach-shmobile/pm-sh7372.c
=================================--- linux-2.6.orig/arch/arm/mach-shmobile/pm-sh7372.c
+++ linux-2.6/arch/arm/mach-shmobile/pm-sh7372.c
@@ -106,7 +106,6 @@ static int pd_power_down_a3rv(struct gen
int ret = pd_power_down(genpd);
/* try to power down A4LC after A3RV is requested off */
- pm_genpd_poweron(&sh7372_a4lc.genpd);
genpd_queue_power_off_work(&sh7372_a4lc.genpd);
return ret;
@@ -118,7 +117,7 @@ static int pd_power_down_a4lc(struct gen
if (!(__raw_readl(PSTR) & (1 << sh7372_a3rv.bit_shift)))
return pd_power_down(genpd);
- return 0;
+ return -EBUSY;
}
static bool pd_active_wakeup(struct device *dev)
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/3] PM / Domains / shmobile fixes
2011-07-13 21:52 [PATCH 0/3] PM / Domains / shmobile fixes Rafael J. Wysocki
` (2 preceding siblings ...)
2011-07-13 21:56 ` [PATCH 3/3] ARM / shmobile: Return -EBUSY from A4LC power off if A3RV is active Rafael J. Wysocki
@ 2011-07-14 2:10 ` Magnus Damm
2011-07-14 19:34 ` Rafael J. Wysocki
3 siblings, 1 reply; 6+ messages in thread
From: Magnus Damm @ 2011-07-14 2:10 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: Linux PM mailing list, LKML, Paul Mundt, linux-sh
On Thu, Jul 14, 2011 at 6:52 AM, Rafael J. Wysocki <rjw@sisk.pl> wrote:
> Hi,
>
> The following three patches fix a couple of issues in the code currently
> in my pm-domains branch at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6.git pm-domains
>
> [1/3] - Use genpd_queue_power_off_work() for queuing up the powering off
> of A4LC (this avoids attempting to queue up a work item while it is
> pending).
>
> [2/3] - Make the generic PM domains code react to -EBUSY returned from a
> PM domain's .power_down() callback (needed for [3/3]).
>
> [3/3] - Return -EBUSY from the A4LC's .power_down() callback to indicate that
> the domain hasn't been powered down on purpose and remove the confusing
> (and now redundant) pm_genpd_poweron(A4LC) from pd_power_down_a3rv().
All patches above look great, thanks a lot for your help!
Acked-by: Magnus Damm <damm@opensource.se>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 0/3] PM / Domains / shmobile fixes
2011-07-14 2:10 ` [PATCH 0/3] PM / Domains / shmobile fixes Magnus Damm
@ 2011-07-14 19:34 ` Rafael J. Wysocki
0 siblings, 0 replies; 6+ messages in thread
From: Rafael J. Wysocki @ 2011-07-14 19:34 UTC (permalink / raw)
To: Magnus Damm; +Cc: Linux PM mailing list, LKML, Paul Mundt, linux-sh
On Thursday, July 14, 2011, Magnus Damm wrote:
> On Thu, Jul 14, 2011 at 6:52 AM, Rafael J. Wysocki <rjw@sisk.pl> wrote:
> > Hi,
> >
> > The following three patches fix a couple of issues in the code currently
> > in my pm-domains branch at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6.git pm-domains
> >
> > [1/3] - Use genpd_queue_power_off_work() for queuing up the powering off
> > of A4LC (this avoids attempting to queue up a work item while it is
> > pending).
> >
> > [2/3] - Make the generic PM domains code react to -EBUSY returned from a
> > PM domain's .power_down() callback (needed for [3/3]).
> >
> > [3/3] - Return -EBUSY from the A4LC's .power_down() callback to indicate that
> > the domain hasn't been powered down on purpose and remove the confusing
> > (and now redundant) pm_genpd_poweron(A4LC) from pd_power_down_a3rv().
>
> All patches above look great, thanks a lot for your help!
>
> Acked-by: Magnus Damm <damm@opensource.se>
Thanks!
Rafael
^ permalink raw reply [flat|nested] 6+ messages in thread