Add 2 new Bds features
1. Lazy ConIn 2. OsIndicationsSupported & OsIndications Signed-off-by: Chao Zhang<chao.b.zhang@intel.com> Reviewed-by: Hot Tian<Hot.Tian@intel.com> git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13566 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -180,6 +180,7 @@
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareRevision
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution
|
||||
gEfiMdeModulePkgTokenSpaceGuid.PcdConInConnectOnDemand
|
||||
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdSetupConOutColumn
|
||||
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdSetupConOutRow
|
||||
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution
|
||||
|
@@ -361,22 +361,80 @@ BdsFormalizeConsoleVariable (
|
||||
|
||||
/**
|
||||
|
||||
Validate variables.
|
||||
|
||||
If found the device path is not a valid device path, remove the variable.
|
||||
Formalize Bds global variables.
|
||||
|
||||
1. For ConIn/ConOut/ConErr, if found the device path is not a valid device path, remove the variable.
|
||||
2. For OsIndicationsSupported, Create a BS/RT/UINT64 variable to report caps
|
||||
3. Delete OsIndications variable if it is not NV/BS/RT UINT64
|
||||
Item 3 is used to solve case when OS corrupts OsIndications. Here simply delete this NV variable.
|
||||
|
||||
**/
|
||||
VOID
|
||||
BdsFormalizeEfiGlobalVariable (
|
||||
VOID
|
||||
)
|
||||
{
|
||||
EFI_STATUS Status;
|
||||
UINT64 OsIndicationSupport;
|
||||
UINT64 OsIndication;
|
||||
UINTN DataSize;
|
||||
UINT32 Attributes;
|
||||
|
||||
//
|
||||
// Validate Console variable.
|
||||
//
|
||||
BdsFormalizeConsoleVariable (L"ConIn");
|
||||
BdsFormalizeConsoleVariable (L"ConOut");
|
||||
BdsFormalizeConsoleVariable (L"ErrOut");
|
||||
|
||||
//
|
||||
// OS indicater support variable
|
||||
//
|
||||
OsIndicationSupport = EFI_OS_INDICATIONS_BOOT_TO_FW_UI;
|
||||
Status = gRT->SetVariable (
|
||||
L"OsIndicationsSupported",
|
||||
&gEfiGlobalVariableGuid,
|
||||
EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
|
||||
sizeof(UINT64),
|
||||
&OsIndicationSupport
|
||||
);
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
|
||||
//
|
||||
// If OsIndications is invalid, remove it.
|
||||
// Invalid case
|
||||
// 1. Data size != UINT64
|
||||
// 2. OsIndication value inconsistence
|
||||
// 3. OsIndication attribute inconsistence
|
||||
//
|
||||
OsIndication = 0;
|
||||
Attributes = 0;
|
||||
DataSize = sizeof(UINT64);
|
||||
Status = gRT->GetVariable (
|
||||
L"OsIndications",
|
||||
&gEfiGlobalVariableGuid,
|
||||
&Attributes,
|
||||
&DataSize,
|
||||
&OsIndication
|
||||
);
|
||||
|
||||
if (!EFI_ERROR(Status)) {
|
||||
if (DataSize != sizeof(UINT64) ||
|
||||
(OsIndication & ~OsIndicationSupport) != 0 ||
|
||||
Attributes != (EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE)){
|
||||
|
||||
DEBUG ((EFI_D_ERROR, "Unformalized OsIndications variable exists. Delete it\n"));
|
||||
Status = gRT->SetVariable (
|
||||
L"OsIndications",
|
||||
&gEfiGlobalVariableGuid,
|
||||
Attributes,
|
||||
0,
|
||||
&OsIndication
|
||||
);
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -902,7 +902,7 @@ ShowProgress (
|
||||
if (TimeoutDefault == 0) {
|
||||
return EFI_TIMEOUT;
|
||||
}
|
||||
|
||||
|
||||
DEBUG ((EFI_D_INFO, "\n\nStart showing progress bar... Press any key to stop it! ...Zzz....\n"));
|
||||
|
||||
SetMem (&Foreground, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL), 0xff);
|
||||
@@ -962,16 +962,18 @@ ShowProgress (
|
||||
//
|
||||
// User pressed some key
|
||||
//
|
||||
Status = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);
|
||||
if (EFI_ERROR (Status)) {
|
||||
return Status;
|
||||
}
|
||||
if (!PcdGetBool (PcdConInConnectOnDemand)) {
|
||||
Status = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);
|
||||
if (EFI_ERROR (Status)) {
|
||||
return Status;
|
||||
}
|
||||
|
||||
if (Key.UnicodeChar == CHAR_CARRIAGE_RETURN) {
|
||||
//
|
||||
// User pressed enter, equivalent to select "continue"
|
||||
//
|
||||
return EFI_TIMEOUT;
|
||||
if (Key.UnicodeChar == CHAR_CARRIAGE_RETURN) {
|
||||
//
|
||||
// User pressed enter, equivalent to select "continue"
|
||||
//
|
||||
return EFI_TIMEOUT;
|
||||
}
|
||||
}
|
||||
|
||||
return EFI_SUCCESS;
|
||||
@@ -1002,7 +1004,10 @@ PlatformBdsEnterFrontPage (
|
||||
EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *SimpleTextOut;
|
||||
UINTN BootTextColumn;
|
||||
UINTN BootTextRow;
|
||||
|
||||
UINT64 OsIndication;
|
||||
UINTN DataSize;
|
||||
EFI_INPUT_KEY Key;
|
||||
|
||||
GraphicsOutput = NULL;
|
||||
SimpleTextOut = NULL;
|
||||
|
||||
@@ -1013,7 +1018,7 @@ PlatformBdsEnterFrontPage (
|
||||
if (ConnectAllHappened) {
|
||||
gConnectAllHappened = TRUE;
|
||||
}
|
||||
|
||||
|
||||
if (!mModeInitialized) {
|
||||
//
|
||||
// After the console is ready, get current video resolution
|
||||
@@ -1067,27 +1072,72 @@ PlatformBdsEnterFrontPage (
|
||||
mModeInitialized = TRUE;
|
||||
}
|
||||
|
||||
|
||||
|
||||
HotkeyBoot ();
|
||||
if (TimeoutDefault != 0xffff) {
|
||||
Status = ShowProgress (TimeoutDefault);
|
||||
StatusHotkey = HotkeyBoot ();
|
||||
//
|
||||
// goto FrontPage directly when EFI_OS_INDICATIONS_BOOT_TO_FW_UI is set
|
||||
//
|
||||
OsIndication = 0;
|
||||
DataSize = sizeof(UINT64);
|
||||
Status = gRT->GetVariable (
|
||||
L"OsIndications",
|
||||
&gEfiGlobalVariableGuid,
|
||||
NULL,
|
||||
&DataSize,
|
||||
&OsIndication
|
||||
);
|
||||
|
||||
if (!FeaturePcdGet(PcdBootlogoOnlyEnable) || !EFI_ERROR(Status) || !EFI_ERROR(StatusHotkey)){
|
||||
//
|
||||
// Ensure screen is clear when switch Console from Graphics mode to Text mode
|
||||
// Skip it in normal boot
|
||||
//
|
||||
gST->ConOut->EnableCursor (gST->ConOut, TRUE);
|
||||
gST->ConOut->ClearScreen (gST->ConOut);
|
||||
//
|
||||
// goto FrontPage directly when EFI_OS_INDICATIONS_BOOT_TO_FW_UI is set. Skip HotkeyBoot
|
||||
//
|
||||
if (!EFI_ERROR(Status) && (OsIndication & EFI_OS_INDICATIONS_BOOT_TO_FW_UI)) {
|
||||
//
|
||||
// Clear EFI_OS_INDICATIONS_BOOT_TO_FW_UI to acknowledge OS
|
||||
//
|
||||
OsIndication &= ~EFI_OS_INDICATIONS_BOOT_TO_FW_UI;
|
||||
Status = gRT->SetVariable (
|
||||
L"OsIndications",
|
||||
&gEfiGlobalVariableGuid,
|
||||
EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,
|
||||
sizeof(UINT64),
|
||||
&OsIndication
|
||||
);
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
|
||||
//
|
||||
// Follow generic rule, Call ReadKeyStroke to connect ConIn before enter UI
|
||||
//
|
||||
if (PcdGetBool (PcdConInConnectOnDemand)) {
|
||||
gST->ConIn->ReadKeyStroke(gST->ConIn, &Key);
|
||||
}
|
||||
|
||||
if (EFI_ERROR (Status)) {
|
||||
//
|
||||
// Timeout or user press enter to continue
|
||||
//
|
||||
goto Exit;
|
||||
//
|
||||
// Ensure screen is clear when switch Console from Graphics mode to Text mode
|
||||
//
|
||||
gST->ConOut->EnableCursor (gST->ConOut, TRUE);
|
||||
gST->ConOut->ClearScreen (gST->ConOut);
|
||||
|
||||
} else {
|
||||
|
||||
HotkeyBoot ();
|
||||
if (TimeoutDefault != 0xffff) {
|
||||
Status = ShowProgress (TimeoutDefault);
|
||||
StatusHotkey = HotkeyBoot ();
|
||||
|
||||
if (!FeaturePcdGet(PcdBootlogoOnlyEnable) || !EFI_ERROR(Status) || !EFI_ERROR(StatusHotkey)){
|
||||
//
|
||||
// Ensure screen is clear when switch Console from Graphics mode to Text mode
|
||||
// Skip it in normal boot
|
||||
//
|
||||
gST->ConOut->EnableCursor (gST->ConOut, TRUE);
|
||||
gST->ConOut->ClearScreen (gST->ConOut);
|
||||
}
|
||||
|
||||
if (EFI_ERROR (Status)) {
|
||||
//
|
||||
// Timeout or user press enter to continue
|
||||
//
|
||||
goto Exit;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -346,30 +346,32 @@ BdsMemoryTest (
|
||||
DEBUG ((EFI_D_INFO, "Perform memory test (ESC to skip).\n"));
|
||||
}
|
||||
|
||||
KeyStatus = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);
|
||||
if (!EFI_ERROR (KeyStatus) && (Key.ScanCode == SCAN_ESC)) {
|
||||
if (!RequireSoftECCInit) {
|
||||
if (!FeaturePcdGet(PcdBootlogoOnlyEnable)) {
|
||||
TmpStr = GetStringById (STRING_TOKEN (STR_PERFORM_MEM_TEST));
|
||||
if (TmpStr != NULL) {
|
||||
PlatformBdsShowProgress (
|
||||
Foreground,
|
||||
Background,
|
||||
TmpStr,
|
||||
Color,
|
||||
100,
|
||||
(UINTN) PreviousValue
|
||||
);
|
||||
FreePool (TmpStr);
|
||||
if (!PcdGetBool (PcdConInConnectOnDemand)) {
|
||||
KeyStatus = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);
|
||||
if (!EFI_ERROR (KeyStatus) && (Key.ScanCode == SCAN_ESC)) {
|
||||
if (!RequireSoftECCInit) {
|
||||
if (!FeaturePcdGet(PcdBootlogoOnlyEnable)) {
|
||||
TmpStr = GetStringById (STRING_TOKEN (STR_PERFORM_MEM_TEST));
|
||||
if (TmpStr != NULL) {
|
||||
PlatformBdsShowProgress (
|
||||
Foreground,
|
||||
Background,
|
||||
TmpStr,
|
||||
Color,
|
||||
100,
|
||||
(UINTN) PreviousValue
|
||||
);
|
||||
FreePool (TmpStr);
|
||||
}
|
||||
|
||||
PrintXY (10, 10, NULL, NULL, L"100");
|
||||
}
|
||||
|
||||
PrintXY (10, 10, NULL, NULL, L"100");
|
||||
Status = GenMemoryTest->Finished (GenMemoryTest);
|
||||
goto Done;
|
||||
}
|
||||
Status = GenMemoryTest->Finished (GenMemoryTest);
|
||||
goto Done;
|
||||
}
|
||||
|
||||
TestAbort = TRUE;
|
||||
TestAbort = TRUE;
|
||||
}
|
||||
}
|
||||
} while (Status != EFI_NOT_FOUND);
|
||||
|
||||
|
Reference in New Issue
Block a user