OrgACRN
/
slimbootloader
mirror of https://github.com/slimbootloader/slimbootloader.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Set PayloadId earlier in Stage2 (#1125) 

QEMU currently set PayloadId in Post PCI enumeration. To be in
sync with other platform, this patch moves it to PreSiliconInit
hook point.

Signed-off-by: Maurice Ma <maurice.ma@intel.com>
This commit is contained in:
Maurice Ma 2021-04-19 08:49:34 -07:00 committed by GitHub
parent d05938d579
commit 62532aa7fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 41 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
Platform/QemuBoardPkg/Library/Stage2BoardInitLib/Stage2BoardInitLib.c
View File

@ -148,6 +148,45 @@ GpioInit (
GpioPadConfigTable (GpioEntries, GpioCfgDataBuffer);
}
/**
Update current boot Payload ID.
**/
VOID
UpdatePayloadId (
VOID
)
{
UINT8 BootDev;
GEN_CFG_DATA *GenericCfgData;
GenericCfgData = (GEN_CFG_DATA *)FindConfigDataByTag (CDATA_GEN_TAG);
if (GenericCfgData != NULL) {
if (GenericCfgData->PayloadId == AUTO_PAYLOAD_ID_SIGNATURE) {
// Use QEMU 3rd bootorder to select the payload
// Add QEMU command line parameter:
// default : enable OsLoader
// '-boot order=??a' : enable EFI payload
// '-boot order=??c' : enable LINUX payload
// Here ?? is the normal boot devices.
IoWrite8 (0x70, 0x38);
BootDev = IoRead8 (0x71) >> 4;
if (BootDev == 1) {
// Boot UEFI payload
SetPayloadId (UEFI_PAYLOAD_ID_SIGNATURE);
} else if (BootDev == 2) {
// Boot LINUX payload
SetPayloadId (LINX_PAYLOAD_ID_SIGNATURE);
} else {
// Boot OsLoader
SetPayloadId (0);
}
} else {
SetPayloadId (GenericCfgData->PayloadId);
}
}
}
/**
Board specific hook point.
@ -163,11 +202,9 @@ BoardInit (
)
{
EFI_STATUS Status;
GEN_CFG_DATA *GenericCfgData;
LOADER_GLOBAL_DATA *LdrGlobal;
UINT32 TsegBase;
UINT64 TsegSize;
UINT8 BootDev;
VOID *Buffer;
UINT32 Length;
@ -203,33 +240,8 @@ BoardInit (
}
// Prepare platform ACPI tempate
Status = PcdSet32S (PcdAcpiTableTemplatePtr, (UINT32)(UINTN)mPlatformAcpiTblTmpl);
break;
case PostPciEnumeration:
GenericCfgData = (GEN_CFG_DATA *)FindConfigDataByTag (CDATA_GEN_TAG);
if (GenericCfgData != NULL) {
if (GenericCfgData->PayloadId == AUTO_PAYLOAD_ID_SIGNATURE) {
// Use QEMU 3rd bootorder to select the payload
// Add QEMU command line parameter:
// default : enable OsLoader
// '-boot order=??a' : enable EFI payload
// '-boot order=??c' : enable LINUX payload
// Here ?? is the normal boot devices.
IoWrite8 (0x70, 0x38);
BootDev = IoRead8 (0x71) >> 4;
if (BootDev == 1) {
// Boot UEFI payload
SetPayloadId (UEFI_PAYLOAD_ID_SIGNATURE);
} else if (BootDev == 2) {
// Boot LINUX payload
SetPayloadId (LINX_PAYLOAD_ID_SIGNATURE);
} else {
// Boot OsLoader
SetPayloadId (0);
}
} else {
SetPayloadId (GenericCfgData->PayloadId);
}
if (GetBootMode() != BOOT_ON_FLASH_UPDATE) {
UpdatePayloadId ();
}
break;