diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-04-08 13:25:25 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-04-08 13:25:25 +0200 |
| commit | 73df623addeaa6154b325b429a6c06eb6ad36004 (patch) | |
| tree | 6cf7196c253f812029e2bf7455fda33f9befd8d5 /arch/x86/kernel/acpi | |
| parent | 9bc0482feae8763447746c89fd971704c819b52e (diff) | |
| parent | 23a299cd93781a190cdca0d7d16034837b7dfd86 (diff) | |
| download | linux-stable-73df623addeaa6154b325b429a6c06eb6ad36004.tar.gz linux-stable-73df623addeaa6154b325b429a6c06eb6ad36004.tar.bz2 linux-stable-73df623addeaa6154b325b429a6c06eb6ad36004.zip | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux into pm-cpuidle
Pull intel_idle and turbostat material for v3.15-rc1 from Len Brown.
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
intel_idle: fine-tune IVT residency targets
tools/power turbostat: Run on Broadwell
tools/power turbostat: simplify output, add Avg_MHz
intel_idle: Add CPU model 54 (Atom N2000 series)
intel_idle: support Bay Trail
intel_idle: allow sparse sub-state numbering, for Bay Trail
ACPI idle: permit sparse C-state sub-state numbers
Diffstat (limited to 'arch/x86/kernel/acpi')
| -rw-r--r-- | arch/x86/kernel/acpi/cstate.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kernel/acpi/cstate.c b/arch/x86/kernel/acpi/cstate.c index e69182fd01cf..4b28159e0421 100644 --- a/arch/x86/kernel/acpi/cstate.c +++ b/arch/x86/kernel/acpi/cstate.c @@ -87,7 +87,9 @@ static long acpi_processor_ffh_cstate_probe_cpu(void *_cx) num_cstate_subtype = edx_part & MWAIT_SUBSTATE_MASK; retval = 0; - if (num_cstate_subtype < (cx->address & MWAIT_SUBSTATE_MASK)) { + /* If the HW does not support any sub-states in this C-state */ + if (num_cstate_subtype == 0) { + pr_warn(FW_BUG "ACPI MWAIT C-state 0x%x not supported by HW (0x%x)\n", cx->address, edx_part); retval = -1; goto out; } |