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@citrix.com>

diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c
index 45e5c3d797e98be75e895747a94025aa84e35b19..2cd0d02121b32240542b2dba0013cd788f514124 100644 (file)
--- a/xen/arch/x86/smpboot.c
+++ b/xen/arch/x86/smpboot.c
@@ -358,45 +358,6 @@ static void unmap_cpu_to_logical_apicid(int cpu)
     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 cpu)
             else
                 /* trampoline code not run */
                 printk("Not responding.\n");
-            inquire_remote_apic(apicid);
         }
     }
 

diff --git a/xen/include/asm-x86/mach-default/mach_wakecpu.h b/xen/include/asm-x86/mach-default/mach_wakecpu.h
index 22ce9c0268081ef8d9a68d035f5ec55e0a7cf387..32555e1022197bf4ee7ed961117476e2e08691c5 100644 (file)
--- a/xen/include/asm-x86/mach-default/mach_wakecpu.h
+++ b/xen/include/asm-x86/mach-default/mach_wakecpu.h
@@ -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 */