UefiCpuPkg: Rename AsmRelocateApLoopStart.

Rename AsmRelocateApLoopStart to AsmRelocateApLoopStartAmdSev

Cc: Guo Dong <guo.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Sean Rhodes <sean@starlabs.systems>
Cc: James Lu <james.lu@intel.com>
Cc: Gua Guo <gua.guo@intel.com>
Signed-off-by: Yuanhao Xie <yuanhao.xie@intel.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Tested-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>

diff --git a/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c b/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c
index d292277d1048c5f6e3078f24c98e91cf5ba4068d..330676b700d1cfd9c6dd0efe1a8b81283a06eb32 100644 (file)
--- a/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c
+++ b/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c
@@ -547,8 +547,8 @@ InitMpGlobalData (
     // 64-bit AMD processors with SEV-ES\r
     //\r
     Address        = BASE_4GB - 1;\r
-    ApLoopFunc     = AddressMap->RelocateApLoopFuncAddress;\r
-    ApLoopFuncSize = AddressMap->RelocateApLoopFuncSize;\r
+    ApLoopFunc     = AddressMap->RelocateApLoopFuncAddressAmdSev;\r
+    ApLoopFuncSize = AddressMap->RelocateApLoopFuncSizeAmdSev;\r
   } else {\r
     //\r
     // Intel processors (32-bit or 64-bit), 32-bit AMD processors, or 64-bit AMD processors without SEV-ES\r

diff --git a/UefiCpuPkg/Library/MpInitLib/MpEqu.inc b/UefiCpuPkg/Library/MpInitLib/MpEqu.inc
index 09c18174265c7b7962fd382d66cf43345b520ece..72af1965135fd98e04d0aed2ee9e04f7e053f34f 100644 (file)
--- a/UefiCpuPkg/Library/MpInitLib/MpEqu.inc
+++ b/UefiCpuPkg/Library/MpInitLib/MpEqu.inc
@@ -26,8 +26,8 @@ struc MP_ASSEMBLY_ADDRESS_MAP
   .RendezvousFunnelSize               CTYPE_UINTN 1\r
   .RelocateApLoopFuncAddressGeneric   CTYPE_UINTN 1\r
   .RelocateApLoopFuncSizeGeneric      CTYPE_UINTN 1\r
-  .RelocateApLoopFuncAddress          CTYPE_UINTN 1\r
-  .RelocateApLoopFuncSize             CTYPE_UINTN 1\r
+  .RelocateApLoopFuncAddressAmdSev    CTYPE_UINTN 1\r
+  .RelocateApLoopFuncSizeAmdSev       CTYPE_UINTN 1\r
   .ModeTransitionOffset               CTYPE_UINTN 1\r
   .SwitchToRealNoNxOffset             CTYPE_UINTN 1\r
   .SwitchToRealPM16ModeOffset         CTYPE_UINTN 1\r

diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.h b/UefiCpuPkg/Library/MpInitLib/MpLib.h
index e137545fc6b40cc201e3b878ebefe5503d428bbb..6f235dcf6d696b6a541948c1614f66c041005c2f 100644 (file)
--- a/UefiCpuPkg/Library/MpInitLib/MpLib.h
+++ b/UefiCpuPkg/Library/MpInitLib/MpLib.h
@@ -179,8 +179,8 @@ typedef struct {
   UINTN    RendezvousFunnelSize;\r
   UINT8    *RelocateApLoopFuncAddressGeneric;\r
   UINTN    RelocateApLoopFuncSizeGeneric;\r
-  UINT8    *RelocateApLoopFuncAddress;\r
-  UINTN    RelocateApLoopFuncSize;\r
+  UINT8    *RelocateApLoopFuncAddressAmdSev;\r
+  UINTN    RelocateApLoopFuncSizeAmdSev;\r
   UINTN    ModeTransitionOffset;\r
   UINTN    SwitchToRealNoNxOffset;\r
   UINTN    SwitchToRealPM16ModeOffset;\r
@@ -388,7 +388,7 @@ typedef
 **/\r
 typedef\r
   VOID\r
-(EFIAPI *ASM_RELOCATE_AP_LOOP)(\r
+(EFIAPI *ASM_RELOCATE_AP_LOOP_AMDSEV)(\r
   IN BOOLEAN                 MwaitSupport,\r
   IN UINTN                   ApTargetCState,\r
   IN UINTN                   PmCodeSegment,\r
@@ -429,7 +429,7 @@ AsmExchangeRole (
 \r
 typedef union {\r
   VOID                            *Data;\r
-  ASM_RELOCATE_AP_LOOP            AmdSevEntry;  // 64-bit AMD Sev processors\r
+  ASM_RELOCATE_AP_LOOP_AMDSEV     AmdSevEntry;  // 64-bit AMD Sev processors\r
   ASM_RELOCATE_AP_LOOP_GENERIC    GenericEntry; // Intel processors (32-bit or 64-bit), 32-bit AMD processors, or AMD non-Sev processors\r
 } RELOCATE_AP_LOOP_ENTRY;\r
 \r

diff --git a/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm b/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm
index c0d7355c6b057d996dafc7db00c256038c3b7a21..1a64d5681f00e20942f2fc3127edef2c637d8449 100644 (file)
--- a/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm
+++ b/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm
@@ -277,14 +277,14 @@ CProcedureInvoke:
 %include "AmdSev.nasm"\r
 \r
 RendezvousFunnelProcEnd:\r
-\r
 ;-------------------------------------------------------------------------------------\r
-;  AsmRelocateApLoop (MwaitSupport, ApTargetCState, PmCodeSegment, TopOfApStack, CountTofinish, Pm16CodeSegment, SevEsAPJumpTable, WakeupBuffer);\r
+;  AsmRelocateApLoopAmdSev (MwaitSupport, ApTargetCState, PmCodeSegment, TopOfApStack, CountTofinish, Pm16CodeSegment, SevEsAPJumpTable, WakeupBuffer);\r
 ;-------------------------------------------------------------------------------------\r
-AsmRelocateApLoopStart:\r
+\r
+AsmRelocateApLoopAmdSevStart:\r
 BITS 64\r
     cmp        qword [rsp + 56], 0  ; SevEsAPJumpTable\r
-    je         NoSevEs\r
+    je         NoSevEsAmdSev\r
 \r
     ;\r
     ; Perform some SEV-ES related setup before leaving 64-bit mode\r
@@ -329,7 +329,7 @@ BITS 64
     pop        rdx\r
     pop        rcx\r
 \r
-NoSevEs:\r
+NoSevEsAmdSev:\r
     cli                          ; Disable interrupt before switching to 32-bit mode\r
     mov        rax, [rsp + 40]   ; CountTofinish\r
     lock dec   dword [rax]       ; (*CountTofinish)--\r
@@ -345,7 +345,7 @@ NoSevEs:
     push       rcx               ; Save MwaitSupport\r
     push       rdx               ; Save ApTargetCState\r
 \r
-    lea        rax, [PmEntry]    ; rax <- The start address of transition code\r
+    lea        rax, [PmEntryAmdSev]    ; rax <- The start address of transition code\r
 \r
     push       r8\r
     push       rax\r
@@ -365,10 +365,10 @@ NoSevEs:
     ;\r
     ; Far return into 32-bit mode\r
     ;\r
-    retfq\r
+o64 retf\r
 \r
 BITS 32\r
-PmEntry:\r
+PmEntryAmdSev:\r
     mov        eax, cr0\r
     btr        eax, 31           ; Clear CR0.PG\r
     mov        cr0, eax          ; Disable paging and caches\r
@@ -386,11 +386,11 @@ PmEntry:
     pop        ecx,\r
     add        esp, 4\r
 \r
-MwaitCheck:\r
+MwaitCheckAmdSev:\r
     cmp        cl, 1              ; Check mwait-monitor support\r
-    jnz        HltLoop\r
+    jnz        HltLoopAmdSev\r
     mov        ebx, edx           ; Save C-State to ebx\r
-MwaitLoop:\r
+MwaitLoopAmdSev:\r
     cli\r
     mov        eax, esp           ; Set Monitor Address\r
     xor        ecx, ecx           ; ecx = 0\r
@@ -399,9 +399,9 @@ MwaitLoop:
     mov        eax, ebx           ; Mwait Cx, Target C-State per eax[7:4]\r
     shl        eax, 4\r
     mwait\r
-    jmp        MwaitLoop\r
+    jmp        MwaitLoopAmdSev\r
 \r
-HltLoop:\r
+HltLoopAmdSev:\r
     pop        edx                ; PM16CodeSegment\r
     add        esp, 4\r
     pop        ebx                ; WakeupBuffer\r
@@ -409,7 +409,7 @@ HltLoop:
     pop        eax                ; SevEsAPJumpTable\r
     add        esp, 4\r
     cmp        eax, 0             ; Check for SEV-ES\r
-    je         DoHlt\r
+    je         DoHltAmdSev\r
 \r
     cli\r
     ;\r
@@ -439,13 +439,13 @@ BITS 32
 \r
     retf\r
 \r
-DoHlt:\r
+DoHltAmdSev:\r
     cli\r
     hlt\r
-    jmp        DoHlt\r
+    jmp        DoHltAmdSev\r
 \r
 BITS 64\r
-AsmRelocateApLoopEnd:\r
+AsmRelocateApLoopAmdSevEnd:\r
 \r
 ;-------------------------------------------------------------------------------------\r
 ;  AsmRelocateApLoop (MwaitSupport, ApTargetCState, TopOfApStack, CountTofinish, Cr3);\r
@@ -511,9 +511,9 @@ ASM_PFX(AsmGetAddressMap):
 lea        rax, [AsmRelocateApLoopGenericStart]\r
     mov        qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.RelocateApLoopFuncAddressGeneric], rax\r
     mov        qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.RelocateApLoopFuncSizeGeneric], AsmRelocateApLoopGenericEnd - AsmRelocateApLoopGenericStart\r
-    lea        rax, [AsmRelocateApLoopStart]\r
-    mov        qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.RelocateApLoopFuncAddress], rax\r
-    mov        qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.RelocateApLoopFuncSize], AsmRelocateApLoopEnd - AsmRelocateApLoopStart\r
+    lea        rax, [AsmRelocateApLoopAmdSevStart]\r
+    mov        qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.RelocateApLoopFuncAddressAmdSev], rax\r
+    mov        qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.RelocateApLoopFuncSizeAmdSev], AsmRelocateApLoopAmdSevEnd - AsmRelocateApLoopAmdSevStart\r
     mov        qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.ModeTransitionOffset], Flat32Start - RendezvousFunnelProcStart\r
     mov        qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.SwitchToRealNoNxOffset], SwitchToRealProcStart - Flat32Start\r
     mov        qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.SwitchToRealPM16ModeOffset], PM16Mode - RendezvousFunnelProcStart\r