diff options
| author | Jeff Fan <jeff.fan@intel.com> | 2015-12-18 05:46:37 +0000 |
|---|---|---|
| committer | vanjeff <vanjeff@Edk2> | 2015-12-18 05:46:37 +0000 |
| commit | 2f10bcddc5be6f4809f3fd2874999627c2fa6b1b (patch) | |
| tree | 741c0ce972f757a5daabfaba519f2ff8ecab8f40 /UefiCpuPkg/CpuMpPei | |
| parent | b95380aa266cf3e2869e7cd69ded5621f332d281 (diff) | |
| download | edk2-2f10bcddc5be6f4809f3fd2874999627c2fa6b1b.tar.gz edk2-2f10bcddc5be6f4809f3fd2874999627c2fa6b1b.tar.bz2 edk2-2f10bcddc5be6f4809f3fd2874999627c2fa6b1b.zip | |
UefiCpuPkg/CpuMpPei: Fix pack(1) issue on x64 arch
Packing alignment for MP_CPU_EXCHANGE_INFO should be 1. This should be typo when
check-in CpuMpPei driver. IA32 arch MP_CPU_EXCHANGE_INFO is luckly pack(1). It
leads CpuMpPei x64 version hung.
(Sync patch r19340 from main trunk.)
Contributed-under: TianoCore Contribution Agreement 1.0
Reported-by: Michael Kinney <michael.d.kinney@intel.com>
Cc: Feng Tian <feng.tian@intel.com>
Cc: Michael Kinney <michael.d.kinney@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jeff Fan <jeff.fan@intel.com>
Tested-by: Michael Kinney <michael.d.kinney@intel.com>
Reviewed-by: Michael Kinney <michael.d.kinney@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/branches/UDK2015@19357 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'UefiCpuPkg/CpuMpPei')
| -rw-r--r-- | UefiCpuPkg/CpuMpPei/CpuMpPei.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/UefiCpuPkg/CpuMpPei/CpuMpPei.h b/UefiCpuPkg/CpuMpPei/CpuMpPei.h index f2286b990e..2b960c6eb1 100644 --- a/UefiCpuPkg/CpuMpPei/CpuMpPei.h +++ b/UefiCpuPkg/CpuMpPei/CpuMpPei.h @@ -72,7 +72,7 @@ typedef struct { typedef struct _PEI_CPU_MP_DATA PEI_CPU_MP_DATA;
-#pragma pack()
+#pragma pack(1)
typedef union {
struct {
@@ -95,6 +95,8 @@ typedef union { //
// MP CPU exchange information for AP reset code
+// This structure is required to be packed because fixed field offsets
+// into this structure are used in assembly code in this module
//
typedef struct {
UINTN Lock;
|