From: Keir Fraser <keir@xen.org>
Date: Wed, 7 Mar 2012 09:12:23 +0000 (+0000)
Subject: Revert 24973:50a70b652b43 "x86: Use deep C states for off-lined CPUs"
X-Git-Tag: 4.2.0-rc1~685
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=8a058bcef741145b49df3b6321ad1f05f047af15;p=xen.git

Revert 24973:50a70b652b43 "x86: Use deep C states for off-lined CPUs"

applied already

Signed-off-by: Keir Fraser <keir@xen.org>
---

diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c
index 75593d146a..a675867f24 100644
--- a/xen/arch/x86/acpi/cpu_idle.c
+++ b/xen/arch/x86/acpi/cpu_idle.c
@@ -566,7 +566,6 @@ static void acpi_dead_idle(void)
 {
     struct acpi_processor_power *power;
     struct acpi_processor_cx *cx;
-    struct cpuinfo_x86 *c = &current_cpu_data;
 
     if ( (power = processor_powers[smp_processor_id()]) == NULL )
         goto default_halt;
@@ -602,23 +601,6 @@ static void acpi_dead_idle(void)
             mb();
             __mwait(cx->address, 0);
         }
-    } 
-    else if ( c->x86_vendor == X86_VENDOR_AMD && 
-              cx->entry_method == ACPI_CSTATE_EM_SYSIO )
-    {
-        /* Intel prefers not to use SYSIO */
-
-        /* Avoid references to shared data after the cache flush */
-        u32 address = cx->address;
-        u32 pmtmr_ioport_local = pmtmr_ioport;
-
-        wbinvd();
-
-        while ( 1 )
-        {
-            inb(address);
-            inl(pmtmr_ioport_local);
-        }
     }
     else if ( current_cpu_data.x86_vendor == X86_VENDOR_AMD &&
               cx->entry_method == ACPI_CSTATE_EM_SYSIO )