Skip to content

Rebase on edk2-stable202505 #50

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

Jump to bottom
Draft
wants to merge 5,121 commits into
base: system76
Choose a base branch
from
Draft

Rebase on edk2-stable202505 #50

wants to merge 5,121 commits into from

Conversation

@crawfxrd
Copy link
Member

@crawfxrd crawfxrd commented Jul 8, 2025 •
edited
Loading

Update from edk2-stable202108 to edk2-stable202505.

  • Cherry-pick some commits that were done by others or affects core code
  • Creates a new System76PayloadPkg as a copy of UefiPayloadPkg
    • Imports copies of most modules that require modifications
  • Applies our changes on top

Resolves: #45

Notes

If testing from an existing checkout of edk2, or otherwise swapping between system76/system76-stable202108 and rebase-stable202508 then you have to do something like:

git clean -dffx
git submodule foreach git clean -dffx
git submodule update --init --recursive --checkout --force --progress
git submodule foreach git clean -dffx

TODO

  • Add Secure Boot key management
  • Add external FS drivers
  • Test on real hardware with NVIDIA dGPU

CrystalLee-77 and others added 30 commits March 19, 2025 10:51
@CrystalLee-77 @mergify
ArmPkg: Add a protocol notification for gEfiDxeMmReadyToLockProtocolGuid
1c6ce56 
Add and install a protocol notification handler for
gEfiDxeMmReadyToLockProtocolGuid, in order to to trigger MMI
handler to install gEfiMmReadyToLockProtocolGuid protocol in Mm.

Signed-off-by: Crystal Lee <[email protected]>
@leiflindholm @mergify
MdeModulePkg/VarCheckHiiLib: don't return success for invalid input
f6aba88 
The doxygen comment for VarCheckHiiLibReceiveHiiBinHandler says that
EFI_INVALID_PARAMETER should be returned if either of CommBuffer or
CommBufferSize is NULL, but the test results in an early return of
EFI_SUCCESS.

Update the code to match the documentation.

Signed-off-by: Leif Lindholm <[email protected]>
@leiflindholm @mergify
MdeModulePkg/VarCheckHiiLib: clean up VarCheckHiiLibReceiveHiiBinHandler
22919e5 
Building VarCheckHiiLib fails on my clang 19.1.6 setup with the error
 variable 'Status' is used uninitialized whenever 'if' condition is false
due to the DispatchHandle != NULL test.

Calling this function with a NULL handle makes no sense, so move the test
to the function entry and return failure if appropriate.

Signed-off-by: Leif Lindholm <[email protected]>
@shuoliu0 @mergify
Maintainers.txt: Add Shuo Liu as UefiPayloadPkg Reviewer
425d97c 
UefiPayloadPkg is used by non-UEFI bootloaders, e.g. coreboot.
Shuo works on Xeon-SP coreboot and will contribute to the
reviewing activity for UefiPayloadPkg.

Signed-off-by: Shuo Liu <[email protected]>
@sunceping @mergify
SecurityPkg: Add TpmMeasurementLib for SEC phase
ebba67b 
Add the SecTpmMeasurementLib to support
TpmMeasurementAndLogData in Sec phase.

Cc: Jiewen Yao <[email protected]>
Signed-off-by: Min Xu <[email protected]>
Signed-off-by: Ceping Sun <[email protected]>
@sunceping @mergify
OvmfPkg.dec: Add gOvmfFwCfgInfoHobGuid
151326e 
Since TDVF has to measure FwCfg data from QEMU,
it is required to cache the data with measurement
in early phase. This can avoid changing the measurement
order when reading the FwCfg process, which depends
on multiple factors(depex, order in the firmware volume).

