UefiCpuPkg/MpInitLib: Fix a hang in above 4GB case

This patch fixed the hang in UEFICpuPkg when it is dispatched above 4GB.
In UEFI BIOS case CpuInfoInHob is provided to DXE under 4GB from PEI.
When using UEFI payload and bootloaders, CpuInfoInHob will be allocated
above 4GB since it is not provided from bootloader. so we need update
the code to make sure this hob could be accessed correctly in this case.

Signed-off-by: Guo Dong <guo.dong@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
diff --git a/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm b/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm
index 5532a1d..aecfd07 100644
--- a/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm
+++ b/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm
@@ -303,17 +303,17 @@
     ;

     xor         ebx, ebx

     lea         eax, [esi + CpuInfoLocation]

-    mov         edi, [eax]

+    mov         rdi, [eax]

 

 GetNextProcNumber:

-    cmp         dword [edi], edx                      ; APIC ID match?

+    cmp         dword [rdi], edx                      ; APIC ID match?

     jz          ProgramStack

-    add         edi, 20

+    add         rdi, 20

     inc         ebx

     jmp         GetNextProcNumber

 

 ProgramStack:

-    mov         rsp, qword [edi + 12]

+    mov         rsp, qword [rdi + 12]

 

 CProcedureInvoke:

     push       rbp               ; Push BIST data at top of AP stack