UefiCpuPkg/MpInitLib: Fix X64 XCODE5/NASM compatibility issues

[mirror_edk2.git] / UefiCpuPkg / Library / MpInitLib / MpLib.c

diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpInitLib/MpLib.c
index bb93526dd990cd7132c52c321ec6a9009842d026..735e099b32f28e934ca20603679574bf82a02a30 100644 (file)
--- a/UefiCpuPkg/Library/MpInitLib/MpLib.c
+++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c
@@ -382,13 +382,13 @@ ApInitializeSync (
 \r
   CpuMpData = (CPU_MP_DATA *) Buffer;\r
   //\r
-  // Sync BSP's MTRR table to AP\r
-  //\r
-  MtrrSetAllMtrrs (&CpuMpData->MtrrTable);\r
-  //\r
   // Load microcode on AP\r
   //\r
   MicrocodeDetect (CpuMpData);\r
+  //\r
+  // Sync BSP's MTRR table to AP\r
+  //\r
+  MtrrSetAllMtrrs (&CpuMpData->MtrrTable);\r
 }\r
 \r
 /**\r
@@ -434,6 +434,8 @@ CollectProcessorCount (
   IN CPU_MP_DATA         *CpuMpData\r
   )\r
 {\r
+  UINTN                  Index;\r
+\r
   //\r
   // Send 1st broadcast IPI to APs to wakeup APs\r
   //\r
@@ -465,6 +467,12 @@ CollectProcessorCount (
     // Enable x2APIC on BSP\r
     //\r
     SetApicMode (LOCAL_APIC_MODE_X2APIC);\r
+    //\r
+    // Set BSP/Aps state to IDLE\r
+    //\r
+    for (Index = 0; Index < CpuMpData->CpuCount; Index++) {\r
+      SetApState (&CpuMpData->CpuData[Index], CpuStateIdle);\r
+    }\r
   }\r
   DEBUG ((DEBUG_INFO, "APIC MODE is %d\n", GetApicMode ()));\r
   //\r
@@ -743,6 +751,8 @@ FillExchangeInfoData (
 \r
   ExchangeInfo->EnableExecuteDisable = IsBspExecuteDisableEnabled ();\r
 \r
+  ExchangeInfo->InitializeFloatingPointUnitsAddress = (UINTN)InitializeFloatingPointUnits;\r
+\r
   //\r
   // Get the BSP's data of GDT and IDT\r
   //\r
@@ -1364,6 +1374,10 @@ MpInitLibInitialize (
   // Store BSP's MTRR setting\r
   //\r
   MtrrGetAllMtrrs (&CpuMpData->MtrrTable);\r
+  //\r
+  // Enable the local APIC for Virtual Wire Mode.\r
+  //\r
+  ProgramVirtualWireMode ();\r
 \r
   if (OldCpuMpData == NULL) {\r
     if (MaxLogicalProcessorNumber > 1) {\r