tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-28 08:04:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

UefiCpuPkg/PiSmmCpuDxeSmm: patch "gSmmInitStack" with PatchInstructionX86()

Browse Source 
Rename the variable to "gPatchSmmInitStack" so that its association with
PatchInstructionX86() is clear from the declaration, change its type to
X86_ASSEMBLY_PATCH_LABEL, and patch it with PatchInstructionX86(). This
lets us remove the binary (DB) encoding of some instructions in
"SmmInit.nasm".

The size of the patched source operand is (sizeof (UINTN)).

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:
Laszlo Ersek 2018-02-02 04:46:26 +01:00
parent 456c4ccab2
commit 5830d2c399
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmInit.nasm
View File

@ -25,7 +25,7 @@ extern ASM_PFX(mSmmRelocationOriginalAddress)
global ASM_PFX(gPatchSmmCr3) global ASM_PFX(gPatchSmmCr3)
global ASM_PFX(gPatchSmmCr4) global ASM_PFX(gPatchSmmCr4)
global ASM_PFX(gPatchSmmCr0) global ASM_PFX(gPatchSmmCr0)
global ASM_PFX(gSmmInitStack) global ASM_PFX(gPatchSmmInitStack)
global ASM_PFX(gcSmiInitGdtr) global ASM_PFX(gcSmiInitGdtr)
global ASM_PFX(gcSmmInitSize) global ASM_PFX(gcSmmInitSize)
global ASM_PFX(gcSmmInitTemplate) global ASM_PFX(gcSmmInitTemplate)
@ -72,8 +72,8 @@ BITS 32
mov fs, edi mov fs, edi
mov gs, edi mov gs, edi
mov ss, edi mov ss, edi
DB 0xbc ; mov esp, imm32 mov esp, strict dword 0 ; source operand will be patched
ASM_PFX(gSmmInitStack): DD 0 ASM_PFX(gPatchSmmInitStack):
call ASM_PFX(SmmInitHandler) call ASM_PFX(SmmInitHandler)
rsm rsm

6
UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c
View File

@ -848,7 +848,11 @@ PiCpuSmmEntry (
// //
// Set SMI stack for SMM base relocation // Set SMI stack for SMM base relocation
// //
gSmmInitStack = (UINTN) (Stacks + mSmmStackSize - sizeof (UINTN)); PatchInstructionX86 (
gPatchSmmInitStack,
(UINTN) (Stacks + mSmmStackSize - sizeof (UINTN)),
sizeof (UINTN)
);
// //
// Initialize IDT // Initialize IDT

2
UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h
View File

@ -302,7 +302,7 @@ extern UINT32 mSmmCr0;
X86_ASSEMBLY_PATCH_LABEL gPatchSmmCr3; X86_ASSEMBLY_PATCH_LABEL gPatchSmmCr3;
extern UINT32 mSmmCr4; extern UINT32 mSmmCr4;
X86_ASSEMBLY_PATCH_LABEL gPatchSmmCr4; X86_ASSEMBLY_PATCH_LABEL gPatchSmmCr4;
extern UINTN gSmmInitStack; X86_ASSEMBLY_PATCH_LABEL gPatchSmmInitStack;
/** /**
Semaphore operation for all processor relocate SMMBase. Semaphore operation for all processor relocate SMMBase.

6
UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmInit.nasm
View File

@ -25,7 +25,7 @@ extern ASM_PFX(mSmmRelocationOriginalAddress)
global ASM_PFX(gPatchSmmCr3) global ASM_PFX(gPatchSmmCr3)
global ASM_PFX(gPatchSmmCr4) global ASM_PFX(gPatchSmmCr4)
global ASM_PFX(gPatchSmmCr0) global ASM_PFX(gPatchSmmCr0)
global ASM_PFX(gSmmInitStack) global ASM_PFX(gPatchSmmInitStack)
global ASM_PFX(gcSmiInitGdtr) global ASM_PFX(gcSmiInitGdtr)
global ASM_PFX(gcSmmInitSize) global ASM_PFX(gcSmmInitSize)
global ASM_PFX(gcSmmInitTemplate) global ASM_PFX(gcSmmInitTemplate)
@ -72,8 +72,8 @@ ASM_PFX(gPatchSmmCr0):
BITS 64 BITS 64
@LongMode: ; long-mode starts here @LongMode: ; long-mode starts here
DB 0x48, 0xbc ; mov rsp, imm64 mov rsp, strict qword 0 ; source operand will be patched
ASM_PFX(gSmmInitStack): DQ 0 ASM_PFX(gPatchSmmInitStack):
and sp, 0xfff0 ; make sure RSP is 16-byte aligned and sp, 0xfff0 ; make sure RSP is 16-byte aligned
; ;
; Accoring to X64 calling convention, XMM0~5 are volatile, we need to save ; Accoring to X64 calling convention, XMM0~5 are volatile, we need to save