uefi-ref/edk2
1
0
Fork 0
mirror of https://github.com/tianocore/edk2 synced 2026-08-27 00:23:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

OvmfPkg: add PcdQemuVarsRequire

Browse source 
Add PcdQemuVarsRequire FeaturePcd, so firmware code can figure whenever
the given build is supposed to use the qemu uefi variable service.

Skip the emulated variable store setup in case PcdQemuVarsRequire is
true.  This is needed to make secure boot work.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2023-10-26 14:05:42 +02:00 • committed by mergify[bot]
parent cd6f84b70c
commit 9af96e21d8
4 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
OvmfPkg/OvmfPkg.dec
View file

@ -464,3 +464,6 @@
# framebuffer. This might be required on platforms that do not tolerate
# misaligned accesses otherwise.
gUefiOvmfPkgTokenSpaceGuid.PcdRemapFrameBufferWriteCombine|FALSE|BOOLEAN|0x75
## This feature flag indicates the firmware build needs the qemu variable service.
gUefiOvmfPkgTokenSpaceGuid.PcdQemuVarsRequire|FALSE|BOOLEAN|0x77

1
OvmfPkg/OvmfPkgX64.dsc
View file

@ -502,6 +502,7 @@
gEfiMdeModulePkgTokenSpaceGuid.PcdEnableVariableRuntimeCache|FALSE
!endif
!if $(QEMU_PV_VARS) == TRUE
gUefiOvmfPkgTokenSpaceGuid.PcdQemuVarsRequire|TRUE
gEfiMdeModulePkgTokenSpaceGuid.PcdEnableVariableRuntimeCache|FALSE
!endif
!if $(SECURE_BOOT_ENABLE) == TRUE

4
OvmfPkg/PlatformPei/Platform.c
View file

@ -221,6 +221,10 @@ ReserveEmuVariableNvStore (
EFI_PHYSICAL_ADDRESS VariableStore;
RETURN_STATUS PcdStatus;
if (FeaturePcdGet (PcdQemuVarsRequire)) {
return;
}
VariableStore = (EFI_PHYSICAL_ADDRESS)(UINTN)PlatformReserveEmuVariableNvStore ();
PcdStatus = PcdSet64S (PcdEmuVariableNvStoreReserved, VariableStore);

1
OvmfPkg/PlatformPei/PlatformPei.inf
View file

@ -143,6 +143,7 @@
[FeaturePcd]
gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire
gUefiOvmfPkgTokenSpaceGuid.PcdQemuVarsRequire
[Ppis]
gEfiPeiMasterBootModePpiGuid