Cc: Erdem Aktas <[email protected]>
Cc: Jiewen Yao <[email protected]>
Cc: Min Xu <[email protected]>
Cc: Gerd Hoffmann <[email protected]>
Cc: Elena Reshetova <[email protected]>
Signed-off-by: Ceping Sun <[email protected]>
@sunceping @mergify
OvmfPkg/PlatformInitLib.h: Add QEMU_FW_CFG_CACHE_WORK_AREA
f66078a 
Add QEMU_FW_CFG_CACHE_WORK_AREA in EFI_HOB_PLATFORM_INFO
to support reading from cache in QemuFwCfgLib.

Cc: Erdem Aktas <[email protected]>
Cc: Jiewen Yao <[email protected]>
Cc: Min Xu <[email protected]>
Cc: Gerd Hoffmann <[email protected]>
Cc: Elena Reshetova <[email protected]>
Signed-off-by: Ceping Sun <[email protected]>
@sunceping @mergify
OvmfPkg/PeilessStartupLib: Build PlatformInfoHob before InitializePla…
63408b2 
…tform

Since the QEMU_FW_CFG_WORK_AREA is saved in EFI_HOB_PLATFORM_INFO
and InitializePlatform would read by QemuFwCfg, TDVF should build
the PlatformInfoHob before InitializePlatform.

Cc: Erdem Aktas <[email protected]>
Cc: Jiewen Yao <[email protected]>
Cc: Min Xu <[email protected]>
Cc: Gerd Hoffmann <[email protected]>
Cc: Elena Reshetova <[email protected]>
Signed-off-by: Ceping Sun <[email protected]>
@sunceping @mergify
OvmfPkg/QemuFwCfgLib: Add FwCfg cache interface
be529ef 
Since TDVF needs to cache and measure FwCfg, it is required to
add an API to support cache with optional measurement and add some
internal interfaces to support cache in QemuFwCfgLib.
The new API is listed below:
  QemuFwCfgInitCache()

The new Internal interfaces are listed below:
  InternalQemuFwCfgCacheReadBytes()
  InternalQemuFwCfgCacheSelectItem()
  InternalQemuFwCfgCacheGetWorkArea()
  InternalQemuFwCfgCacheResetWorkArea()
  InternalQemuFwCfgItemCached()
  InternalQemuFwCfgCacheReading()
  InternalQemuFwCfgInitCache()
  InternalQemuFwCfgCheckOvmfWorkArea()

Cc: Erdem Aktas <[email protected]>
Cc: Jiewen Yao <[email protected]>
Cc: Min Xu <[email protected]>
Cc: Gerd Hoffmann <[email protected]>
Cc: Elena Reshetova <[email protected]>
Signed-off-by: Min Xu <[email protected]>
Signed-off-by: Ceping Sun <[email protected]>
@sunceping @mergify
OvmfPkg/QemuFwCfgLib: Support Cache FwCfg with optional measurement
fb56dc7 
OVMF uses FW_CFG_SELECTOR(0x510) and FW_CFG_IO_DATA(0x511) to
get configuration information from QEMU. From the security perspective
these information shall be measured before they're consumed.

This patch reads the FwCfg items and caches them in a GuidHob. In the
meanwhile these FwCfg items are measured as well. This is to avoid
changing the order when reading the FwCfg process, which depends on
multiple factors(depex, order in the Firmware volume).

Cc: Erdem Aktas <[email protected]>
Cc: Jiewen Yao <[email protected]>
Cc: Min Xu <[email protected]>
Cc: Gerd Hoffmann <[email protected]>
Cc: Elena Reshetova <[email protected]>
Signed-off-by: Min Xu <[email protected]>
Signed-off-by: Ceping Sun <[email protected]>
@sunceping @mergify
OvmfPkg: Refactor QEMU_FW_CFG_CACHE_WORK_AREA
4d2af7b 
Move QemuFwCfgSupported and QemuFwCfgDmaSupported to the struct
since they will be used as global variables in the DXE phase
along with QEMU_FW_CFG_CACHE_WORK_AREA.

Additionally, change its name to QEMU_FW_CFG_WORK_AREA.

