UefiCpuPkg: Duplicated AsmRelocateApLoop as AsmRelocateApLoopAmd

AsmRelocateApLoop is replicated for future Intel Logic Extraction,
further brings AP into 64-bit, and enables paging.

Signed-off-by: Yuanhao Xie <yuanhao.xie@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>

5 files changed, 235 insertions, 20 deletions

diff --git a/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c b/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c
index a84e9e33ba..445e0853d2 100644
--- a/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c
+++ b/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c
@@ -1,7 +1,7 @@
 /** @file

   MP initialize support functions for DXE phase.

 

-  Copyright (c) 2016 - 2020, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2016 - 2022, Intel Corporation. All rights reserved.<BR>

   SPDX-License-Identifier: BSD-2-Clause-Patent

 

 **/

@@ -378,32 +378,44 @@ RelocateApLoop (
   IN OUT VOID  *Buffer

   )

 {

-  CPU_MP_DATA           *CpuMpData;

-  BOOLEAN               MwaitSupport;

-  ASM_RELOCATE_AP_LOOP  AsmRelocateApLoopFunc;

-  UINTN                 ProcessorNumber;

-  UINTN                 StackStart;

+  CPU_MP_DATA               *CpuMpData;

+  BOOLEAN                   MwaitSupport;

+  ASM_RELOCATE_AP_LOOP      AsmRelocateApLoopFunc;

+  ASM_RELOCATE_AP_LOOP_AMD  AsmRelocateApLoopFuncAmd;

+  UINTN                     ProcessorNumber;

+  UINTN                     StackStart;

 

   MpInitLibWhoAmI (&ProcessorNumber);

   CpuMpData    = GetCpuMpData ();

   MwaitSupport = IsMwaitSupport ();

-  if (CpuMpData->UseSevEsAPMethod) {

-    StackStart = CpuMpData->SevEsAPResetStackStart;

+  if (StandardSignatureIsAuthenticAMD ()) {

+    StackStart               = CpuMpData->UseSevEsAPMethod ? CpuMpData->SevEsAPResetStackStart : mReservedTopOfApStack;

+    AsmRelocateApLoopFuncAmd = (ASM_RELOCATE_AP_LOOP_AMD)(UINTN)mReservedApLoopFunc;

+    AsmRelocateApLoopFuncAmd (

+      MwaitSupport,

+      CpuMpData->ApTargetCState,

+      CpuMpData->PmCodeSegment,

+      StackStart - ProcessorNumber * AP_SAFE_STACK_SIZE,

+      (UINTN)&mNumberToFinish,

+      CpuMpData->Pm16CodeSegment,

+      CpuMpData->SevEsAPBuffer,

+      CpuMpData->WakeupBuffer

+      );

   } else {

-    StackStart = mReservedTopOfApStack;

+    StackStart            = mReservedTopOfApStack;

+    AsmRelocateApLoopFunc = (ASM_RELOCATE_AP_LOOP)(UINTN)mReservedApLoopFunc;

+    AsmRelocateApLoopFunc (

+      MwaitSupport,

+      CpuMpData->ApTargetCState,

+      CpuMpData->PmCodeSegment,

+      StackStart - ProcessorNumber * AP_SAFE_STACK_SIZE,

+      (UINTN)&mNumberToFinish,

+      CpuMpData->Pm16CodeSegment,

+      CpuMpData->SevEsAPBuffer,

+      CpuMpData->WakeupBuffer

+      );

   }

 

-  AsmRelocateApLoopFunc = (ASM_RELOCATE_AP_LOOP)(UINTN)mReservedApLoopFunc;

-  AsmRelocateApLoopFunc (

-    MwaitSupport,

-    CpuMpData->ApTargetCState,

-    CpuMpData->PmCodeSegment,

-    StackStart - ProcessorNumber * AP_SAFE_STACK_SIZE,

-    (UINTN)&mNumberToFinish,

-    CpuMpData->Pm16CodeSegment,

-    CpuMpData->SevEsAPBuffer,

-    CpuMpData->WakeupBuffer

-    );

   //

   // It should never reach here

   //

diff --git a/UefiCpuPkg/Library/MpInitLib/MpEqu.inc b/UefiCpuPkg/Library/MpInitLib/MpEqu.inc
index ebadcc6fb3..ea202d4aef 100644
--- a/UefiCpuPkg/Library/MpInitLib/MpEqu.inc
+++ b/UefiCpuPkg/Library/MpInitLib/MpEqu.inc
@@ -26,6 +26,8 @@ struc MP_ASSEMBLY_ADDRESS_MAP
   .RendezvousFunnelSize          CTYPE_UINTN 1

   .RelocateApLoopFuncAddress     CTYPE_UINTN 1

   .RelocateApLoopFuncSize        CTYPE_UINTN 1

+  .RelocateApLoopFuncAddressAmd  CTYPE_UINTN 1

+  .RelocateApLoopFuncSizeAmd     CTYPE_UINTN 1

   .ModeTransitionOffset          CTYPE_UINTN 1

   .SwitchToRealNoNxOffset        CTYPE_UINTN 1

   .SwitchToRealPM16ModeOffset    CTYPE_UINTN 1

diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.h b/UefiCpuPkg/Library/MpInitLib/MpLib.h
index f5086e497e..1102003a93 100644
--- a/UefiCpuPkg/Library/MpInitLib/MpLib.h
+++ b/UefiCpuPkg/Library/MpInitLib/MpLib.h
@@ -179,6 +179,8 @@ typedef struct {
   UINTN    RendezvousFunnelSize;

   UINT8    *RelocateApLoopFuncAddress;

   UINTN    RelocateApLoopFuncSize;

+  UINT8    *RelocateApLoopFuncAddressAmd;

+  UINTN    RelocateApLoopFuncSizeAmd;

   UINTN    ModeTransitionOffset;

   UINTN    SwitchToRealNoNxOffset;

   UINTN    SwitchToRealPM16ModeOffset;

@@ -347,6 +349,31 @@ typedef
 extern EFI_GUID  mCpuInitMpLibHobGuid;

 

 /**

+  Assembly code to place AP into safe loop mode for Amd.

+  Place AP into targeted C-State if MONITOR is supported, otherwise

+  place AP into hlt state.

+  Place AP in protected mode if the current is long mode. Due to AP maybe

+  wakeup by some hardware event. It could avoid accessing page table that

+  may not available during booting to OS.

+  @param[in] MwaitSupport    TRUE indicates MONITOR is supported.

+                             FALSE indicates MONITOR is not supported.

+  @param[in] ApTargetCState  Target C-State value.

+  @param[in] PmCodeSegment   Protected mode code segment value.

+**/

+typedef

+  VOID

+(EFIAPI *ASM_RELOCATE_AP_LOOP_AMD)(

+  IN BOOLEAN                 MwaitSupport,

+  IN UINTN                   ApTargetCState,

+  IN UINTN                   PmCodeSegment,

+  IN UINTN                   TopOfApStack,

+  IN UINTN                   NumberToFinish,

+  IN UINTN                   Pm16CodeSegment,

+  IN UINTN                   SevEsAPJumpTable,

+  IN UINTN                   WakeupBuffer

+  );

+

+/**

   Assembly code to place AP into safe loop mode.

 

   Place AP into targeted C-State if MONITOR is supported, otherwise

diff --git a/UefiCpuPkg/Library/MpInitLib/X64/AmdSev.nasm b/UefiCpuPkg/Library/MpInitLib/X64/AmdSev.nasm
index 7c2469f9c5..b2d95adf6d 100644
--- a/UefiCpuPkg/Library/MpInitLib/X64/AmdSev.nasm
+++ b/UefiCpuPkg/Library/MpInitLib/X64/AmdSev.nasm
@@ -346,3 +346,172 @@ PM16Mode:
     iret

 

 SwitchToRealProcEnd:

+;-------------------------------------------------------------------------------------

+;  AsmRelocateApLoopAmd (MwaitSupport, ApTargetCState, PmCodeSegment, TopOfApStack, CountTofinish, Pm16CodeSegment, SevEsAPJumpTable, WakeupBuffer);

+;-------------------------------------------------------------------------------------

+

+AsmRelocateApLoopStartAmd:

+BITS 64

+    cmp        qword [rsp + 56], 0  ; SevEsAPJumpTable

+    je         NoSevEsAmd

+

+    ;

+    ; Perform some SEV-ES related setup before leaving 64-bit mode

+    ;

+    push       rcx

+    push       rdx

+

+    ;

+    ; Get the RDX reset value using CPUID

+    ;

+    mov        rax, 1

+    cpuid

+    mov        rsi, rax          ; Save off the reset value for RDX

+

+    ;

+    ; Prepare the GHCB for the AP_HLT_LOOP VMGEXIT call

+    ;   - Must be done while in 64-bit long mode so that writes to

+    ;     the GHCB memory will be unencrypted.

+    ;   - No NAE events can be generated once this is set otherwise

+    ;     the AP_RESET_HOLD SW_EXITCODE will be overwritten.

+    ;

+    mov        rcx, 0xc0010130

+    rdmsr                        ; Retrieve current GHCB address

+    shl        rdx, 32

+    or         rdx, rax

+

+    mov        rdi, rdx

+    xor        rax, rax

+    mov        rcx, 0x800

+    shr        rcx, 3

+    rep stosq                    ; Clear the GHCB

+

+    mov        rax, 0x80000004   ; VMGEXIT AP_RESET_HOLD

+    mov        [rdx + 0x390], rax

+    mov        rax, 114          ; Set SwExitCode valid bit

+    bts        [rdx + 0x3f0], rax

+    inc        rax               ; Set SwExitInfo1 valid bit

+    bts        [rdx + 0x3f0], rax

+    inc        rax               ; Set SwExitInfo2 valid bit

+    bts        [rdx + 0x3f0], rax

+

+    pop        rdx

+    pop        rcx

+

+NoSevEsAmd:

+    cli                          ; Disable interrupt before switching to 32-bit mode

+    mov        rax, [rsp + 40]   ; CountTofinish

+    lock dec   dword [rax]       ; (*CountTofinish)--

+

+    mov        r10, [rsp + 48]   ; Pm16CodeSegment

+    mov        rax, [rsp + 56]   ; SevEsAPJumpTable

+    mov        rbx, [rsp + 64]   ; WakeupBuffer

+    mov        rsp, r9           ; TopOfApStack

+

+    push       rax               ; Save SevEsAPJumpTable

+    push       rbx               ; Save WakeupBuffer

+    push       r10               ; Save Pm16CodeSegment

+    push       rcx               ; Save MwaitSupport

+    push       rdx               ; Save ApTargetCState

+

+    lea        rax, [PmEntryAmd]    ; rax <- The start address of transition code

+

+    push       r8

+    push       rax

+

+    ;

+    ; Clear R8 - R15, for reset, before going into 32-bit mode

+    ;

+    xor        r8, r8

+    xor        r9, r9

+    xor        r10, r10

+    xor        r11, r11

+    xor        r12, r12

+    xor        r13, r13

+    xor        r14, r14

+    xor        r15, r15

+

+    ;

+    ; Far return into 32-bit mode

+    ;

+o64 retf

+

+BITS 32

+PmEntryAmd:

+    mov        eax, cr0

+    btr        eax, 31           ; Clear CR0.PG

+    mov        cr0, eax          ; Disable paging and caches

+

+    mov        ecx, 0xc0000080

+    rdmsr

+    and        ah, ~ 1           ; Clear LME

+    wrmsr

+    mov        eax, cr4

+    and        al, ~ (1 << 5)    ; Clear PAE

+    mov        cr4, eax

+

+    pop        edx

+    add        esp, 4

+    pop        ecx,

+    add        esp, 4

+

+MwaitCheckAmd:

+    cmp        cl, 1              ; Check mwait-monitor support

+    jnz        HltLoopAmd

+    mov        ebx, edx           ; Save C-State to ebx

+MwaitLoopAmd:

+    cli

+    mov        eax, esp           ; Set Monitor Address

+    xor        ecx, ecx           ; ecx = 0

+    xor        edx, edx           ; edx = 0

+    monitor

+    mov        eax, ebx           ; Mwait Cx, Target C-State per eax[7:4]

+    shl        eax, 4

+    mwait

+    jmp        MwaitLoopAmd

+

+HltLoopAmd:

+    pop        edx                ; PM16CodeSegment

+    add        esp, 4

+    pop        ebx                ; WakeupBuffer

+    add        esp, 4

+    pop        eax                ; SevEsAPJumpTable

+    add        esp, 4

+    cmp        eax, 0             ; Check for SEV-ES

+    je         DoHltAmd

+

+    cli

+    ;

+    ; SEV-ES is enabled, use VMGEXIT (GHCB information already

+    ; set by caller)

+    ;

+BITS 64

+    rep        vmmcall

+BITS 32

+

+    ;

+    ; Back from VMGEXIT AP_HLT_LOOP

+    ;   Push the FLAGS/CS/IP values to use

+    ;

+    push       word 0x0002        ; EFLAGS

+    xor        ecx, ecx

+    mov        cx, [eax + 2]      ; CS

+    push       cx

+    mov        cx, [eax]          ; IP

+    push       cx

+    push       word 0x0000        ; For alignment, will be discarded

+

+    push       edx

+    push       ebx

+

+    mov        edx, esi           ; Restore RDX reset value

+

+    retf

+

+DoHltAmd:

+    cli

+    hlt

+    jmp        DoHltAmd

+

+BITS 64

+AsmRelocateApLoopEndAmd:

diff --git a/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm b/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm
index 5d71995bf8..39c3e8606a 100644
--- a/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm
+++ b/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm
@@ -460,6 +460,11 @@ ASM_PFX(AsmGetAddressMap):
     mov        qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.RelocateApLoopFuncAddress], rax

     mov        qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.RelocateApLoopFuncSize], AsmRelocateApLoopEnd - AsmRelocateApLoopStart

     mov        qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.ModeTransitionOffset], Flat32Start - RendezvousFunnelProcStart

+

+    lea        rax, [AsmRelocateApLoopStartAmd]

+    mov        qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.RelocateApLoopFuncAddressAmd], rax

+    mov        qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.RelocateApLoopFuncSizeAmd], AsmRelocateApLoopEndAmd - AsmRelocateApLoopStartAmd

+

     mov        qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.SwitchToRealNoNxOffset], SwitchToRealProcStart - Flat32Start

     mov        qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.SwitchToRealPM16ModeOffset], PM16Mode - RendezvousFunnelProcStart

     mov        qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.SwitchToRealPM16ModeSize], SwitchToRealProcEnd - PM16Mode