UefiCpuPkg/PiSmmCpuDxeSmm: patch "gSmmCr0" with PatchInstructionX86()
Like "gSmmCr4" in the previous patch, "gSmmCr0" is not only used for machine code patching, but also as a means to communicate the initial CR0 value from SmmRelocateBases() to InitSmmS3ResumeState(). In other words, the last four bytes of the "mov eax, Cr0Value" instruction's binary representation are utilized as normal data too. In order to get rid of the DB for "mov eax, Cr0Value", we have to split both roles, patching and data flow. Introduce the "mSmmCr0" global (SMRAM) variable for the data flow purpose. Rename the "gSmmCr0" variable to "gPatchSmmCr0" so that its association with PatchInstructionX86() is clear from the declaration, change its type to X86_ASSEMBLY_PATCH_LABEL, and patch it with PatchInstructionX86(), to the value now contained in "mSmmCr0". This lets us remove the binary (DB) encoding of "mov eax, Cr0Value" in "SmmInit.nasm". Cc: Eric Dong <eric.dong@intel.com> Cc: Michael D Kinney <michael.d.kinney@intel.com> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=866 Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
@@ -24,7 +24,7 @@ extern ASM_PFX(mSmmRelocationOriginalAddress)
|
||||
|
||||
global ASM_PFX(gPatchSmmCr3)
|
||||
global ASM_PFX(gPatchSmmCr4)
|
||||
global ASM_PFX(gSmmCr0)
|
||||
global ASM_PFX(gPatchSmmCr0)
|
||||
global ASM_PFX(gSmmJmpAddr)
|
||||
global ASM_PFX(gSmmInitStack)
|
||||
global ASM_PFX(gcSmiInitGdtr)
|
||||
@@ -63,8 +63,8 @@ ASM_PFX(gPatchSmmCr4):
|
||||
or ah, BIT3 ; set NXE bit
|
||||
.1:
|
||||
wrmsr
|
||||
DB 0x66, 0xb8 ; mov eax, imm32
|
||||
ASM_PFX(gSmmCr0): DD 0
|
||||
mov eax, strict dword 0 ; source operand will be patched
|
||||
ASM_PFX(gPatchSmmCr0):
|
||||
mov cr0, eax ; enable protected mode & paging
|
||||
DB 0x66, 0xea ; far jmp to long mode
|
||||
ASM_PFX(gSmmJmpAddr): DQ 0;@LongMode
|
||||
|
Reference in New Issue
Block a user