sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set correct DS/ES/FS/GS/SS segment selectors after GDT loaded.

Browse Source 
Signed-off-by: Jeff Fan <jeff.fan@intel.com>
Reviewed-by: Rui Sun <rui.sun@intel.com>



git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13667 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
vanjeff
2012-08-22 08:56:50 +00:00
parent 8d4e1bd933
commit abef469fc1
6 changed files with 204 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
View File

@@ -193,6 +193,18 @@ S3RestoreConfig2 (
IN EFI_PEI_S3_RESUME2_PPI *This
);
/**
Set data segment selectors value including DS/ES/FS/GS/SS.
@param[in] SelectorValue Segment selector value to be set.
**/
VOID
EFIAPI
AsmSetDataSelectors (
IN UINT16 SelectorValue
);
//
// Globals
//
@@ -232,6 +244,8 @@ GLOBAL_REMOVE_IF_UNREFERENCED IA32_GDT mGdtEntries[] = {
/* 0x40 */ {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}},
};
#define DATA_SEGEMENT_SELECTOR 0x18
//
// IA32 Gdt register
//
@@ -701,6 +715,7 @@ S3ResumeExecuteBootScript (
IA32_DESCRIPTOR *IdtDescriptor;
VOID *IdtBuffer;
PEI_S3_RESUME_STATE *PeiS3ResumeState;
BOOLEAN InterruptStatus;
DEBUG ((EFI_D_ERROR, "S3ResumeExecuteBootScript()\n"));
@@ -769,10 +784,19 @@ S3ResumeExecuteBootScript (
*(UINTN*)(IdtDescriptor->Base - sizeof(UINTN)) = (UINTN)GetPeiServicesTablePointer ();
}
InterruptStatus = SaveAndDisableInterrupts ();
//
// Need to make sure the GDT is loaded with values that support long mode and real mode.
//
AsmWriteGdtr (&mGdt);
//
// update segment selectors per the new GDT.
//
AsmSetDataSelectors (DATA_SEGEMENT_SELECTOR);
//
// Restore interrupt state.
//
SetInterruptState (InterruptStatus);
//
// Prepare data for return back
@@ -873,6 +897,7 @@ S3RestoreConfig2 (
SMM_S3_RESUME_STATE *SmmS3ResumeState;
VOID *GuidHob;
BOOLEAN Build4GPageTableOnly;
BOOLEAN InterruptStatus;
TempAcpiS3Context = 0;
TempEfiBootScriptExecutorVariable = 0;
@@ -1002,10 +1027,20 @@ S3RestoreConfig2 (
// Switch to long mode to complete resume.
//
InterruptStatus = SaveAndDisableInterrupts ();
//
// Need to make sure the GDT is loaded with values that support long mode and real mode.
//
AsmWriteGdtr (&mGdt);
//
// update segment selectors per the new GDT.
//
AsmSetDataSelectors (DATA_SEGEMENT_SELECTOR);
//
// Restore interrupt state.
//
SetInterruptState (InterruptStatus);
AsmWriteCr3 ((UINTN)SmmS3ResumeState->SmmS3Cr3);
AsmEnablePaging64 (
0x38,