Cc: Erdem Aktas <[email protected]>
Cc: Jiewen Yao <[email protected]>
Cc: Min Xu <[email protected]>
Cc: Gerd Hoffmann <[email protected]>
Cc: Elena Reshetova <[email protected]>
Signed-off-by: Ceping Sun <[email protected]>
@sunceping @mergify
OvmfPkg/PlatformPei: Cache and measure FwCfg items
81c2c92 
Since OVMF would initialize the platform info with FwCfg,
TDVF needs to cache and measure the FwCfg at first.

Cc: Erdem Aktas <[email protected]>
Cc: Jiewen Yao <[email protected]>
Cc: Min Xu <[email protected]>
Cc: Gerd Hoffmann <[email protected]>
Cc: Elena Reshetova <[email protected]>
Signed-off-by: Min Xu <[email protected]>
Signed-off-by: Ceping Sun <[email protected]>
@sunceping @mergify
OvmfPkg/IntelTdx: Cache and measure FwCfg
2eac71a 
Since OVMF would initialize the platform info with FwCfg,
TDVF needs to cache and measure the FwCfg at first.

Cc: Erdem Aktas <[email protected]>
Cc: Jiewen Yao <[email protected]>
Cc: Min Xu <[email protected]>
Cc: Gerd Hoffmann <[email protected]>
Cc: Elena Reshetova <[email protected]>
Signed-off-by: Min Xu <[email protected]>
Signed-off-by: Ceping Sun <[email protected]>
@sweeaun @mergify
Maintainers.txt: Update StandaloneMmPkg reviewer
589be8d 
Add SweeAun as StandaloneMmPkg reviewer.

Signed-off-by: Khor Swee Aun <[email protected]>
@sarah-walker-arm @mergify
MdePkg: IndustryStandard: Rename ACPI SPCR revision 4 structure
2a3926d 
The structure for the SPCR revision 4 table was originally named
EFI_ACPI_4_0_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE. This prefix suggests it
is an ACPI 4.0 structure, which it is not. This could cause confusion with
genuine ACPI 4.0 structures and defines (eg
EFI_ACPI_4_0_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_SIGNATURE, which is
unrelated to SPCR revision 4).

Rename the structure to EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_4.

Signed-off-by: Sarah Walker <[email protected]>
@lzeng14 @mergify
UefiCpuPkg MpInformation2.h: Include PiMultiPhase.h
cd387d2 
There will be build failure because of EFI_AP_PROCEDURE definition
not found if MpInformation2.h is included by base type library.

MpInformation2.h depends on MpService.h because of
EFI_PROCESSOR_INFORMATION definition, and then MpService.h
depends on PiMultiPhase.h because of EFI_AP_PROCEDURE definition.

This patch updates MpInformation2.h to include PiMultiPhase.h instead
of PiPei.h and also removes SecPlatformInformation.h including.
It also does minor refinement to file header description.

Signed-off-by: Star Zeng <[email protected]>
@makubacki @mergify
MdeModulePkg/DxeCorePerformanceLib: Use EFI_MM_COMMUNICATE_HEADER
874c24b 
Refactor the file to use the new type name EFI_MM_COMMUNICATE_HEADER.

This is the same type but follows the new name and is more clear
with upcoming Standalone MM support being added.

Signed-off-by: Michael Kubacki <[email protected]>
@makubacki @mergify
MdeModulePkg: Add Standalone MM Core performance support
11b44c5 
Adds a new library instance to support MM core functionality for
performance in Standalone MM.

- Add StandaloneMmCorePerformanceLib instance
- Move common MM logic to a new file `MmCorePerformanceLib.c`
- Define interfaces with implementation specific to MM environment
  type in `SmmCorePerformanceLibInternal.h` and implement those
  functions in the Standalone MM and Traditional MM specific C files

