UefiCpuPkg/MpInitLib: Enable 5-level paging for AP when BSP's enabled

[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 cea90f3d4deb56dcc4e1318aa966d259efc585d2..87f2523e856faaeecd187058f5ac039665d86627 100644 (file)
--- a/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm
+++ b/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm
@@ -1,5 +1,5 @@
 ;------------------------------------------------------------------------------ ;\r
-; Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2015 - 2019, Intel Corporation. All rights reserved.<BR>\r
 ; SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ;\r
 ; Module Name:\r
@@ -100,6 +100,18 @@ SkipEnableExecuteDisableBit:
     ;\r
     mov        eax, cr4\r
     bts        eax, 5\r
+\r
+    mov        esi, Enable5LevelPagingLocation\r
+    cmp        byte [ebx + esi], 0\r
+    jz         SkipEnable5LevelPaging\r
+\r
+    ;\r
+    ; Enable 5 Level Paging\r
+    ;\r
+    bts        eax, 12                     ; Set LA57=1.\r
+\r
+SkipEnable5LevelPaging:\r
+\r
     mov        cr4, eax\r
 \r
     ;\r