47 lines
1.5 KiB
Diff
47 lines
1.5 KiB
Diff
|
# HG changeset patch
|
||
|
|
# User Gang Wei <gang.wei@intel.com>
|
||
|
|
# Date 1325153274 0
|
||
|
|
# Node ID a7b2610b8e5c9a15b1f5de9a3eabf7f19d0b4199
|
||
|
|
# Parent 2863b2f43a3bc9268885379d6fd55ed325b8c0a2
|
||
|
|
X86: Add a delay between INIT & SIPIs for tboot AP bring-up in X2APIC case
|
||
|
|
|
||
|
|
Without this delay, Xen could not bring APs up while working with
|
||
|
|
TXT/tboot, because tboot needs some time in APs to handle INIT before
|
||
|
|
becoming ready for receiving SIPIs (this delay was removed as part of
|
||
|
|
c/s 23724 by Tim Deegan).
|
||
|
|
|
||
|
|
Signed-off-by: Gang Wei <gang.wei@intel.com>
|
||
|
|
Acked-by: Keir Fraser <keir@xen.org>
|
||
|
|
Acked-by: Tim Deegan <tim@xen.org>
|
||
|
|
Committed-by: Tim Deegan <tim@xen.org>
|
||
|
|
|
||
|
|
--- a/xen/arch/x86/smpboot.c
|
||
|
|
+++ b/xen/arch/x86/smpboot.c
|
||
|
|
@@ -42,6 +42,7 @@
|
||
|
|
#include <asm/msr.h>
|
||
|
|
#include <asm/mtrr.h>
|
||
|
|
#include <asm/time.h>
|
||
|
|
+#include <asm/tboot.h>
|
||
|
|
#include <mach_apic.h>
|
||
|
|
#include <mach_wakecpu.h>
|
||
|
|
#include <smpboot_hooks.h>
|
||
|
|
@@ -473,6 +474,18 @@ static int wakeup_secondary_cpu(int phys
|
||
|
|
send_status = apic_read(APIC_ICR) & APIC_ICR_BUSY;
|
||
|
|
} while ( send_status && (timeout++ < 1000) );
|
||
|
|
}
|
||
|
|
+ else if ( tboot_in_measured_env() )
|
||
|
|
+ {
|
||
|
|
+ /*
|
||
|
|
+ * With tboot AP is actually spinning in a mini-guest before
|
||
|
|
+ * receiving INIT. Upon receiving INIT ipi, AP need time to VMExit,
|
||
|
|
+ * update VMCS to tracking SIPIs and VMResume.
|
||
|
|
+ *
|
||
|
|
+ * While AP is in root mode handling the INIT the CPU will drop
|
||
|
|
+ * any SIPIs
|
||
|
|
+ */
|
||
|
|
+ udelay(10);
|
||
|
|
+ }
|
||
|
|
|
||
|
|
/*
|
||
|
|
* Should we send STARTUP IPIs ?
|