Note: StandaloneMmCorePerformanceLib supports both
      `MM_CORE_STANDALONE` and `MM_STANDALONE` as some Standalone MM
	  environments have privilege separation and need to link this
	  functionality in a ring 3 Standalone MM driver that is outside
	  the ring 0 Standalone MM core driver.

Signed-off-by: Michael Kubacki <[email protected]>
@makubacki @mergify
MdeModulePkg: Add Standalone MM perf library support
1c51a26 
Adds a new library instance to support logging performance data in
Standalone MM.

- Add StandaloneMmPerformanceLib instance
- Move common MM logic to a new file `SmmPerformanceLibInternal.c`
- Since the library largely defers most logic to the performance
  measurement protocol a large degree of code can be shared between
  Standalone MM and Traditional MM.

Signed-off-by: Michael Kubacki <[email protected]>
@mergify
BaseTools/GenFv: Ensure the minimum pad file size for the FV with VTF
b279ac9 
In case of the FV with VTF, the left size should be enough to add the
minimum pad file size (EFI_FFS_FILE_HEADER, 0x18). It prevents the build
error, "GenFv: ERROR 0006: invalid FFS file header checksum" caused by the
pad file overwriting some header data in VTF. This includes these updates
for CalculateFvSize() function.

1. If NumBlocks is not defined, ensure the minimum pad file size for the
left size (if the pad file is required as VTF is not bottom aligned at end
of block, insert EFI_FFS_FILE_HEADER to ensure the pad file size)
2. If NumBlocks is defined, report more clear error message (the required
fv image size = 0x%x. the set fv image size = 0x%x. Free space left is not
enough to add a pad file (0x18))
3. Remove MaxPadFileSize, which is reported when the taken size is same as
the total size. It can not be the actual left size to add an FFS file. It
causes confusion when referring to the build log (FV Space Information)

Signed-off-by: Phil Noh <[email protected]>
@LiuZhiguang001 @mergify
BaseTools: Fix missing module PCD in compile information of build report
e01f418 
Module PCD in compile information is missed in module_report.json

Signed-off-by: Zhiguang Liu <[email protected]>
@xuweiintel @lgao4
MdeModulePkg/DxeCorePerformanceLib: Fix incorrect size calculation
95bf74f 
The values of BootRecordDataPayloadSize and CommSize are incorrect.
BootRecordDataPayloadSize should equal to
  SmmBootRecordDataSize - SmmBootRecordDataRetrieved
CommSize should equal to
  OFFSET_OF (EFI_MM_COMMUNICATE_HEADER,Data) \
  + (UINTN)MmCommBufferHeader->MessageLength
SmmCommData->BootRecordSize should be set to BootRecordDataPayloadSize,
instead of the total size of entire Smm boot record data.

Signed-off-by: Wei6 Xu <[email protected]>
@linjaso1 @mergify
BaseTools/FMMT: Fix GUID Tool Not Found the Shell Script Issue
a7ab45a 
- FMMT tool would use the "PATH" environment variable for locating
  the required GUID tool.

- On Windows-like system, batch file not found in the "PATH" environment
  variable when "shell=False".

- This issue required commands to include program extensions or
  absolute paths.

- This patch sets "shell=True" to extend the support for batch files,
  including scripts in BinWrappers under BaseTools.

- Converted input commands from lists to strings to ensure proper
  argument interpretation in POSIX-like shell scripts.

Signed-off-by: Jason1 Lin <[email protected]>
@mergify
StandaloneMmPkg: Add gMmStatusCodeUseSerialHobGuid HOB definition
b7ef717 
PcdStatusCodeUseSerial can be the dynamic PCD, which can't be used
in MM drivers. So, defines gMmStatusCodeUseSerialHobGuid HOB to
indicate StatusCode is reported via serial port or not. The value
shall match with the PcdStatusCodeUseSerial.

Signed-off-by: Jiaxin Wu <[email protected]>
@mergify
StandaloneMmPkg: Produce gMmStatusCodeUseSerialHobGuid HOB
5c6fea4 
Produce gMmStatusCodeUseSerialHobGuid as MM Foundation HOB to
describe the status code use serial port or not.

