UefiCpuPkg/MpInitLib: Add InitFlag and CpuInfo in MP_CPU_EXCHANGE_INFO

Cc: Feng Tian <feng.tian@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jeff Fan <jeff.fan@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>

diff --git a/UefiCpuPkg/Library/MpInitLib/Ia32/MpEqu.inc b/UefiCpuPkg/Library/MpInitLib/Ia32/MpEqu.inc
index 5c6d4ef477dea3791371463814aa86085c60a495..62762308e22e792595de77f0d0df43237de186bc 100644 (file)
--- a/UefiCpuPkg/Library/MpInitLib/Ia32/MpEqu.inc
+++ b/UefiCpuPkg/Library/MpInitLib/Ia32/MpEqu.inc
@@ -38,4 +38,6 @@ CodeSegmentLocation           equ        LockLocation + 28h
 DataSegmentLocation           equ        LockLocation + 2Ch\r
 EnableExecuteDisableLocation  equ        LockLocation + 30h\r
 Cr3Location                   equ        LockLocation + 34h\r
 DataSegmentLocation           equ        LockLocation + 2Ch\r
 EnableExecuteDisableLocation  equ        LockLocation + 30h\r
 Cr3Location                   equ        LockLocation + 34h\r

+InitFlagLocation              equ        LockLocation + 38h\r
+CpuInfoLocation               equ        LockLocation + 3Ch\r

 \r
 \r

diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpInitLib/MpLib.c
index 529df60ce6f680c69a871485379512956233eb46..2fde765744eabd0fa14cec00e9576f555a714a67 100644 (file)
--- a/UefiCpuPkg/Library/MpInitLib/MpLib.c
+++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c
@@ -664,6 +664,8 @@ FillExchangeInfoData (
 \r
   ExchangeInfo->CFunction       = (UINTN) ApWakeupFunction;\r
   ExchangeInfo->NumApsExecuting = 0;\r
 \r
   ExchangeInfo->CFunction       = (UINTN) ApWakeupFunction;\r
   ExchangeInfo->NumApsExecuting = 0;\r

+  ExchangeInfo->InitFlag        = (UINTN) CpuMpData->InitFlag;\r
+  ExchangeInfo->CpuInfo         = (CPU_INFO_IN_HOB *) (UINTN) CpuMpData->CpuInfoInHob;\r

   ExchangeInfo->CpuMpData       = CpuMpData;\r
 \r
   ExchangeInfo->EnableExecuteDisable = IsBspExecuteDisableEnabled ();\r
   ExchangeInfo->CpuMpData       = CpuMpData;\r
 \r
   ExchangeInfo->EnableExecuteDisable = IsBspExecuteDisableEnabled ();\r

diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.h b/UefiCpuPkg/Library/MpInitLib/MpLib.h
index f107b6d2d87147fa133066ee3ee2ef612eaba4ec..a58c855a6c2012973d10206e29637658a9e7e160 100644 (file)
--- a/UefiCpuPkg/Library/MpInitLib/MpLib.h
+++ b/UefiCpuPkg/Library/MpInitLib/MpLib.h
@@ -171,6 +171,8 @@ typedef struct {
   UINTN                 DataSegment;\r
   UINTN                 EnableExecuteDisable;\r
   UINTN                 Cr3;\r
   UINTN                 DataSegment;\r
   UINTN                 EnableExecuteDisable;\r
   UINTN                 Cr3;\r

+  UINTN                 InitFlag;\r
+  CPU_INFO_IN_HOB       *CpuInfo;\r

   CPU_MP_DATA           *CpuMpData;\r
 } MP_CPU_EXCHANGE_INFO;\r
 \r
   CPU_MP_DATA           *CpuMpData;\r
 } MP_CPU_EXCHANGE_INFO;\r
 \r

diff --git a/UefiCpuPkg/Library/MpInitLib/X64/MpEqu.inc b/UefiCpuPkg/Library/MpInitLib/X64/MpEqu.inc
index d533741f0e2b0141f09d336f513b4063a6a466a8..a63cd23a400666ae66317f593f1d9a3faf2d8a95 100644 (file)
--- a/UefiCpuPkg/Library/MpInitLib/X64/MpEqu.inc
+++ b/UefiCpuPkg/Library/MpInitLib/X64/MpEqu.inc
@@ -38,6 +38,6 @@ CodeSegmentLocation           equ        LockLocation + 4Ch
 DataSegmentLocation           equ        LockLocation + 54h\r
 EnableExecuteDisableLocation  equ        LockLocation + 5Ch\r
 Cr3Location                   equ        LockLocation + 64h\r
 DataSegmentLocation           equ        LockLocation + 54h\r
 EnableExecuteDisableLocation  equ        LockLocation + 5Ch\r
 Cr3Location                   equ        LockLocation + 64h\r

+InitFlagLocation              equ        LockLocation + 6Ch\r
+CpuInfoLocation               equ        LockLocation + 74h\r

 \r
 \r

-\r
-;-------------------------------------------------------------------------------\r