From 7e6c1a905b598e078416d9716d6d83108df6d6eb Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Thu, 12 Mar 2026 09:58:32 +0100 Subject: [PATCH] * Thu Mar 12 2026 Miroslav Rezanina - 20260221-1 - Rebase to edk2-stable202602 [RHEL-151719] - Resolves: RHEL-151719 ([edk2,rhel-10] rebase to edk2-stable202602) --- 0003-Remove-paths-leading-to-submodules.patch | 12 +- ...minalDxe-set-xterm-resolution-on-mod.patch | 6 +- ...ResizeXterm-from-the-QEMU-command-li.patch | 18 +-- ...PcdResizeXterm-from-the-QEMU-command.patch | 6 +- ...mfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch | 10 +- ...DEBUG_VERBOSE-0x00400000-in-QemuVide.patch | 16 +-- ...ce-DEBUG_VERBOSE-0x00400000-in-QemuR.patch | 10 +- ...bDxe-Do-not-report-DXE-failure-on-Aa.patch | 2 +- ...EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch | 14 +- ...elLoaderFsDxe-suppress-error-on-no-k.patch | 2 +- ...Dxe-suppress-error-on-no-swtpm-in-si.patch | 6 +- 0014-OvmfPkg-Remove-EbcDxe-RHEL-only.patch | 22 ++-- ...ve-VirtioGpu-device-driver-RHEL-only.patch | 26 ++-- ...irtioFsDxe-filesystem-driver-RHEL-on.patch | 14 +- ...e-VirtioFsDxe-filesystem-driver-RHEL.patch | 12 +- ...e-UdfDxe-filesystem-driver-RHEL-only.patch | 22 ++-- ...e-UdfDxe-filesystem-driver-RHEL-only.patch | 12 +- ...ftpDynamicCommand-from-shell-RHEL-on.patch | 2 +- ...ttpDynamicCommand-from-shell-RHEL-on.patch | 2 +- ...inuxInitrdDynamicShellCommand-RHEL-o.patch | 2 +- ...Dxe-Shim-Reboot-workaround-RHEL-only.patch | 2 +- ...tLib-add-stat.h-include-file-RH-only.patch | 2 +- ...-add-access-open-read-write-close-sy.patch | 6 +- ...tLib-Reword-PseudoRandom-error-loggi.patch | 2 +- 0027-OvmfPkg-Add-a-Fallback-RNG-RH-only.patch | 2 +- ...rmVirtPkg-Add-a-Fallback-RNG-RH-only.patch | 2 +- ...opt-org.tianocore-UninstallMemAttrPr.patch | 2 +- ...ebugLogLib-use-AcquireSpinLockOrFail.patch | 49 ------- ...mInitLib-reserve-igvm-parameter-area.patch | 91 ------------- ...g-Fix-boot-failure-on-FEAT_LPA-only-.patch | 64 --------- ...-use-MemDebugLogPeiCoreLib-for-PEIMs.patch | 47 ------- ...-AmdSev-add-memory-debug-log-support.patch | 121 ------------------ ...mDebugLogPeiCoreLib-enable-for-PEIMs.patch | 41 ------ ...LogPeiLib-drop-duplicate-MemDebugLog.patch | 89 ------------- ...oadImageLib-flip-default-for-EnableL.patch | 95 -------------- ...-use-MemDebugLogPeiCoreLib-for-PEIMs.patch | 102 --------------- edk2.spec | 57 ++------- sources | 2 +- 38 files changed, 127 insertions(+), 865 deletions(-) delete mode 100644 0030-OvmfPkg-MemDebugLogLib-use-AcquireSpinLockOrFail.patch delete mode 100644 0031-OvmfPkg-PlatformInitLib-reserve-igvm-parameter-area.patch delete mode 100644 edk2-ArmPkg-UefiCpuPkg-Fix-boot-failure-on-FEAT_LPA-only-.patch delete mode 100644 edk2-ArmVirtPkg-use-MemDebugLogPeiCoreLib-for-PEIMs.patch delete mode 100644 edk2-OvmfPkg-AmdSev-add-memory-debug-log-support.patch delete mode 100644 edk2-OvmfPkg-MemDebugLogPeiCoreLib-enable-for-PEIMs.patch delete mode 100644 edk2-OvmfPkg-MemDebugLogPeiLib-drop-duplicate-MemDebugLog.patch delete mode 100644 edk2-OvmfPkg-X86QemuLoadImageLib-flip-default-for-EnableL.patch delete mode 100644 edk2-OvmfPkg-use-MemDebugLogPeiCoreLib-for-PEIMs.patch diff --git a/0003-Remove-paths-leading-to-submodules.patch b/0003-Remove-paths-leading-to-submodules.patch index a2c6794..467eda4 100644 --- a/0003-Remove-paths-leading-to-submodules.patch +++ b/0003-Remove-paths-leading-to-submodules.patch @@ -1,4 +1,4 @@ -From 3ba51256bdef2ee84943c2e2da85422107fdd8dc Mon Sep 17 00:00:00 2001 +From c56d2349b18fb6b23f9f0c404093ae2f37b4f9d5 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Thu, 24 Mar 2022 03:23:02 -0400 Subject: [PATCH] Remove paths leading to submodules @@ -15,19 +15,19 @@ Signed-off-by: Miroslav Rezanina 3 files changed, 9 deletions(-) diff --git a/BaseTools/Source/C/GNUmakefile b/BaseTools/Source/C/GNUmakefile -index 0ea314ef96..92d3dedf47 100644 +index 73f4b27eeb..7de12940b3 100644 --- a/BaseTools/Source/C/GNUmakefile +++ b/BaseTools/Source/C/GNUmakefile -@@ -24,7 +24,6 @@ all: makerootdir subdirs +@@ -23,7 +23,6 @@ all: makerootdir subdirs + LIBRARIES = Common - VFRAUTOGEN = VfrCompile/VfrLexer.h APPLICATIONS = \ - BrotliCompress \ VfrCompile \ EfiRom \ GenFfs \ diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec -index 0775aa954a..0d981111ed 100644 +index 9e2c6074eb..89a8401b71 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -27,9 +27,6 @@ @@ -41,7 +41,7 @@ index 0775aa954a..0d981111ed 100644 ## @libraryclass Defines a set of methods to reset whole system. ResetSystemLib|Include/Library/ResetSystemLib.h diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec -index 8f02cf1767..3e4d25d2e1 100644 +index 4b781d6592..8065f0239d 100644 --- a/MdePkg/MdePkg.dec +++ b/MdePkg/MdePkg.dec @@ -30,7 +30,6 @@ diff --git a/0004-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch b/0004-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch index cd90248..82aed57 100644 --- a/0004-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch +++ b/0004-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch @@ -1,4 +1,4 @@ -From dbdf905bad52ad0126f99438f637bd464313c1b8 Mon Sep 17 00:00:00 2001 +From 016edc47677a962537253dd0996d66d1da77cb56 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Tue, 25 Feb 2014 22:40:01 +0100 Subject: [PATCH] MdeModulePkg: TerminalDxe: set xterm resolution on mode @@ -104,10 +104,10 @@ Signed-off-by: Laszlo Ersek 3 files changed, 36 insertions(+) diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec -index 0d981111ed..77d8aa49df 100644 +index 89a8401b71..e74b1497bd 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec -@@ -2300,6 +2300,10 @@ +@@ -2313,6 +2313,10 @@ # @Prompt Conduit to use in ArmFfaLib. gEfiMdeModulePkgTokenSpaceGuid.PcdFfaLibConduitSmc|TRUE|BOOLEAN|0x10000029 diff --git a/0005-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch b/0005-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch index 7dace6f..34b9f55 100644 --- a/0005-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch +++ b/0005-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch @@ -1,4 +1,4 @@ -From f9b45a184e1dbb81010ce25b04299d208fe94121 Mon Sep 17 00:00:00 2001 +From 7112c0dee9a676943936715199106e7cb69e327b Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 14 Oct 2015 15:59:06 +0200 Subject: [PATCH] OvmfPkg: take PcdResizeXterm from the QEMU command line (RH @@ -82,10 +82,10 @@ Signed-off-by: Laszlo Ersek 8 files changed, 20 insertions(+), 1 deletion(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index 8e7e69da00..b18345f4a7 100644 +index 266c72580a..dd972f61bc 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -487,6 +487,7 @@ +@@ -503,6 +503,7 @@ [PcdsDynamicDefault] gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 @@ -118,10 +118,10 @@ index 18fd116311..83772af284 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0 diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc -index 884d5a9432..b56ca4e42f 100644 +index 0186456170..302fecf9fb 100644 --- a/OvmfPkg/Microvm/MicrovmX64.dsc +++ b/OvmfPkg/Microvm/MicrovmX64.dsc -@@ -588,7 +588,7 @@ +@@ -604,7 +604,7 @@ # only set when # ($(SMM_REQUIRE) == FALSE) gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 @@ -131,7 +131,7 @@ index 884d5a9432..b56ca4e42f 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 5b2f51e49a..5273113e0f 100644 +index de78bf3272..4c8f908b5a 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -620,6 +620,7 @@ @@ -143,7 +143,7 @@ index 5b2f51e49a..5273113e0f 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 9180e88645..fbbe0656b4 100644 +index 94c639be13..86df478edd 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -697,6 +697,7 @@ @@ -155,7 +155,7 @@ index 9180e88645..fbbe0656b4 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c -index a354e0641f..bb791fba71 100644 +index 1768a24037..21749bce19 100644 --- a/OvmfPkg/PlatformPei/Platform.c +++ b/OvmfPkg/PlatformPei/Platform.c @@ -43,6 +43,18 @@ @@ -177,7 +177,7 @@ index a354e0641f..bb791fba71 100644 EFI_PEI_PPI_DESCRIPTOR mPpiBootMode[] = { { EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST, -@@ -365,6 +377,7 @@ InitializePlatform ( +@@ -368,6 +380,7 @@ InitializePlatform ( MemTypeInfoInitialization (PlatformInfoHob); MemMapInitialization (PlatformInfoHob); NoexecDxeInitialization (PlatformInfoHob); diff --git a/0006-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch b/0006-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch index a0e87c5..3709cde 100644 --- a/0006-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch +++ b/0006-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch @@ -1,4 +1,4 @@ -From c3bec28d544bd8a77e8b6fc31208d9348dd749c3 Mon Sep 17 00:00:00 2001 +From 9e0561b81a6941ae4dd05ac517880c40e5ee3370 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Sun, 26 Jul 2015 08:02:50 +0000 Subject: [PATCH] ArmVirtPkg: take PcdResizeXterm from the QEMU command line @@ -96,7 +96,7 @@ Signed-off-by: Laszlo Ersek create mode 100644 ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index 9d85ef653b..24416ca984 100644 +index a38a1d8d18..94da4e2b2c 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -317,6 +317,8 @@ @@ -108,7 +108,7 @@ index 9d85ef653b..24416ca984 100644 [PcdsDynamicHii] gUefiOvmfPkgTokenSpaceGuid.PcdForceNoAcpi|L"ForceNoAcpi"|gOvmfVariableGuid|0x0|FALSE|NV,BS -@@ -452,7 +454,10 @@ +@@ -455,7 +457,10 @@ MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf diff --git a/0007-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch b/0007-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch index 675c65f..707dd8d 100644 --- a/0007-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch +++ b/0007-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch @@ -1,4 +1,4 @@ -From 48ff6ef136079ee9fab4c20bdb0ec791e8c3af03 Mon Sep 17 00:00:00 2001 +From c8b620ef099d69acb364ad6f4dccb893c0a82472 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 21 Nov 2017 00:57:45 +0100 Subject: [PATCH] OvmfPkg: enable DEBUG_VERBOSE (RHEL only) @@ -64,10 +64,10 @@ Signed-off-by: Paolo Bonzini 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index b18345f4a7..c7342f4f34 100644 +index dd972f61bc..294fe95769 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -432,7 +432,7 @@ +@@ -448,7 +448,7 @@ # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may # // significantly impact boot performance # DEBUG_ERROR 0x80000000 // Error @@ -77,7 +77,7 @@ index b18345f4a7..c7342f4f34 100644 !if $(SOURCE_DEBUG_ENABLE) == TRUE gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 5273113e0f..db2abc7cd3 100644 +index 4c8f908b5a..d7b896fb8d 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -551,7 +551,7 @@ @@ -90,7 +90,7 @@ index 5273113e0f..db2abc7cd3 100644 !if $(SOURCE_DEBUG_ENABLE) == TRUE gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index fbbe0656b4..75768c37c6 100644 +index 86df478edd..d450058822 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -629,7 +629,7 @@ diff --git a/0008-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch b/0008-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch index 48b7360..6fdff51 100644 --- a/0008-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch +++ b/0008-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch @@ -1,4 +1,4 @@ -From a3bb6ef0037323bf330d2f16cd4863ecc0a82b81 Mon Sep 17 00:00:00 2001 +From e9e31a559de98cd83daab0ba1b058c984f0b53d0 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 21 Nov 2017 00:57:46 +0100 Subject: [PATCH] OvmfPkg: silence DEBUG_VERBOSE (0x00400000) in @@ -85,10 +85,10 @@ Signed-off-by: Paolo Bonzini 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index c7342f4f34..b4fb1554e7 100644 +index 294fe95769..0a30c1b4bc 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -683,8 +683,14 @@ +@@ -706,8 +706,14 @@ MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf @@ -106,10 +106,10 @@ index c7342f4f34..b4fb1554e7 100644 # diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index db2abc7cd3..935cbab30d 100644 +index d7b896fb8d..071095c17c 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -848,8 +848,14 @@ +@@ -856,8 +856,14 @@ MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf @@ -127,12 +127,12 @@ index db2abc7cd3..935cbab30d 100644 OvmfPkg/VirtHstiDxe/VirtHstiDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 75768c37c6..c27cf21deb 100644 +index d450058822..92fd637044 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -979,8 +979,14 @@ - MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf +@@ -988,8 +988,14 @@ MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf + MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf - OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf - OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf diff --git a/0009-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch b/0009-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch index de47f3a..962d330 100644 --- a/0009-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch +++ b/0009-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch @@ -1,4 +1,4 @@ -From b7ea0f898387c9d8fe1f04bc2156e0d696d80eeb Mon Sep 17 00:00:00 2001 +From 94370db79d289d4fa077a0a01b10fb7687090c22 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 27 Jan 2016 03:05:18 +0100 Subject: [PATCH] ArmVirtPkg: silence DEBUG_VERBOSE (0x00400000) in @@ -61,10 +61,10 @@ Signed-off-by: Laszlo Ersek 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index 24416ca984..6432b03c27 100644 +index 94da4e2b2c..558e06c33f 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -579,7 +579,10 @@ +@@ -581,7 +581,10 @@ # # Video support # @@ -77,10 +77,10 @@ index 24416ca984..6432b03c27 100644 OvmfPkg/PlatformDxe/Platform.inf diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc -index ebdb7dc834..354d16ac28 100644 +index d257ca45c5..bd49df901c 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc -@@ -463,7 +463,10 @@ +@@ -462,7 +462,10 @@ # # Video support # diff --git a/0010-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch b/0010-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch index 6c1260b..a1d0f8f 100644 --- a/0010-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch +++ b/0010-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch @@ -1,4 +1,4 @@ -From 3b9d1965958e2b76a09500a16fd5e19f561479ae Mon Sep 17 00:00:00 2001 +From 6d5fddc24072517986722fc785b0197801877107 Mon Sep 17 00:00:00 2001 From: Philippe Mathieu-Daude Date: Thu, 1 Aug 2019 20:43:48 +0200 Subject: [PATCH] OvmfPkg: QemuRamfbDxe: Do not report DXE failure on Aarch64 diff --git a/0011-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch b/0011-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch index 82a572c..2fa6f8b 100644 --- a/0011-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch +++ b/0011-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch @@ -1,4 +1,4 @@ -From 03a7bc5196c937121618c01cb468f89614fac322 Mon Sep 17 00:00:00 2001 +From 051bfaf81ae4da64f04eaaf73cc12e932bba0245 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 21 Nov 2017 00:57:47 +0100 Subject: [PATCH] OvmfPkg: silence EFI_D_VERBOSE (0x00400000) in NvmExpressDxe @@ -62,10 +62,10 @@ Signed-off-by: Paolo Bonzini 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index b4fb1554e7..97f595b38a 100644 +index 0a30c1b4bc..1d4719a9ca 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -678,7 +678,10 @@ +@@ -701,7 +701,10 @@ MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf @@ -78,10 +78,10 @@ index b4fb1554e7..97f595b38a 100644 MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 935cbab30d..5bb2a7cef7 100644 +index 071095c17c..33f0761e56 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -843,7 +843,10 @@ +@@ -851,7 +851,10 @@ MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf @@ -94,10 +94,10 @@ index 935cbab30d..5bb2a7cef7 100644 MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index c27cf21deb..62d6a008c6 100644 +index 92fd637044..748f356bfc 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -974,7 +974,10 @@ +@@ -982,7 +982,10 @@ MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf diff --git a/0012-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch b/0012-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch index d15f7a6..20e81c6 100644 --- a/0012-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch +++ b/0012-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch @@ -1,4 +1,4 @@ -From 5b0bc2cc3e84b8951e82246b12c3aef80c433b70 Mon Sep 17 00:00:00 2001 +From 5baa050faeba28cba3d7991cc21ec925d90b88ba Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 24 Jun 2020 11:31:36 +0200 Subject: [PATCH] OvmfPkg/QemuKernelLoaderFsDxe: suppress error on no "-kernel" diff --git a/0013-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch b/0013-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch index fdd9a85..27cce16 100644 --- a/0013-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch +++ b/0013-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch @@ -1,4 +1,4 @@ -From 28b4ba4dcd57eda5ef568ef6f4e08a0cb0007ab6 Mon Sep 17 00:00:00 2001 +From 9654ea288a7618c5b46ccbcecccaf2f9550d390f Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 24 Jun 2020 11:40:09 +0200 Subject: [PATCH] SecurityPkg/Tcg2Dxe: suppress error on no swtpm in silent @@ -31,7 +31,7 @@ Signed-off-by: Miroslav Rezanina 2 files changed, 18 insertions(+) diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c -index 85a852842d..179c1499d3 100644 +index 2fa37c47e1..895b643a0b 100644 --- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c +++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c @@ -29,6 +29,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent @@ -42,7 +42,7 @@ index 85a852842d..179c1499d3 100644 #include #include #include -@@ -2753,6 +2754,22 @@ DriverEntry ( +@@ -2784,6 +2785,22 @@ DriverEntry ( CompareGuid (PcdGetPtr (PcdTpmInstanceGuid), &gEfiTpmDeviceInstanceTpm12Guid)) { DEBUG ((DEBUG_INFO, "No TPM2 instance required!\n")); diff --git a/0014-OvmfPkg-Remove-EbcDxe-RHEL-only.patch b/0014-OvmfPkg-Remove-EbcDxe-RHEL-only.patch index 33b2efd..60a9ca4 100644 --- a/0014-OvmfPkg-Remove-EbcDxe-RHEL-only.patch +++ b/0014-OvmfPkg-Remove-EbcDxe-RHEL-only.patch @@ -1,4 +1,4 @@ -From 42fd784f17f7ce1c2d2fe1b29cd4ac9aff198f7b Mon Sep 17 00:00:00 2001 +From 12b9547622ea9214f3df140bf9a019cd43e2aff5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:28:49 +0200 Subject: [PATCH] OvmfPkg: Remove EbcDxe (RHEL only) @@ -27,10 +27,10 @@ Signed-off-by: Miroslav Rezanina 6 files changed, 6 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index 97f595b38a..06b8bf7275 100644 +index 1d4719a9ca..2ab88c4f60 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -612,7 +612,6 @@ +@@ -632,7 +632,6 @@ !include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc } @@ -39,10 +39,10 @@ index 97f595b38a..06b8bf7275 100644 UefiCpuPkg/CpuDxe/CpuDxe.inf OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf -index dbb733310e..d49e51da69 100644 +index f86005090d..928013e878 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf -@@ -149,7 +149,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf +@@ -152,7 +152,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf @@ -51,10 +51,10 @@ index dbb733310e..d49e51da69 100644 INF UefiCpuPkg/CpuDxe/CpuDxe.inf INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 5bb2a7cef7..59c205ead5 100644 +index 33f0761e56..5610e7ba1c 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -771,7 +771,6 @@ +@@ -779,7 +779,6 @@ !include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc } @@ -63,7 +63,7 @@ index 5bb2a7cef7..59c205ead5 100644 UefiCpuPkg/CpuDxe/CpuDxe.inf OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index 2ab9bcf45c..a6054701a7 100644 +index c51721cf76..0f6712992e 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -187,7 +187,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf @@ -75,10 +75,10 @@ index 2ab9bcf45c..a6054701a7 100644 INF UefiCpuPkg/CpuDxe/CpuDxe.inf INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 62d6a008c6..7342d5871e 100644 +index 748f356bfc..4b6d5d3c65 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -879,7 +879,6 @@ +@@ -887,7 +887,6 @@ !include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc } @@ -87,7 +87,7 @@ index 62d6a008c6..7342d5871e 100644 UefiCpuPkg/CpuDxe/CpuDxe.inf { diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index 3eec3145ad..b9f88a32fc 100644 +index e4f6995e4d..051508970d 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -197,7 +197,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf diff --git a/0015-OvmfPkg-Remove-VirtioGpu-device-driver-RHEL-only.patch b/0015-OvmfPkg-Remove-VirtioGpu-device-driver-RHEL-only.patch index 742cda8..d37ab62 100644 --- a/0015-OvmfPkg-Remove-VirtioGpu-device-driver-RHEL-only.patch +++ b/0015-OvmfPkg-Remove-VirtioGpu-device-driver-RHEL-only.patch @@ -1,4 +1,4 @@ -From 1abeb1fd3164d212d799d9a767eeeb15a5c911e3 Mon Sep 17 00:00:00 2001 +From afd10ad3ace2db76987c9c07718747d31b6f3588 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:28:59 +0200 Subject: [PATCH] OvmfPkg: Remove VirtioGpu device driver (RHEL only) @@ -27,10 +27,10 @@ Signed-off-by: Miroslav Rezanina 6 files changed, 6 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index 06b8bf7275..6efc896439 100644 +index 2ab88c4f60..bec956acff 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -693,7 +693,6 @@ +@@ -716,7 +716,6 @@ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F } @@ -39,10 +39,10 @@ index 06b8bf7275..6efc896439 100644 # # ISA Support diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf -index d49e51da69..6177fb65c3 100644 +index 928013e878..e9b3a8408e 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf -@@ -228,7 +228,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf +@@ -231,7 +231,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf @@ -51,10 +51,10 @@ index d49e51da69..6177fb65c3 100644 INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 59c205ead5..24a27f34ea 100644 +index 5610e7ba1c..f6c05dfe42 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -858,7 +858,6 @@ +@@ -866,7 +866,6 @@ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F } @@ -63,10 +63,10 @@ index 59c205ead5..24a27f34ea 100644 # diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index a6054701a7..d8a1dcca04 100644 +index 0f6712992e..ed83683d22 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -285,7 +285,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf +@@ -289,7 +289,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf @@ -75,10 +75,10 @@ index a6054701a7..d8a1dcca04 100644 INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 7342d5871e..5a8ffe8828 100644 +index 4b6d5d3c65..25e0a11843 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -989,7 +989,6 @@ +@@ -998,7 +998,6 @@ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F } @@ -87,10 +87,10 @@ index 7342d5871e..5a8ffe8828 100644 # diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index b9f88a32fc..84a77918ba 100644 +index 051508970d..e13d2866e0 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -303,7 +303,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf +@@ -307,7 +307,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf diff --git a/0016-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch b/0016-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch index 450c923..acb7eef 100644 --- a/0016-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch +++ b/0016-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch @@ -1,4 +1,4 @@ -From 948e269f5424976af342eaed0725bcd7ee384706 Mon Sep 17 00:00:00 2001 +From 2655e1c5ec25493c1a396ac79f1393ba9940e9ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:29:13 +0200 Subject: [PATCH] OvmfPkg: Remove VirtioFsDxe filesystem driver (RHEL only) @@ -25,10 +25,10 @@ Signed-off-by: Miroslav Rezanina 4 files changed, 4 deletions(-) diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 24a27f34ea..4c8d78ba80 100644 +index f6c05dfe42..995a8070ac 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -836,7 +836,6 @@ +@@ -844,7 +844,6 @@ MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf @@ -37,7 +37,7 @@ index 24a27f34ea..4c8d78ba80 100644 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index d8a1dcca04..bf3411774f 100644 +index ed83683d22..83e59e11e6 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -253,7 +253,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour @@ -49,10 +49,10 @@ index d8a1dcca04..bf3411774f 100644 INF MdeModulePkg/Logo/LogoDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 5a8ffe8828..fee634edd3 100644 +index 25e0a11843..6ce7bce4eb 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -967,7 +967,6 @@ +@@ -975,7 +975,6 @@ MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf @@ -61,7 +61,7 @@ index 5a8ffe8828..fee634edd3 100644 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index 84a77918ba..f0a3664339 100644 +index e13d2866e0..782b99b28f 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -269,7 +269,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour diff --git a/0017-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch b/0017-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch index 70c4ddb..1c4f89f 100644 --- a/0017-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch +++ b/0017-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch @@ -1,4 +1,4 @@ -From 78172198efd225c2b2d0d4de685e497e27ec7816 Mon Sep 17 00:00:00 2001 +From 4762ca3c07c0d8af8ae1c4d7f69b8309e2de7c91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:29:16 +0200 Subject: [PATCH] ArmVirtPkg: Remove VirtioFsDxe filesystem driver (RHEL only) @@ -24,10 +24,10 @@ Signed-off-by: Miroslav Rezanina 3 files changed, 3 deletions(-) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index 6432b03c27..a0bf583b54 100644 +index 558e06c33f..0304f21b1e 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -507,7 +507,6 @@ +@@ -509,7 +509,6 @@ MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf @@ -36,7 +36,7 @@ index 6432b03c27..a0bf583b54 100644 # # Bds diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -index df9fa67ddf..9d67ee607f 100644 +index bb3efcb0b0..8297f321f0 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc @@ -90,7 +90,6 @@ READ_LOCK_STATUS = TRUE @@ -48,10 +48,10 @@ index df9fa67ddf..9d67ee607f 100644 # # Status Code Routing diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc -index 354d16ac28..f1aa5a78a9 100644 +index bd49df901c..04daee730d 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc -@@ -391,7 +391,6 @@ +@@ -390,7 +390,6 @@ MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf diff --git a/0018-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch b/0018-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch index cc19f17..cd149b7 100644 --- a/0018-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch +++ b/0018-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch @@ -1,4 +1,4 @@ -From 6a292afd406e0f596401865e045d07cbfb007e7d Mon Sep 17 00:00:00 2001 +From 9b0cabe2446d5a8d1a2fdda8e8469e70f73538f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:29:19 +0200 Subject: [PATCH] OvmfPkg: Remove UdfDxe filesystem driver (RHEL only) @@ -27,10 +27,10 @@ Signed-off-by: Miroslav Rezanina 6 files changed, 6 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index 6efc896439..717956cfc9 100644 +index bec956acff..34715237b4 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -671,7 +671,6 @@ +@@ -694,7 +694,6 @@ MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf @@ -39,10 +39,10 @@ index 6efc896439..717956cfc9 100644 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf -index 6177fb65c3..069dc40e97 100644 +index e9b3a8408e..accbece8d0 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf -@@ -208,7 +208,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf +@@ -211,7 +211,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf INF FatPkg/EnhancedFatDxe/Fat.inf @@ -51,10 +51,10 @@ index 6177fb65c3..069dc40e97 100644 INF OvmfPkg/AmdSev/SecretDxe/SecretDxe.inf INF OvmfPkg/AmdSev/Grub/Grub.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 4c8d78ba80..2be6a1321c 100644 +index 995a8070ac..adb57928fb 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -835,7 +835,6 @@ +@@ -843,7 +843,6 @@ MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf @@ -63,7 +63,7 @@ index 4c8d78ba80..2be6a1321c 100644 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index bf3411774f..c1b9b9b6d7 100644 +index 83e59e11e6..837f64cc0f 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -252,7 +252,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf @@ -75,10 +75,10 @@ index bf3411774f..c1b9b9b6d7 100644 INF MdeModulePkg/Logo/LogoDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index fee634edd3..724a84554c 100644 +index 6ce7bce4eb..c2a6521891 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -966,7 +966,6 @@ +@@ -974,7 +974,6 @@ MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf @@ -87,7 +87,7 @@ index fee634edd3..724a84554c 100644 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index f0a3664339..9f24e6cd88 100644 +index 782b99b28f..1c168ada0c 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -268,7 +268,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf diff --git a/0019-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch b/0019-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch index 8d26811..8ecd38a 100644 --- a/0019-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch +++ b/0019-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch @@ -1,4 +1,4 @@ -From 9dbf4272b3c0a23974806cb7956d10adf176ac55 Mon Sep 17 00:00:00 2001 +From 303d3f331428a459656c17295f8a6b48c911cfd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:29:22 +0200 Subject: [PATCH] ArmVirtPkg: Remove UdfDxe filesystem driver (RHEL only) @@ -24,10 +24,10 @@ Signed-off-by: Miroslav Rezanina 3 files changed, 3 deletions(-) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index a0bf583b54..a0a36632c2 100644 +index 0304f21b1e..e8688e2b6a 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -506,7 +506,6 @@ +@@ -508,7 +508,6 @@ MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf @@ -36,7 +36,7 @@ index a0bf583b54..a0a36632c2 100644 # # Bds diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -index 9d67ee607f..e476343401 100644 +index 8297f321f0..5606c1616f 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc @@ -89,7 +89,6 @@ READ_LOCK_STATUS = TRUE @@ -48,10 +48,10 @@ index 9d67ee607f..e476343401 100644 # # Status Code Routing diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc -index f1aa5a78a9..8212cd2a00 100644 +index 04daee730d..1320faeeab 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc -@@ -390,7 +390,6 @@ +@@ -389,7 +389,6 @@ MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf diff --git a/0020-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch b/0020-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch index cfd6581..d394aca 100644 --- a/0020-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch +++ b/0020-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch @@ -1,4 +1,4 @@ -From b7953417ba9a4db13049d2428b3ed43f48bbc6d2 Mon Sep 17 00:00:00 2001 +From f5101bfd0ceb94f9490e6499c4936849f425105c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:29:25 +0200 Subject: [PATCH] OvmfPkg: Remove TftpDynamicCommand from shell (RHEL only) diff --git a/0021-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch b/0021-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch index 12e14c2..31da520 100644 --- a/0021-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch +++ b/0021-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch @@ -1,4 +1,4 @@ -From ecc0fc23de0ae74e90d50ae99cdde34a0eec9efe Mon Sep 17 00:00:00 2001 +From 619260e36d0dfbc72ca21158b42c65085bb4c626 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:29:31 +0200 Subject: [PATCH] OvmfPkg: Remove HttpDynamicCommand from shell (RHEL only) diff --git a/0022-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch b/0022-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch index ac6146d..4c2b120 100644 --- a/0022-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch +++ b/0022-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch @@ -1,4 +1,4 @@ -From 33411781440d81b039a48637c0772ecaec88f7e4 Mon Sep 17 00:00:00 2001 +From 4dda207ec3e7c96100a6a70fa748570171e04d65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:29:39 +0200 Subject: [PATCH] OvmfPkg: Remove LinuxInitrdDynamicShellCommand (RHEL only) diff --git a/0023-OvmfPkg-AmdSevDxe-Shim-Reboot-workaround-RHEL-only.patch b/0023-OvmfPkg-AmdSevDxe-Shim-Reboot-workaround-RHEL-only.patch index 922e968..aea0915 100644 --- a/0023-OvmfPkg-AmdSevDxe-Shim-Reboot-workaround-RHEL-only.patch +++ b/0023-OvmfPkg-AmdSevDxe-Shim-Reboot-workaround-RHEL-only.patch @@ -1,4 +1,4 @@ -From 8f2163ec41344d311f9d985a7325b7fa4c4b122d Mon Sep 17 00:00:00 2001 +From 031392bf15bc64ca5bc1df0168a7f624a984bad8 Mon Sep 17 00:00:00 2001 From: Oliver Steffen Date: Wed, 16 Aug 2023 12:09:40 +0200 Subject: [PATCH] OvmfPkg/AmdSevDxe: Shim Reboot workaround (RHEL only) diff --git a/0024-CryptoPkg-CrtLib-add-stat.h-include-file-RH-only.patch b/0024-CryptoPkg-CrtLib-add-stat.h-include-file-RH-only.patch index c480db4..64f41d0 100644 --- a/0024-CryptoPkg-CrtLib-add-stat.h-include-file-RH-only.patch +++ b/0024-CryptoPkg-CrtLib-add-stat.h-include-file-RH-only.patch @@ -1,4 +1,4 @@ -From c5d8df4e356938b081d0a42b5f127337b0d211cb Mon Sep 17 00:00:00 2001 +From 24355539b36e642317a509c0b8e9876faa3f6a46 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Mon, 28 Aug 2023 13:11:02 +0200 Subject: [PATCH] CryptoPkg/CrtLib: add stat.h include file (RH only) diff --git a/0025-CryptoPkg-CrtLib-add-access-open-read-write-close-sy.patch b/0025-CryptoPkg-CrtLib-add-access-open-read-write-close-sy.patch index 4e44ada..a8e8ef6 100644 --- a/0025-CryptoPkg-CrtLib-add-access-open-read-write-close-sy.patch +++ b/0025-CryptoPkg-CrtLib-add-access-open-read-write-close-sy.patch @@ -1,4 +1,4 @@ -From 555619114921a2e44fae3fb4e741b291e6b9de1b Mon Sep 17 00:00:00 2001 +From af54081fced824c8c89f49ab9bb3a5c840a28170 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Mon, 28 Aug 2023 13:27:09 +0200 Subject: [PATCH] CryptoPkg/CrtLib: add access/open/read/write/close syscalls @@ -73,7 +73,7 @@ index 8a8fdfefc7..11d01106d4 100644 getuid ( void diff --git a/CryptoPkg/Library/Include/CrtLibSupport.h b/CryptoPkg/Library/Include/CrtLibSupport.h -index 4da2ef61f7..5cf2de58a9 100644 +index 613d418493..0d9d21a8dc 100644 --- a/CryptoPkg/Library/Include/CrtLibSupport.h +++ b/CryptoPkg/Library/Include/CrtLibSupport.h @@ -62,6 +62,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent @@ -100,7 +100,7 @@ index 4da2ef61f7..5cf2de58a9 100644 // // Basic types mapping // -@@ -316,6 +326,37 @@ fprintf ( +@@ -317,6 +327,37 @@ fprintf ( ... ); diff --git a/0026-NetworkPkg-DxeNetLib-Reword-PseudoRandom-error-loggi.patch b/0026-NetworkPkg-DxeNetLib-Reword-PseudoRandom-error-loggi.patch index f54ddb9..1b362ab 100644 --- a/0026-NetworkPkg-DxeNetLib-Reword-PseudoRandom-error-loggi.patch +++ b/0026-NetworkPkg-DxeNetLib-Reword-PseudoRandom-error-loggi.patch @@ -1,4 +1,4 @@ -From a7adaad69c0af3dde7184ccb2c725ca84986d1c7 Mon Sep 17 00:00:00 2001 +From 857e1f76088e53c28f6b4777386a43ae48ef98a5 Mon Sep 17 00:00:00 2001 From: Oliver Steffen Date: Wed, 14 Aug 2024 09:53:49 +0200 Subject: [PATCH] NetworkPkg/DxeNetLib: Reword PseudoRandom error logging diff --git a/0027-OvmfPkg-Add-a-Fallback-RNG-RH-only.patch b/0027-OvmfPkg-Add-a-Fallback-RNG-RH-only.patch index 40d28b0..9a5d9d7 100644 --- a/0027-OvmfPkg-Add-a-Fallback-RNG-RH-only.patch +++ b/0027-OvmfPkg-Add-a-Fallback-RNG-RH-only.patch @@ -1,4 +1,4 @@ -From a6f05c646722bb85de8b2f21af47e0f88e103010 Mon Sep 17 00:00:00 2001 +From 2c4a2512ce0ad6bb959262a7a2778762a46a0cb5 Mon Sep 17 00:00:00 2001 From: Oliver Steffen Date: Mon, 4 Nov 2024 12:40:12 +0100 Subject: [PATCH] OvmfPkg: Add a Fallback RNG (RH only) diff --git a/0028-OvmfPkg-ArmVirtPkg-Add-a-Fallback-RNG-RH-only.patch b/0028-OvmfPkg-ArmVirtPkg-Add-a-Fallback-RNG-RH-only.patch index c3f5704..6011707 100644 --- a/0028-OvmfPkg-ArmVirtPkg-Add-a-Fallback-RNG-RH-only.patch +++ b/0028-OvmfPkg-ArmVirtPkg-Add-a-Fallback-RNG-RH-only.patch @@ -1,4 +1,4 @@ -From f3548d62625d5ad2728078e4188e9f40965dbfe2 Mon Sep 17 00:00:00 2001 +From bbbce07cc8bb2202ac8396fead63ca5766d353ce Mon Sep 17 00:00:00 2001 From: Oliver Steffen Date: Thu, 7 Nov 2024 11:36:22 +0100 Subject: [PATCH] OvmfPkg/ArmVirtPkg: Add a Fallback RNG (RH only) diff --git a/0029-OvmfPkg-X64-add-opt-org.tianocore-UninstallMemAttrPr.patch b/0029-OvmfPkg-X64-add-opt-org.tianocore-UninstallMemAttrPr.patch index 8df837b..c3ed89a 100644 --- a/0029-OvmfPkg-X64-add-opt-org.tianocore-UninstallMemAttrPr.patch +++ b/0029-OvmfPkg-X64-add-opt-org.tianocore-UninstallMemAttrPr.patch @@ -1,4 +1,4 @@ -From d66a5ff583903e27bd3851e41c3ee17f697f60af Mon Sep 17 00:00:00 2001 +From bf504b2191b8e5921ebcc55259e5806fa2fdc1ee Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Thu, 16 Jan 2025 17:20:38 +0100 Subject: [PATCH] OvmfPkg/X64: add opt/org.tianocore/UninstallMemAttrProtocol diff --git a/0030-OvmfPkg-MemDebugLogLib-use-AcquireSpinLockOrFail.patch b/0030-OvmfPkg-MemDebugLogLib-use-AcquireSpinLockOrFail.patch deleted file mode 100644 index 2257b8c..0000000 --- a/0030-OvmfPkg-MemDebugLogLib-use-AcquireSpinLockOrFail.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 1d520eb1e36b63d4f9ecebf935dc7bae43ccf3f1 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Wed, 3 Dec 2025 10:40:11 +0100 -Subject: [PATCH] OvmfPkg/MemDebugLogLib: use AcquireSpinLockOrFail - -Drop log lines if we can't get the spin lock. Not nice, but better than -risking a deadlock. - -Some background: Most of edk2 runs single-threaded on the BSP, so if -something holds the lock it is rather unlikely that waiting is going to -help. Specifically I think a deadlock can happen if (a) a timer -interrupt arrives while the lock is held, and (b) some higher-TPL timer -handler tries to print something to the debug log. - -Signed-off-by: Gerd Hoffmann ---- - OvmfPkg/Library/MemDebugLogLib/MemDebugLogCommon.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/OvmfPkg/Library/MemDebugLogLib/MemDebugLogCommon.c b/OvmfPkg/Library/MemDebugLogLib/MemDebugLogCommon.c -index 8c9ce61cb6..b737cb0f70 100644 ---- a/OvmfPkg/Library/MemDebugLogLib/MemDebugLogCommon.c -+++ b/OvmfPkg/Library/MemDebugLogLib/MemDebugLogCommon.c -@@ -29,12 +29,12 @@ MemDebugLogLockInit ( - } - - STATIC --VOID -+BOOLEAN - MemDebugLogLockAcquire ( - IN volatile UINT64 *MemDebugLogLock - ) - { -- AcquireSpinLock ((SPIN_LOCK *)MemDebugLogLock); -+ return AcquireSpinLockOrFail ((SPIN_LOCK *)MemDebugLogLock); - } - - STATIC -@@ -90,7 +90,9 @@ MemDebugLogWriteBuffer ( - return EFI_INVALID_PARAMETER; - } - -- MemDebugLogLockAcquire (MemDebugLogLock); -+ if (!MemDebugLogLockAcquire (MemDebugLogLock)) { -+ return EFI_NOT_READY; -+ } - - BufStart = (CHAR8 *)(UINTN)(MemDebugLogBufAddr + MemDebugLogHdr->HeaderSize); - BufEnd = (CHAR8 *)(UINTN)(MemDebugLogBufAddr + MemDebugLogHdr->HeaderSize + MemDebugLogHdr->DebugLogSize) - 1; diff --git a/0031-OvmfPkg-PlatformInitLib-reserve-igvm-parameter-area.patch b/0031-OvmfPkg-PlatformInitLib-reserve-igvm-parameter-area.patch deleted file mode 100644 index 46e5414..0000000 --- a/0031-OvmfPkg-PlatformInitLib-reserve-igvm-parameter-area.patch +++ /dev/null @@ -1,91 +0,0 @@ -From aa5554fe6e935519f9ca531289aa541c3ef679d8 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Fri, 5 Dec 2025 13:59:18 +0100 -Subject: [PATCH] OvmfPkg/PlatformInitLib: reserve igvm parameter area - -Signed-off-by: Gerd Hoffmann ---- - OvmfPkg/Include/Library/PlatformInitLib.h | 6 +++++ - OvmfPkg/Library/PlatformInitLib/Igvm.c | 27 +++++++++++++++++++ - OvmfPkg/Library/PlatformInitLib/MemDetect.c | 2 ++ - .../PlatformInitLib/PlatformInitLib.inf | 1 + - 4 files changed, 36 insertions(+) - -diff --git a/OvmfPkg/Include/Library/PlatformInitLib.h b/OvmfPkg/Include/Library/PlatformInitLib.h -index 469c49b628..884e381928 100644 ---- a/OvmfPkg/Include/Library/PlatformInitLib.h -+++ b/OvmfPkg/Include/Library/PlatformInitLib.h -@@ -321,4 +321,10 @@ PlatformIgvmVpCount ( - VOID - ); - -+VOID -+EFIAPI -+PlatformIgvmParamReserve ( -+ VOID -+ ); -+ - #endif // PLATFORM_INIT_LIB_H_ -diff --git a/OvmfPkg/Library/PlatformInitLib/Igvm.c b/OvmfPkg/Library/PlatformInitLib/Igvm.c -index 1b0d9a9b85..dd5a94ef38 100644 ---- a/OvmfPkg/Library/PlatformInitLib/Igvm.c -+++ b/OvmfPkg/Library/PlatformInitLib/Igvm.c -@@ -75,6 +75,33 @@ PlatformIgvmMemoryMapFind ( - return Map; - } - -+VOID -+EFIAPI -+PlatformIgvmParamReserve ( -+ VOID -+ ) -+{ -+ UINT64 Base; -+ UINT64 Size; -+ -+ Base = FixedPcdGet64 (PcdOvmfIgvmParamBase); -+ Size = FixedPcdGet64 (PcdOvmfIgvmParamSize); -+ -+ if (Base && Size) { -+ // -+ // Reserve igvm parameter area as runtime data, to make sure the OS isn't -+ // going to use it, otherwise we can get corrupted IGVM parameters after -+ // guest reboot. -+ // -+ DEBUG ((DEBUG_INFO, "%a: 0x%x +0x%x\n", __func__, Base, Size)); -+ BuildMemoryAllocationHob ( -+ Base, -+ Size, -+ EfiRuntimeServicesData -+ ); -+ } -+} -+ - BOOLEAN - EFIAPI - PlatformIgvmMemoryMapCheck ( -diff --git a/OvmfPkg/Library/PlatformInitLib/MemDetect.c b/OvmfPkg/Library/PlatformInitLib/MemDetect.c -index 81fa60ade5..937e2b77a5 100644 ---- a/OvmfPkg/Library/PlatformInitLib/MemDetect.c -+++ b/OvmfPkg/Library/PlatformInitLib/MemDetect.c -@@ -1240,6 +1240,8 @@ PlatformQemuInitializeRam ( - - DEBUG ((DEBUG_INFO, "%a called\n", __func__)); - -+ PlatformIgvmParamReserve (); -+ - // - // Determine total memory size available - // -diff --git a/OvmfPkg/Library/PlatformInitLib/PlatformInitLib.inf b/OvmfPkg/Library/PlatformInitLib/PlatformInitLib.inf -index a02959c2cd..9df218c65c 100644 ---- a/OvmfPkg/Library/PlatformInitLib/PlatformInitLib.inf -+++ b/OvmfPkg/Library/PlatformInitLib/PlatformInitLib.inf -@@ -113,6 +113,7 @@ - gUefiOvmfPkgTokenSpaceGuid.PcdOvmfEarlyMemDebugLogSize - - gUefiOvmfPkgTokenSpaceGuid.PcdOvmfIgvmParamBase -+ gUefiOvmfPkgTokenSpaceGuid.PcdOvmfIgvmParamSize - gUefiOvmfPkgTokenSpaceGuid.PcdOvmfIgvmHobBase - gUefiOvmfPkgTokenSpaceGuid.PcdOvmfIgvmHobSize - diff --git a/edk2-ArmPkg-UefiCpuPkg-Fix-boot-failure-on-FEAT_LPA-only-.patch b/edk2-ArmPkg-UefiCpuPkg-Fix-boot-failure-on-FEAT_LPA-only-.patch deleted file mode 100644 index 486a38a..0000000 --- a/edk2-ArmPkg-UefiCpuPkg-Fix-boot-failure-on-FEAT_LPA-only-.patch +++ /dev/null @@ -1,64 +0,0 @@ -From cb6a558564347b71cca36111c377b126b314604e Mon Sep 17 00:00:00 2001 -From: Vishnu Pajjuri -Date: Tue, 30 Dec 2025 00:36:16 -0800 -Subject: [PATCH] ArmPkg, UefiCpuPkg: Fix boot failure on FEAT_LPA-only systems - without LPA2 - -RH-Author: Gerd Hoffmann -RH-MergeRequest: 103: ArmPkg, UefiCpuPkg: Fix boot failure on FEAT_LPA-only systems without LPA2 -RH-Jira: RHEL-138335 -RH-Acked-by: Luigi Leonardi -RH-Commit: [1/1] a7fcedd6490eedbc45f6a81fdaa95e80274e7034 (kraxel.rh/centos-src-edk2) - -Commit 9077163 added support for 52-bit PA/VA (LPA2) in EDK2. The previous -change treated the presence of FEAT_LPA as sufficient to enable 52-bit -VA for 4K page granularity. Some platforms advertise FEAT_LPA but do not -implement full LPA2 support for 4K PAGE_SIZE; enabling 52-bit VA on -those platforms produced an invalid MMU configuration and caused boot -failures. - -This patch tightens the detection logic so 52-bit PA/VA (LPA2) is enabled -only when the platform explicitly advertises LPA2 support. When LPA2 is -not present we fall back to the previous 48-bit address limit for 4K -pages, preserving correct behavior on non-LPA2 systems. - -Fixes: 9077163 ("UefiCpuPkg/ArmMmuLib: Add support for LPA2") - -Co-authored-by: Ganapatrao Kulkarni -Signed-off-by: Vishnu Pajjuri -(cherry picked from commit 1a4c4fb5a76fb15a5a50706685dc4ba36f1c2260) ---- - UefiCpuPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/UefiCpuPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c b/UefiCpuPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c -index d111e8c7cd3..2353adf5073 100644 ---- a/UefiCpuPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c -+++ b/UefiCpuPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c -@@ -94,6 +94,7 @@ ArmMemoryAttributeToPageAttribute ( - // T0SZ can be below MIN_T0SZ when LPA2 is in use, meaning the page table starts at level -1 - #define MIN_T0SZ 16 - #define BITS_PER_LEVEL 9 -+#define MAX_VA_BITS_48 48 - #define MAX_VA_BITS 52 - - STATIC -@@ -658,8 +659,13 @@ ArmConfigureMmu ( - // into account the architectural limitations that result from UEFI's - // use of 4 KB pages. - // -- MaxAddressBits = MIN (ArmGetPhysicalAddressBits (), MAX_VA_BITS); -- MaxAddress = LShiftU64 (1ULL, MaxAddressBits) - 1; -+ if (ArmHas52BitTgran4 ()) { -+ MaxAddressBits = MIN (ArmGetPhysicalAddressBits (), MAX_VA_BITS); -+ } else { -+ MaxAddressBits = MIN (ArmGetPhysicalAddressBits (), MAX_VA_BITS_48); -+ } -+ -+ MaxAddress = LShiftU64 (1ULL, MaxAddressBits) - 1; - - T0SZ = 64 - MaxAddressBits; - RootTableEntryCount = GetRootTableEntryCount (T0SZ); --- -2.47.3 - diff --git a/edk2-ArmVirtPkg-use-MemDebugLogPeiCoreLib-for-PEIMs.patch b/edk2-ArmVirtPkg-use-MemDebugLogPeiCoreLib-for-PEIMs.patch deleted file mode 100644 index 4d701f9..0000000 --- a/edk2-ArmVirtPkg-use-MemDebugLogPeiCoreLib-for-PEIMs.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 89ca998de1a2202f227986f7bbb878d18e1fed47 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Tue, 20 Jan 2026 17:16:03 +0100 -Subject: [PATCH 4/5] ArmVirtPkg: use MemDebugLogPeiCoreLib for PEIMs - -RH-Author: Luigi Leonardi -RH-MergeRequest: 104: ArmVirtPkg, AmdSev: fix memory debug logging -RH-Jira: RHEL-139470 -RH-Acked-by: Gerd Hoffmann -RH-Commit: [4/5] 4b152715d6ad2614c68bc6a77aaad793bf04b2c4 (luigileonardi/edk2) - -Switch PEIMs from MemDebugLogPeiLib to MemDebugLogPeiCoreLib, except for -the MemDebugLog PEIM which needs the MemDebugLogPages() function. - -Signed-off-by: Gerd Hoffmann ---- - ArmVirtPkg/ArmVirtQemu.dsc | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index a0a36632c21..a1c6ed48413 100644 ---- a/ArmVirtPkg/ArmVirtQemu.dsc -+++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -114,7 +114,7 @@ - Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf - QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgMmioPeiLib.inf - !if $(DEBUG_TO_MEM) -- MemDebugLogLib|OvmfPkg/Library/MemDebugLogLib/MemDebugLogPeiLib.inf -+ MemDebugLogLib|OvmfPkg/Library/MemDebugLogLib/MemDebugLogPeiCoreLib.inf - !else - MemDebugLogLib|OvmfPkg/Library/MemDebugLogLib/MemDebugLogLibNull.inf - !endif -@@ -369,7 +369,10 @@ - ArmPkg/Drivers/CpuPei/CpuPei.inf - - !if $(DEBUG_TO_MEM) -- OvmfPkg/MemDebugLogPei/MemDebugLogPei.inf -+ OvmfPkg/MemDebugLogPei/MemDebugLogPei.inf { -+ -+ MemDebugLogLib|OvmfPkg/Library/MemDebugLogLib/MemDebugLogPeiLib.inf -+ } - !endif - - !if $(TPM2_ENABLE) == TRUE --- -2.47.3 - diff --git a/edk2-OvmfPkg-AmdSev-add-memory-debug-log-support.patch b/edk2-OvmfPkg-AmdSev-add-memory-debug-log-support.patch deleted file mode 100644 index fb395d5..0000000 --- a/edk2-OvmfPkg-AmdSev-add-memory-debug-log-support.patch +++ /dev/null @@ -1,121 +0,0 @@ -From 61c1174521d20fe34630a73f85b28b4028b9feee Mon Sep 17 00:00:00 2001 -From: Luigi Leonardi -Date: Tue, 13 Jan 2026 05:28:10 -0500 -Subject: [PATCH 1/5] OvmfPkg/AmdSev: add memory debug log support - -RH-Author: Luigi Leonardi -RH-MergeRequest: 104: ArmVirtPkg, AmdSev: fix memory debug logging -RH-Jira: RHEL-139470 -RH-Acked-by: Gerd Hoffmann -RH-Commit: [1/5] 5925e432750361be369cf42d0f1f5d29cdb91d74 (luigileonardi/edk2) - -Enable memory-based debug logging support when `DEBUG_TO_MEM` build flag -is set. - -Signed-off-by: Luigi Leonardi ---- - OvmfPkg/AmdSev/AmdSevX64.dsc | 23 +++++++++++++++++++++++ - OvmfPkg/AmdSev/AmdSevX64.fdf | 3 +++ - 2 files changed, 26 insertions(+) - -diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index 717956cfc9c..34715237b4b 100644 ---- a/OvmfPkg/AmdSev/AmdSevX64.dsc -+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -209,7 +209,11 @@ - TdxLib|MdePkg/Library/TdxLib/TdxLib.inf - TdxMailboxLib|OvmfPkg/Library/TdxMailboxLib/TdxMailboxLibNull.inf - TdxHelperLib|OvmfPkg/IntelTdx/TdxHelperLib/TdxHelperLibNull.inf -+!if $(DEBUG_TO_MEM) -+ MemDebugLogLib|OvmfPkg/Library/MemDebugLogLib/MemDebugLogDxeLib.inf -+!else - MemDebugLogLib|OvmfPkg/Library/MemDebugLogLib/MemDebugLogLibNull.inf -+!endif - - [LibraryClasses.common.SEC] - TimerLib|OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.inf -@@ -218,6 +222,9 @@ - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf - !else - DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf -+!endif -+!if $(DEBUG_TO_MEM) -+ MemDebugLogLib|OvmfPkg/Library/MemDebugLogLib/MemDebugLogSecLib.inf - !endif - ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf - ExtractGuidedSectionLib|MdePkg/Library/BaseExtractGuidedSectionLib/BaseExtractGuidedSectionLib.inf -@@ -246,6 +253,9 @@ - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf - !else - DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf -+!endif -+!if $(DEBUG_TO_MEM) -+ MemDebugLogLib|OvmfPkg/Library/MemDebugLogLib/MemDebugLogPeiCoreLib.inf - !endif - PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf - CcProbeLib|OvmfPkg/Library/CcProbeLib/SecPeiCcProbeLib.inf -@@ -263,6 +273,9 @@ - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf - !else - DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf -+!endif -+!if $(DEBUG_TO_MEM) -+ MemDebugLogLib|OvmfPkg/Library/MemDebugLogLib/MemDebugLogPeiLib.inf - !endif - PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf - ResourcePublicationLib|MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf -@@ -310,6 +323,9 @@ - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf - !else - DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf -+!endif -+!if $(DEBUG_TO_MEM) -+ MemDebugLogLib|OvmfPkg/Library/MemDebugLogLib/MemDebugLogRtLib.inf - !endif - UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf -@@ -567,6 +583,9 @@ - # PEI Phase modules - # - MdeModulePkg/Core/Pei/PeiMain.inf -+!if $(DEBUG_TO_MEM) -+ OvmfPkg/MemDebugLogPei/MemDebugLogPei.inf -+!endif - MdeModulePkg/Universal/PCD/Pei/Pcd.inf { - - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf -@@ -603,6 +622,7 @@ - MdeModulePkg/Universal/PCD/Dxe/Pcd.inf { - - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf -+ MemDebugLogLib|OvmfPkg/Library/MemDebugLogLib/MemDebugLogLibNull.inf - } - - MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf -@@ -665,6 +685,9 @@ - - DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf -+!if $(DEBUG_TO_MEM) -+ MemDebugLogLib|OvmfPkg/Library/MemDebugLogLib/MemDebugLogLibNull.inf -+!endif - } - MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf - MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf -diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf -index 069dc40e97e..accbece8d08 100644 ---- a/OvmfPkg/AmdSev/AmdSevX64.fdf -+++ b/OvmfPkg/AmdSev/AmdSevX64.fdf -@@ -96,6 +96,9 @@ APRIORI PEI { - # - # PEI Phase modules - # -+!if $(DEBUG_TO_MEM) -+INF OvmfPkg/MemDebugLogPei/MemDebugLogPei.inf -+!endif - INF MdeModulePkg/Core/Pei/PeiMain.inf - INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf - INF MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf --- -2.47.3 - diff --git a/edk2-OvmfPkg-MemDebugLogPeiCoreLib-enable-for-PEIMs.patch b/edk2-OvmfPkg-MemDebugLogPeiCoreLib-enable-for-PEIMs.patch deleted file mode 100644 index 4163cbd..0000000 --- a/edk2-OvmfPkg-MemDebugLogPeiCoreLib-enable-for-PEIMs.patch +++ /dev/null @@ -1,41 +0,0 @@ -From e752ef369036e2dc799c8eb58b1e6697d1442fe8 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Tue, 20 Jan 2026 17:17:16 +0100 -Subject: [PATCH 3/5] OvmfPkg/MemDebugLogPeiCoreLib: enable for PEIMs - -RH-Author: Luigi Leonardi -RH-MergeRequest: 104: ArmVirtPkg, AmdSev: fix memory debug logging -RH-Jira: RHEL-139470 -RH-Acked-by: Gerd Hoffmann -RH-Commit: [3/5] 97050d5ba36b91340970c2af9d4b75d4b08bd16a (luigileonardi/edk2) - -Allow PEIMs use the MemDebugLogPeiCoreLib lib. - -The difference between MemDebugLogPeiCoreLib and MemDebugLogPeiLib is -that the latter does additionally provide the MemDebugLogPages() -function, and pulls in QemuFwCfg* libraries as dependency. - -Most PEIMs do not need MemDebugLogPages() though, only the ones which -handle the setup of the memory logging buffer do. - -Signed-off-by: Gerd Hoffmann ---- - OvmfPkg/Library/MemDebugLogLib/MemDebugLogPeiCoreLib.inf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/OvmfPkg/Library/MemDebugLogLib/MemDebugLogPeiCoreLib.inf b/OvmfPkg/Library/MemDebugLogLib/MemDebugLogPeiCoreLib.inf -index 56908caa5a7..12aa0441792 100644 ---- a/OvmfPkg/Library/MemDebugLogLib/MemDebugLogPeiCoreLib.inf -+++ b/OvmfPkg/Library/MemDebugLogLib/MemDebugLogPeiCoreLib.inf -@@ -14,7 +14,7 @@ - FILE_GUID = EEAF8A01-167A-4222-A647-80EB16AEEC69 - MODULE_TYPE = BASE - VERSION_STRING = 1.0 -- LIBRARY_CLASS = MemDebugLogLib|PEI_CORE -+ LIBRARY_CLASS = MemDebugLogLib|PEI_CORE PEIM - - - [Sources] --- -2.47.3 - diff --git a/edk2-OvmfPkg-MemDebugLogPeiLib-drop-duplicate-MemDebugLog.patch b/edk2-OvmfPkg-MemDebugLogPeiLib-drop-duplicate-MemDebugLog.patch deleted file mode 100644 index 9fa537f..0000000 --- a/edk2-OvmfPkg-MemDebugLogPeiLib-drop-duplicate-MemDebugLog.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 7e80f0fe3c74a518c1d43706391e42afb1d3ba40 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Tue, 20 Jan 2026 17:18:07 +0100 -Subject: [PATCH 2/5] OvmfPkg/MemDebugLogPeiLib: drop duplicate - MemDebugLogWrite function - -RH-Author: Luigi Leonardi -RH-MergeRequest: 104: ArmVirtPkg, AmdSev: fix memory debug logging -RH-Jira: RHEL-139470 -RH-Acked-by: Gerd Hoffmann -RH-Commit: [2/5] 59f8cad8121f3b659928a0342b46b39ab2da1dd5 (luigileonardi/edk2) - -The MemDebugLogWrite() function is identical in MemDebugLogPei.c and -MemDebugLogPeiCore.c So drop it from MemDebugLogPei.c and simply add -MemDebugLogPeiCore.c to MemDebugLogPeiLib.inf instead. - -Signed-off-by: Gerd Hoffmann ---- - .../Library/MemDebugLogLib/MemDebugLogPei.c | 41 ------------------- - .../MemDebugLogLib/MemDebugLogPeiLib.inf | 1 + - 2 files changed, 1 insertion(+), 41 deletions(-) - -diff --git a/OvmfPkg/Library/MemDebugLogLib/MemDebugLogPei.c b/OvmfPkg/Library/MemDebugLogLib/MemDebugLogPei.c -index 05e32daf1ca..d1beb74487d 100644 ---- a/OvmfPkg/Library/MemDebugLogLib/MemDebugLogPei.c -+++ b/OvmfPkg/Library/MemDebugLogLib/MemDebugLogPei.c -@@ -12,47 +12,6 @@ - #include - #include - --EFI_STATUS --EFIAPI --MemDebugLogWrite ( -- IN CHAR8 *Buffer, -- IN UINTN Length -- ) --{ -- EFI_PHYSICAL_ADDRESS MemDebugLogBufAddr; -- EFI_STATUS Status; -- -- // -- // Obtain the Memory Debug Log buffer addr from HOB -- // NOTE: This is expected to fail until the HOB is created. -- // -- Status = MemDebugLogAddrFromHOB (&MemDebugLogBufAddr); -- -- if (EFI_ERROR (Status)) { -- MemDebugLogBufAddr = 0; -- } -- -- if (MemDebugLogBufAddr != 0) { -- Status = MemDebugLogWriteBuffer (MemDebugLogBufAddr, Buffer, Length); -- } else { -- // -- // HOB has not yet been created, so -- // write to the early debug log buffer. -- // -- if (FixedPcdGet32 (PcdOvmfEarlyMemDebugLogBase) != 0x0) { -- Status = MemDebugLogWriteBuffer ( -- (EFI_PHYSICAL_ADDRESS)(UINTN)FixedPcdGet32 (PcdOvmfEarlyMemDebugLogBase), -- Buffer, -- Length -- ); -- } else { -- Status = EFI_NOT_FOUND; -- } -- } -- -- return Status; --} -- - UINT32 - EFIAPI - MemDebugLogPages ( -diff --git a/OvmfPkg/Library/MemDebugLogLib/MemDebugLogPeiLib.inf b/OvmfPkg/Library/MemDebugLogLib/MemDebugLogPeiLib.inf -index b6b407c8919..6a954d1d8c0 100644 ---- a/OvmfPkg/Library/MemDebugLogLib/MemDebugLogPeiLib.inf -+++ b/OvmfPkg/Library/MemDebugLogLib/MemDebugLogPeiLib.inf -@@ -19,6 +19,7 @@ - - [Sources] - MemDebugLogPei.c -+ MemDebugLogPeiCore.c - MemDebugLogCommon.c - - [Packages] --- -2.47.3 - diff --git a/edk2-OvmfPkg-X86QemuLoadImageLib-flip-default-for-EnableL.patch b/edk2-OvmfPkg-X86QemuLoadImageLib-flip-default-for-EnableL.patch deleted file mode 100644 index a89ba43..0000000 --- a/edk2-OvmfPkg-X86QemuLoadImageLib-flip-default-for-EnableL.patch +++ /dev/null @@ -1,95 +0,0 @@ -From e97e4a3f15ff7c0a5bc7bb1de5e664ccb0329ae6 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Wed, 10 Dec 2025 11:16:08 +0100 -Subject: [PATCH 1/3] OvmfPkg/X86QemuLoadImageLib: flip default for - EnableLegacyLoader to false - -RH-Author: Gerd Hoffmann -RH-MergeRequest: 105: OvmfPkg/X86QemuLoadImageLib: flip default for EnableLegacyLoader to false -RH-Jira: RHEL-134956 -RH-Acked-by: Luigi Leonardi -RH-Acked-by: Oliver Steffen -RH-Commit: [1/1] b6375a5344271fc087ce09fb3c6a42daaa0d7c9b (kraxel.rh/centos-src-edk2) - -What happened since commit 1549bf11cc94 ("OvmfPkg/X86QemuLoadImageLib: -make legacy loader configurable.") ? - -First, qemu 10.0 has been released, which brings support for the -shim -command line option so direct kernel boot with secure boot works. - -Second, support has been added to libvirt (version v11.2.0 and newer). - -Third, we got a bunch of linux distro releases. Latest debian, ubuntu -and fedora releases all have new enough edk2+qemu+libvirt packages to -support direct kernel boot with shim.efi loading and proper secure boot -verification. - -Lastly, the edk2 security advisory GHSA-6pp6-cm5h-86g5 and CVE-2025-2296 -have been published. - -Time for the next step in tightening the screws: Flip the default for -the EnableLegacyLoader config option from true to false. Also update -the documentation accordingly. - -The documentation for the config option is here: -https://github.com/tianocore/edk2/blob/master/OvmfPkg/RUNTIME_CONFIG.md#user-content-security-optorgtianocoreenablelegacyloader - -Upcoming final step, in a year or two: remove the legacy loader from the -code base (drop X86QemuLoadImageLib, migrade all users to use -GenericQemuLoadImageLib instead). - -Signed-off-by: Gerd Hoffmann -(cherry picked from commit d2cbaefc082294eadaa30a3d5f0fa8ba264a574a) - -Resolves: RHEL-134956 ---- - .../X86QemuLoadImageLib/X86QemuLoadImageLib.c | 2 +- - OvmfPkg/RUNTIME_CONFIG.md | 15 +++++++++------ - 2 files changed, 10 insertions(+), 7 deletions(-) - -diff --git a/OvmfPkg/Library/X86QemuLoadImageLib/X86QemuLoadImageLib.c b/OvmfPkg/Library/X86QemuLoadImageLib/X86QemuLoadImageLib.c -index b16bdeb47f8..f98f8ab885b 100644 ---- a/OvmfPkg/Library/X86QemuLoadImageLib/X86QemuLoadImageLib.c -+++ b/OvmfPkg/Library/X86QemuLoadImageLib/X86QemuLoadImageLib.c -@@ -449,7 +449,7 @@ QemuLoadKernelImage ( - &Enabled - ); - if (EFI_ERROR (RetStatus)) { -- Enabled = TRUE; -+ Enabled = FALSE; - } - - if (!Enabled) { -diff --git a/OvmfPkg/RUNTIME_CONFIG.md b/OvmfPkg/RUNTIME_CONFIG.md -index b75a5dacadf..57d0dd96111 100644 ---- a/OvmfPkg/RUNTIME_CONFIG.md -+++ b/OvmfPkg/RUNTIME_CONFIG.md -@@ -153,16 +153,19 @@ without EFI stub. If you are using kernels that old secure boot - support is the least of your problems though ... - - The linux kernel is typically signed by the distro secure boot keys --and is verified by the distro `shim.efi` binary. qemu release 10.0 --(ETA ~ March 2025) will get support for passing the shim binary -+and is verified by the distro `shim.efi` binary. qemu version 10.0 -+(released in April 2025) got support for passing the shim binary - (additionally to kernel + initrd) to the firmware, so the usual secure - boot verification can work with direct kernel load too. - --For now the legacy loader is enabled by default. Once the new qemu --release is available in most linux distros the defaut will be flipped --to disabled. -+In edk2-stable202502 and newer the EnableLegacyLoader config option is -+available and enabled by default. - --Usage (qemu 10.0+): -+In edk2-stable202602 and newer the EnableLegacyLoader config option is -+disabled by default. -+ -+Here is the qemu command line for direct kernel boot with secure boot -+verification: - - ``` - qemu-system-x86_64 \ --- -2.47.3 - diff --git a/edk2-OvmfPkg-use-MemDebugLogPeiCoreLib-for-PEIMs.patch b/edk2-OvmfPkg-use-MemDebugLogPeiCoreLib-for-PEIMs.patch deleted file mode 100644 index b1bdb60..0000000 --- a/edk2-OvmfPkg-use-MemDebugLogPeiCoreLib-for-PEIMs.patch +++ /dev/null @@ -1,102 +0,0 @@ -From ab6410ba7d54964884687e020fd015ed5ef3d18f Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Wed, 21 Jan 2026 12:35:59 +0100 -Subject: [PATCH 5/5] OvmfPkg: use MemDebugLogPeiCoreLib for PEIMs - -RH-Author: Luigi Leonardi -RH-MergeRequest: 104: ArmVirtPkg, AmdSev: fix memory debug logging -RH-Jira: RHEL-139470 -RH-Acked-by: Gerd Hoffmann -RH-Commit: [5/5] 66932a14dcf1a61fc92319e50fe9e87c03f89378 (luigileonardi/edk2) - -Switch PEIMs from MemDebugLogPeiLib to MemDebugLogPeiCoreLib, except for -the MemDebugLog and PlatformPei PEIMs which need the MemDebugLogPages() -function. - -Signed-off-by: Gerd Hoffmann ---- - OvmfPkg/OvmfPkgIa32X64.dsc | 14 +++++++++++--- - OvmfPkg/OvmfPkgX64.dsc | 14 +++++++++++--- - 2 files changed, 22 insertions(+), 6 deletions(-) - -diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 2be6a1321c8..e49132deb08 100644 ---- a/OvmfPkg/OvmfPkgIa32X64.dsc -+++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -312,7 +312,7 @@ - DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf - !endif - !if $(DEBUG_TO_MEM) -- MemDebugLogLib|OvmfPkg/Library/MemDebugLogLib/MemDebugLogPeiLib.inf -+ MemDebugLogLib|OvmfPkg/Library/MemDebugLogLib/MemDebugLogPeiCoreLib.inf - !endif - PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf - ResourcePublicationLib|MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf -@@ -708,7 +708,10 @@ - # - MdeModulePkg/Core/Pei/PeiMain.inf - !if $(DEBUG_TO_MEM) -- OvmfPkg/MemDebugLogPei/MemDebugLogPei.inf -+ OvmfPkg/MemDebugLogPei/MemDebugLogPei.inf { -+ -+ MemDebugLogLib|OvmfPkg/Library/MemDebugLogLib/MemDebugLogPeiLib.inf -+ } - !endif - MdeModulePkg/Universal/PCD/Pei/Pcd.inf { - -@@ -724,7 +727,12 @@ - } - MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf - -- OvmfPkg/PlatformPei/PlatformPei.inf -+ OvmfPkg/PlatformPei/PlatformPei.inf { -+ -+!if $(DEBUG_TO_MEM) -+ MemDebugLogLib|OvmfPkg/Library/MemDebugLogLib/MemDebugLogPeiLib.inf -+!endif -+ } - - UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf { - -diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 724a84554c8..5c016b336b5 100644 ---- a/OvmfPkg/OvmfPkgX64.dsc -+++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -344,7 +344,7 @@ - DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf - !endif - !if $(DEBUG_TO_MEM) -- MemDebugLogLib|OvmfPkg/Library/MemDebugLogLib/MemDebugLogPeiLib.inf -+ MemDebugLogLib|OvmfPkg/Library/MemDebugLogLib/MemDebugLogPeiCoreLib.inf - !endif - PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf - ResourcePublicationLib|MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf -@@ -788,7 +788,10 @@ - # - MdeModulePkg/Core/Pei/PeiMain.inf - !if $(DEBUG_TO_MEM) -- OvmfPkg/MemDebugLogPei/MemDebugLogPei.inf -+ OvmfPkg/MemDebugLogPei/MemDebugLogPei.inf { -+ -+ MemDebugLogLib|OvmfPkg/Library/MemDebugLogLib/MemDebugLogPeiLib.inf -+ } - !endif - MdeModulePkg/Universal/PCD/Pei/Pcd.inf { - -@@ -804,7 +807,12 @@ - } - MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf - -- OvmfPkg/PlatformPei/PlatformPei.inf -+ OvmfPkg/PlatformPei/PlatformPei.inf { -+ -+!if $(DEBUG_TO_MEM) -+ MemDebugLogLib|OvmfPkg/Library/MemDebugLogLib/MemDebugLogPeiLib.inf -+!endif -+ } - - UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf { - --- -2.47.3 - diff --git a/edk2.spec b/edk2.spec index 855038c..c2b7c4a 100644 --- a/edk2.spec +++ b/edk2.spec @@ -1,8 +1,8 @@ ExclusiveArch: x86_64 aarch64 riscv64 -# edk2-stable202511 -%define GITDATE 20251114 -%define GITCOMMIT 46548b1adac8 +# edk2-stable202602 +%define GITDATE 20260221 +%define GITCOMMIT b7a715f7c03c %define TOOLCHAIN GCC %define OPENSSL_VER 3.5.5 @@ -25,7 +25,7 @@ ExclusiveArch: x86_64 aarch64 riscv64 Name: edk2 Version: %{GITDATE} -Release: 5%{?dist} +Release: 1%{?dist} Summary: UEFI firmware for 64-bit virtual machines License: BSD-2-Clause-Patent and Apache-2.0 and MIT URL: http://www.tianocore.org @@ -91,22 +91,6 @@ Patch24: 0026-NetworkPkg-DxeNetLib-Reword-PseudoRandom-error-loggi.patch Patch25: 0027-OvmfPkg-Add-a-Fallback-RNG-RH-only.patch Patch26: 0028-OvmfPkg-ArmVirtPkg-Add-a-Fallback-RNG-RH-only.patch Patch27: 0029-OvmfPkg-X64-add-opt-org.tianocore-UninstallMemAttrPr.patch -Patch28: 0030-OvmfPkg-MemDebugLogLib-use-AcquireSpinLockOrFail.patch -Patch29: 0031-OvmfPkg-PlatformInitLib-reserve-igvm-parameter-area.patch -# For RHEL-138335 - [AmpereoneX] ArmConfigureMmu: The MaxAddress 0xFFFFFFFFFFFFF is not supported by this MMU configuration -Patch30: edk2-ArmPkg-UefiCpuPkg-Fix-boot-failure-on-FEAT_LPA-only-.patch -# For RHEL-139470 - Enable memory debug logging support in firmware image configs -Patch31: edk2-OvmfPkg-AmdSev-add-memory-debug-log-support.patch -# For RHEL-139470 - Enable memory debug logging support in firmware image configs -Patch32: edk2-OvmfPkg-MemDebugLogPeiLib-drop-duplicate-MemDebugLog.patch -# For RHEL-139470 - Enable memory debug logging support in firmware image configs -Patch33: edk2-OvmfPkg-MemDebugLogPeiCoreLib-enable-for-PEIMs.patch -# For RHEL-139470 - Enable memory debug logging support in firmware image configs -Patch34: edk2-ArmVirtPkg-use-MemDebugLogPeiCoreLib-for-PEIMs.patch -# For RHEL-139470 - Enable memory debug logging support in firmware image configs -Patch35: edk2-OvmfPkg-use-MemDebugLogPeiCoreLib-for-PEIMs.patch -# For RHEL-134956 - CVE-2025-2296 edk2: EDK2: Improper Input Validation allows arbitrary command execution [rhel-10.2] -Patch36: edk2-OvmfPkg-X86QemuLoadImageLib-flip-default-for-EnableL.patch # python3-devel and libuuid-devel are required for building tools. # python3-devel is also needed for varstore template generation and @@ -503,39 +487,16 @@ install -m 0644 \ %changelog +* Thu Mar 12 2026 Miroslav Rezanina - 20260221-1 +- Rebase to edk2-stable202602 [RHEL-151719] +- Resolves: RHEL-151719 + ([edk2,rhel-10] rebase to edk2-stable202602) + * Mon Mar 09 2026 Miroslav Rezanina - 20251114-5 - edk2-add-uefi-vars-firmware-json-files.patch [RHEL-150696] - Resolves: RHEL-150696 (edk2: Add JSON descriptors for uefi-vars builds) -* Thu Feb 12 2026 Miroslav Rezanina - 20251114-4 -- edk2-OvmfPkg-X86QemuLoadImageLib-flip-default-for-EnableL.patch [RHEL-134956] -- edk2-update-openssl-rhel-submodule.patch [RHEL-147785] -- edk2-update-openssl-rhel-tarball.patch [RHEL-147785] -- Resolves: RHEL-134956 - (CVE-2025-2296 edk2: EDK2: Improper Input Validation allows arbitrary command execution [rhel-10.2]) -- Resolves: RHEL-147785 - ([edk2] pick up openssl updates) - -* Mon Feb 09 2026 Miroslav Rezanina - 20251114-3 -- edk2-OvmfPkg-AmdSev-add-memory-debug-log-support.patch [RHEL-139470] -- edk2-OvmfPkg-MemDebugLogPeiLib-drop-duplicate-MemDebugLog.patch [RHEL-139470] -- edk2-OvmfPkg-MemDebugLogPeiCoreLib-enable-for-PEIMs.patch [RHEL-139470] -- edk2-ArmVirtPkg-use-MemDebugLogPeiCoreLib-for-PEIMs.patch [RHEL-139470] -- edk2-OvmfPkg-use-MemDebugLogPeiCoreLib-for-PEIMs.patch [RHEL-139470] -- Resolves: RHEL-139470 - (Enable memory debug logging support in firmware image configs) - -* Thu Jan 08 2026 Miroslav Rezanina - 20251114-2 -- edk2-ArmPkg-UefiCpuPkg-Fix-boot-failure-on-FEAT_LPA-only-.patch [RHEL-138335] -- Resolves: RHEL-138335 - ([AmpereoneX] ArmConfigureMmu: The MaxAddress 0xFFFFFFFFFFFFF is not supported by this MMU configuration) - -* Wed Dec 10 2025 Miroslav Rezanina - 20251114-1 -- Rebase to edk2-stable202511 [RHEL-118386] -- Resolves: RHEL-118386 - ([edk2,rhel-10] rebase to edk2-stable202511) - * Wed Nov 12 2025 Miroslav Rezanina - 20250822-4 - edk2-make-dbxupdate.sh-get-version-tag-add-to-commit-mess.patch [RHEL-126085] - edk2-update-dbx-to-20251016-v1.6.1.patch [RHEL-126085] diff --git a/sources b/sources index 6cb81a4..aae037c 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (DBXUpdate-20251016.aa64.bin) = 2af6d22d139ff58cb2d0dc0883257b6131f1bd9cc04b4c062c21f1d0560508f8f4ea062e6946fd37c8ab47259772884e29c32a93844d5d6beadcf9e778e4ee51 SHA512 (DBXUpdate-20251016.x64.bin) = 0452d2c302f702eeb2d549fd5ac4b3c3623172de9559a881bc92875590f3c5b65e301b880f5f76786e22b1af145b2aa6e58c74fef00a279950f3d6641aef484e SHA512 (dtc-1.7.0.tar.xz) = d3ba6902a9a2f2cdbaff55f12fca3cfe4a1ec5779074a38e3d8b88097c7abc981835957e8ce72971e10c131e05fde0b1b961768e888ff96d89e42c75edb53afb -SHA512 (edk2-46548b1adac8.tar.xz) = 56b340943585df5efacc31af564f865664ade5eb5ff443040518263dd36784045a383970e11d3925c8c33927829e00b82efbfd77447e2fb96ad50e16064e0827 +SHA512 (edk2-b7a715f7c03c.tar.xz) = c7f24a5bc56ce9e9ef53aef3610fc399e43bcc5a17a0c389c02ffced22baf6dce42d0e577dd18771fc0f52dec5f992feaf3aa8fad15d10b10ace73ceb56afabd SHA512 (openssl-rhel-c6600b817708cb4f3c6b044f28e10e9b1a1b3e2c.tar.xz) = be9bb76ba1b8c3f16f4d6d15d4b4a8c57b9361dab56996b9a19bb6360996144c556c0e07827c8734b37f071e842dc0abe39d2321f09f42c47f610808f15aa0a5