Signed-off-by: Jiaxin Wu <[email protected]>
@mergify
MdeModulePkg/Universal: Remove dynamic PcdStatusCodeUseSerial usage i…
14b730c 
…n MM

This patch is to replace dynamic PcdStatusCodeUseSerial by the
gMmStatusCodeUseSerialHobGuid.

Signed-off-by: Jiaxin Wu <[email protected]>
@abdattar @mergify
PrmPkg: Correct the flags for X64 GCC compiler
9006a9b 
Correct the GCC GenFw and ld flag to build PRM run time modules.
These changes are made for X64 GCC compiler, current present for AARCH64 only.
Adds addition _X64_OBJCOPY_STRIPFLAG for X64 to retain required symbol
during objcopy.

Signed-off-by: Abdul Lateef Attar <[email protected]>
@changab
RedfishPkg/RedfishHttpDxe : Fix the incorrect length of the Basic Auth
3907f8a 
Use AsciiStrLen function instead of AsciiStrSize to determine
the length of Basic Auth string.

Signed-off-by: Abner Chang <[email protected]>
@sachinami @mergify
MdeModulePkg/Core: Add Hot Pluggable type to Attribute Conversion Table
5d3314d 
Hot Pluggable resource attribute was introduced in UEFI 2.11 and PI 1.9
specifications.
This type should have an entry in the Attribute Conversion Table.

Signed-off-by: Sachin Ganesh <[email protected]>
@leiflindholm @mergify
ArmPlatformPkg/PeilessSec: drop _SetSVCMode symbol from AArch64
ad6639c 
AArch64 has no SVC mode, this was clearly copied from the AArch32
version, so drop it.

Signed-off-by: Leif Lindholm <[email protected]>
crawfxrd added 4 commits July 7, 2025 17:15
@crawfxrd
System76PayloadPkg: Enable boot splash
2cf5173 
Signed-off-by: Tim Crawford <[email protected]>
@crawfxrd
System76PayloadPkg: Use System76 boot logo
d812e40 
Signed-off-by: Tim Crawford <[email protected]>
@crawfxrd
System76PayloadPkg: Add custom BootLogoLib
c18d028 
Add a stripped down version of MdeModulePkg/BootLogoLib.

- Only supports a single logo
- Always places logo at 38.2% from top of screen
- Removes support for UGA
- Removes support for original BootLogo protocol

Signed-off-by: Tim Crawford <[email protected]>
@crawfxrd
System76PayloadPkg: Map Escape to Boot Manager
46ad856 
Signed-off-by: Tim Crawford <[email protected]>
@crawfxrd crawfxrd mentioned this pull request Jul 8, 2025
Draft
@crawfxrd crawfxrd force-pushed the rebase-stable202505 branch 2 times, most recently from 72a6ee8 to 684e99e Compare July 8, 2025 22:18
@crawfxrd
Copy link
Member Author

crawfxrd commented Jul 8, 2025

Boot works on darp10 with release build and qemu with debug build.

crawfxrd and others added 10 commits July 10, 2025 10:15
@crawfxrd
System76PayloadPkg: Show boot message as progress text
cdeeea9 
Signed-off-by: Tim Crawford <[email protected]>
@crawfxrd
System76PayloadPkg: Copy PlatformBootManagerUnableToBoot() from OvmfPkg
05f337d 
Signed-off-by: Tim Crawford <[email protected]>
@crawfxrd
System76PayloadPkg: Clear screen on boot error
d8f1112 
Signed-off-by: Tim Crawford <[email protected]>
@crawfxrd
System76PayloadPkg: Reduce boot timeout to 2s
d1c29a0 
Signed-off-by: Tim Crawford <[email protected]>
@crawfxrd
System76PayloadPkg: Stall before connecting devices
4e11019 
USB devices are not being detected when booting. Pause a bit for them to
be initialized and detected by EfiBootManagerConnectAll().

