diff options
| author | Jeff Fan <jeff.fan@intel.com> | 2016-11-14 11:09:00 +0800 |
|---|---|---|
| committer | Jeff Fan <jeff.fan@intel.com> | 2016-11-16 16:28:21 +0800 |
| commit | 46d4b8858f0eea8952a4f3d289c47d96218159b4 (patch) | |
| tree | a5e6be436ef7365b674b1dde9e6f0d4ac2afe47a | |
| parent | 31a1e4da495ed211d7bdfdfe626a18c594aaa11c (diff) | |
| download | edk2-platforms-46d4b8858f0eea8952a4f3d289c47d96218159b4.tar.xz | |
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>
| -rw-r--r-- | UefiCpuPkg/Library/MpInitLib/Ia32/MpEqu.inc | 2 | ||||
| -rw-r--r-- | UefiCpuPkg/Library/MpInitLib/MpLib.c | 2 | ||||
| -rw-r--r-- | UefiCpuPkg/Library/MpInitLib/MpLib.h | 2 | ||||
| -rw-r--r-- | UefiCpuPkg/Library/MpInitLib/X64/MpEqu.inc | 4 |
4 files changed, 8 insertions, 2 deletions
diff --git a/UefiCpuPkg/Library/MpInitLib/Ia32/MpEqu.inc b/UefiCpuPkg/Library/MpInitLib/Ia32/MpEqu.inc index 5c6d4ef477..62762308e2 100644 --- 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
EnableExecuteDisableLocation equ LockLocation + 30h
Cr3Location equ LockLocation + 34h
+InitFlagLocation equ LockLocation + 38h
+CpuInfoLocation equ LockLocation + 3Ch
diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpInitLib/MpLib.c index 529df60ce6..2fde765744 100644 --- a/UefiCpuPkg/Library/MpInitLib/MpLib.c +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c @@ -664,6 +664,8 @@ FillExchangeInfoData ( ExchangeInfo->CFunction = (UINTN) ApWakeupFunction;
ExchangeInfo->NumApsExecuting = 0;
+ ExchangeInfo->InitFlag = (UINTN) CpuMpData->InitFlag;
+ ExchangeInfo->CpuInfo = (CPU_INFO_IN_HOB *) (UINTN) CpuMpData->CpuInfoInHob;
ExchangeInfo->CpuMpData = CpuMpData;
ExchangeInfo->EnableExecuteDisable = IsBspExecuteDisableEnabled ();
diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.h b/UefiCpuPkg/Library/MpInitLib/MpLib.h index f107b6d2d8..a58c855a6c 100644 --- a/UefiCpuPkg/Library/MpInitLib/MpLib.h +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.h @@ -171,6 +171,8 @@ typedef struct { UINTN DataSegment;
UINTN EnableExecuteDisable;
UINTN Cr3;
+ UINTN InitFlag;
+ CPU_INFO_IN_HOB *CpuInfo;
CPU_MP_DATA *CpuMpData;
} MP_CPU_EXCHANGE_INFO;
diff --git a/UefiCpuPkg/Library/MpInitLib/X64/MpEqu.inc b/UefiCpuPkg/Library/MpInitLib/X64/MpEqu.inc index d533741f0e..a63cd23a40 100644 --- 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
EnableExecuteDisableLocation equ LockLocation + 5Ch
Cr3Location equ LockLocation + 64h
+InitFlagLocation equ LockLocation + 6Ch
+CpuInfoLocation equ LockLocation + 74h
-
-;-------------------------------------------------------------------------------
|