Commit 431bf99d authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: (51 commits)
  PM: Improve error code of pm_notifier_call_chain()
  PM: Add "RTC" to PM trace time stamps to avoid confusion
  PM / Suspend: Export suspend_set_ops, suspend_valid_only_mem
  PM / Suspend: Add .suspend_again() callback to suspend_ops
  PM / OPP: Introduce function to free cpufreq table
  ARM / shmobile: Return -EBUSY from A4LC power off if A3RV is active
  PM / Domains: Take .power_off() error code into account
  ARM / shmobile: Use genpd_queue_power_off_work()
  ARM / shmobile: Use pm_genpd_poweroff_unused()
  PM / Domains: Introduce function to power off all unused PM domains
  OMAP: PM: disable idle on suspend for GPIO and UART
  OMAP: PM: omap_device: add API to disable idle on suspend
  OMAP: PM: omap_device: add system PM methods for PM domain handling
  OMAP: PM: omap_device: conditionally use PM domain runtime helpers
  PM / Runtime: Add new helper function: pm_runtime_status_suspended()
  PM / Domains: Queue up power off work only if it is not pending
  PM / Domains: Improve handling of wakeup devices during system suspend
  PM / Domains: Do not restore all devices on power off error
  PM / Domains: Allow callbacks to execute all runtime PM helpers
  PM / Domains: Do not execute device callbacks under locks
  ...