Signed-off-by: Tim Crawford <[email protected]>
@jackpot51 @crawfxrd
System76PayloadPkg: Add lib for logging to System76 EC
cd06cd2 
Make use of the SMFI command interface to forward logs from edk2 to
System76 EC.

Signed-off-by: Jeremy Soller <[email protected]>
Signed-off-by: Tim Crawford <[email protected]>
@crawfxrd
System76PayloadPkg: Add GOP and GOP policy drivers
d068faa 
Disable the edk2 GOP driver when GOP and policy drivers are enabled.

Signed-off-by: Tim Crawford <[email protected]>
@crawfxrd
System76PayloadPkg: Add System76 Setup menu
9946a35 
Signed-off-by: Tim Crawford <[email protected]>
@crawfxrd
System76PayloadPkg: Disable Device Manager
c866359 
Signed-off-by: Tim Crawford <[email protected]>
@crawfxrd
System76PayloadPkg: Import boot manager modules
1f5a721 
Import main firmware app and related libraries from MdeModulePkg for
customizing.

Signed-off-by: Tim Crawford <[email protected]>
@crawfxrd crawfxrd force-pushed the rebase-stable202505 branch from 684e99e to e8a1631 Compare July 10, 2025 16:15
crawfxrd and others added 10 commits July 14, 2025 10:56
@crawfxrd @jackpot51
System76PayloadPkg: Customize UiApp
5e25a09 
Co-authored-by: Jeremy Soller <[email protected]>
Signed-off-by: Tim Crawford <[email protected]>
@crawfxrd
System76PayloadPkg: Customize BootManagerUiLib
a45bf0f 
Signed-off-by: Tim Crawford <[email protected]>
@crawfxrd
System76PayloadPkg: Customize BootMaintenanceManager
b7e0636 
Signed-off-by: Tim Crawford <[email protected]>
@crawfxrd
System76PayloadPkg: Customize UefiBootManagerLib
9086875 
- Remove "UEFI" prefix from device descriptions
- Remove serial numbers from device descriptions

Signed-off-by: Tim Crawford <[email protected]>
@crawfxrd
System76PayloadPkg: Wait for input on each boot failure
557ed89 
Signed-off-by: Tim Crawford <[email protected]>
@crawfxrd
System76PayloadPkg: Modify no bootable media message
7b3eb55 
Signed-off-by: Tim Crawford <[email protected]>
@jackpot51 @crawfxrd
System76PayloadPkg: Notify System76 security callback prior to loadin…
66dbaf9 
…g boot options

Signed-off-by: Jeremy Soller <[email protected]>
Signed-off-by: Tim Crawford <[email protected]>
@coolstar @crawfxrd
Add filesystem drivers
29023d4 
Add EXT2/EXT4, exFAT, NTFS filesystem drivers.
Do not add ISO9115 drivers as it breaks El Torito boot.

Sourced from:
https://github.com/pbatard/EfiFs/releases/tag/v1.10
https://github.com/pbatard/ntfs-3g/releases/tag/1.7

Signed-off-by: Matt DeVillier <[email protected]>
Change-Id: I2e4d67cd8251ef3ec8a122a3ea0081aca6cfc455
@PatrickRudolph @crawfxrd
UefiPayloadPkg: Use new filesystem drivers
4af2f9b 
Signed-off-by: Patrick Rudolph <[email protected]>
@crawfxrd
System76PayloadPkg: UiApp: Link to SecureBootConfig
345ebdf 
Shoehorn in logic from Device Manager to show only the Secure Boot
Config entry on the front page.

Signed-off-by: Tim Crawford <[email protected]>
@crawfxrd crawfxrd force-pushed the rebase-stable202505 branch from a25a11c to 345ebdf Compare July 14, 2025 17:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Rebase on edk2-stable202505