tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add additional reset when Memory Type Information settings change. 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10879 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
niruiyu 2010-09-16 01:14:51 +00:00
parent d18221e82e
commit 7bee5a761f
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
IntelFrameworkModulePkg/Library/GenericBdsLib/BdsMisc.c
View File

@ -1117,18 +1117,23 @@ BdsSetMemoryTypeInformationVariable (
EFI_MEMORY_TYPE_INFORMATION *PreviousMemoryTypeInformation; EFI_MEMORY_TYPE_INFORMATION *PreviousMemoryTypeInformation;
EFI_MEMORY_TYPE_INFORMATION *CurrentMemoryTypeInformation; EFI_MEMORY_TYPE_INFORMATION *CurrentMemoryTypeInformation;
UINTN VariableSize; UINTN VariableSize;
BOOLEAN UpdateRequired;
UINTN Index; UINTN Index;
UINTN Index1; UINTN Index1;
UINT32 Previous; UINT32 Previous;
UINT32 Current; UINT32 Current;
UINT32 Next; UINT32 Next;
EFI_HOB_GUID_TYPE *GuidHob; EFI_HOB_GUID_TYPE *GuidHob;
BOOLEAN MemoryTypeInformationModified;
BOOLEAN MemoryTypeInformationVariableExists; BOOLEAN MemoryTypeInformationVariableExists;
UpdateRequired = TRUE; MemoryTypeInformationModified = FALSE;
MemoryTypeInformationVariableExists = FALSE; MemoryTypeInformationVariableExists = FALSE;
//
// Only get the the Memory Type Information variable in the boot mode
// other than BOOT_WITH_DEFAULT_SETTINGS because the Memory Type
// Information is not valid in this boot mode.
//
if (GetBootModeHob () != BOOT_WITH_DEFAULT_SETTINGS) { if (GetBootModeHob () != BOOT_WITH_DEFAULT_SETTINGS) {
VariableSize = 0; VariableSize = 0;
Status = gRT->GetVariable ( Status = gRT->GetVariable (
@ -1140,7 +1145,6 @@ BdsSetMemoryTypeInformationVariable (
); );
if (Status == EFI_BUFFER_TOO_SMALL) { if (Status == EFI_BUFFER_TOO_SMALL) {
MemoryTypeInformationVariableExists = TRUE; MemoryTypeInformationVariableExists = TRUE;
UpdateRequired = FALSE;
} }
} }
@ -1210,16 +1214,17 @@ BdsSetMemoryTypeInformationVariable (
if (Next != Previous) { if (Next != Previous) {
PreviousMemoryTypeInformation[Index].NumberOfPages = Next; PreviousMemoryTypeInformation[Index].NumberOfPages = Next;
UpdateRequired = TRUE; MemoryTypeInformationModified = TRUE;
} }
DEBUG ((EFI_D_INFO, " %02x %08x %08x %08x\n", PreviousMemoryTypeInformation[Index].Type, Previous, Current, Next)); DEBUG ((EFI_D_INFO, " %02x %08x %08x %08x\n", PreviousMemoryTypeInformation[Index].Type, Previous, Current, Next));
} }
// //
// If any changes were made to the Memory Type Information settings, then set the new variable value // If any changes were made to the Memory Type Information settings, then set the new variable value;
// Or create the variable in first boot.
// //
if (UpdateRequired || !MemoryTypeInformationVariableExists) { if (MemoryTypeInformationModified || !MemoryTypeInformationVariableExists) {
Status = gRT->SetVariable ( Status = gRT->SetVariable (
EFI_MEMORY_TYPE_INFORMATION_VARIABLE_NAME, EFI_MEMORY_TYPE_INFORMATION_VARIABLE_NAME,
&gEfiMemoryTypeInformationGuid, &gEfiMemoryTypeInformationGuid,
@ -1227,6 +1232,16 @@ BdsSetMemoryTypeInformationVariable (
VariableSize, VariableSize,
PreviousMemoryTypeInformation PreviousMemoryTypeInformation
); );
//
// If the Memory Type Information settings have been modified, then reset the platform
// so the new Memory Type Information setting will be used to guarantee that an S4
// entry/resume cycle will not fail.
//
if (MemoryTypeInformationModified) {
DEBUG ((EFI_D_ERROR, "Memory Type Information settings change. Warm Reset!!!\n"));
gRT->ResetSystem (EfiResetWarm, EFI_SUCCESS, 0, NULL);
}
} }
} }