From 91e717495ce585b032d8ed14b70e2e8771fde201 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Fri, 26 Sep 2008 17:12:56 +0100 Subject: [PATCH] CPUIDLE: Initialize timer broadcast mechanism for C2 Without this patch, while running on platforms on which the deepest C-state is C2, acpi_processor_idle fns will call into NULL function. This has been the case since 18518:e61c7833dc9d8. Signed-off-by: Wei Gang --- xen/arch/x86/acpi/cpu_idle.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index a23ff5ebfe..8d2aa88d41 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -81,7 +81,7 @@ static void print_acpi_power(uint32_t cpu, struct acpi_processor_power *power) for ( i = 1; i < power->count; i++ ) { printk((power->last_state == &power->states[i]) ? " *" : " "); - printk("C%d:\t\t", i); + printk("C%d:\t", i); printk("type[C%d] ", power->states[i].type); printk("latency[%03d] ", power->states[i].latency); printk("usage[%08d] ", power->states[i].usage); @@ -487,8 +487,12 @@ static int check_cx(struct acpi_processor_power *power, xen_processor_cx_t *cx) return -ENODEV; } - if ( cx->type == ACPI_STATE_C3 ) + switch ( cx->type ) { + case ACPI_STATE_C2: + if ( local_apic_timer_c2_ok ) + break; + case ACPI_STATE_C3: /* We must be able to use HPET in place of LAPIC timers. */ if ( hpet_broadcast_is_available() ) { @@ -551,6 +555,8 @@ static int check_cx(struct acpi_processor_power *power, xen_processor_cx_t *cx) } acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0); } + + break; } return 0; -- 2.30.2