From: Len Brown <lenb@kernel.org>
To: linux-pm@lists.linux-foundation.org
Cc: linux-kernel@vger.kernel.org, Len Brown <len.brown@intel.com>
Subject: [PATCH 08/18] cpuidle: create bootparam "cpuidle.off=1"
Date: Sat, 02 Apr 2011 02:22:50 -0400 [thread overview]
Message-ID: <d0d4b0749cf60042ce56636fdb019ab496fb45ff.1301724243.git.len.brown@intel.com> (raw)
In-Reply-To: <1301725380-10579-1-git-send-email-lenb@kernel.org>
In-Reply-To: <c82cf78992a66bfa7f0c82aeb20ba6922127463b.1301724243.git.len.brown@intel.com>
From: Len Brown <len.brown@intel.com>
useful for disabling cpuidle to fall back
to architecture-default idle loop
cpuidle drivers and governors will fail to register.
on x86 they'll say so:
intel_idle: intel_idle yielding to (null)
ACPI: acpi_idle yielding to (null)
Signed-off-by: Len Brown <len.brown@intel.com>
---
Documentation/kernel-parameters.txt | 3 +++
drivers/cpuidle/cpuidle.c | 10 ++++++++++
drivers/cpuidle/cpuidle.h | 1 +
drivers/cpuidle/driver.c | 3 +++
drivers/cpuidle/governor.c | 3 +++
5 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index f4a04c0..08e8a22 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -546,6 +546,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
/proc/<pid>/coredump_filter.
See also Documentation/filesystems/proc.txt.
+ cpuidle.off=1 [CPU_IDLE]
+ disable the cpuidle sub-system
+
cpcihp_generic= [HW,PCI] Generic port I/O CompactPCI driver
Format:
<first_slot>,<last_slot>,<port>,<enum_bit>[,<debug>]
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index bf50924..faae2c3 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -28,6 +28,12 @@ LIST_HEAD(cpuidle_detected_devices);
static void (*pm_idle_old)(void);
static int enabled_devices;
+static int off __read_mostly;
+
+int cpuidle_disabled(void)
+{
+ return off;
+}
#if defined(CONFIG_ARCH_HAS_CPU_IDLE_WAIT)
static void cpuidle_kick_cpus(void)
@@ -427,6 +433,9 @@ static int __init cpuidle_init(void)
{
int ret;
+ if (cpuidle_disabled())
+ return -ENODEV;
+
pm_idle_old = pm_idle;
ret = cpuidle_add_class_sysfs(&cpu_sysdev_class);
@@ -438,4 +447,5 @@ static int __init cpuidle_init(void)
return 0;
}
+module_param(off, int, 0444);
core_initcall(cpuidle_init);
diff --git a/drivers/cpuidle/cpuidle.h b/drivers/cpuidle/cpuidle.h
index 33e50d5..38c3fd8 100644
--- a/drivers/cpuidle/cpuidle.h
+++ b/drivers/cpuidle/cpuidle.h
@@ -13,6 +13,7 @@ extern struct list_head cpuidle_governors;
extern struct list_head cpuidle_detected_devices;
extern struct mutex cpuidle_lock;
extern spinlock_t cpuidle_driver_lock;
+extern int cpuidle_disabled(void);
/* idle loop */
extern void cpuidle_install_idle_handler(void);
diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c
index fd1601e..3f7e3ce 100644
--- a/drivers/cpuidle/driver.c
+++ b/drivers/cpuidle/driver.c
@@ -26,6 +26,9 @@ int cpuidle_register_driver(struct cpuidle_driver *drv)
if (!drv)
return -EINVAL;
+ if (cpuidle_disabled())
+ return -ENODEV;
+
spin_lock(&cpuidle_driver_lock);
if (cpuidle_curr_driver) {
spin_unlock(&cpuidle_driver_lock);
diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c
index 724c164..ea2f8e7 100644
--- a/drivers/cpuidle/governor.c
+++ b/drivers/cpuidle/governor.c
@@ -81,6 +81,9 @@ int cpuidle_register_governor(struct cpuidle_governor *gov)
if (!gov || !gov->select)
return -EINVAL;
+ if (cpuidle_disabled())
+ return -ENODEV;
+
mutex_lock(&cpuidle_lock);
if (__cpuidle_find_governor(gov->name) == NULL) {
ret = 0;
--
1.7.5.rc0
next prev parent reply other threads:[~2011-04-02 6:23 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-24 7:08 [PATCH 0/5] x86 idle cruft removal Len Brown
2011-03-24 7:08 ` [PATCH 1/5] x86 idle: remove "no-hlt" cmdline param Len Brown
2011-03-24 7:08 ` [PATCH 2/5] x86 idle: remove NOP cpuinfo_x86.hlt_works_ok flag Len Brown
2011-03-24 7:08 ` [PATCH 3/5] x86 idle: remove NOP halt_works() Len Brown
2011-03-24 7:08 ` [PATCH 4/5] x86 idle floppy: delete disable_hlt()/enable_hlt() Len Brown
2011-03-24 15:58 ` Andi Kleen
2011-03-24 7:08 ` [PATCH 5/5] x86 idle: remove NOP hlt_use_halt() Len Brown
2011-03-25 19:02 ` [linux-pm] " Vaidyanathan Srinivasan
2011-03-31 6:03 ` [PATCH 0/9] x86 idle cruft removal - v2 Len Brown
2011-03-31 6:03 ` [PATCH 1/9] x86 idle: remove "no-hlt" cmdline param Len Brown
2011-03-31 6:03 ` [PATCH 2/9] x86 idle: remove NOP cpuinfo_x86.hlt_works_ok flag Len Brown
2011-03-31 6:12 ` Ingo Molnar
2011-03-31 7:02 ` Len Brown
2011-03-31 8:18 ` Ingo Molnar
2011-03-31 9:23 ` Alan Cox
2011-03-31 9:27 ` Ingo Molnar
2011-03-31 9:33 ` Alan Cox
2011-03-31 9:35 ` Ingo Molnar
2011-03-31 14:19 ` H. Peter Anvin
2011-03-31 14:41 ` Alan Cox
2011-03-31 15:09 ` H. Peter Anvin
2011-03-31 18:07 ` Len Brown
2011-03-31 18:28 ` H. Peter Anvin
2011-03-31 6:03 ` [PATCH 3/9] x86 idle: remove NOP halt_works() Len Brown
2011-03-31 6:03 ` [PATCH 4/9] x86 idle floppy: delete disable_hlt()/enable_hlt() Len Brown
2011-03-31 6:03 ` [PATCH 5/9] x86 idle: remove NOP hlt_use_halt() Len Brown
2011-03-31 6:03 ` [PATCH 6/9] x86 idle APM: delete apm_cpu_idle(), and its use of (pm_idle)() Len Brown
2011-03-31 6:03 ` [PATCH 7/9] x86 idle: do not EXPORT_SYMBOL pm_idle and default_idle Len Brown
2011-03-31 6:03 ` [PATCH 8/9] x86 idle: move mwait_idle_with_hints() to where it is used Len Brown
2011-03-31 6:03 ` [PATCH 9/9] x86 idle: delete mwait_idle() Len Brown
2011-04-01 11:02 ` Andreas Herrmann
2011-03-31 6:39 ` [linux-pm] [PATCH 0/9] x86 idle cruft removal - v2 Trinabh Gupta
2011-03-31 7:21 ` Len Brown
2011-03-31 9:45 ` Alan Cox
2011-03-31 10:28 ` Ingo Molnar
2011-04-01 4:24 ` Len Brown
2011-04-01 9:38 ` [linux-pm] " Trinabh Gupta
2011-04-01 18:33 ` Len Brown
2011-04-02 6:22 ` idle cleanup - v3 Len Brown
2011-04-02 6:22 ` [PATCH 01/18] cpuidle: menu: fixed wrapping timers at 4.294 seconds Len Brown
2011-04-02 6:22 ` [PATCH 02/18] x86 idle floppy: deprecate disable_hlt() Len Brown
2011-04-02 6:22 ` [PATCH 03/18] x86 idle APM: deprecate CONFIG_APM_CPU_IDLE Len Brown
2011-04-02 11:28 ` Alan Cox
2011-04-02 18:28 ` Len Brown
2011-04-02 19:44 ` Alan Cox
2011-04-08 6:22 ` Pavel Machek
2011-04-02 6:22 ` [PATCH 04/18] x86 idle: EXPORT_SYMBOL(default_idle, pm_idle) only when APM demands it Len Brown
2011-04-02 11:28 ` Alan Cox
2011-04-02 12:21 ` [linux-pm] " Trinabh Gupta
2011-04-02 6:22 ` [PATCH 05/18] x86 idle: deprecate "no-hlt" cmdline param Len Brown
2011-04-02 6:22 ` [PATCH 06/18] x86 idle: deprecate mwait_idle() and "idle=mwait" " Len Brown
2011-04-02 6:22 ` [PATCH 07/18] x86 idle: clarify AMD erratum 400 workaround Len Brown
2011-04-02 8:23 ` Borislav Petkov
2011-04-02 19:19 ` Len Brown
2011-04-02 19:22 ` [PATCH 07/18] x86 idle: clarify AMD erratum 400 workaround -v2 Len Brown
2011-04-03 9:00 ` Borislav Petkov
2011-04-02 6:22 ` Len Brown [this message]
2011-07-15 11:27 ` [linux-pm] [PATCH 08/18] cpuidle: create bootparam "cpuidle.off=1" Deepthi Dharwar
2011-04-02 6:22 ` [PATCH 09/18] cpuidle: replace xen access to x86 pm_idle and default_idle Len Brown
2011-04-04 15:33 ` [Xen-devel] " Konrad Rzeszutek Wilk
2011-04-02 6:22 ` [PATCH 10/18] x86 idle: move mwait_idle_with_hints() to where it is used Len Brown
2011-04-02 6:22 ` [PATCH 11/18] cpuidle: stop using pm_idle Len Brown
2011-04-25 10:41 ` [linux-pm] " Trinabh Gupta
2011-04-02 6:22 ` [PATCH 12/18] 2.6.40: x86 idle: remove deprecated "no-hlt" cmdline param Len Brown
2011-04-02 6:22 ` [PATCH 13/18] 2.6.40: x86 idle: remove deprecated "hlt_bug: no" in 32-bit /proc/cpuinfo Len Brown
2011-04-02 6:22 ` [PATCH 14/18] 2.6.40: x86 idle floppy: remove deprecated disable_hlt()/enable_hlt() Len Brown
2011-04-02 6:22 ` [PATCH 15/18] 2.6.40: x86 idle: remove deprecated hlt_use_halt() Len Brown
2011-04-02 6:22 ` [PATCH 16/18] 2.6.40: x86 idle APM: remove deprecated apm_cpu_idle() Len Brown
2011-04-02 11:40 ` Alan Cox
2011-04-02 19:44 ` Len Brown
2011-04-02 21:00 ` Alan Cox
2011-04-03 2:48 ` [linux-pm] " Trinabh Gupta
2011-04-04 10:05 ` Alan Cox
2011-04-02 6:22 ` [PATCH 17/18] 2.6.40: x86 idle: do not export default_idle() and (pm_idle)() Len Brown
2011-04-02 6:23 ` [PATCH 18/18] 2.6.40: x86 idle: remove deprecated mwait_idle() Len Brown
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=d0d4b0749cf60042ce56636fdb019ab496fb45ff.1301724243.git.len.brown@intel.com \
--to=lenb@kernel.org \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@lists.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
all inboxes | Powered by JetHome®