65 lines
2.4 KiB
Diff
65 lines
2.4 KiB
Diff
|
# HG changeset patch
|
||
|
|
# User Jan Beulich <jbeulich@suse.com>
|
||
|
|
# Date 1321017916 -3600
|
||
|
|
# Node ID 8b08b2166aa82e7df0b1fa620ed57078810f8c12
|
||
|
|
# Parent 4699decb8424a00447c466205be3cb4d0fb95a76
|
||
|
|
x86: quiesce cpuidle code
|
||
|
|
|
||
|
|
So far these messages got pointlessly (as the code in other places
|
||
|
|
assumes symmetric configuration) emitted once per CPU. Hide the debug
|
||
|
|
one behind opt_cpu_info, and issue the info one just once (if the code
|
||
|
|
gets adjusted to support assymtric configurations, this would need to
|
||
|
|
be revisited, but ideally without producing per-CPU messages again).
|
||
|
|
|
||
|
|
Signed-off-by: Jan Beulich <jbeulich@suse.com>
|
||
|
|
Acked-by: Keir Fraser <keir@xen.org>
|
||
|
|
|
||
|
|
--- a/xen/arch/x86/acpi/cpu_idle.c
|
||
|
|
+++ b/xen/arch/x86/acpi/cpu_idle.c
|
||
|
|
@@ -659,6 +659,8 @@ static int acpi_processor_ffh_cstate_pro
|
||
|
|
unsigned int edx_part;
|
||
|
|
unsigned int cstate_type; /* C-state type and not ACPI C-state type */
|
||
|
|
unsigned int num_cstate_subtype;
|
||
|
|
+ int ret = 0;
|
||
|
|
+ static unsigned long printed;
|
||
|
|
|
||
|
|
if ( c->cpuid_level < CPUID_MWAIT_LEAF )
|
||
|
|
{
|
||
|
|
@@ -667,8 +669,9 @@ static int acpi_processor_ffh_cstate_pro
|
||
|
|
}
|
||
|
|
|
||
|
|
cpuid(CPUID_MWAIT_LEAF, &eax, &ebx, &ecx, &edx);
|
||
|
|
- printk(XENLOG_DEBUG "cpuid.MWAIT[.eax=%x, .ebx=%x, .ecx=%x, .edx=%x]\n",
|
||
|
|
- eax, ebx, ecx, edx);
|
||
|
|
+ if ( opt_cpu_info )
|
||
|
|
+ printk(XENLOG_DEBUG "cpuid.MWAIT[eax=%x ebx=%x ecx=%x edx=%x]\n",
|
||
|
|
+ eax, ebx, ecx, edx);
|
||
|
|
|
||
|
|
/* Check whether this particular cx_type (in CST) is supported or not */
|
||
|
|
cstate_type = (cx->reg.address >> MWAIT_SUBSTATE_SIZE) + 1;
|
||
|
|
@@ -676,15 +679,16 @@ static int acpi_processor_ffh_cstate_pro
|
||
|
|
num_cstate_subtype = edx_part & MWAIT_SUBSTATE_MASK;
|
||
|
|
|
||
|
|
if ( num_cstate_subtype < (cx->reg.address & MWAIT_SUBSTATE_MASK) )
|
||
|
|
- return -EFAULT;
|
||
|
|
-
|
||
|
|
+ ret = -ERANGE;
|
||
|
|
/* mwait ecx extensions INTERRUPT_BREAK should be supported for C2/C3 */
|
||
|
|
- if ( !(ecx & CPUID5_ECX_EXTENSIONS_SUPPORTED) ||
|
||
|
|
- !(ecx & CPUID5_ECX_INTERRUPT_BREAK) )
|
||
|
|
- return -EFAULT;
|
||
|
|
-
|
||
|
|
- printk(XENLOG_INFO "Monitor-Mwait will be used to enter C-%d state\n", cx->type);
|
||
|
|
- return 0;
|
||
|
|
+ else if ( !(ecx & CPUID5_ECX_EXTENSIONS_SUPPORTED) ||
|
||
|
|
+ !(ecx & CPUID5_ECX_INTERRUPT_BREAK) )
|
||
|
|
+ ret = -ENODEV;
|
||
|
|
+ else if ( opt_cpu_info || cx->type >= BITS_PER_LONG ||
|
||
|
|
+ !test_and_set_bit(cx->type, &printed) )
|
||
|
|
+ printk(XENLOG_INFO "Monitor-Mwait will be used to enter C%d state\n",
|
||
|
|
+ cx->type);
|
||
|
|
+ return ret;
|
||
|
|
}
|
||
|
|
|
||
|
|
/*
|