UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm

[mirror_edk2.git] / UefiCpuPkg / CpuDxe / X64 / CpuAsm.nasm

diff --git a/UefiCpuPkg/CpuDxe/X64/CpuAsm.nasm b/UefiCpuPkg/CpuDxe/X64/CpuAsm.nasm
index 77ecfb34047647fa9d7913f418800b8d023a370b..a894ff53ad3f5bba48988c898097a10685baa98e 100644 (file)
--- a/UefiCpuPkg/CpuDxe/X64/CpuAsm.nasm
+++ b/UefiCpuPkg/CpuDxe/X64/CpuAsm.nasm
@@ -1,13 +1,7 @@
 ;------------------------------------------------------------------------------\r
 ;*\r
-;*   Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
-;*   This program and the accompanying materials\r
-;*   are licensed and made available under the terms and conditions of the BSD License\r
-;*   which accompanies this distribution.  The full text of the license may be found at\r
-;*   http://opensource.org/licenses/bsd-license.php\r
-;*\r
-;*   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-;*   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+;*   Copyright (c) 2016 - 2022, Intel Corporation. All rights reserved.<BR>\r
+;*   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;*\r
 ;*    CpuAsm.nasm\r
 ;*\r
@@ -26,13 +20,11 @@
 ;------------------------------------------------------------------------------\r
 global ASM_PFX(SetCodeSelector)\r
 ASM_PFX(SetCodeSelector):\r
-    sub     rsp, 0x10\r
+    push    rcx\r
     lea     rax, [setCodeSelectorLongJump]\r
-    mov     [rsp], rax\r
-    mov     [rsp+4], cx\r
-    jmp     dword far [rsp]\r
+    push    rax\r
+    retfq\r
 setCodeSelectorLongJump:\r
-    add     rsp, 0x10\r
     ret\r
 \r
 ;------------------------------------------------------------------------------\r