parents 72f96e0e 7ae033cc
...@@ -506,8 +506,8 @@ routines. Nevertheless, different callback pointers are used in case there is a ...@@ -506,8 +506,8 @@ routines. Nevertheless, different callback pointers are used in case there is a
situation where it actually matters. situation where it actually matters.
Device Power Domains Device Power Management Domains
-------------------- -------------------------------
Sometimes devices share reference clocks or other power resources. In those Sometimes devices share reference clocks or other power resources. In those
cases it generally is not possible to put devices into low-power states cases it generally is not possible to put devices into low-power states
individually. Instead, a set of devices sharing a power resource can be put individually. Instead, a set of devices sharing a power resource can be put
...@@ -516,8 +516,8 @@ power resource. Of course, they also need to be put into the full-power state ...@@ -516,8 +516,8 @@ power resource. Of course, they also need to be put into the full-power state
together, by turning the shared power resource on. A set of devices with this together, by turning the shared power resource on. A set of devices with this
property is often referred to as a power domain. property is often referred to as a power domain.
Support for power domains is provided through the pwr_domain field of struct Support for power domains is provided through the pm_domain field of struct
device. This field is a pointer to an object of type struct dev_power_domain, device. This field is a pointer to an object of type struct dev_pm_domain,
defined in include/linux/pm.h, providing a set of power management callbacks defined in include/linux/pm.h, providing a set of power management callbacks
analogous to the subsystem-level and device driver callbacks that are executed analogous to the subsystem-level and device driver callbacks that are executed
for the given device during all power transitions, instead of the respective for the given device during all power transitions, instead of the respective
...@@ -604,7 +604,7 @@ state temporarily, for example so that its system wakeup capability can be ...@@ -604,7 +604,7 @@ state temporarily, for example so that its system wakeup capability can be
disabled. This all depends on the hardware and the design of the subsystem and disabled. This all depends on the hardware and the design of the subsystem and
device driver in question. device driver in question.
During system-wide resume from a sleep state it's best to put devices into the During system-wide resume from a sleep state it's easiest to put devices into
full-power state, as explained in Documentation/power/runtime_pm.txt. Refer to the full-power state, as explained in Documentation/power/runtime_pm.txt. Refer
that document for more information regarding this particular issue as well as to that document for more information regarding this particular issue as well as
for information on the device runtime power management framework in general. for information on the device runtime power management framework in general.
...@@ -321,6 +321,8 @@ opp_init_cpufreq_table - cpufreq framework typically is initialized with ...@@ -321,6 +321,8 @@ opp_init_cpufreq_table - cpufreq framework typically is initialized with
addition to CONFIG_PM as power management feature is required to addition to CONFIG_PM as power management feature is required to
dynamically scale voltage and frequency in a system. dynamically scale voltage and frequency in a system.
opp_free_cpufreq_table - Free up the table allocated by opp_init_cpufreq_table
7. Data Structures 7. Data Structures
================== ==================
Typically an SoC contains multiple voltage domains which are variable. Each Typically an SoC contains multiple voltage domains which are variable. Each
......
This diff is collapsed.
...@@ -642,6 +642,7 @@ config ARCH_SHMOBILE ...@@ -642,6 +642,7 @@ config ARCH_SHMOBILE
select NO_IOPORT select NO_IOPORT
select SPARSE_IRQ select SPARSE_IRQ
select MULTI_IRQ_HANDLER select MULTI_IRQ_HANDLER
select PM_GENERIC_DOMAINS if PM
help help
Support for Renesas's SH-Mobile and R-Mobile ARM platforms. Support for Renesas's SH-Mobile and R-Mobile ARM platforms.
......
...@@ -32,7 +32,7 @@ static int omap1_pm_runtime_suspend(struct device *dev) ...@@ -32,7 +32,7 @@ static int omap1_pm_runtime_suspend(struct device *dev)
if (ret) if (ret)
return ret; return ret;
ret = pm_runtime_clk_suspend(dev); ret = pm_clk_suspend(dev);
if (ret) { if (ret) {
pm_generic_runtime_resume(dev); pm_generic_runtime_resume(dev);
return ret; return ret;
...@@ -45,24 +45,24 @@ static int omap1_pm_runtime_resume(struct device *dev) ...@@ -45,24 +45,24 @@ static int omap1_pm_runtime_resume(struct device *dev)
{ {
dev_dbg(dev, "%s\n", __func__); dev_dbg(dev, "%s\n", __func__);
pm_runtime_clk_resume(dev); pm_clk_resume(dev);
return pm_generic_runtime_resume(dev); return pm_generic_runtime_resume(dev);
} }
static struct dev_power_domain default_power_domain = { static struct dev_pm_domain default_pm_domain = {
.ops = { .ops = {
.runtime_suspend = omap1_pm_runtime_suspend, .runtime_suspend = omap1_pm_runtime_suspend,
.runtime_resume = omap1_pm_runtime_resume, .runtime_resume = omap1_pm_runtime_resume,
USE_PLATFORM_PM_SLEEP_OPS USE_PLATFORM_PM_SLEEP_OPS
}, },
}; };
#define OMAP1_PWR_DOMAIN (&default_power_domain) #define OMAP1_PM_DOMAIN (&default_pm_domain)
#else #else
#define OMAP1_PWR_DOMAIN NULL #define OMAP1_PM_DOMAIN NULL
#endif /* CONFIG_PM_RUNTIME */ #endif /* CONFIG_PM_RUNTIME */
static struct pm_clk_notifier_block platform_bus_notifier = { static struct pm_clk_notifier_block platform_bus_notifier = {
.pwr_domain = OMAP1_PWR_DOMAIN, .pm_domain = OMAP1_PM_DOMAIN,
.con_ids = { "ick", "fck", NULL, }, .con_ids = { "ick", "fck", NULL, },
}; };
...@@ -71,7 +71,7 @@ static int __init omap1_pm_runtime_init(void) ...@@ -71,7 +71,7 @@ static int __init omap1_pm_runtime_init(void)
if (!cpu_class_is_omap1()) if (!cpu_class_is_omap1())
return -ENODEV; return -ENODEV;
pm_runtime_clk_add_notifier(&platform_bus_type, &platform_bus_notifier); pm_clk_add_notifier(&platform_bus_type, &platform_bus_notifier);
return 0; return 0;
} }
......
...@@ -119,6 +119,8 @@ static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused) ...@@ -119,6 +119,8 @@ static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused)
return PTR_ERR(od); return PTR_ERR(od);
} }
omap_device_disable_idle_on_suspend(od);
gpio_bank_count++; gpio_bank_count++;
return 0; return 0;
} }
......
...@@ -805,6 +805,7 @@ void __init omap_serial_init_port(struct omap_board_data *bdata) ...@@ -805,6 +805,7 @@ void __init omap_serial_init_port(struct omap_board_data *bdata)
WARN(IS_ERR(od), "Could not build omap_device for %s: %s.\n", WARN(IS_ERR(od), "Could not build omap_device for %s: %s.\n",
name, oh->name); name, oh->name);
omap_device_disable_idle_on_suspend(od);
oh->mux = omap_hwmod_mux_init(bdata->pads, bdata->pads_cnt); oh->mux = omap_hwmod_mux_init(bdata->pads, bdata->pads_cnt);
uart->irq = oh->mpu_irqs[0].irq; uart->irq = oh->mpu_irqs[0].irq;
......
...@@ -1408,9 +1408,14 @@ static void __init ap4evb_init(void) ...@@ -1408,9 +1408,14 @@ static void __init ap4evb_init(void)
platform_add_devices(ap4evb_devices, ARRAY_SIZE(ap4evb_devices)); platform_add_devices(ap4evb_devices, ARRAY_SIZE(ap4evb_devices));
sh7372_add_device_to_domain(&sh7372_a4lc, &lcdc1_device);
sh7372_add_device_to_domain(&sh7372_a4lc, &lcdc_device);
sh7372_add_device_to_domain(&sh7372_a4mp, &fsi_device);
hdmi_init_pm_clock(); hdmi_init_pm_clock();
fsi_init_pm_clock(); fsi_init_pm_clock();
sh7372_pm_init(); sh7372_pm_init();
pm_clk_add(&fsi_device.dev, "spu2");
} }
static void __init ap4evb_timer_init(void) static void __init ap4evb_timer_init(void)
......
...@@ -1582,8 +1582,13 @@ static void __init mackerel_init(void) ...@@ -1582,8 +1582,13 @@ static void __init mackerel_init(void)
platform_add_devices(mackerel_devices, ARRAY_SIZE(mackerel_devices)); platform_add_devices(mackerel_devices, ARRAY_SIZE(mackerel_devices));
sh7372_add_device_to_domain(&sh7372_a4lc, &lcdc_device);
sh7372_add_device_to_domain(&sh7372_a4lc, &hdmi_lcdc_device);
sh7372_add_device_to_domain(&sh7372_a4mp, &fsi_device);
hdmi_init_pm_clock(); hdmi_init_pm_clock();
sh7372_pm_init(); sh7372_pm_init();
pm_clk_add(&fsi_device.dev, "spu2");
} }
static void __init mackerel_timer_init(void) static void __init mackerel_timer_init(void)
......
...@@ -662,6 +662,7 @@ static struct clk_lookup lookups[] = { ...@@ -662,6 +662,7 @@ static struct clk_lookup lookups[] = {
CLKDEV_ICK_ID("ick", "sh-mobile-hdmi", &div6_reparent_clks[DIV6_HDMI]), CLKDEV_ICK_ID("ick", "sh-mobile-hdmi", &div6_reparent_clks[DIV6_HDMI]),
CLKDEV_ICK_ID("icka", "sh_fsi2", &div6_reparent_clks[DIV6_FSIA]), CLKDEV_ICK_ID("icka", "sh_fsi2", &div6_reparent_clks[DIV6_FSIA]),
CLKDEV_ICK_ID("ickb", "sh_fsi2", &div6_reparent_clks[DIV6_FSIB]), CLKDEV_ICK_ID("ickb", "sh_fsi2", &div6_reparent_clks[DIV6_FSIB]),
CLKDEV_ICK_ID("spu2", "sh_fsi2", &mstp_clks[MSTP223]),
}; };
void __init sh7372_clock_init(void) void __init sh7372_clock_init(void)
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#define __ASM_SH7372_H__ #define __ASM_SH7372_H__
#include <linux/sh_clk.h> #include <linux/sh_clk.h>
#include <linux/pm_domain.h>
/* /*
* Pin Function Controller: * Pin Function Controller:
...@@ -470,4 +471,32 @@ extern struct clk sh7372_fsibck_clk; ...@@ -470,4 +471,32 @@ extern struct clk sh7372_fsibck_clk;
extern struct clk sh7372_fsidiva_clk; extern struct clk sh7372_fsidiva_clk;
extern struct clk sh7372_fsidivb_clk; extern struct clk sh7372_fsidivb_clk;
struct platform_device;
struct sh7372_pm_domain {
struct generic_pm_domain genpd;
unsigned int bit_shift;
};
static inline struct sh7372_pm_domain *to_sh7372_pd(struct generic_pm_domain *d)
{
return container_of(d, struct sh7372_pm_domain, genpd);
}
#ifdef CONFIG_PM
extern struct sh7372_pm_domain sh7372_a4lc;
extern struct sh7372_pm_domain sh7372_a4mp;
extern struct sh7372_pm_domain sh7372_d4;
extern struct sh7372_pm_domain sh7372_a3rv;
extern struct sh7372_pm_domain sh7372_a3ri;
extern struct sh7372_pm_domain sh7372_a3sg;
extern void sh7372_init_pm_domain(struct sh7372_pm_domain *sh7372_pd);
extern void sh7372_add_device_to_domain(struct sh7372_pm_domain *sh7372_pd,
struct platform_device *pdev);
#else
#define sh7372_init_pm_domain(pd) do { } while(0)
#define sh7372_add_device_to_domain(pd, pdev) do { } while(0)
#endif /* CONFIG_PM */
#endif /* __ASM_SH7372_H__ */ #endif /* __ASM_SH7372_H__ */
...@@ -15,16 +15,176 @@ ...@@ -15,16 +15,176 @@
#include <linux/list.h> #include <linux/list.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/pm_runtime.h>
#include <linux/platform_device.h>
#include <linux/delay.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
#include <mach/common.h> #include <mach/common.h>
#include <mach/sh7372.h>
#define SMFRAM 0xe6a70000 #define SMFRAM 0xe6a70000
#define SYSTBCR 0xe6150024 #define SYSTBCR 0xe6150024
#define SBAR 0xe6180020 #define SBAR 0xe6180020
#define APARMBAREA 0xe6f10020 #define APARMBAREA 0xe6f10020
#define SPDCR 0xe6180008
#define SWUCR 0xe6180014
#define PSTR 0xe6180080
#define PSTR_RETRIES 100
#define PSTR_DELAY_US 10
#ifdef CONFIG_PM
static int pd_power_down(struct generic_pm_domain *genpd)
{
struct sh7372_pm_domain *sh7372_pd = to_sh7372_pd(genpd);
unsigned int mask = 1 << sh7372_pd->bit_shift;
if (__raw_readl(PSTR) & mask) {
unsigned int retry_count;
__raw_writel(mask, SPDCR);
for (retry_count = PSTR_RETRIES; retry_count; retry_count--) {
if (!(__raw_readl(SPDCR) & mask))
break;
cpu_relax();
}
}
pr_debug("sh7372 power domain down 0x%08x -> PSTR = 0x%08x\n",
mask, __raw_readl(PSTR));
return 0;
}
static int pd_power_up(struct generic_pm_domain *genpd)
{
struct sh7372_pm_domain *sh7372_pd = to_sh7372_pd(genpd);
unsigned int mask = 1 << sh7372_pd->bit_shift;
unsigned int retry_count;
int ret = 0;
if (__raw_readl(PSTR) & mask)
goto out;
__raw_writel(mask, SWUCR);
for (retry_count = 2 * PSTR_RETRIES; retry_count; retry_count--) {
if (!(__raw_readl(SWUCR) & mask))
goto out;
if (retry_count > PSTR_RETRIES)
udelay(PSTR_DELAY_US);
else
cpu_relax();
}
if (__raw_readl(SWUCR) & mask)
ret = -EIO;
out:
pr_debug("sh7372 power domain up 0x%08x -> PSTR = 0x%08x\n",
mask, __raw_readl(PSTR));
return ret;
}
static int pd_power_up_a3rv(struct generic_pm_domain *genpd)
{
int ret = pd_power_up(genpd);
/* force A4LC on after A3RV has been requested on */
pm_genpd_poweron(&sh7372_a4lc.genpd);
return ret;
}
static int pd_power_down_a3rv(struct generic_pm_domain *genpd)
{
int ret = pd_power_down(genpd);
/* try to power down A4LC after A3RV is requested off */
genpd_queue_power_off_work(&sh7372_a4lc.genpd);
return ret;
}
static int pd_power_down_a4lc(struct generic_pm_domain *genpd)
{
/* only power down A4LC if A3RV is off */
if (!(__raw_readl(PSTR) & (1 << sh7372_a3rv.bit_shift)))
return pd_power_down(genpd);
return -EBUSY;
}
static bool pd_active_wakeup(struct device *dev)
{
return true;
}
void sh7372_init_pm_domain(struct sh7372_pm_domain *sh7372_pd)
{
struct generic_pm_domain *genpd = &sh7372_pd->genpd;
pm_genpd_init(genpd, NULL, false);
genpd->stop_device = pm_clk_suspend;
genpd->start_device = pm_clk_resume;
genpd->active_wakeup = pd_active_wakeup;
if (sh7372_pd == &sh7372_a4lc) {
genpd->power_off = pd_power_down_a4lc;
genpd->power_on = pd_power_up;
} else if (sh7372_pd == &sh7372_a3rv) {
genpd->power_off = pd_power_down_a3rv;
genpd->power_on = pd_power_up_a3rv;
} else {
genpd->power_off = pd_power_down;
genpd->power_on = pd_power_up;
}
genpd->power_on(&sh7372_pd->genpd);
}
void sh7372_add_device_to_domain(struct sh7372_pm_domain *sh7372_pd,
struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
if (!dev->power.subsys_data) {
pm_clk_init(dev);
pm_clk_add(dev, NULL);
}
pm_genpd_add_device(&sh7372_pd->genpd, dev);
}
struct sh7372_pm_domain sh7372_a4lc = {
.bit_shift = 1,
};
struct sh7372_pm_domain sh7372_a4mp = {
.bit_shift = 2,
};
struct sh7372_pm_domain sh7372_d4 = {
.bit_shift = 3,
};
struct sh7372_pm_domain sh7372_a3rv = {
.bit_shift = 6,
};
struct sh7372_pm_domain sh7372_a3ri = {
.bit_shift = 8,
};
struct sh7372_pm_domain sh7372_a3sg = {
.bit_shift = 13,
};
#endif /* CONFIG_PM */
static void sh7372_enter_core_standby(void) static void sh7372_enter_core_standby(void)
{ {
void __iomem *smfram = (void __iomem *)SMFRAM; void __iomem *smfram = (void __iomem *)SMFRAM;
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/pm_domain.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/sh_clk.h> #include <linux/sh_clk.h>
...@@ -28,31 +29,38 @@ static int default_platform_runtime_idle(struct device *dev) ...@@ -28,31 +29,38 @@ static int default_platform_runtime_idle(struct device *dev)
return pm_runtime_suspend(dev); return pm_runtime_suspend(dev);
} }
static struct dev_power_domain default_power_domain = { static struct dev_pm_domain default_pm_domain = {
.ops = { .ops = {
.runtime_suspend = pm_runtime_clk_suspend, .runtime_suspend = pm_clk_suspend,
.runtime_resume = pm_runtime_clk_resume, .runtime_resume = pm_clk_resume,
.runtime_idle = default_platform_runtime_idle, .runtime_idle = default_platform_runtime_idle,
USE_PLATFORM_PM_SLEEP_OPS USE_PLATFORM_PM_SLEEP_OPS
}, },
}; };
#define DEFAULT_PWR_DOMAIN_PTR (&default_power_domain) #define DEFAULT_PM_DOMAIN_PTR (&default_pm_domain)
#else #else
#define DEFAULT_PWR_DOMAIN_PTR NULL #define DEFAULT_PM_DOMAIN_PTR NULL
#endif /* CONFIG_PM_RUNTIME */ #endif /* CONFIG_PM_RUNTIME */
static struct pm_clk_notifier_block platform_bus_notifier = { static struct pm_clk_notifier_block platform_bus_notifier = {
.pwr_domain = DEFAULT_PWR_DOMAIN_PTR, .pm_domain = DEFAULT_PM_DOMAIN_PTR,
.con_ids = { NULL, }, .con_ids = { NULL, },
}; };
static int __init sh_pm_runtime_init(void) static int __init sh_pm_runtime_init(void)
{ {
pm_runtime_clk_add_notifier(&platform_bus_type, &platform_bus_notifier); pm_clk_add_notifier(&platform_bus_type, &platform_bus_notifier);
return 0; return 0;
} }
core_initcall(sh_pm_runtime_init); core_initcall(sh_pm_runtime_init);
static int __init sh_pm_runtime_late_init(void)
{
pm_genpd_poweroff_unused();
return 0;
}
late_initcall(sh_pm_runtime_late_init);
...@@ -841,11 +841,22 @@ static struct platform_device *sh7372_late_devices[] __initdata = { ...@@ -841,11 +841,22 @@ static struct platform_device *sh7372_late_devices[] __initdata = {
void __init sh7372_add_standard_devices(void) void __init sh7372_add_standard_devices(void)
{ {
sh7372_init_pm_domain(&sh7372_a4lc);
sh7372_init_pm_domain(&sh7372_a4mp);
sh7372_init_pm_domain(&sh7372_d4);
sh7372_init_pm_domain(&sh7372_a3rv);
sh7372_init_pm_domain(&sh7372_a3ri);
sh7372_init_pm_domain(&sh7372_a3sg);
platform_add_devices(sh7372_early_devices, platform_add_devices(sh7372_early_devices,
ARRAY_SIZE(sh7372_early_devices)); ARRAY_SIZE(sh7372_early_devices));
platform_add_devices(sh7372_late_devices, platform_add_devices(sh7372_late_devices,
ARRAY_SIZE(sh7372_late_devices)); ARRAY_SIZE(sh7372_late_devices));
sh7372_add_device_to_domain(&sh7372_a3rv, &vpu_device);
sh7372_add_device_to_domain(&sh7372_a4mp, &spu0_device);
sh7372_add_device_to_domain(&sh7372_a4mp, &spu1_device);
} }
void __init sh7372_add_early_devices(void) void __init sh7372_add_early_devices(void)
......
...@@ -44,6 +44,10 @@ extern struct device omap_device_parent; ...@@ -44,6 +44,10 @@ extern struct device omap_device_parent;
#define OMAP_DEVICE_STATE_IDLE 2 #define OMAP_DEVICE_STATE_IDLE 2
#define OMAP_DEVICE_STATE_SHUTDOWN 3 #define OMAP_DEVICE_STATE_SHUTDOWN 3
/* omap_device.flags values */
#define OMAP_DEVICE_SUSPENDED BIT(0)
#define OMAP_DEVICE_NO_IDLE_ON_SUSPEND BIT(1)
/** /**
* struct omap_device - omap_device wrapper for platform_devices * struct omap_device - omap_device wrapper for platform_devices
* @pdev: platform_device * @pdev: platform_device
...@@ -73,6 +77,7 @@ struct omap_device { ...@@ -73,6 +77,7 @@ struct omap_device {
s8 pm_lat_level; s8 pm_lat_level;
u8 hwmods_cnt; u8 hwmods_cnt;
u8 _state; u8 _state;
u8 flags;
}; };
/* Device driver interface (call via platform_data fn ptrs) */ /* Device driver interface (call via platform_data fn ptrs) */
...@@ -117,6 +122,10 @@ int omap_device_enable_hwmods(struct omap_device *od); ...@@ -117,6 +122,10 @@ int omap_device_enable_hwmods(struct omap_device *od);
int omap_device_disable_clocks(struct omap_device *od); int omap_device_disable_clocks(struct omap_device *od);
int omap_device_enable_clocks(struct omap_device *od); int omap_device_enable_clocks(struct omap_device *od);
static inline void omap_device_disable_idle_on_suspend(struct omap_device *od)
{
od->flags |= OMAP_DEVICE_NO_IDLE_ON_SUSPEND;
}
/* /*
* Entries should be kept in latency order ascending * Entries should be kept in latency order ascending
......
...@@ -537,6 +537,7 @@ int omap_early_device_register(struct omap_device *od) ...@@ -537,6 +537,7 @@ int omap_early_device_register(struct omap_device *od)
return 0; return 0;
} }
#ifdef CONFIG_PM_RUNTIME
static int _od_runtime_suspend(struct device *dev) static int _od_runtime_suspend(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
...@@ -563,13 +564,55 @@ static int _od_runtime_resume(struct device *dev) ...@@ -563,13 +564,55 @@ static int _od_runtime_resume(struct device *dev)
return pm_generic_runtime_resume(dev); return pm_generic_runtime_resume(dev);
} }
#endif
static struct dev_power_domain omap_device_power_domain = { #ifdef CONFIG_SUSPEND
static int _od_suspend_noirq(struct device *dev)
{
struct platform_device *pdev = to_platform_device(dev);
struct omap_device *od = to_omap_device(pdev);
int ret;
if (od->flags & OMAP_DEVICE_NO_IDLE_ON_SUSPEND)
return pm_generic_suspend_noirq(dev);
ret = pm_generic_suspend_noirq(dev);
if (!ret && !pm_runtime_status_suspended(dev)) {
if (pm_generic_runtime_suspend(dev) == 0) {
omap_device_idle(pdev);
od->flags |= OMAP_DEVICE_SUSPENDED;
}
}
return ret;
}
static int _od_resume_noirq(struct device *dev)
{
struct platform_device *pdev = to_platform_device(dev);
struct omap_device *od = to_omap_device(pdev);
if (od->flags & OMAP_DEVICE_NO_IDLE_ON_SUSPEND)
return pm_generic_resume_noirq(dev);
if ((od->flags & OMAP_DEVICE_SUSPENDED) &&
!pm_runtime_status_suspended(dev)) {
od->flags &= ~OMAP_DEVICE_SUSPENDED;
omap_device_enable(pdev);
pm_generic_runtime_resume(dev);
}
return pm_generic_resume_noirq(dev);
}
#endif
static struct dev_pm_domain omap_device_pm_domain = {
.ops = { .ops = {
.runtime_suspend = _od_runtime_suspend, SET_RUNTIME_PM_OPS(_od_runtime_suspend, _od_runtime_resume,
.runtime_idle = _od_runtime_idle, _od_runtime_idle)
.runtime_resume = _od_runtime_resume,
USE_PLATFORM_PM_SLEEP_OPS USE_PLATFORM_PM_SLEEP_OPS
SET_SYSTEM_SLEEP_PM_OPS(_od_suspend_noirq, _od_resume_noirq)
} }
}; };
...@@ -586,7 +629,7 @@ int omap_device_register(struct omap_device *od) ...@@ -586,7 +629,7 @@ int omap_device_register(struct omap_device *od)
pr_debug("omap_device: %s: registering\n", od->pdev.name); pr_debug("omap_device: %s: registering\n", od->pdev.name);
od->pdev.dev.parent = &omap_device_parent; od->pdev.dev.parent = &omap_device_parent;
od->pdev.dev.pwr_domain = &omap_device_power_domain; od->pdev.dev.pm_domain = &omap_device_pm_domain;
return platform_device_register(&od->pdev); return platform_device_register(&od->pdev);
} }
......
...@@ -256,7 +256,7 @@ static int default_platform_runtime_idle(struct device *dev) ...@@ -256,7 +256,7 @@ static int default_platform_runtime_idle(struct device *dev)
return ret; return ret;
} }
static struct dev_power_domain default_power_domain = { static struct dev_pm_domain default_pm_domain = {
.ops = { .ops = {
.runtime_suspend = default_platform_runtime_suspend, .runtime_suspend = default_platform_runtime_suspend,
.runtime_resume = default_platform_runtime_resume, .runtime_resume = default_platform_runtime_resume,
...@@ -285,7 +285,7 @@ static int platform_bus_notify(struct notifier_block *nb, ...@@ -285,7 +285,7 @@ static int platform_bus_notify(struct notifier_block *nb,
hwblk_disable(hwblk_info, hwblk); hwblk_disable(hwblk_info, hwblk);
/* make sure driver re-inits itself once */ /* make sure driver re-inits itself once */
__set_bit(PDEV_ARCHDATA_FLAG_INIT, &pdev->archdata.flags); __set_bit(PDEV_ARCHDATA_FLAG_INIT, &pdev->archdata.flags);
dev->pwr_domain = &default_power_domain; dev->pm_domain = &default_pm_domain;
break; break;
/* TODO: add BUS_NOTIFY_BIND_DRIVER and increase idle count */ /* TODO: add BUS_NOTIFY_BIND_DRIVER and increase idle count */
case BUS_NOTIFY_BOUND_DRIVER: case BUS_NOTIFY_BOUND_DRIVER:
...@@ -299,7 +299,7 @@ static int platform_bus_notify(struct notifier_block *nb, ...@@ -299,7 +299,7 @@ static int platform_bus_notify(struct notifier_block *nb,
__set_bit(PDEV_ARCHDATA_FLAG_INIT, &pdev->archdata.flags); __set_bit(PDEV_ARCHDATA_FLAG_INIT, &pdev->archdata.flags);
break; break;
case BUS_NOTIFY_DEL_DEVICE: case BUS_NOTIFY_DEL_DEVICE:
dev->pwr_domain = NULL; dev->pm_domain = NULL;
break; break;
} }
return 0; return 0;
......
...@@ -3,6 +3,7 @@ obj-$(CONFIG_PM_SLEEP) += main.o wakeup.o ...@@ -3,6 +3,7 @@ obj-$(CONFIG_PM_SLEEP) += main.o wakeup.o
obj-$(CONFIG_PM_RUNTIME) += runtime.o obj-$(CONFIG_PM_RUNTIME) += runtime.o
obj-$(CONFIG_PM_TRACE_RTC) += trace.o obj-$(CONFIG_PM_TRACE_RTC) += trace.o
obj-$(CONFIG_PM_OPP) += opp.o obj-$(CONFIG_PM_OPP) += opp.o
obj-$(CONFIG_PM_GENERIC_DOMAINS) += domain.o
obj-$(CONFIG_HAVE_CLK) += clock_ops.o obj-$(CONFIG_HAVE_CLK) += clock_ops.o
ccflags-$(CONFIG_DEBUG_DRIVER) := -DDEBUG ccflags-$(CONFIG_DEBUG_DRIVER) := -DDEBUG
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
...@@ -94,12 +94,13 @@ int pm_generic_prepare(struct device *dev) ...@@ -94,12 +94,13 @@ int pm_generic_prepare(struct device *dev)
* __pm_generic_call - Generic suspend/freeze/poweroff/thaw subsystem callback. * __pm_generic_call - Generic suspend/freeze/poweroff/thaw subsystem callback.
* @dev: Device to handle. * @dev: Device to handle.
* @event: PM transition of the system under way. * @event: PM transition of the system under way.
* @bool: Whether or not this is the "noirq" stage.
* *
* If the device has not been suspended at run time, execute the * If the device has not been suspended at run time, execute the
* suspend/freeze/poweroff/thaw callback provided by its driver, if defined, and * suspend/freeze/poweroff/thaw callback provided by its driver, if defined, and
* return its error code. Otherwise, return zero. * return its error code. Otherwise, return zero.
*/ */
static int __pm_generic_call(struct device *dev, int event) static int __pm_generic_call(struct device *dev, int event, bool noirq)
{ {
const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL; const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
int (*callback)(struct device *); int (*callback)(struct device *);
...@@ -109,16 +110,16 @@ static int __pm_generic_call(struct device *dev, int event) ...@@ -109,16 +110,16 @@ static int __pm_generic_call(struct device *dev, int event)
switch (event) { switch (event) {
case PM_EVENT_SUSPEND: case PM_EVENT_SUSPEND:
callback = pm->suspend; callback = noirq ? pm->suspend_noirq : pm->suspend;
break; break;
case PM_EVENT_FREEZE: case PM_EVENT_FREEZE:
callback = pm->freeze; callback = noirq ? pm->freeze_noirq : pm->freeze;
break; break;
case PM_EVENT_HIBERNATE: case PM_EVENT_HIBERNATE:
callback = pm->poweroff; callback = noirq ? pm->poweroff_noirq : pm->poweroff;
break; break;
case PM_EVENT_THAW: case PM_EVENT_THAW:
callback = pm->thaw; callback = noirq ? pm->thaw_noirq : pm->thaw;
break; break;
default: default:
callback = NULL; callback = NULL;
...@@ -128,43 +129,83 @@ static int __pm_generic_call(struct device *dev, int event) ...@@ -128,43 +129,83 @@ static int __pm_generic_call(struct device *dev, int event)
return callback ? callback(dev) : 0; return callback ? callback(dev) : 0;
} }
/**
* pm_generic_suspend_noirq - Generic suspend_noirq callback for subsystems.
* @dev: Device to suspend.
*/
int pm_generic_suspend_noirq(struct device *dev)
{
return __pm_generic_call(dev, PM_EVENT_SUSPEND, true);
}
EXPORT_SYMBOL_GPL(pm_generic_suspend_noirq);
/** /**
* pm_generic_suspend - Generic suspend callback for subsystems. * pm_generic_suspend - Generic suspend callback for subsystems.
* @dev: Device to suspend. * @dev: Device to suspend.
*/ */
int pm_generic_suspend(struct device *dev) int pm_generic_suspend(struct device *dev)
{ {
return __pm_generic_call(dev, PM_EVENT_SUSPEND); return __pm_generic_call(dev, PM_EVENT_SUSPEND, false);
} }
EXPORT_SYMBOL_GPL(pm_generic_suspend); EXPORT_SYMBOL_GPL(pm_generic_suspend);
/**
* pm_generic_freeze_noirq - Generic freeze_noirq callback for subsystems.
* @dev: Device to freeze.
*/
int pm_generic_freeze_noirq(struct device *dev)
{
return __pm_generic_call(dev, PM_EVENT_FREEZE, true);
}
EXPORT_SYMBOL_GPL(pm_generic_freeze_noirq);
/** /**
* pm_generic_freeze - Generic freeze callback for subsystems. * pm_generic_freeze - Generic freeze callback for subsystems.
* @dev: Device to freeze. * @dev: Device to freeze.
*/ */
int pm_generic_freeze(struct device *dev) int pm_generic_freeze(struct device *dev)
{ {
return __pm_generic_call(dev, PM_EVENT_FREEZE); return __pm_generic_call(dev, PM_EVENT_FREEZE, false);
} }
EXPORT_SYMBOL_GPL(pm_generic_freeze); EXPORT_SYMBOL_GPL(pm_generic_freeze);
/**
* pm_generic_poweroff_noirq - Generic poweroff_noirq callback for subsystems.
* @dev: Device to handle.
*/
int pm_generic_poweroff_noirq(struct device *dev)
{
return __pm_generic_call(dev, PM_EVENT_HIBERNATE, true);
}
EXPORT_SYMBOL_GPL(pm_generic_poweroff_noirq);
/** /**
* pm_generic_poweroff - Generic poweroff callback for subsystems. * pm_generic_poweroff - Generic poweroff callback for subsystems.
* @dev: Device to handle. * @dev: Device to handle.
*/ */
int pm_generic_poweroff(struct device *dev) int pm_generic_poweroff(struct device *dev)
{ {
return __pm_generic_call(dev, PM_EVENT_HIBERNATE); return __pm_generic_call(dev, PM_EVENT_HIBERNATE, false);
} }
EXPORT_SYMBOL_GPL(pm_generic_poweroff); EXPORT_SYMBOL_GPL(pm_generic_poweroff);
/**
* pm_generic_thaw_noirq - Generic thaw_noirq callback for subsystems.
* @dev: Device to thaw.
*/
int pm_generic_thaw_noirq(struct device *dev)
{
return __pm_generic_call(dev, PM_EVENT_THAW, true);
}
EXPORT_SYMBOL_GPL(pm_generic_thaw_noirq);
/** /**
* pm_generic_thaw - Generic thaw callback for subsystems. * pm_generic_thaw - Generic thaw callback for subsystems.
* @dev: Device to thaw. * @dev: Device to thaw.
*/ */
int pm_generic_thaw(struct device *dev) int pm_generic_thaw(struct device *dev)
{ {
return __pm_generic_call(dev, PM_EVENT_THAW); return __pm_generic_call(dev, PM_EVENT_THAW, false);
} }
EXPORT_SYMBOL_GPL(pm_generic_thaw); EXPORT_SYMBOL_GPL(pm_generic_thaw);
...@@ -172,12 +213,13 @@ EXPORT_SYMBOL_GPL(pm_generic_thaw); ...@@ -172,12 +213,13 @@ EXPORT_SYMBOL_GPL(pm_generic_thaw);
* __pm_generic_resume - Generic resume/restore callback for subsystems. * __pm_generic_resume - Generic resume/restore callback for subsystems.
* @dev: Device to handle. * @dev: Device to handle.
* @event: PM transition of the system under way. * @event: PM transition of the system under way.
* @bool: Whether or not this is the "noirq" stage.
* *
* Execute the resume/resotre callback provided by the @dev's driver, if * Execute the resume/resotre callback provided by the @dev's driver, if
* defined. If it returns 0, change the device's runtime PM status to 'active'. * defined. If it returns 0, change the device's runtime PM status to 'active'.
* Return the callback's error code. * Return the callback's error code.
*/ */
static int __pm_generic_resume(struct device *dev, int event) static int __pm_generic_resume(struct device *dev, int event, bool noirq)
{ {
const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL; const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
int (*callback)(struct device *); int (*callback)(struct device *);
...@@ -188,10 +230,10 @@ static int __pm_generic_resume(struct device *dev, int event) ...@@ -188,10 +230,10 @@ static int __pm_generic_resume(struct device *dev, int event)
switch (event) { switch (event) {
case PM_EVENT_RESUME: case PM_EVENT_RESUME:
callback = pm->resume; callback = noirq ? pm->resume_noirq : pm->resume;
break; break;
case PM_EVENT_RESTORE: case PM_EVENT_RESTORE:
callback = pm->restore; callback = noirq ? pm->restore_noirq : pm->restore;
break; break;
default: default:
callback = NULL; callback = NULL;
...@@ -202,7 +244,7 @@ static int __pm_generic_resume(struct device *dev, int event) ...@@ -202,7 +244,7 @@ static int __pm_generic_resume(struct device *dev, int event)
return 0; return 0;
ret = callback(dev); ret = callback(dev);
if (!ret && pm_runtime_enabled(dev)) { if (!ret && !noirq && pm_runtime_enabled(dev)) {
pm_runtime_disable(dev); pm_runtime_disable(dev);
pm_runtime_set_active(dev); pm_runtime_set_active(dev);
pm_runtime_enable(dev); pm_runtime_enable(dev);
...@@ -211,23 +253,43 @@ static int __pm_generic_resume(struct device *dev, int event) ...@@ -211,23 +253,43 @@ static int __pm_generic_resume(struct device *dev, int event)
return ret; return ret;
} }
/**
* pm_generic_resume_noirq - Generic resume_noirq callback for subsystems.
* @dev: Device to resume.
*/
int pm_generic_resume_noirq(struct device *dev)
{
return __pm_generic_resume(dev, PM_EVENT_RESUME, true);
}
EXPORT_SYMBOL_GPL(pm_generic_resume_noirq);
/** /**
* pm_generic_resume - Generic resume callback for subsystems. * pm_generic_resume - Generic resume callback for subsystems.
* @dev: Device to resume. * @dev: Device to resume.
*/ */
int pm_generic_resume(struct device *dev) int pm_generic_resume(struct device *dev)
{ {
return __pm_generic_resume(dev, PM_EVENT_RESUME); return __pm_generic_resume(dev, PM_EVENT_RESUME, false);
} }
EXPORT_SYMBOL_GPL(pm_generic_resume); EXPORT_SYMBOL_GPL(pm_generic_resume);
/**
* pm_generic_restore_noirq - Generic restore_noirq callback for subsystems.
* @dev: Device to restore.
*/
int pm_generic_restore_noirq(struct device *dev)
{
return __pm_generic_resume(dev, PM_EVENT_RESTORE, true);
}
EXPORT_SYMBOL_GPL(pm_generic_restore_noirq);
/** /**
* pm_generic_restore - Generic restore callback for subsystems. * pm_generic_restore - Generic restore callback for subsystems.
* @dev: Device to restore. * @dev: Device to restore.
*/ */
int pm_generic_restore(struct device *dev) int pm_generic_restore(struct device *dev)
{ {
return __pm_generic_resume(dev, PM_EVENT_RESTORE); return __pm_generic_resume(dev, PM_EVENT_RESTORE, false);
} }
EXPORT_SYMBOL_GPL(pm_generic_restore); EXPORT_SYMBOL_GPL(pm_generic_restore);
...@@ -256,11 +318,17 @@ struct dev_pm_ops generic_subsys_pm_ops = { ...@@ -256,11 +318,17 @@ struct dev_pm_ops generic_subsys_pm_ops = {
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
.prepare = pm_generic_prepare, .prepare = pm_generic_prepare,
.suspend = pm_generic_suspend, .suspend = pm_generic_suspend,
.suspend_noirq = pm_generic_suspend_noirq,
.resume = pm_generic_resume, .resume = pm_generic_resume,
.resume_noirq = pm_generic_resume_noirq,
.freeze = pm_generic_freeze, .freeze = pm_generic_freeze,
.freeze_noirq = pm_generic_freeze_noirq,
.thaw = pm_generic_thaw, .thaw = pm_generic_thaw,
.thaw_noirq = pm_generic_thaw_noirq,
.poweroff = pm_generic_poweroff, .poweroff = pm_generic_poweroff,
.poweroff_noirq = pm_generic_poweroff_noirq,
.restore = pm_generic_restore, .restore = pm_generic_restore,
.restore_noirq = pm_generic_restore_noirq,
.complete = pm_generic_complete, .complete = pm_generic_complete,
#endif #endif
#ifdef CONFIG_PM_RUNTIME #ifdef CONFIG_PM_RUNTIME
......
...@@ -425,9 +425,9 @@ static int device_resume_noirq(struct device *dev, pm_message_t state) ...@@ -425,9 +425,9 @@ static int device_resume_noirq(struct device *dev, pm_message_t state)
TRACE_DEVICE(dev); TRACE_DEVICE(dev);
TRACE_RESUME(0); TRACE_RESUME(0);
if (dev->pwr_domain) { if (dev->pm_domain) {
pm_dev_dbg(dev, state, "EARLY power domain "); pm_dev_dbg(dev, state, "EARLY power domain ");
error = pm_noirq_op(dev, &dev->pwr_domain->ops, state); error = pm_noirq_op(dev, &dev->pm_domain->ops, state);
} else if (dev->type && dev->type->pm) { } else if (dev->type && dev->type->pm) {
pm_dev_dbg(dev, state, "EARLY type "); pm_dev_dbg(dev, state, "EARLY type ");
error = pm_noirq_op(dev, dev->type->pm, state); error = pm_noirq_op(dev, dev->type->pm, state);
...@@ -505,6 +505,7 @@ static int legacy_resume(struct device *dev, int (*cb)(struct device *dev)) ...@@ -505,6 +505,7 @@ static int legacy_resume(struct device *dev, int (*cb)(struct device *dev))
static int device_resume(struct device *dev, pm_message_t state, bool async) static int device_resume(struct device *dev, pm_message_t state, bool async)
{ {
int error = 0; int error = 0;
bool put = false;
TRACE_DEVICE(dev); TRACE_DEVICE(dev);
TRACE_RESUME(0); TRACE_RESUME(0);
...@@ -521,9 +522,12 @@ static int device_resume(struct device *dev, pm_message_t state, bool async) ...@@ -521,9 +522,12 @@ static int device_resume(struct device *dev, pm_message_t state, bool async)
if (!dev->power.is_suspended) if (!dev->power.is_suspended)
goto Unlock; goto Unlock;
if (dev->pwr_domain) { pm_runtime_enable(dev);
put = true;
if (dev->pm_domain) {
pm_dev_dbg(dev, state, "power domain "); pm_dev_dbg(dev, state, "power domain ");
error = pm_op(dev, &dev->pwr_domain->ops, state); error = pm_op(dev, &dev->pm_domain->ops, state);
goto End; goto End;
} }
...@@ -563,6 +567,10 @@ static int device_resume(struct device *dev, pm_message_t state, bool async) ...@@ -563,6 +567,10 @@ static int device_resume(struct device *dev, pm_message_t state, bool async)
complete_all(&dev->power.completion); complete_all(&dev->power.completion);
TRACE_RESUME(error); TRACE_RESUME(error);
if (put)
pm_runtime_put_sync(dev);
return error; return error;
} }
...@@ -641,10 +649,10 @@ static void device_complete(struct device *dev, pm_message_t state) ...@@ -641,10 +649,10 @@ static void device_complete(struct device *dev, pm_message_t state)
{ {
device_lock(dev); device_lock(dev);
if (dev->pwr_domain) { if (dev->pm_domain) {
pm_dev_dbg(dev, state, "completing power domain "); pm_dev_dbg(dev, state, "completing power domain ");
if (dev->pwr_domain->ops.complete) if (dev->pm_domain->ops.complete)
dev->pwr_domain->ops.complete(dev); dev->pm_domain->ops.complete(dev);
} else if (dev->type && dev->type->pm) { } else if (dev->type && dev->type->pm) {
pm_dev_dbg(dev, state, "completing type "); pm_dev_dbg(dev, state, "completing type ");
if (dev->type->pm->complete) if (dev->type->pm->complete)
...@@ -744,9 +752,9 @@ static int device_suspend_noirq(struct device *dev, pm_message_t state) ...@@ -744,9 +752,9 @@ static int device_suspend_noirq(struct device *dev, pm_message_t state)
{ {
int error; int error;
if (dev->pwr_domain) { if (dev->pm_domain) {
pm_dev_dbg(dev, state, "LATE power domain "); pm_dev_dbg(dev, state, "LATE power domain ");
error = pm_noirq_op(dev, &dev->pwr_domain->ops, state); error = pm_noirq_op(dev, &dev->pm_domain->ops, state);
if (error) if (error)
return error; return error;
} else if (dev->type && dev->type->pm) { } else if (dev->type && dev->type->pm) {
...@@ -843,19 +851,25 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async) ...@@ -843,19 +851,25 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
int error = 0; int error = 0;
dpm_wait_for_children(dev, async); dpm_wait_for_children(dev, async);
device_lock(dev);
if (async_error) if (async_error)
goto Unlock; return 0;
pm_runtime_get_noresume(dev);
if (pm_runtime_barrier(dev) && device_may_wakeup(dev))
pm_wakeup_event(dev, 0);
if (pm_wakeup_pending()) { if (pm_wakeup_pending()) {
pm_runtime_put_sync(dev);
async_error = -EBUSY; async_error = -EBUSY;
goto Unlock; return 0;
} }
if (dev->pwr_domain) { device_lock(dev);
if (dev->pm_domain) {
pm_dev_dbg(dev, state, "power domain "); pm_dev_dbg(dev, state, "power domain ");
error = pm_op(dev, &dev->pwr_domain->ops, state); error = pm_op(dev, &dev->pm_domain->ops, state);
goto End; goto End;
} }
...@@ -890,12 +904,15 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async) ...@@ -890,12 +904,15 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
End: End:
dev->power.is_suspended = !error; dev->power.is_suspended = !error;
Unlock:
device_unlock(dev); device_unlock(dev);
complete_all(&dev->power.completion); complete_all(&dev->power.completion);
if (error) if (error) {
pm_runtime_put_sync(dev);
async_error = error; async_error = error;
} else if (dev->power.is_suspended) {
__pm_runtime_disable(dev, false);
}
return error; return error;
} }
...@@ -982,11 +999,11 @@ static int device_prepare(struct device *dev, pm_message_t state) ...@@ -982,11 +999,11 @@ static int device_prepare(struct device *dev, pm_message_t state)
device_lock(dev); device_lock(dev);
if (dev->pwr_domain) { if (dev->pm_domain) {
pm_dev_dbg(dev, state, "preparing power domain "); pm_dev_dbg(dev, state, "preparing power domain ");
if (dev->pwr_domain->ops.prepare) if (dev->pm_domain->ops.prepare)
error = dev->pwr_domain->ops.prepare(dev); error = dev->pm_domain->ops.prepare(dev);
suspend_report_result(dev->pwr_domain->ops.prepare, error); suspend_report_result(dev->pm_domain->ops.prepare, error);
if (error) if (error)
goto End; goto End;
} else if (dev->type && dev->type->pm) { } else if (dev->type && dev->type->pm) {
...@@ -1035,13 +1052,7 @@ int dpm_prepare(pm_message_t state) ...@@ -1035,13 +1052,7 @@ int dpm_prepare(pm_message_t state)
get_device(dev); get_device(dev);
mutex_unlock(&dpm_list_mtx); mutex_unlock(&dpm_list_mtx);
pm_runtime_get_noresume(dev); error = device_prepare(dev, state);
if (pm_runtime_barrier(dev) && device_may_wakeup(dev))
pm_wakeup_event(dev, 0);
pm_runtime_put_sync(dev);
error = pm_wakeup_pending() ?
-EBUSY : device_prepare(dev, state);
mutex_lock(&dpm_list_mtx); mutex_lock(&dpm_list_mtx);
if (error) { if (error) {
......
...@@ -625,4 +625,21 @@ int opp_init_cpufreq_table(struct device *dev, ...@@ -625,4 +625,21 @@ int opp_init_cpufreq_table(struct device *dev,
return 0; return 0;
} }
/**
* opp_free_cpufreq_table() - free the cpufreq table
* @dev: device for which we do this operation
* @table: table to free
*
* Free up the table allocated by opp_init_cpufreq_table
*/
void opp_free_cpufreq_table(struct device *dev,
struct cpufreq_frequency_table **table)
{
if (!table)
return;
kfree(*table);
*table = NULL;
}
#endif /* CONFIG_CPU_FREQ */ #endif /* CONFIG_CPU_FREQ */
This diff is collapsed.
...@@ -116,12 +116,14 @@ static ssize_t control_store(struct device * dev, struct device_attribute *attr, ...@@ -116,12 +116,14 @@ static ssize_t control_store(struct device * dev, struct device_attribute *attr,
cp = memchr(buf, '\n', n); cp = memchr(buf, '\n', n);
if (cp) if (cp)
len = cp - buf; len = cp - buf;
device_lock(dev);
if (len == sizeof ctrl_auto - 1 && strncmp(buf, ctrl_auto, len) == 0) if (len == sizeof ctrl_auto - 1 && strncmp(buf, ctrl_auto, len) == 0)
pm_runtime_allow(dev); pm_runtime_allow(dev);
else if (len == sizeof ctrl_on - 1 && strncmp(buf, ctrl_on, len) == 0) else if (len == sizeof ctrl_on - 1 && strncmp(buf, ctrl_on, len) == 0)
pm_runtime_forbid(dev); pm_runtime_forbid(dev);
else else
return -EINVAL; n = -EINVAL;
device_unlock(dev);
return n; return n;
} }
...@@ -205,7 +207,9 @@ static ssize_t autosuspend_delay_ms_store(struct device *dev, ...@@ -205,7 +207,9 @@ static ssize_t autosuspend_delay_ms_store(struct device *dev,
if (strict_strtol(buf, 10, &delay) != 0 || delay != (int) delay) if (strict_strtol(buf, 10, &delay) != 0 || delay != (int) delay)
return -EINVAL; return -EINVAL;
device_lock(dev);
pm_runtime_set_autosuspend_delay(dev, delay); pm_runtime_set_autosuspend_delay(dev, delay);
device_unlock(dev);
return n; return n;
} }
......
...@@ -112,7 +112,7 @@ static unsigned int read_magic_time(void) ...@@ -112,7 +112,7 @@ static unsigned int read_magic_time(void)
unsigned int val; unsigned int val;
get_rtc_time(&time); get_rtc_time(&time);
pr_info("Time: %2d:%02d:%02d Date: %02d/%02d/%02d\n", pr_info("RTC time: %2d:%02d:%02d, date: %02d/%02d/%02d\n",
time.tm_hour, time.tm_min, time.tm_sec, time.tm_hour, time.tm_min, time.tm_sec,
time.tm_mon + 1, time.tm_mday, time.tm_year % 100); time.tm_mon + 1, time.tm_mday, time.tm_year % 100);
val = time.tm_year; /* 100 years */ val = time.tm_year; /* 100 years */
......
...@@ -606,7 +606,7 @@ static int apm_suspend_notifier(struct notifier_block *nb, ...@@ -606,7 +606,7 @@ static int apm_suspend_notifier(struct notifier_block *nb,
return NOTIFY_OK; return NOTIFY_OK;
/* interrupted by signal */ /* interrupted by signal */
return NOTIFY_BAD; return notifier_from_errno(err);
case PM_POST_SUSPEND: case PM_POST_SUSPEND:
/* /*
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/cpu.h> #include <linux/cpu.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/suspend.h>
#include "pci.h" #include "pci.h"
struct pci_dynid { struct pci_dynid {
...@@ -615,6 +616,21 @@ static int pci_pm_prepare(struct device *dev) ...@@ -615,6 +616,21 @@ static int pci_pm_prepare(struct device *dev)
struct device_driver *drv = dev->driver; struct device_driver *drv = dev->driver;
int error = 0; int error = 0;
/*
* If a PCI device configured to wake up the system from sleep states
* has been suspended at run time and there's a resume request pending
* for it, this is equivalent to the device signaling wakeup, so the
* system suspend operation should be aborted.
*/
pm_runtime_get_noresume(dev);
if (pm_runtime_barrier(dev) && device_may_wakeup(dev))
pm_wakeup_event(dev, 0);
if (pm_wakeup_pending()) {
pm_runtime_put_sync(dev);
return -EBUSY;
}
/* /*
* PCI devices suspended at run time need to be resumed at this * PCI devices suspended at run time need to be resumed at this
* point, because in general it is necessary to reconfigure them for * point, because in general it is necessary to reconfigure them for
...@@ -624,7 +640,7 @@ static int pci_pm_prepare(struct device *dev) ...@@ -624,7 +640,7 @@ static int pci_pm_prepare(struct device *dev)
* system from the sleep state, we'll have to prevent it from signaling * system from the sleep state, we'll have to prevent it from signaling
* wake-up. * wake-up.
*/ */
pm_runtime_get_sync(dev); pm_runtime_resume(dev);
if (drv && drv->pm && drv->pm->prepare) if (drv && drv->pm && drv->pm->prepare)
error = drv->pm->prepare(dev); error = drv->pm->prepare(dev);
......
...@@ -258,13 +258,13 @@ static int vmwdt_suspend(void) ...@@ -258,13 +258,13 @@ static int vmwdt_suspend(void)
if (test_and_set_bit(VMWDT_OPEN, &vmwdt_is_open)) { if (test_and_set_bit(VMWDT_OPEN, &vmwdt_is_open)) {
pr_err("The system cannot be suspended while the watchdog" pr_err("The system cannot be suspended while the watchdog"
" is in use\n"); " is in use\n");
return NOTIFY_BAD; return notifier_from_errno(-EBUSY);
} }
if (test_bit(VMWDT_RUNNING, &vmwdt_is_open)) { if (test_bit(VMWDT_RUNNING, &vmwdt_is_open)) {
clear_bit(VMWDT_OPEN, &vmwdt_is_open); clear_bit(VMWDT_OPEN, &vmwdt_is_open);
pr_err("The system cannot be suspended while the watchdog" pr_err("The system cannot be suspended while the watchdog"
" is running\n"); " is running\n");
return NOTIFY_BAD; return notifier_from_errno(-EBUSY);
} }
return NOTIFY_DONE; return NOTIFY_DONE;
} }
......
...@@ -814,8 +814,8 @@ static int css_power_event(struct notifier_block *this, unsigned long event, ...@@ -814,8 +814,8 @@ static int css_power_event(struct notifier_block *this, unsigned long event,
mutex_unlock(&css->mutex); mutex_unlock(&css->mutex);
continue; continue;
} }
if (__chsc_do_secm(css, 0)) ret = __chsc_do_secm(css, 0);
ret = NOTIFY_BAD; ret = notifier_from_errno(ret);
mutex_unlock(&css->mutex); mutex_unlock(&css->mutex);
} }
break; break;
...@@ -831,8 +831,8 @@ static int css_power_event(struct notifier_block *this, unsigned long event, ...@@ -831,8 +831,8 @@ static int css_power_event(struct notifier_block *this, unsigned long event,
mutex_unlock(&css->mutex); mutex_unlock(&css->mutex);
continue; continue;
} }
if (__chsc_do_secm(css, 1)) ret = __chsc_do_secm(css, 1);
ret = NOTIFY_BAD; ret = notifier_from_errno(ret);
mutex_unlock(&css->mutex); mutex_unlock(&css->mutex);
} }
/* search for subchannels, which appeared during hibernation */ /* search for subchannels, which appeared during hibernation */
......
...@@ -144,9 +144,9 @@ int scsi_autopm_get_device(struct scsi_device *sdev) ...@@ -144,9 +144,9 @@ int scsi_autopm_get_device(struct scsi_device *sdev)
int err; int err;
err = pm_runtime_get_sync(&sdev->sdev_gendev); err = pm_runtime_get_sync(&sdev->sdev_gendev);
if (err < 0) if (err < 0 && err !=-EACCES)
pm_runtime_put_sync(&sdev->sdev_gendev); pm_runtime_put_sync(&sdev->sdev_gendev);
else if (err > 0) else
err = 0; err = 0;
return err; return err;
} }
...@@ -173,9 +173,9 @@ int scsi_autopm_get_host(struct Scsi_Host *shost) ...@@ -173,9 +173,9 @@ int scsi_autopm_get_host(struct Scsi_Host *shost)
int err; int err;
err = pm_runtime_get_sync(&shost->shost_gendev); err = pm_runtime_get_sync(&shost->shost_gendev);
if (err < 0) if (err < 0 && err !=-EACCES)
pm_runtime_put_sync(&shost->shost_gendev); pm_runtime_put_sync(&shost->shost_gendev);
else if (err > 0) else
err = 0; err = 0;
return err; return err;
} }
......
...@@ -516,7 +516,7 @@ struct device_dma_parameters { ...@@ -516,7 +516,7 @@ struct device_dma_parameters {
* minimizes board-specific #ifdefs in drivers. * minimizes board-specific #ifdefs in drivers.
* @power: For device power management. * @power: For device power management.
* See Documentation/power/devices.txt for details. * See Documentation/power/devices.txt for details.
* @pwr_domain: Provide callbacks that are executed during system suspend, * @pm_domain: Provide callbacks that are executed during system suspend,
* hibernation, system resume and during runtime PM transitions * hibernation, system resume and during runtime PM transitions
* along with subsystem-level and driver-level callbacks. * along with subsystem-level and driver-level callbacks.
* @numa_node: NUMA node this device is close to. * @numa_node: NUMA node this device is close to.
...@@ -567,7 +567,7 @@ struct device { ...@@ -567,7 +567,7 @@ struct device {
void *platform_data; /* Platform specific data, device void *platform_data; /* Platform specific data, device
core doesn't touch it */ core doesn't touch it */
struct dev_pm_info power; struct dev_pm_info power;
struct dev_power_domain *pwr_domain; struct dev_pm_domain *pm_domain;
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
int numa_node; /* NUMA node this device is close to */ int numa_node; /* NUMA node this device is close to */
......
...@@ -94,12 +94,20 @@ static inline int opp_disable(struct device *dev, unsigned long freq) ...@@ -94,12 +94,20 @@ static inline int opp_disable(struct device *dev, unsigned long freq)
#if defined(CONFIG_CPU_FREQ) && defined(CONFIG_PM_OPP) #if defined(CONFIG_CPU_FREQ) && defined(CONFIG_PM_OPP)
int opp_init_cpufreq_table(struct device *dev, int opp_init_cpufreq_table(struct device *dev,
struct cpufreq_frequency_table **table); struct cpufreq_frequency_table **table);
void opp_free_cpufreq_table(struct device *dev,
struct cpufreq_frequency_table **table);
#else #else
static inline int opp_init_cpufreq_table(struct device *dev, static inline int opp_init_cpufreq_table(struct device *dev,
struct cpufreq_frequency_table **table) struct cpufreq_frequency_table **table)
{ {
return -EINVAL; return -EINVAL;
} }
static inline
void opp_free_cpufreq_table(struct device *dev,
struct cpufreq_frequency_table **table)
{
}
#endif /* CONFIG_CPU_FREQ */ #endif /* CONFIG_CPU_FREQ */
#endif /* __LINUX_OPP_H__ */ #endif /* __LINUX_OPP_H__ */
...@@ -461,8 +461,8 @@ struct dev_pm_info { ...@@ -461,8 +461,8 @@ struct dev_pm_info {
unsigned long active_jiffies; unsigned long active_jiffies;
unsigned long suspended_jiffies; unsigned long suspended_jiffies;
unsigned long accounting_timestamp; unsigned long accounting_timestamp;
void *subsys_data; /* Owned by the subsystem. */
#endif #endif
void *subsys_data; /* Owned by the subsystem. */
}; };
extern void update_pm_runtime_accounting(struct device *dev); extern void update_pm_runtime_accounting(struct device *dev);
...@@ -472,7 +472,7 @@ extern void update_pm_runtime_accounting(struct device *dev); ...@@ -472,7 +472,7 @@ extern void update_pm_runtime_accounting(struct device *dev);
* hibernation, system resume and during runtime PM transitions along with * hibernation, system resume and during runtime PM transitions along with
* subsystem-level and driver-level callbacks. * subsystem-level and driver-level callbacks.
*/ */
struct dev_power_domain { struct dev_pm_domain {
struct dev_pm_ops ops; struct dev_pm_ops ops;
}; };
...@@ -553,11 +553,17 @@ extern void __suspend_report_result(const char *function, void *fn, int ret); ...@@ -553,11 +553,17 @@ extern void __suspend_report_result(const char *function, void *fn, int ret);
extern int device_pm_wait_for_dev(struct device *sub, struct device *dev); extern int device_pm_wait_for_dev(struct device *sub, struct device *dev);
extern int pm_generic_prepare(struct device *dev); extern int pm_generic_prepare(struct device *dev);
extern int pm_generic_suspend_noirq(struct device *dev);
extern int pm_generic_suspend(struct device *dev); extern int pm_generic_suspend(struct device *dev);
extern int pm_generic_resume_noirq(struct device *dev);
extern int pm_generic_resume(struct device *dev); extern int pm_generic_resume(struct device *dev);
extern int pm_generic_freeze_noirq(struct device *dev);
extern int pm_generic_freeze(struct device *dev); extern int pm_generic_freeze(struct device *dev);
extern int pm_generic_thaw_noirq(struct device *dev);
extern int pm_generic_thaw(struct device *dev); extern int pm_generic_thaw(struct device *dev);
extern int pm_generic_restore_noirq(struct device *dev);
extern int pm_generic_restore(struct device *dev); extern int pm_generic_restore(struct device *dev);
extern int pm_generic_poweroff_noirq(struct device *dev);
extern int pm_generic_poweroff(struct device *dev); extern int pm_generic_poweroff(struct device *dev);
extern void pm_generic_complete(struct device *dev); extern void pm_generic_complete(struct device *dev);
......
/*
* pm_domain.h - Definitions and headers related to device power domains.
*
* Copyright (C) 2011 Rafael J. Wysocki <rjw@sisk.pl>, Renesas Electronics Corp.
*
* This file is released under the GPLv2.
*/
#ifndef _LINUX_PM_DOMAIN_H
#define _LINUX_PM_DOMAIN_H
#include <linux/device.h>
enum gpd_status {
GPD_STATE_ACTIVE = 0, /* PM domain is active */
GPD_STATE_BUSY, /* Something is happening to the PM domain */
GPD_STATE_REPEAT, /* Power off in progress, to be repeated */
GPD_STATE_POWER_OFF, /* PM domain is off */
};
struct dev_power_governor {
bool (*power_down_ok)(struct dev_pm_domain *domain);
};
struct generic_pm_domain {
struct dev_pm_domain domain; /* PM domain operations */
struct list_head gpd_list_node; /* Node in the global PM domains list */
struct list_head sd_node; /* Node in the parent's subdomain list */
struct generic_pm_domain *parent; /* Parent PM domain */
struct list_head sd_list; /* List of dubdomains */
struct list_head dev_list; /* List of devices */
struct mutex lock;
struct dev_power_governor *gov;
struct work_struct power_off_work;
unsigned int in_progress; /* Number of devices being suspended now */
unsigned int sd_count; /* Number of subdomains with power "on" */
enum gpd_status status; /* Current state of the domain */
wait_queue_head_t status_wait_queue;
struct task_struct *poweroff_task; /* Powering off task */
unsigned int resume_count; /* Number of devices being resumed */
unsigned int device_count; /* Number of devices */
unsigned int suspended_count; /* System suspend device counter */
unsigned int prepared_count; /* Suspend counter of prepared devices */
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);
int (*start_device)(struct device *dev);
int (*stop_device)(struct device *dev);
bool (*active_wakeup)(struct device *dev);
};
static inline struct generic_pm_domain *pd_to_genpd(struct dev_pm_domain *pd)
{
return container_of(pd, struct generic_pm_domain, domain);
}
struct dev_list_entry {
struct list_head node;
struct device *dev;
bool need_restore;
};
#ifdef CONFIG_PM_GENERIC_DOMAINS
extern int pm_genpd_add_device(struct generic_pm_domain *genpd,
struct device *dev);
extern int pm_genpd_remove_device(struct generic_pm_domain *genpd,
struct device *dev);
extern int pm_genpd_add_subdomain(struct generic_pm_domain *genpd,
struct generic_pm_domain *new_subdomain);
extern int pm_genpd_remove_subdomain(struct generic_pm_domain *genpd,
struct generic_pm_domain *target);
extern void pm_genpd_init(struct generic_pm_domain *genpd,
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)
{
return -ENOSYS;
}
static inline int pm_genpd_remove_device(struct generic_pm_domain *genpd,
struct device *dev)
{
return -ENOSYS;
}
static inline int pm_genpd_add_subdomain(struct generic_pm_domain *genpd,
struct generic_pm_domain *new_sd)
{
return -ENOSYS;
}
static inline int pm_genpd_remove_subdomain(struct generic_pm_domain *genpd,
struct generic_pm_domain *target)
{
return -ENOSYS;
}
static inline void pm_genpd_init(struct generic_pm_domain *genpd,
struct dev_power_governor *gov, bool is_off) {}
static inline int pm_genpd_poweron(struct generic_pm_domain *genpd)
{
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 */
...@@ -82,6 +82,11 @@ static inline bool pm_runtime_suspended(struct device *dev) ...@@ -82,6 +82,11 @@ static inline bool pm_runtime_suspended(struct device *dev)
&& !dev->power.disable_depth; && !dev->power.disable_depth;
} }
static inline bool pm_runtime_status_suspended(struct device *dev)
{
return dev->power.runtime_status == RPM_SUSPENDED;
}
static inline bool pm_runtime_enabled(struct device *dev) static inline bool pm_runtime_enabled(struct device *dev)
{ {
return !dev->power.disable_depth; return !dev->power.disable_depth;
...@@ -130,6 +135,7 @@ static inline void pm_runtime_put_noidle(struct device *dev) {} ...@@ -130,6 +135,7 @@ static inline void pm_runtime_put_noidle(struct device *dev) {}
static inline bool device_run_wake(struct device *dev) { return false; } static inline bool device_run_wake(struct device *dev) { return false; }
static inline void device_set_run_wake(struct device *dev, bool enable) {} static inline void device_set_run_wake(struct device *dev, bool enable) {}
static inline bool pm_runtime_suspended(struct device *dev) { return false; } static inline bool pm_runtime_suspended(struct device *dev) { return false; }
static inline bool pm_runtime_status_suspended(struct device *dev) { return false; }
static inline bool pm_runtime_enabled(struct device *dev) { return false; } static inline bool pm_runtime_enabled(struct device *dev) { return false; }
static inline int pm_generic_runtime_idle(struct device *dev) { return 0; } static inline int pm_generic_runtime_idle(struct device *dev) { return 0; }
...@@ -247,41 +253,41 @@ static inline void pm_runtime_dont_use_autosuspend(struct device *dev) ...@@ -247,41 +253,41 @@ static inline void pm_runtime_dont_use_autosuspend(struct device *dev)
struct pm_clk_notifier_block { struct pm_clk_notifier_block {
struct notifier_block nb; struct notifier_block nb;
struct dev_power_domain *pwr_domain; struct dev_pm_domain *pm_domain;
char *con_ids[]; char *con_ids[];
}; };
#ifdef CONFIG_PM_RUNTIME_CLK #ifdef CONFIG_PM_CLK
extern int pm_runtime_clk_init(struct device *dev); extern int pm_clk_init(struct device *dev);
extern void pm_runtime_clk_destroy(struct device *dev); extern void pm_clk_destroy(struct device *dev);
extern int pm_runtime_clk_add(struct device *dev, const char *con_id); extern int pm_clk_add(struct device *dev, const char *con_id);
extern void pm_runtime_clk_remove(struct device *dev, const char *con_id); extern void pm_clk_remove(struct device *dev, const char *con_id);
extern int pm_runtime_clk_suspend(struct device *dev); extern int pm_clk_suspend(struct device *dev);
extern int pm_runtime_clk_resume(struct device *dev); extern int pm_clk_resume(struct device *dev);
#else #else
static inline int pm_runtime_clk_init(struct device *dev) static inline int pm_clk_init(struct device *dev)
{ {
return -EINVAL; return -EINVAL;
} }
static inline void pm_runtime_clk_destroy(struct device *dev) static inline void pm_clk_destroy(struct device *dev)
{ {
} }
static inline int pm_runtime_clk_add(struct device *dev, const char *con_id) static inline int pm_clk_add(struct device *dev, const char *con_id)
{ {
return -EINVAL; return -EINVAL;
} }
static inline void pm_runtime_clk_remove(struct device *dev, const char *con_id) static inline void pm_clk_remove(struct device *dev, const char *con_id)
{ {
} }
#define pm_runtime_clock_suspend NULL #define pm_clk_suspend NULL
#define pm_runtime_clock_resume NULL #define pm_clk_resume NULL
#endif #endif
#ifdef CONFIG_HAVE_CLK #ifdef CONFIG_HAVE_CLK
extern void pm_runtime_clk_add_notifier(struct bus_type *bus, extern void pm_clk_add_notifier(struct bus_type *bus,
struct pm_clk_notifier_block *clknb); struct pm_clk_notifier_block *clknb);
#else #else
static inline void pm_runtime_clk_add_notifier(struct bus_type *bus, static inline void pm_clk_add_notifier(struct bus_type *bus,
struct pm_clk_notifier_block *clknb) struct pm_clk_notifier_block *clknb)
{ {
} }
......
...@@ -92,6 +92,13 @@ typedef int __bitwise suspend_state_t; ...@@ -92,6 +92,13 @@ typedef int __bitwise suspend_state_t;
* @enter() and @wake(), even if any of them fails. It is executed after * @enter() and @wake(), even if any of them fails. It is executed after
* a failing @prepare. * a failing @prepare.
* *
* @suspend_again: Returns whether the system should suspend again (true) or
* not (false). If the platform wants to poll sensors or execute some
* code during suspended without invoking userspace and most of devices,
* suspend_again callback is the place assuming that periodic-wakeup or
* alarm-wakeup is already setup. This allows to execute some codes while
* being kept suspended in the view of userland and devices.
*
* @end: Called by the PM core right after resuming devices, to indicate to * @end: Called by the PM core right after resuming devices, to indicate to
* the platform that the system has returned to the working state or * the platform that the system has returned to the working state or
* the transition to the sleep state has been aborted. * the transition to the sleep state has been aborted.
...@@ -113,6 +120,7 @@ struct platform_suspend_ops { ...@@ -113,6 +120,7 @@ struct platform_suspend_ops {
int (*enter)(suspend_state_t state); int (*enter)(suspend_state_t state);
void (*wake)(void); void (*wake)(void);
void (*finish)(void); void (*finish)(void);
bool (*suspend_again)(void);
void (*end)(void); void (*end)(void);
void (*recover)(void); void (*recover)(void);
}; };
......
...@@ -224,6 +224,10 @@ config PM_OPP ...@@ -224,6 +224,10 @@ config PM_OPP
implementations a ready to use framework to manage OPPs. implementations a ready to use framework to manage OPPs.
For more information, read <file:Documentation/power/opp.txt> For more information, read <file:Documentation/power/opp.txt>
config PM_RUNTIME_CLK config PM_CLK
def_bool y def_bool y
depends on PM_RUNTIME && HAVE_CLK depends on PM && HAVE_CLK
config PM_GENERIC_DOMAINS
bool
depends on PM
...@@ -37,8 +37,9 @@ EXPORT_SYMBOL_GPL(unregister_pm_notifier); ...@@ -37,8 +37,9 @@ EXPORT_SYMBOL_GPL(unregister_pm_notifier);
int pm_notifier_call_chain(unsigned long val) int pm_notifier_call_chain(unsigned long val)
{ {
return (blocking_notifier_call_chain(&pm_chain_head, val, NULL) int ret = blocking_notifier_call_chain(&pm_chain_head, val, NULL);
== NOTIFY_BAD) ? -EINVAL : 0;
return notifier_to_errno(ret);
} }
/* If set, devices may be suspended and resumed asynchronously. */ /* If set, devices may be suspended and resumed asynchronously. */
......
...@@ -44,6 +44,7 @@ void suspend_set_ops(const struct platform_suspend_ops *ops) ...@@ -44,6 +44,7 @@ void suspend_set_ops(const struct platform_suspend_ops *ops)
suspend_ops = ops; suspend_ops = ops;
mutex_unlock(&pm_mutex); mutex_unlock(&pm_mutex);
} }
EXPORT_SYMBOL_GPL(suspend_set_ops);
bool valid_state(suspend_state_t state) bool valid_state(suspend_state_t state)
{ {
...@@ -65,6 +66,7 @@ int suspend_valid_only_mem(suspend_state_t state) ...@@ -65,6 +66,7 @@ int suspend_valid_only_mem(suspend_state_t state)
{ {
return state == PM_SUSPEND_MEM; return state == PM_SUSPEND_MEM;
} }
EXPORT_SYMBOL_GPL(suspend_valid_only_mem);
static int suspend_test(int level) static int suspend_test(int level)
{ {
...@@ -126,12 +128,13 @@ void __attribute__ ((weak)) arch_suspend_enable_irqs(void) ...@@ -126,12 +128,13 @@ void __attribute__ ((weak)) arch_suspend_enable_irqs(void)
} }
/** /**
* suspend_enter - enter the desired system sleep state. * suspend_enter - enter the desired system sleep state.
* @state: state to enter * @state: State to enter
* @wakeup: Returns information that suspend should not be entered again.
* *
* This function should be called after devices have been suspended. * This function should be called after devices have been suspended.
*/ */
static int suspend_enter(suspend_state_t state) static int suspend_enter(suspend_state_t state, bool *wakeup)
{ {
int error; int error;
...@@ -165,7 +168,8 @@ static int suspend_enter(suspend_state_t state) ...@@ -165,7 +168,8 @@ static int suspend_enter(suspend_state_t state)
error = syscore_suspend(); error = syscore_suspend();
if (!error) { if (!error) {
if (!(suspend_test(TEST_CORE) || pm_wakeup_pending())) { *wakeup = pm_wakeup_pending();
if (!(suspend_test(TEST_CORE) || *wakeup)) {
error = suspend_ops->enter(state); error = suspend_ops->enter(state);
events_check_enabled = false; events_check_enabled = false;
} }
...@@ -199,6 +203,7 @@ static int suspend_enter(suspend_state_t state) ...@@ -199,6 +203,7 @@ static int suspend_enter(suspend_state_t state)
int suspend_devices_and_enter(suspend_state_t state) int suspend_devices_and_enter(suspend_state_t state)
{ {
int error; int error;
bool wakeup = false;
if (!suspend_ops) if (!suspend_ops)
return -ENOSYS; return -ENOSYS;
...@@ -220,7 +225,10 @@ int suspend_devices_and_enter(suspend_state_t state) ...@@ -220,7 +225,10 @@ int suspend_devices_and_enter(suspend_state_t state)
if (suspend_test(TEST_DEVICES)) if (suspend_test(TEST_DEVICES))
goto Recover_platform; goto Recover_platform;
error = suspend_enter(state); do {
error = suspend_enter(state, &wakeup);
} while (!error && !wakeup
&& suspend_ops->suspend_again && suspend_ops->suspend_again());
Resume_devices: Resume_devices:
suspend_test_start(); suspend_test_start();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment