Skip to content

OvmfPkg: create two guid hob, gNvVariableInfoGuid and gSpiFlashInfoGuid #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LiuZhiguang001 wants to merge 1 commit into
base: for_upstream_test
Choose a base branch
from
Open

OvmfPkg: create two guid hob, gNvVariableInfoGuid and gSpiFlashInfoGuid #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions OvmfPkg/OvmfPkgPol.fdf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,20 +302,20 @@ INF OvmfPkg/PlatformBootManagerDriver/PlatformBootManagerDriver.inf
INF OvmfPkg/SmmAccess/SmmAccess2Dxe.inf
INF OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.inf
INF OvmfPkg/CpuS3DataDxe/CpuS3DataDxe.inf
INF MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf
INF MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
#INF MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf
#INF MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
INF OvmfPkg/CpuHotplugSmm/CpuHotplugSmm.inf
INF UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf
#INF UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf
INF MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf
INF UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf

#
# Variable driver stack (SMM)
#
INF OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesSmm.inf
INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf
INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf
INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
#INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf
#INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf
#INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf

!else

Expand Down
8 changes: 7 additions & 1 deletion OvmfPkg/PlatformPei/PlatformPei.inf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@
gPldSerialPortInfoGuid
gUefiAcpiBoardInfoGuid
gPldPciRootBridgeInfoGuid
gSpiFlashInfoGuid
gNvVariableInfoGuid

[LibraryClasses]
BaseLib
Expand All @@ -73,6 +75,8 @@
BaseMemoryLib

[Pcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvSize
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvBase
Expand Down Expand Up @@ -116,7 +120,9 @@
gUefiCpuPkgTokenSpaceGuid.PcdCpuBootLogicalProcessorNumber
gUefiCpuPkgTokenSpaceGuid.PcdCpuApStackSize
gUefiCpuPkgTokenSpaceGuid.PcdSevEsIsEnabled

gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFdBaseAddress
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareFdSize
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareBlockSize
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPldFvBase
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPldFvSize

Expand Down
19 changes: 18 additions & 1 deletion OvmfPkg/PlatformPei/Upl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
#include <Library/QemuFwCfgLib.h>
#include <OvmfPlatforms.h>
#include <Library/BaseMemoryLib.h>

#include <Guid/NvVariableInfoGuid.h>
#include <Guid/SpiFlashInfoGuid.h>
STATIC PLD_PCI_ROOT_BRIDGE_APERTURE mNonExistAperture = { MAX_UINT64, 0 };

EFI_STATUS
Expand Down Expand Up @@ -363,5 +364,21 @@ UplInitialization (
DEBUG ((DEBUG_ERROR, "%a: PciRootBridgeInfo->RootBridge[0].ResourceAssigned: 0x%04x\n", __FUNCTION__, PciRootBridgeInfo->RootBridge[0].ResourceAssigned));
DEBUG ((DEBUG_ERROR, "%a: PciRootBridgeInfo->RootBridge[0].ResourceAssigned: 0x%x\n", __FUNCTION__, (UINTN)PciRootBridgeInfo->RootBridge[0].Bus.Limit));
//PciRootBridgeInfo->RootBridge[0].ResourceAssigned = FALSE;

SPI_FLASH_INFO *NewSpiFlashInfo;
NewSpiFlashInfo = BuildGuidHob (&gSpiFlashInfoGuid, sizeof (SPI_FLASH_INFO));
NewSpiFlashInfo->Flags = TRUE;
NewSpiFlashInfo->SpiAddress.AddressSpaceId = EFI_ACPI_3_0_PCI_CONFIGURATION_SPACE;
NewSpiFlashInfo->SpiAddress.RegisterBitWidth = 32;
NewSpiFlashInfo->SpiAddress.RegisterBitOffset = 0;
NewSpiFlashInfo->SpiAddress.AccessSize = EFI_ACPI_3_0_DWORD;
NewSpiFlashInfo->SpiAddress.Address = (UINT64) PcdGet32 (PcdOvmfFdBaseAddress);

NV_VARIABLE_INFO *NewNvVariableInfo;
NewNvVariableInfo = BuildGuidHob (&gNvVariableInfoGuid, sizeof (NV_VARIABLE_INFO));
NewNvVariableInfo->VariableStoreBase = FixedPcdGet32 (PcdFlashNvStorageVariableBase64);
NewNvVariableInfo->VariableStoreSize= 2 * (FixedPcdGet32 (PcdFlashNvStorageVariableSize) + 0x2000);
// 0x2000 is a hard code value in UefiPayloadPkg\FvbRuntimeDxe\FvbInfo.c, line 95: FtwWorkingSize = 0x2000;

}

2 changes: 2 additions & 0 deletions UefiPayloadPkg/UefiPayloadPkg.fdf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,9 @@ INF PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
INF MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf
INF MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
INF UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf
!if $(UNIVERSAL_PAYLOAD) == FALSE
INF UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf
!endif
INF UefiPayloadPkg/PchSmiDispatchSmm/PchSmiDispatchSmm.inf
!endif

Expand Down
6 changes: 3 additions & 3 deletions build_qemu_pol.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ if "%VS_VER%" == "" (
)

echo Building Universal UEFI payload DXE FV ...
call build -p UefiPayloadPkg\UefiPayloadPkg.dsc -a X64 -D UNIVERSAL_PAYLOAD=TRUE -t %VS_VER% -y upllog.txt -D EMU_VARIABLE_ENABLE=TRUE
call build -p UefiPayloadPkg\UefiPayloadPkg.dsc -a X64 -D UNIVERSAL_PAYLOAD=TRUE -t %VS_VER% -y upllog.txt
if not %ERRORLEVEL% == 0 exit /b 1

:entry
Expand Down Expand Up @@ -62,13 +62,13 @@ python UefiPayloadPkg\Tools\GenUpldInfo.py Build\upld_info UEFI

:ovmf
echo Building OVMF POL ...
call build -p OvmfPkg\OvmfPkgPol.dsc -a IA32 -a X64 -D DEBUG_ON_SERIAL_PORT -t %VS_VER% -y ovmflog.txt
call build -p OvmfPkg\OvmfPkgPol.dsc -a IA32 -a X64 -D DEBUG_ON_SERIAL_PORT -D SMM_REQUIRE=TRUE -t %VS_VER% -y ovmflog.txt
@if not %ERRORLEVEL% == 0 exit /b 1
goto :eof

:run
echo Running OVMF POL on QEMU ...
"C:\Program Files\qemu\qemu-system-x86_64.exe" -m 512M -cpu max -machine q35,accel=tcg -bios Build\OvmfPol\DEBUG_%VS_VER%\FV\OVMF.fd -boot menu=on,splash-time=0 -net none --serial stdio
"C:\Program Files\qemu\qemu-system-x86_64.exe" -m 512M -cpu max -machine q35,accel=tcg -drive file=Build\OvmfPol\DEBUG_%VS_VER%\FV\OVMF.fd,if=pflash,format=raw -boot menu=on,splash-time=0 -net none --serial stdio



Expand Down