From: "Fenghua Yu" <fenghua.yu@intel.com>
To: "Thomas Gleixner" <tglx@linutronix.de>,
"H Peter Anvin" <hpa@zytor.com>, "Ingo Molnar" <mingo@elte.hu>,
"Linus Torvalds" <torvalds@linux-foundation.org>,
"Andrew Morton" <akpm@linux-foundation.org>,
"Tony Luck" <tony.luck@intel.com>,
"Suresh B Siddha" <suresh.b.siddha@intel.com>,
"Len Brown" <len.brown@intel.com>,
"Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>,
Peter Zijlstra <peterz@infradead.org>
Cc: "linux-kernel" <linux-kernel@vger.kernel.org>,
"Fenghua Yu" <fenghua.yu@intel.com>
Subject: [PATCH 6/9] kernel/power/suspend.c,hibernate.c: Don't hibernate/suspend if CPU0 is offline
Date: Fri, 4 Nov 2011 15:03:58 -0700 [thread overview]
Message-ID: <1320444241-834-7-git-send-email-fenghua.yu@intel.com> (raw)
In-Reply-To: <1320444241-834-1-git-send-email-fenghua.yu@intel.com>
From: Fenghua Yu <fenghua.yu@intel.com>
Because x86 BIOS requires CPU0 to resume from sleep, suspend/resume or hibernate
can't be executed if CPU0 is detected offline.
Signed-off-by: Fenghua Yu <fenghua.yu@intel.com>
---
kernel/power/hibernate.c | 5 +++++
kernel/power/main.c | 5 +++++
kernel/power/suspend.c | 4 ++++
3 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index 1c53f7f..b9d1a37 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -612,6 +612,11 @@ int hibernate(void)
int error;
mutex_lock(&pm_mutex);
+
+ error = arch_state_check();
+ if (error)
+ goto Unlock;
+
/* The snapshot device should not be opened while we're running */
if (!atomic_add_unless(&snapshot_device_available, -1, 0)) {
error = -EBUSY;
diff --git a/kernel/power/main.c b/kernel/power/main.c
index a52e884..863d05d 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -447,4 +447,9 @@ static int __init pm_init(void)
return sysfs_create_group(power_kobj, &attr_group);
}
+int __weak arch_state_check(void)
+{
+ return 0;
+}
+
core_initcall(pm_init);
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index fdd4263..f86ff6b 100644
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -284,6 +284,10 @@ int enter_state(suspend_state_t state)
if (!mutex_trylock(&pm_mutex))
return -EBUSY;
+ error = arch_state_check();
+ if (error)
+ goto Unlock;
+
printk(KERN_INFO "PM: Syncing filesystems ... ");
sys_sync();
printk("done.\n");
--
1.6.0.3
next prev parent reply other threads:[~2011-11-04 22:22 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-04 22:03 [PATCH 0/9] BSP or CPU0 online/offline Fenghua Yu
2011-11-04 22:03 ` [PATCH 1/9] include/linux/cpu.h: Define architecture dependent cpu map update and state check functions Fenghua Yu
2011-11-04 22:03 ` [PATCH 2/9] kernel/cpu.c: Add arch dependent cpu map update functions Fenghua Yu
2011-11-05 10:28 ` Srivatsa S. Bhat
2011-11-04 22:03 ` [PATCH 3/9] x86/i387.c: Thread xstate is initialized only on BSP once Fenghua Yu
2011-11-04 22:03 ` [PATCH 4/9] x86/common.c: Init BSP data during BSP online Fenghua Yu
2011-11-04 22:03 ` [PATCH 5/9] x86/mtrr/main.c: Ask the first online CPU to save mtrr Fenghua Yu
2011-11-04 22:03 ` Fenghua Yu [this message]
2011-11-04 22:03 ` [PATCH 7/9] x86/topology.c: Support functions for BSP online/offline Fenghua Yu
2011-11-05 11:01 ` Srivatsa S. Bhat
2011-11-05 21:13 ` Srivatsa S. Bhat
2011-11-07 19:57 ` Yu, Fenghua
2011-11-04 22:04 ` [PATCH 8/9] x86/smpboot.c: Don't offline BSP if any irq can not be migrated out of it Fenghua Yu
2011-11-04 22:04 ` [PATCH 9/9] Documentations/cpu-hotplug.tx, kernel-parameters.txt: Add x86 CPU0 online/offline feature Fenghua Yu
2011-11-04 23:27 ` Randy Dunlap
2011-11-05 11:17 ` [PATCH 0/9] BSP or CPU0 online/offline Srivatsa S. Bhat
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1320444241-834-7-git-send-email-fenghua.yu@intel.com \
--to=fenghua.yu@intel.com \
--cc=akpm@linux-foundation.org \
--cc=hpa@zytor.com \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=srivatsa.bhat@linux.vnet.ibm.com \
--cc=suresh.b.siddha@intel.com \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome