aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2007-04-30 18:09:51 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-04-30 19:40:40 -0400
commitfe0c935a6cbf25d72a27c7a345df8a2151de0b74 (patch)
tree841a847412694ee586b0ca7e1e2ce7c45700d9b1
parent1173a729fc3ce2fa0d698bd39be8ff7bf6c70bf1 (diff)
rework pm_ops pm_disk_mode, kill misuse
This patch series cleans up some misconceptions about pm_ops. Some users of the pm_ops structure attempt to use it to stop the user from entering suspend to disk, this, however, is not possible since the user can always use "shutdown" in /sys/power/disk and then the pm_ops are never invoked. Also, platforms that don't support suspend to disk simply should not allow configuring SOFTWARE_SUSPEND (read the help text on it, it only selects suspend to disk and nothing else, all the other stuff depends on PM). The pm_ops structure is actually intended to provide a way to enter platform-defined sleep states (currently supported states are "standby" and "mem" (suspend to ram)) and additionally (if SOFTWARE_SUSPEND is configured) allows a platform to support a platform specific way to enter low-power mode once everything has been saved to disk. This is currently only used by ACPI (S4). This patch: The pm_ops.pm_disk_mode is used in totally bogus ways since nobody really seems to understand what it actually does. This patch clarifies the pm_disk_mode description. It also removes all the arm and sh users that think they can veto suspend to disk via pm_ops; not so since the user can always do echo shutdown > /sys/power/disk, they need to find a better way involving Kconfig or such. ACPI is the only user left with a non-zero pm_disk_mode. The patch also sets the default mode to shutdown again, but when a new pm_ops is registered its pm_disk_mode is selected as default, that way the default stays for ACPI where it is apparently required. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Cc: David Brownell <david-b@pacbell.net> Acked-by: Pavel Machek <pavel@ucw.cz> Cc: <linux-pm@lists.linux-foundation.org> Cc: Len Brown <lenb@kernel.org> Acked-by: Russell King <rmk@arm.linux.org.uk> Cc: Greg KH <greg@kroah.com> Cc: "Rafael J. Wysocki" <rjw@sisk.pl> Acked-by: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/arm/common/sharpsl_pm.c1
-rw-r--r--arch/arm/mach-at91/pm.c1
-rw-r--r--arch/arm/mach-omap1/pm.c1
-rw-r--r--arch/arm/mach-omap2/pm.c1
-rw-r--r--arch/arm/mach-pxa/pm.c4
-rw-r--r--arch/arm/mach-sa1100/pm.c7
-rw-r--r--arch/arm/plat-s3c24xx/pm.c9
-rw-r--r--arch/sh/boards/hp6xx/pm.c7
-rw-r--r--include/linux/pm.h23
-rw-r--r--kernel/power/disk.c60
-rw-r--r--kernel/power/main.c6
11 files changed, 56 insertions, 64 deletions
diff --git a/arch/arm/common/sharpsl_pm.c b/arch/arm/common/sharpsl_pm.c
index a9bc5b52218f..4cb895d4ae5b 100644
--- a/arch/arm/common/sharpsl_pm.c
+++ b/arch/arm/common/sharpsl_pm.c
@@ -766,7 +766,6 @@ static void sharpsl_apm_get_power_status(struct apm_power_info *info)
766} 766}
767 767
768static struct pm_ops sharpsl_pm_ops = { 768static struct pm_ops sharpsl_pm_ops = {
769 .pm_disk_mode = PM_DISK_FIRMWARE,
770 .prepare = pxa_pm_prepare, 769 .prepare = pxa_pm_prepare,
771 .enter = corgi_pxa_pm_enter, 770 .enter = corgi_pxa_pm_enter,
772 .finish = pxa_pm_finish, 771 .finish = pxa_pm_finish,
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index b49bfda53d7f..ff8db29e989e 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -201,7 +201,6 @@ error:
201 201
202 202
203static struct pm_ops at91_pm_ops ={ 203static struct pm_ops at91_pm_ops ={
204 .pm_disk_mode = 0,
205 .valid = at91_pm_valid_state, 204 .valid = at91_pm_valid_state,
206 .prepare = at91_pm_prepare, 205 .prepare = at91_pm_prepare,
207 .enter = at91_pm_enter, 206 .enter = at91_pm_enter,
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index 49efe903dacd..4248117e5e3f 100644
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -698,7 +698,6 @@ static struct irqaction omap_wakeup_irq = {
698 698
699 699
700static struct pm_ops omap_pm_ops ={ 700static struct pm_ops omap_pm_ops ={
701 .pm_disk_mode = 0,
702 .prepare = omap_pm_prepare, 701 .prepare = omap_pm_prepare,
703 .enter = omap_pm_enter, 702 .enter = omap_pm_enter,
704 .finish = omap_pm_finish, 703 .finish = omap_pm_finish,
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index d7eee99b7e3f..3e9a128feea1 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -370,7 +370,6 @@ static int omap2_pm_finish(suspend_state_t state)
370} 370}
371 371
372static struct pm_ops omap_pm_ops = { 372static struct pm_ops omap_pm_ops = {
373 .pm_disk_mode = 0,
374 .prepare = omap2_pm_prepare, 373 .prepare = omap2_pm_prepare,
375 .enter = omap2_pm_enter, 374 .enter = omap2_pm_enter,
376 .finish = omap2_pm_finish, 375 .finish = omap2_pm_finish,
diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c
index b4d8276d6050..0a99ef43b36f 100644
--- a/arch/arm/mach-pxa/pm.c
+++ b/arch/arm/mach-pxa/pm.c
@@ -223,11 +223,7 @@ int pxa_pm_finish(suspend_state_t state)
223 223
224EXPORT_SYMBOL_GPL(pxa_pm_finish); 224EXPORT_SYMBOL_GPL(pxa_pm_finish);
225 225
226/*
227 * Set to PM_DISK_FIRMWARE so we can quickly veto suspend-to-disk.
228 */
229static struct pm_ops pxa_pm_ops = { 226static struct pm_ops pxa_pm_ops = {
230 .pm_disk_mode = PM_DISK_FIRMWARE,
231 .prepare = pxa_pm_prepare, 227 .prepare = pxa_pm_prepare,
232 .enter = pxa_pm_enter, 228 .enter = pxa_pm_enter,
233 .finish = pxa_pm_finish, 229 .finish = pxa_pm_finish,
diff --git a/arch/arm/mach-sa1100/pm.c b/arch/arm/mach-sa1100/pm.c
index 786c8534231f..b0837113b2aa 100644
--- a/arch/arm/mach-sa1100/pm.c
+++ b/arch/arm/mach-sa1100/pm.c
@@ -59,9 +59,6 @@ static int sa11x0_pm_enter(suspend_state_t state)
59 unsigned long gpio, sleep_save[SLEEP_SAVE_SIZE]; 59 unsigned long gpio, sleep_save[SLEEP_SAVE_SIZE];
60 struct timespec delta, rtc; 60 struct timespec delta, rtc;
61 61
62 if (state != PM_SUSPEND_MEM)
63 return -EINVAL;
64
65 /* preserve current time */ 62 /* preserve current time */
66 rtc.tv_sec = RCNR; 63 rtc.tv_sec = RCNR;
67 rtc.tv_nsec = 0; 64 rtc.tv_nsec = 0;
@@ -134,11 +131,7 @@ unsigned long sleep_phys_sp(void *sp)
134 return virt_to_phys(sp); 131 return virt_to_phys(sp);
135} 132}
136 133
137/*
138 * Set to PM_DISK_FIRMWARE so we can quickly veto suspend-to-disk.
139 */
140static struct pm_ops sa11x0_pm_ops = { 134static struct pm_ops sa11x0_pm_ops = {
141 .pm_disk_mode = PM_DISK_FIRMWARE,
142 .enter = sa11x0_pm_enter, 135 .enter = sa11x0_pm_enter,
143}; 136};
144 137
diff --git a/arch/arm/plat-s3c24xx/pm.c b/arch/arm/plat-s3c24xx/pm.c
index ecf68d611904..d6af3082af30 100644
--- a/arch/arm/plat-s3c24xx/pm.c
+++ b/arch/arm/plat-s3c24xx/pm.c
@@ -511,11 +511,6 @@ static int s3c2410_pm_enter(suspend_state_t state)
511 return -EINVAL; 511 return -EINVAL;
512 } 512 }
513 513
514 if (state != PM_SUSPEND_MEM) {
515 printk(KERN_ERR PFX "error: only PM_SUSPEND_MEM supported\n");
516 return -EINVAL;
517 }
518
519 /* check if we have anything to wake-up with... bad things seem 514 /* check if we have anything to wake-up with... bad things seem
520 * to happen if you suspend with no wakeup (system will often 515 * to happen if you suspend with no wakeup (system will often
521 * require a full power-cycle) 516 * require a full power-cycle)
@@ -633,11 +628,7 @@ static int s3c2410_pm_finish(suspend_state_t state)
633 return 0; 628 return 0;
634} 629}
635 630
636/*
637 * Set to PM_DISK_FIRMWARE so we can quickly veto suspend-to-disk.
638 */
639static struct pm_ops s3c2410_pm_ops = { 631static struct pm_ops s3c2410_pm_ops = {
640 .pm_disk_mode = PM_DISK_FIRMWARE,
641 .prepare = s3c2410_pm_prepare, 632 .prepare = s3c2410_pm_prepare,
642 .enter = s3c2410_pm_enter, 633 .enter = s3c2410_pm_enter,
643 .finish = s3c2410_pm_finish, 634 .finish = s3c2410_pm_finish,
diff --git a/arch/sh/boards/hp6xx/pm.c b/arch/sh/boards/hp6xx/pm.c
index d1947732fb3e..4b2f29a4bde9 100644
--- a/arch/sh/boards/hp6xx/pm.c
+++ b/arch/sh/boards/hp6xx/pm.c
@@ -27,9 +27,6 @@ static int hp6x0_pm_enter(suspend_state_t state)
27 u16 hd64461_stbcr; 27 u16 hd64461_stbcr;
28#endif 28#endif
29 29
30 if (state != PM_SUSPEND_MEM)
31 return -EINVAL;
32
33#ifdef CONFIG_HD64461_ENABLER 30#ifdef CONFIG_HD64461_ENABLER
34 outb(0, HD64461_PCC1CSCIER); 31 outb(0, HD64461_PCC1CSCIER);
35 32
@@ -70,11 +67,7 @@ static int hp6x0_pm_enter(suspend_state_t state)
70 return 0; 67 return 0;
71} 68}
72 69
73/*
74 * Set to PM_DISK_FIRMWARE so we can quickly veto suspend-to-disk.
75 */
76static struct pm_ops hp6x0_pm_ops = { 70static struct pm_ops hp6x0_pm_ops = {
77 .pm_disk_mode = PM_DISK_FIRMWARE,
78 .enter = hp6x0_pm_enter, 71 .enter = hp6x0_pm_enter,
79}; 72};
80 73
diff --git a/include/linux/pm.h b/include/linux/pm.h
index 9bd86db4d395..dfced9188bdc 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -112,6 +112,8 @@ typedef int __bitwise suspend_state_t;
112 112
113typedef int __bitwise suspend_disk_method_t; 113typedef int __bitwise suspend_disk_method_t;
114 114
115/* invalid must be 0 so struct pm_ops initialisers can leave it out */
116#define PM_DISK_INVALID ((__force suspend_disk_method_t) 0)
115#define PM_DISK_FIRMWARE ((__force suspend_disk_method_t) 1) 117#define PM_DISK_FIRMWARE ((__force suspend_disk_method_t) 1)
116#define PM_DISK_PLATFORM ((__force suspend_disk_method_t) 2) 118#define PM_DISK_PLATFORM ((__force suspend_disk_method_t) 2)
117#define PM_DISK_SHUTDOWN ((__force suspend_disk_method_t) 3) 119#define PM_DISK_SHUTDOWN ((__force suspend_disk_method_t) 3)
@@ -137,17 +139,16 @@ typedef int __bitwise suspend_disk_method_t;
137 * @finish: Called when the system has left the given state and all devices 139 * @finish: Called when the system has left the given state and all devices
138 * are resumed. The return value is ignored. 140 * are resumed. The return value is ignored.
139 * 141 *
140 * @pm_disk_mode: Set to the disk method that the user should be able to 142 * @pm_disk_mode: The generic code always allows one of the shutdown methods
141 * configure for suspend-to-disk. Since %PM_DISK_SHUTDOWN, 143 * %PM_DISK_SHUTDOWN, %PM_DISK_REBOOT, %PM_DISK_TEST and
142 * %PM_DISK_REBOOT, %PM_DISK_TEST and %PM_DISK_TESTPROC 144 * %PM_DISK_TESTPROC. If this variable is set, the mode it is set
143 * are always allowed, currently only %PM_DISK_PLATFORM 145 * to is allowed in addition to those modes and is also made default.
144 * makes sense. If the user then choses %PM_DISK_PLATFORM, 146 * When this mode is sent selected, the @prepare call will be called
145 * the @prepare call will be called before suspending to disk 147 * before suspending to disk (if present), the @enter call should be
146 * (if present), the @enter call should be present and will 148 * present and will be called after all state has been saved and the
147 * be called after all state has been saved and the machine 149 * machine is ready to be powered off; the @finish callback is called
148 * is ready to be shut down/suspended/..., and the @finish 150 * after state has been restored. All these calls are called with
149 * callback is called after state has been restored. All 151 * %PM_SUSPEND_DISK as the state.
150 * these calls are called with %PM_SUSPEND_DISK as the state.
151 */ 152 */
152struct pm_ops { 153struct pm_ops {
153 int (*valid)(suspend_state_t state); 154 int (*valid)(suspend_state_t state);
diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index aec19b063e3f..4de2f69fe095 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -39,7 +39,13 @@ static inline int platform_prepare(void)
39{ 39{
40 int error = 0; 40 int error = 0;
41 41
42 if (pm_disk_mode == PM_DISK_PLATFORM) { 42 switch (pm_disk_mode) {
43 case PM_DISK_TEST:
44 case PM_DISK_TESTPROC:
45 case PM_DISK_SHUTDOWN:
46 case PM_DISK_REBOOT:
47 break;
48 default:
43 if (pm_ops && pm_ops->prepare) 49 if (pm_ops && pm_ops->prepare)
44 error = pm_ops->prepare(PM_SUSPEND_DISK); 50 error = pm_ops->prepare(PM_SUSPEND_DISK);
45 } 51 }
@@ -48,40 +54,48 @@ static inline int platform_prepare(void)
48 54
49/** 55/**
50 * power_down - Shut machine down for hibernate. 56 * power_down - Shut machine down for hibernate.
51 * @mode: Suspend-to-disk mode
52 * 57 *
53 * Use the platform driver, if configured so, and return gracefully if it 58 * Use the platform driver, if configured so; otherwise try
54 * fails. 59 * to power off or reboot.
55 * Otherwise, try to power off and reboot. If they fail, halt the machine,
56 * there ain't no turning back.
57 */ 60 */
58 61
59static void power_down(suspend_disk_method_t mode) 62static void power_down(void)
60{ 63{
61 switch(mode) { 64 switch (pm_disk_mode) {
62 case PM_DISK_PLATFORM: 65 case PM_DISK_TEST:
63 if (pm_ops && pm_ops->enter) { 66 case PM_DISK_TESTPROC:
64 kernel_shutdown_prepare(SYSTEM_SUSPEND_DISK); 67 break;
65 pm_ops->enter(PM_SUSPEND_DISK);
66 break;
67 }
68 case PM_DISK_SHUTDOWN: 68 case PM_DISK_SHUTDOWN:
69 kernel_power_off(); 69 kernel_power_off();
70 break; 70 break;
71 case PM_DISK_REBOOT: 71 case PM_DISK_REBOOT:
72 kernel_restart(NULL); 72 kernel_restart(NULL);
73 break; 73 break;
74 default:
75 if (pm_ops && pm_ops->enter) {
76 kernel_shutdown_prepare(SYSTEM_SUSPEND_DISK);
77 pm_ops->enter(PM_SUSPEND_DISK);
78 break;
79 }
74 } 80 }
75 kernel_halt(); 81 kernel_halt();
76 /* Valid image is on the disk, if we continue we risk serious data corruption 82 /*
77 after resume. */ 83 * Valid image is on the disk, if we continue we risk serious data
84 * corruption after resume.
85 */
78 printk(KERN_CRIT "Please power me down manually\n"); 86 printk(KERN_CRIT "Please power me down manually\n");
79 while(1); 87 while(1);
80} 88}
81 89
82static inline void platform_finish(void) 90static inline void platform_finish(void)
83{ 91{
84 if (pm_disk_mode == PM_DISK_PLATFORM) { 92 switch (pm_disk_mode) {
93 case PM_DISK_TEST:
94 case PM_DISK_TESTPROC:
95 case PM_DISK_SHUTDOWN:
96 case PM_DISK_REBOOT:
97 break;
98 default:
85 if (pm_ops && pm_ops->finish) 99 if (pm_ops && pm_ops->finish)
86 pm_ops->finish(PM_SUSPEND_DISK); 100 pm_ops->finish(PM_SUSPEND_DISK);
87 } 101 }
@@ -166,7 +180,7 @@ int pm_suspend_disk(void)
166 pr_debug("PM: writing image.\n"); 180 pr_debug("PM: writing image.\n");
167 error = swsusp_write(); 181 error = swsusp_write();
168 if (!error) 182 if (!error)
169 power_down(pm_disk_mode); 183 power_down();
170 else { 184 else {
171 swsusp_free(); 185 swsusp_free();
172 goto Thaw; 186 goto Thaw;
@@ -338,10 +352,14 @@ static ssize_t disk_store(struct subsystem * s, const char * buf, size_t n)
338 } 352 }
339 } 353 }
340 if (mode) { 354 if (mode) {
341 if (mode == PM_DISK_SHUTDOWN || mode == PM_DISK_REBOOT || 355 switch (mode) {
342 mode == PM_DISK_TEST || mode == PM_DISK_TESTPROC) { 356 case PM_DISK_SHUTDOWN:
357 case PM_DISK_REBOOT:
358 case PM_DISK_TEST:
359 case PM_DISK_TESTPROC:
343 pm_disk_mode = mode; 360 pm_disk_mode = mode;
344 } else { 361 break;
362 default:
345 if (pm_ops && pm_ops->enter && 363 if (pm_ops && pm_ops->enter &&
346 (mode == pm_ops->pm_disk_mode)) 364 (mode == pm_ops->pm_disk_mode))
347 pm_disk_mode = mode; 365 pm_disk_mode = mode;
diff --git a/kernel/power/main.c b/kernel/power/main.c
index 3062e940d1fa..053c0a7d7f57 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -30,7 +30,7 @@
30DEFINE_MUTEX(pm_mutex); 30DEFINE_MUTEX(pm_mutex);
31 31
32struct pm_ops *pm_ops; 32struct pm_ops *pm_ops;
33suspend_disk_method_t pm_disk_mode = PM_DISK_PLATFORM; 33suspend_disk_method_t pm_disk_mode = PM_DISK_SHUTDOWN;
34 34
35/** 35/**
36 * pm_set_ops - Set the global power method table. 36 * pm_set_ops - Set the global power method table.
@@ -41,6 +41,10 @@ void pm_set_ops(struct pm_ops * ops)
41{ 41{
42 mutex_lock(&pm_mutex); 42 mutex_lock(&pm_mutex);
43 pm_ops = ops; 43 pm_ops = ops;
44 if (ops && ops->pm_disk_mode != PM_DISK_INVALID) {
45 pm_disk_mode = ops->pm_disk_mode;
46 } else
47 pm_disk_mode = PM_DISK_SHUTDOWN;
44 mutex_unlock(&pm_mutex); 48 mutex_unlock(&pm_mutex);
45} 49}
46 50