From: Len Brown <lenb@kernel.org>
To: x86@kernel.org, linux-pm@lists.linux-foundation.org
Cc: linux-kernel@vger.kernel.org, Len Brown <len.brown@intel.com>
Subject: [PATCH 4/8] ACPI: allow a native cpuidle driver to displace ACPI
Date: Wed, 26 May 2010 22:42:27 -0400 [thread overview]
Message-ID: <c5e048dcef31b8c306995b7239a0cbd4511f9828.1274926772.git.len.brown@intel.com> (raw)
In-Reply-To: <1274928151-30919-1-git-send-email-lenb@kernel.org>
In-Reply-To: <e099975ca65a7f6ac7f8bc3fee84d3e03893aa31.1274926772.git.len.brown@intel.com>
From: Len Brown <len.brown@intel.com>
The ACPI driver would fail probe when it found that
another driver had previously registered with cpuidle.
But this is a natural situation, as a native hardware
cpuidle driver should be able to bind instead of ACPI,
and the ACPI processor driver should be able to handle
yielding control of C-states while still handling
P-states and T-states.
Add a KERN_DEBUG line showing when acpi_idle
does successfully register.
Signed-off-by: Len Brown <len.brown@intel.com>
---
drivers/acpi/processor_driver.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index 5675d97..deefa85 100644
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -616,7 +616,8 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
acpi_processor_get_limit_info(pr);
- acpi_processor_power_init(pr, device);
+ if (cpuidle_get_driver() == &acpi_idle_driver)
+ acpi_processor_power_init(pr, device);
pr->cdev = thermal_cooling_device_register("Processor", device,
&processor_cooling_ops);
@@ -920,9 +921,10 @@ static int __init acpi_processor_init(void)
if (!acpi_processor_dir)
return -ENOMEM;
#endif
- result = cpuidle_register_driver(&acpi_idle_driver);
- if (result < 0)
- goto out_proc;
+
+ if (!cpuidle_register_driver(&acpi_idle_driver))
+ printk(KERN_DEBUG "ACPI: %s registered with cpuidle\n",
+ acpi_idle_driver.name);
result = acpi_bus_register_driver(&acpi_processor_driver);
if (result < 0)
@@ -941,7 +943,6 @@ static int __init acpi_processor_init(void)
out_cpuidle:
cpuidle_unregister_driver(&acpi_idle_driver);
-out_proc:
#ifdef CONFIG_ACPI_PROCFS
remove_proc_entry(ACPI_PROCESSOR_CLASS, acpi_root_dir);
#endif
--
1.6.0.6
next prev parent reply other threads:[~2010-05-27 2:43 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-27 2:42 idle-test patches queued for upstream Len Brown
2010-05-27 2:42 ` [PATCH 1/8] cpuidle: fail to register if !CONFIG_CPU_IDLE Len Brown
2010-05-27 2:42 ` [PATCH 2/8] cpuidle: add cpuidle_unregister_driver() error check Len Brown
2010-05-27 3:14 ` Andrew Morton
2010-05-27 5:11 ` [PATCH-v2 " Len Brown
2010-05-27 5:13 ` Andrew Morton
2010-05-27 2:42 ` [PATCH 3/8] cpuidle: make cpuidle_curr_driver static Len Brown
2010-05-27 5:27 ` [PATCH-v2 " Len Brown
2010-05-27 18:40 ` Luck, Tony
2010-05-27 23:30 ` Len Brown
2010-05-27 2:42 ` Len Brown [this message]
2010-05-27 2:42 ` [PATCH 5/8] sched: clarify commment for TS_POLLING Len Brown
2010-05-27 5:53 ` [PATCH-v2 " Len Brown
2010-05-27 2:42 ` [PATCH 6/8] acpi_pad: uses MONITOR/MWAIT, so it doesn't need to clear TS_POLLING Len Brown
2010-05-27 2:42 ` [PATCH 7/8] ACPI: acpi_idle: touch TS_POLLING only in the non-MWAIT case Len Brown
2010-05-27 2:42 ` [PATCH 8/8] intel_idle: create a native cpuidle driver for select intel processors Len Brown
2010-05-27 3:44 ` Andrew Morton
2010-05-28 3:57 ` Len Brown
2010-05-30 9:20 ` Andi Kleen
2010-05-27 8:53 ` [linux-pm] " Thomas Renninger
2010-05-28 1:44 ` Len Brown
2010-05-28 7:46 ` Thomas Renninger
2010-05-28 17:38 ` Len Brown
2010-05-29 4:17 ` Thomas Renninger
2010-05-27 14:14 ` Kevin Hilman
2010-05-27 14:22 ` Arjan van de Ven
2010-05-27 14:36 ` Kevin Hilman
2010-05-28 0:22 ` Len Brown
2010-05-28 17:28 ` Kevin Hilman
2010-05-27 14:51 ` [linux-pm] " Igor Stoppa
2010-05-28 3:14 ` Arjan van de Ven
2010-05-28 17:27 ` Kevin Hilman
2010-05-29 0:38 ` Arjan van de Ven
2010-05-28 2:32 ` Chase Douglas
2010-05-28 4:16 ` Len Brown
2010-05-28 15:09 ` Chase Douglas
2010-05-28 17:43 ` Len Brown
2010-05-28 19:51 ` Chase Douglas
2010-05-28 20:14 ` Chase Douglas
2010-05-27 5:25 ` (No subject header) Milton Miller
2010-05-27 5:47 ` Len Brown
2010-05-27 8:45 ` [linux-pm] idle-test patches queued for upstream Thomas Renninger
2010-05-28 0:59 ` Len Brown
2010-05-28 8:07 ` Thomas Renninger
2010-05-28 17:42 ` Len Brown
2010-06-16 7:53 ` Pavel Machek
2010-05-28 6:01 idle patches for 2.6.35 Len Brown
2010-05-28 6:01 ` [PATCH 1/8] cpuidle: fail to register if !CONFIG_CPU_IDLE Len Brown
2010-05-28 6:01 ` [PATCH 4/8] ACPI: allow a native cpuidle driver to displace ACPI 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=c5e048dcef31b8c306995b7239a0cbd4511f9828.1274926772.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 \
--cc=x86@kernel.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®