commit 686c4cbb10fc0e75b29b097290b4f7fc3f010b9e · tjh.dev/kernel

tjh.dev / kernel

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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

* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
PM: Add missing syscore_suspend() and syscore_resume() calls
PM: Fix error code paths executed after failing syscore_suspend()

Linus Torvalds 15 years ago 686c4cbb b07ad996

+34 -4

6 changed files

expand all

unified split

arch

x86

kernel

apm_32.c

drivers

base

syscore.c

xen

manage.c

kernel

kexec.c

power

hibernate.c

suspend.c

arch/x86/kernel/apm_32.c

··· 228 228 #include <linux/kthread.h> 229 229 #include <linux/jiffies.h> 230 230 #include <linux/acpi.h> 231 + #include <linux/syscore_ops.h> 231 232 232 233 #include <asm/system.h> 233 234 #include <asm/uaccess.h> ··· 1239 1238 1240 1239 local_irq_disable(); 1241 1240 sysdev_suspend(PMSG_SUSPEND); 1241 + syscore_suspend(); 1242 1242 1243 1243 local_irq_enable(); 1244 1244 ··· 1257 1255 apm_error("suspend", err); 1258 1256 err = (err == APM_SUCCESS) ? 0 : -EIO; 1259 1257 1258 + syscore_resume(); 1260 1259 sysdev_resume(); 1261 1260 local_irq_enable(); 1262 1261 ··· 1283 1280 1284 1281 local_irq_disable(); 1285 1282 sysdev_suspend(PMSG_SUSPEND); 1283 + syscore_suspend(); 1286 1284 local_irq_enable(); 1287 1285 1288 1286 err = set_system_power_state(APM_STATE_STANDBY); ··· 1291 1287 apm_error("standby", err); 1292 1288 1293 1289 local_irq_disable(); 1290 + syscore_resume(); 1294 1291 sysdev_resume(); 1295 1292 local_irq_enable(); 1296 1293

drivers/base/syscore.c

··· 73 73 74 74 return ret; 75 75 } 76 + EXPORT_SYMBOL_GPL(syscore_suspend); 76 77 77 78 /** 78 79 * syscore_resume - Execute all the registered system core resume callbacks. ··· 96 95 "Interrupts enabled after %pF\n", ops->resume); 97 96 } 98 97 } 98 + EXPORT_SYMBOL_GPL(syscore_resume); 99 99 #endif /* CONFIG_PM_SLEEP */ 100 100 101 101 /**

+8 -1

drivers/xen/manage.c

··· 8 8 #include <linux/sysrq.h> 9 9 #include <linux/stop_machine.h> 10 10 #include <linux/freezer.h> 11 + #include <linux/syscore_ops.h> 11 12 12 13 #include <xen/xen.h> 13 14 #include <xen/xenbus.h> ··· 71 70 BUG_ON(!irqs_disabled()); 72 71 73 72 err = sysdev_suspend(PMSG_FREEZE); 73 + if (!err) { 74 + err = syscore_suspend(); 75 + if (err) 76 + sysdev_resume(); 77 + } 74 78 if (err) { 75 - printk(KERN_ERR "xen_suspend: sysdev_suspend failed: %d\n", 79 + printk(KERN_ERR "xen_suspend: system core suspend failed: %d\n", 76 80 err); 77 81 return err; 78 82 } ··· 101 95 xen_timer_resume(); 102 96 } 103 97 98 + syscore_resume(); 104 99 sysdev_resume(); 105 100 106 101 return 0;

kernel/kexec.c

··· 33 33 #include <linux/vmalloc.h> 34 34 #include <linux/swap.h> 35 35 #include <linux/kmsg_dump.h> 36 + #include <linux/syscore_ops.h> 36 37 37 38 #include <asm/page.h> 38 39 #include <asm/uaccess.h> ··· 1533 1532 local_irq_disable(); 1534 1533 /* Suspend system devices */ 1535 1534 error = sysdev_suspend(PMSG_FREEZE); 1535 + if (!error) { 1536 + error = syscore_suspend(); 1537 + if (error) 1538 + sysdev_resume(); 1539 + } 1536 1540 if (error) 1537 1541 goto Enable_irqs; 1538 1542 } else ··· 1552 1546 1553 1547 #ifdef CONFIG_KEXEC_JUMP 1554 1548 if (kexec_image->preserve_context) { 1549 + syscore_resume(); 1555 1550 sysdev_resume(); 1556 1551 Enable_irqs: 1557 1552 local_irq_enable();

+8 -2

kernel/power/hibernate.c

··· 273 273 local_irq_disable(); 274 274 275 275 error = sysdev_suspend(PMSG_FREEZE); 276 - if (!error) 276 + if (!error) { 277 277 error = syscore_suspend(); 278 + if (error) 279 + sysdev_resume(); 280 + } 278 281 if (error) { 279 282 printk(KERN_ERR "PM: Some system devices failed to power down, " 280 283 "aborting hibernation\n"); ··· 410 407 local_irq_disable(); 411 408 412 409 error = sysdev_suspend(PMSG_QUIESCE); 413 - if (!error) 410 + if (!error) { 414 411 error = syscore_suspend(); 412 + if (error) 413 + sysdev_resume(); 414 + } 415 415 if (error) 416 416 goto Enable_irqs; 417 417

+4 -1

kernel/power/suspend.c

··· 164 164 BUG_ON(!irqs_disabled()); 165 165 166 166 error = sysdev_suspend(PMSG_SUSPEND); 167 - if (!error) 167 + if (!error) { 168 168 error = syscore_suspend(); 169 + if (error) 170 + sysdev_resume(); 171 + } 169 172 if (!error) { 170 173 if (!(suspend_test(TEST_CORE) || pm_wakeup_pending())) { 171 174 error = suspend_ops->enter(state);