UefiCpuPkg/MpInitLib: support 64-bit AP stack addresses

[mirror_edk2.git] / UefiCpuPkg / Library / MpInitLib / X64 / MpFuncs.nasm

diff --git a/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm b/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm
index 138b97312b1d02d2e549f7065087b2c561207555..aaabb50c54684493e1b5f9c2b4e98225f2c19efe 100644 (file)
--- a/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm
+++ b/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm
@@ -185,13 +185,12 @@ GetProcessorNumber:
 GetNextProcNumber:\r
     cmp         dword [edi], edx                      ; APIC ID match?\r
     jz          ProgramStack\r
-    add         edi, 16\r
+    add         edi, 20\r
     inc         ebx\r
     jmp         GetNextProcNumber    \r
 \r
 ProgramStack:\r
-    xor         rsp, rsp\r
-    mov         esp, dword [edi + 12]\r
+    mov         rsp, qword [edi + 12]\r
 \r
 CProcedureInvoke:\r
     push       rbp               ; Push BIST data at top of AP stack\r