[Xen-changelog] [xen-unstable] x86: Remove obsolete inquire_remote_apic()

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1274372535 -3600
# Node ID a7fcf2e35d32709315741079d2867882935b04f9
# Parent  e2a5a8bfeea7c605a752c1b5d3fc82187dc9e149
x86: Remove obsolete inquire_remote_apic()

Integrated APICs do not have this facility. Which means no
multi-processor machine in more than a decade.

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/arch/x86/smpboot.c                          |   40 ------------------------
 xen/include/asm-x86/mach-default/mach_wakecpu.h |   10 ------
 2 files changed, 50 deletions(-)

diff -r e2a5a8bfeea7 -r a7fcf2e35d32 xen/arch/x86/smpboot.c
--- a/xen/arch/x86/smpboot.c    Thu May 20 15:30:49 2010 +0100
+++ b/xen/arch/x86/smpboot.c    Thu May 20 17:22:15 2010 +0100
@@ -358,45 +358,6 @@ static void unmap_cpu_to_logical_apicid(
     cpu_2_logical_apicid[cpu] = BAD_APICID;
 }
 
-#if APIC_DEBUG
-static void __inquire_remote_apic(int apicid)
-{
-    int i, regs[] = { APIC_ID >> 4, APIC_LVR >> 4, APIC_SPIV >> 4 };
-    char *names[] = { "ID", "VERSION", "SPIV" };
-    int timeout, status;
-
-    printk("Inquiring remote APIC #%d...\n", apicid);
-
-    for ( i = 0; i < ARRAY_SIZE(regs); i++ )
-    {
-        printk("... APIC #%d %s: ", apicid, names[i]);
-
-        /*
-         * Wait for idle.
-         */
-        apic_wait_icr_idle();
-
-        apic_icr_write(APIC_DM_REMRD | regs[i], apicid);
-
-        timeout = 0;
-        do {
-            udelay(100);
-            status = apic_read(APIC_ICR) & APIC_ICR_RR_MASK;
-        } while ( status == APIC_ICR_RR_INPROG && timeout++ < 1000 );
-
-        switch ( status )
-        {
-        case APIC_ICR_RR_VALID:
-            status = apic_read(APIC_RRR);
-            printk("%08x\n", status);
-            break;
-        default:
-            printk("failed\n");
-        }
-    }
-}
-#endif
-
 static int wakeup_secondary_cpu(int phys_apicid, unsigned long start_eip)
 {
     unsigned long send_status = 0, accept_status = 0;
@@ -588,7 +549,6 @@ static int do_boot_cpu(int apicid, int c
             else
                 /* trampoline code not run */
                 printk("Not responding.\n");
-            inquire_remote_apic(apicid);
         }
     }
 
diff -r e2a5a8bfeea7 -r a7fcf2e35d32 
xen/include/asm-x86/mach-default/mach_wakecpu.h
--- a/xen/include/asm-x86/mach-default/mach_wakecpu.h   Thu May 20 15:30:49 
2010 +0100
+++ b/xen/include/asm-x86/mach-default/mach_wakecpu.h   Thu May 20 17:22:15 
2010 +0100
@@ -6,17 +6,7 @@
  * INIT, INIT, STARTUP sequence.
  */
 
-#define WAKE_SECONDARY_VIA_INIT
-
 #define TRAMPOLINE_LOW maddr_to_virt(0x467)
 #define TRAMPOLINE_HIGH maddr_to_virt(0x469)
 
-#define boot_cpu_apicid boot_cpu_physical_apicid
-
-#if APIC_DEBUG
- #define inquire_remote_apic(apicid) __inquire_remote_apic(apicid)
-#else
- #define inquire_remote_apic(apicid) {}
-#endif
-
 #endif /* __ASM_MACH_WAKECPU_H */

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog