UefiCpuPkg/CpuMpPei: Load microcode if found newer revision

[mirror_edk2.git] / UefiCpuPkg / CpuMpPei / CpuMpPei.h

diff --git a/UefiCpuPkg/CpuMpPei/CpuMpPei.h b/UefiCpuPkg/CpuMpPei/CpuMpPei.h
index f2286b990ee9181b5377b5aece474e7ffbe96416..7c8a218e0ee33aff8e4c95f3dff615709014152a 100644 (file)
--- a/UefiCpuPkg/CpuMpPei/CpuMpPei.h
+++ b/UefiCpuPkg/CpuMpPei/CpuMpPei.h
@@ -38,6 +38,7 @@
 #include <Library/SynchronizationLib.h>\r
 #include <Library/TimerLib.h>\r
 #include <Library/UefiCpuLib.h>\r
+#include <Library/CpuLib.h>\r
 \r
 #include "Microcode.h"\r
 \r
@@ -50,6 +51,14 @@ typedef enum {
   CpuStateDisabled\r
 } CPU_STATE;\r
 \r
+#define WAKEUP_AP_SIGNAL SIGNATURE_32 ('S', 'T', 'A', 'P')\r
+\r
+typedef enum {\r
+  ApInHltLoop   = 1,\r
+  ApInMwaitLoop = 2,\r
+  ApInRunLoop   = 3\r
+} AP_LOOP_MODE;\r
+\r
 //\r
 // AP reset code information\r
 //\r
@@ -72,7 +81,7 @@ typedef struct {
 \r
 typedef struct _PEI_CPU_MP_DATA  PEI_CPU_MP_DATA;\r
 \r
-#pragma pack()\r
+#pragma pack(1)\r
 \r
 typedef union {\r
   struct {\r
@@ -95,6 +104,8 @@ typedef union {
 \r
 //\r
 // MP CPU exchange information for AP reset code\r
+// This structure is required to be packed because fixed field offsets\r
+// into this structure are used in assembly code in this module\r
 //\r
 typedef struct {\r
   UINTN                 Lock;\r
@@ -126,6 +137,7 @@ typedef struct {
 } CPU_VOLATILE_REGISTERS;\r
 \r
 typedef struct {\r
+  volatile UINT32                *StartupApSignal;\r
   UINT32                         ApicId;\r
   EFI_HEALTH_FLAGS               Health;\r
   CPU_STATE                      State;\r
@@ -155,6 +167,8 @@ struct _PEI_CPU_MP_DATA {
   CPU_EXCHANGE_ROLE_INFO         BSPInfo;\r
   CPU_EXCHANGE_ROLE_INFO         APInfo;\r
   MTRR_SETTINGS                  MtrrTable;\r
+  UINT8                          ApLoopMode;\r
+  UINT8                          ApTargetCState;\r
   PEI_CPU_DATA                   *CpuData;\r
   volatile MP_CPU_EXCHANGE_INFO  *MpCpuExchangeInfo;\r
 };\r
@@ -184,16 +198,6 @@ AsmInitializeGdt (
   IN IA32_DESCRIPTOR  *Gdtr\r
   );\r
 \r
-/**\r
-  Assembly code to do CLI-HALT loop.\r
-\r
-**/\r
-VOID\r
-EFIAPI\r
-AsmCliHltLoop (\r
-  VOID\r
-  );\r
-\r
 /**\r
   Get available system memory below 1MB by specified size.\r
 \r
@@ -241,7 +245,7 @@ CpuMpEndOfPeiCallback (
   @param PeiCpuMpData       Pointer to PEI CPU MP Data\r
   @param Broadcast          TRUE:  Send broadcast IPI to all APs\r
                             FALSE: Send IPI to AP by ApicId\r
-  @param ApicId             Apic ID for the processor to be waked\r
+  @param ProcessorNumber    The handle number of specified processor\r
   @param Procedure          The function to be invoked by AP\r
   @param ProcedureArgument  The argument to be passed into AP function\r
 **/\r
@@ -249,7 +253,7 @@ VOID
 WakeUpAP (\r
   IN PEI_CPU_MP_DATA           *PeiCpuMpData,\r
   IN BOOLEAN                   Broadcast,\r
-  IN UINT32                    ApicId,\r
+  IN UINTN                     ProcessorNumber,\r
   IN EFI_AP_PROCEDURE          Procedure,              OPTIONAL\r
   IN VOID                      *ProcedureArgument      OPTIONAL\r
   );\r