UefiCpuPkg/PiSmmCpu: Always set WP in CR0

[mirror_edk2.git] / UefiCpuPkg / PiSmmCpuDxeSmm / X64 / SmiEntry.S

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.S b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.S
index 831559357f159035bb9f793604ae53aba5b2beec..7e9ac58cb2c96f33b554654b40e23c624522a72c 100644 (file)
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.S
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.S
@@ -24,7 +24,6 @@ ASM_GLOBAL  ASM_PFX(gcSmiHandlerSize)
 ASM_GLOBAL  ASM_PFX(gSmiCr3)\r
 ASM_GLOBAL  ASM_PFX(gSmiStack)\r
 ASM_GLOBAL  ASM_PFX(gSmbase)\r
-ASM_GLOBAL  ASM_PFX(FeaturePcdGet (PcdCpuSmmDebug))\r
 ASM_GLOBAL  ASM_PFX(gSmiHandlerIdtr)\r
 \r
 #\r
@@ -128,14 +127,6 @@ ASM_PFX(gSmiCr3):    .space  4
     sgdt    (%rsp)\r
     movl    2(%rsp), %eax               # eax = GDT base\r
     addl    $8, %esp\r
-    movl    %eax, %edx\r
-    addl    $GDT_SIZE, %edx\r
-    movb    %dl, (TSS_SEGMENT + 2)(%rax)\r
-    movb    %dh, (TSS_SEGMENT + 3)(%rax)\r
-    .byte   0xc1, 0xea, 0x10             # shr     edx, 16\r
-    movb    %dl, (TSS_SEGMENT + 4)(%rax)\r
-    movb    %dh, (TSS_SEGMENT + 7)(%rax)\r
-    movl    %eax, %edx\r
     movb    $0x89, %dl\r
     movb    %dl, (TSS_SEGMENT + 5)(%rax) # clear busy flag\r
     movl    $TSS_SEGMENT, %eax\r
@@ -153,7 +144,7 @@ Base:
     orb     $1,%ah\r
     wrmsr\r
     movq    %cr0, %rbx\r
-    btsl    $31, %ebx\r
+    orl     $0x080010000, %ebx          # enable paging + WP\r
     movq    %rbx, %cr0\r
     retf\r
 LongMode:                               # long mode (64-bit code) starts here\r
@@ -171,20 +162,7 @@ LongMode:                               # long mode (64-bit code) starts here
 #   jmp     _SmiHandler                 ; instruction is not needed\r
 \r
 _SmiHandler:\r
-    movabsq $ASM_PFX(FeaturePcdGet (PcdCpuSmmDebug)), %rax\r
-    cmpb    $0, (%rax)\r
-    jz      L1\r
-\r
-    .byte   0x48, 0x8b, 0x0d            # mov rcx, [rip + disp32]\r
-    .long   SSM_DR6 - (. + 4 - _SmiEntryPoint + 0x8000)\r
-    .byte   0x48, 0x8b, 0x15            # mov rdx, [rip + disp32]\r
-    .long   SSM_DR7 - (. + 4 - _SmiEntryPoint + 0x8000)\r
-    movq    %rcx, %dr6\r
-    movq    %rdx, %dr7\r
-L1:\r
-\r
-    movabsq $ASM_PFX(SmiRendezvous), %rax\r
-    movq    (%rsp), %rcx\r
+    movq    (%rsp), %rbx\r
     # Save FP registers\r
 \r
     subq    $0x208, %rsp\r
@@ -192,7 +170,19 @@ L1:
     fxsave  (%rsp)\r
 \r
     addq    $-0x20, %rsp\r
+\r
+    movq    %rbx, %rcx\r
+    movabsq $ASM_PFX(CpuSmmDebugEntry), %rax\r
     call    *%rax\r
+\r
+    movq    %rbx, %rcx\r
+    movabsq $ASM_PFX(SmiRendezvous), %rax\r
+    call    *%rax\r
+\r
+    movq    %rbx, %rcx\r
+    movabsq $ASM_PFX(CpuSmmDebugExit), %rax\r
+    call    *%rax\r
+\r
     addq    $0x20, %rsp\r
 \r
     #\r
@@ -201,17 +191,6 @@ L1:
     .byte   0x48                        # FXRSTOR64\r
     fxrstor (%rsp)\r
 \r
-    movabsq $ASM_PFX(FeaturePcdGet (PcdCpuSmmDebug)), %rax\r
-    cmpb    $0, (%rax)\r
-    jz      L2\r
-\r
-    movq    %dr7, %rdx\r
-    movq    %dr6, %rcx\r
-    .byte   0x48, 0x89, 0x15            # mov [rip + disp32], rdx\r
-    .long   SSM_DR7 - (. + 4 - _SmiEntryPoint + 0x8000)\r
-    .byte   0x48, 0x89, 0x0d            # mov [rip + disp32], rcx\r
-    .long   SSM_DR6 - (. + 4 - _SmiEntryPoint + 0x8000)\r
-L2:\r
     rsm\r
 \r
 ASM_PFX(gcSmiHandlerSize):    .word      . - _SmiEntryPoint\r