From ae3e8b4a46045e29fdbf5b446aece9574249ea41 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Tue, 16 Dec 2025 10:44:11 +0100 Subject: [PATCH] * Tue Dec 10 2025 Miroslav Rezanina - 20251114-1 - Rebase to edk2-stable202511 [RHEL-118386] - Resolves: RHEL-118386 ([edk2,rhel-10] rebase to edk2-stable202511) --- 0003-Remove-paths-leading-to-submodules.patch | 10 +- ...minalDxe-set-xterm-resolution-on-mod.patch | 18 +-- ...ResizeXterm-from-the-QEMU-command-li.patch | 23 +-- ...PcdResizeXterm-from-the-QEMU-command.patch | 8 +- ...mfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch | 24 +-- ...DEBUG_VERBOSE-0x00400000-in-QemuVide.patch | 32 +--- ...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 | 27 +--- ...elLoaderFsDxe-suppress-error-on-no-k.patch | 14 +- ...Dxe-suppress-error-on-no-swtpm-in-si.patch | 2 +- 0014-OvmfPkg-Remove-EbcDxe-RHEL-only.patch | 48 ++---- ...ve-VirtioGpu-device-driver-RHEL-only.patch | 48 ++---- ...irtioFsDxe-filesystem-driver-RHEL-on.patch | 44 ++--- ...e-VirtioFsDxe-filesystem-driver-RHEL.patch | 12 +- ...e-UdfDxe-filesystem-driver-RHEL-only.patch | 48 ++---- ...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 | 10 +- ...tLib-Reword-PseudoRandom-error-loggi.patch | 2 +- 0027-OvmfPkg-Add-a-Fallback-RNG-RH-only.patch | 4 +- ...rmVirtPkg-Add-a-Fallback-RNG-RH-only.patch | 4 +- ...opt-org.tianocore-UninstallMemAttrPr.patch | 4 +- ...ebugLogLib-use-AcquireSpinLockOrFail.patch | 49 ++++++ ...DeviceLibDTpm-Remove-global-variable.patch | 150 ------------------ ...mInitLib-reserve-igvm-parameter-area.patch | 91 +++++++++++ edk2-build.rhel-10 | 8 +- edk2.spec | 16 +- sources | 4 +- 33 files changed, 281 insertions(+), 453 deletions(-) create mode 100644 0030-OvmfPkg-MemDebugLogLib-use-AcquireSpinLockOrFail.patch delete mode 100644 0030-SecurityPkg-Tpm2DeviceLibDTpm-Remove-global-variable.patch create mode 100644 0031-OvmfPkg-PlatformInitLib-reserve-igvm-parameter-area.patch diff --git a/0003-Remove-paths-leading-to-submodules.patch b/0003-Remove-paths-leading-to-submodules.patch index 06d4d26..a2c6794 100644 --- a/0003-Remove-paths-leading-to-submodules.patch +++ b/0003-Remove-paths-leading-to-submodules.patch @@ -1,4 +1,4 @@ -From 00c911e68115577cc1b47c892e5a5d9eebe376bc Mon Sep 17 00:00:00 2001 +From 3ba51256bdef2ee84943c2e2da85422107fdd8dc 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 @@ -27,10 +27,10 @@ index 0ea314ef96..92d3dedf47 100644 EfiRom \ GenFfs \ diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec -index 24cc64f6b4..71825947d0 100644 +index 0775aa954a..0d981111ed 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec -@@ -26,9 +26,6 @@ +@@ -27,9 +27,6 @@ Include Test/Mock/Include @@ -41,7 +41,7 @@ index 24cc64f6b4..71825947d0 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 ed22a67568..0a2bfb5ec9 100644 +index 8f02cf1767..3e4d25d2e1 100644 --- a/MdePkg/MdePkg.dec +++ b/MdePkg/MdePkg.dec @@ -30,7 +30,6 @@ @@ -52,7 +52,7 @@ index ed22a67568..0a2bfb5ec9 100644 [Includes.IA32] Include/Ia32 -@@ -296,10 +295,6 @@ +@@ -293,10 +292,6 @@ # FdtLib|Include/Library/FdtLib.h diff --git a/0004-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch b/0004-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch index ba2ec20..cd90248 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 9037d5c6dbb18e6f7d9fb12ffcf2334930ba8a56 Mon Sep 17 00:00:00 2001 +From dbdf905bad52ad0126f99438f637bd464313c1b8 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 71825947d0..b511a5a6b3 100644 +index 0d981111ed..77d8aa49df 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec -@@ -2281,6 +2281,10 @@ +@@ -2300,6 +2300,10 @@ # @Prompt Conduit to use in ArmFfaLib. gEfiMdeModulePkgTokenSpaceGuid.PcdFfaLibConduitSmc|TRUE|BOOLEAN|0x10000029 @@ -119,10 +119,10 @@ index 71825947d0..b511a5a6b3 100644 ## Specify memory size with page number for PEI code when # Loading Module at Fixed Address feature is enabled. diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c -index eb8658c892..6d62cbf500 100644 +index 10d6695397..1423e99830 100644 --- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c +++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c -@@ -8,6 +8,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent +@@ -9,6 +9,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -131,9 +131,9 @@ index eb8658c892..6d62cbf500 100644 #include "Terminal.h" // -@@ -82,6 +84,16 @@ CHAR16 mSetCursorPositionString[] = { ESC, '[', '0', '0', ';', '0', '0', 'H', 0 - CHAR16 mCursorForwardString[] = { ESC, '[', '0', '0', 'C', 0 }; - CHAR16 mCursorBackwardString[] = { ESC, '[', '0', '0', 'D', 0 }; +@@ -83,6 +85,16 @@ CHAR16 mSetCursorPositionString[] = { ESC, '[', '0', '0', '0', ';', '0', '0', ' + CHAR16 mCursorForwardString[] = { ESC, '[', '0', '0', '0', 'C', 0 }; + CHAR16 mCursorBackwardString[] = { ESC, '[', '0', '0', '0', 'D', 0 }; +// +// Note that this is an ASCII format string, taking two INT32 arguments: @@ -148,7 +148,7 @@ index eb8658c892..6d62cbf500 100644 // // Body of the ConOut functions // -@@ -521,6 +533,24 @@ TerminalConOutSetMode ( +@@ -533,6 +545,24 @@ TerminalConOutSetMode ( return EFI_DEVICE_ERROR; } 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 d90fa4b..7dace6f 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 aa889d023adfafd8c562302119c4ca6d377195b0 Mon Sep 17 00:00:00 2001 +From f9b45a184e1dbb81010ce25b04299d208fe94121 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 @@ -75,12 +75,11 @@ Signed-off-by: Laszlo Ersek OvmfPkg/CloudHv/CloudHvX64.dsc | 1 + OvmfPkg/IntelTdx/IntelTdxX64.dsc | 1 + OvmfPkg/Microvm/MicrovmX64.dsc | 2 +- - OvmfPkg/OvmfPkgIa32.dsc | 1 + OvmfPkg/OvmfPkgIa32X64.dsc | 1 + OvmfPkg/OvmfPkgX64.dsc | 1 + OvmfPkg/PlatformPei/Platform.c | 13 +++++++++++++ OvmfPkg/PlatformPei/PlatformPei.inf | 1 + - 9 files changed, 21 insertions(+), 1 deletion(-) + 8 files changed, 20 insertions(+), 1 deletion(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc index 8e7e69da00..b18345f4a7 100644 @@ -131,23 +130,11 @@ index 884d5a9432..b56ca4e42f 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0 -diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 550c54d321..6502464285 100644 ---- a/OvmfPkg/OvmfPkgIa32.dsc -+++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -592,6 +592,7 @@ - # ($(SMM_REQUIRE) == FALSE) - gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 - -+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE - !if $(SMM_REQUIRE) == FALSE - gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 - gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 06fc031ab4..aa40cdbadb 100644 +index 5b2f51e49a..5273113e0f 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -619,6 +619,7 @@ +@@ -620,6 +620,7 @@ # ($(SMM_REQUIRE) == FALSE) gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 @@ -156,7 +143,7 @@ index 06fc031ab4..aa40cdbadb 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index f859db6acd..5600a25954 100644 +index 9180e88645..fbbe0656b4 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -697,6 +697,7 @@ diff --git a/0006-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch b/0006-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch index 02117ed..a0e87c5 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 cfb42ab82de9694d83deebe2957d4d1e46951d97 Mon Sep 17 00:00:00 2001 +From c3bec28d544bd8a77e8b6fc31208d9348dd749c3 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,10 +96,10 @@ Signed-off-by: Laszlo Ersek create mode 100644 ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index 1e239bbbf7..738f1b1403 100644 +index 9d85ef653b..24416ca984 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -318,6 +318,8 @@ +@@ -317,6 +317,8 @@ gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress|0x0 !endif @@ -108,7 +108,7 @@ index 1e239bbbf7..738f1b1403 100644 [PcdsDynamicHii] gUefiOvmfPkgTokenSpaceGuid.PcdForceNoAcpi|L"ForceNoAcpi"|gOvmfVariableGuid|0x0|FALSE|NV,BS -@@ -432,7 +434,10 @@ +@@ -452,7 +454,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 2c7b48e..675c65f 100644 --- a/0007-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch +++ b/0007-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch @@ -1,4 +1,4 @@ -From 6201ce5b2b6803d7c69fb1c757e9962d028524ad Mon Sep 17 00:00:00 2001 +From 48ff6ef136079ee9fab4c20bdb0ec791e8c3af03 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) @@ -59,10 +59,9 @@ Signed-off-by: Paolo Bonzini (cherry picked from commit 5ecc18badaabe774d9d0806b027ab63a30c6a2d7) --- OvmfPkg/AmdSev/AmdSevX64.dsc | 2 +- - OvmfPkg/OvmfPkgIa32.dsc | 2 +- OvmfPkg/OvmfPkgIa32X64.dsc | 2 +- OvmfPkg/OvmfPkgX64.dsc | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc index b18345f4a7..c7342f4f34 100644 @@ -75,26 +74,13 @@ index b18345f4a7..c7342f4f34 100644 - gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F + gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8040004F - !if $(SOURCE_DEBUG_ENABLE) == TRUE - gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 -diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 6502464285..0f2cc35529 100644 ---- a/OvmfPkg/OvmfPkgIa32.dsc -+++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -528,7 +528,7 @@ - # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may - # // significantly impact boot performance - # DEBUG_ERROR 0x80000000 // Error -- gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F -+ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8040004F - !if $(SOURCE_DEBUG_ENABLE) == TRUE gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index aa40cdbadb..3f3e3f0526 100644 +index 5273113e0f..db2abc7cd3 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -550,7 +550,7 @@ +@@ -551,7 +551,7 @@ # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may # // significantly impact boot performance # DEBUG_ERROR 0x80000000 // Error @@ -104,7 +90,7 @@ index aa40cdbadb..3f3e3f0526 100644 !if $(SOURCE_DEBUG_ENABLE) == TRUE gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 5600a25954..e8d1c48ca1 100644 +index fbbe0656b4..75768c37c6 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 c43d18a..48b7360 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 a746987ffec6322426fe28c93305d83c8645e0ec Mon Sep 17 00:00:00 2001 +From a3bb6ef0037323bf330d2f16cd4863ecc0a82b81 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 @@ -80,10 +80,9 @@ Signed-off-by: Paolo Bonzini (cherry picked from commit 1355849ad97c1e4a5c430597a377165a5cc118f7) --- OvmfPkg/AmdSev/AmdSevX64.dsc | 10 ++++++++-- - OvmfPkg/OvmfPkgIa32.dsc | 10 ++++++++-- OvmfPkg/OvmfPkgIa32X64.dsc | 10 ++++++++-- OvmfPkg/OvmfPkgX64.dsc | 10 ++++++++-- - 4 files changed, 32 insertions(+), 8 deletions(-) + 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc index c7342f4f34..b4fb1554e7 100644 @@ -106,32 +105,11 @@ index c7342f4f34..b4fb1554e7 100644 OvmfPkg/VirtioGpuDxe/VirtioGpu.inf # -diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 0f2cc35529..9e3f9673cf 100644 ---- a/OvmfPkg/OvmfPkgIa32.dsc -+++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -808,8 +808,14 @@ - MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf - MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf - -- OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf -- OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf -+ OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf { -+ -+ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F -+ } -+ OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf { -+ -+ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F -+ } - OvmfPkg/VirtioGpuDxe/VirtioGpu.inf - OvmfPkg/VirtHstiDxe/VirtHstiDxe.inf - diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 3f3e3f0526..c9a19b8e58 100644 +index db2abc7cd3..935cbab30d 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -847,8 +847,14 @@ +@@ -848,8 +848,14 @@ MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf @@ -149,7 +127,7 @@ index 3f3e3f0526..c9a19b8e58 100644 OvmfPkg/VirtHstiDxe/VirtHstiDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index e8d1c48ca1..cb1ad574c2 100644 +index 75768c37c6..c27cf21deb 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -979,8 +979,14 @@ diff --git a/0009-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch b/0009-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch index 830fc06..de47f3a 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 1cd95a1d3d7de8efb2b1673fcc3d3cb1ff84967a Mon Sep 17 00:00:00 2001 +From b7ea0f898387c9d8fe1f04bc2156e0d696d80eeb 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 738f1b1403..d14888508d 100644 +index 24416ca984..6432b03c27 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -559,7 +559,10 @@ +@@ -579,7 +579,10 @@ # # Video support # @@ -77,10 +77,10 @@ index 738f1b1403..d14888508d 100644 OvmfPkg/PlatformDxe/Platform.inf diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc -index eee9590a7e..eb9f4b9fca 100644 +index ebdb7dc834..354d16ac28 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc -@@ -467,7 +467,10 @@ +@@ -463,7 +463,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 020ff66..6c1260b 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 ad73ab2cd9fe347c2d857364b0cc6a76202b610f Mon Sep 17 00:00:00 2001 +From 3b9d1965958e2b76a09500a16fd5e19f561479ae 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 480a230..82a572c 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 f6997042745a9d1594d5f8d1bbabd4c256b437af Mon Sep 17 00:00:00 2001 +From 03a7bc5196c937121618c01cb468f89614fac322 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 @@ -57,10 +57,9 @@ Signed-off-by: Paolo Bonzini (cherry picked from commit ed89844b47f46cfe911f1bf2bda40e537a908502) --- OvmfPkg/AmdSev/AmdSevX64.dsc | 5 ++++- - OvmfPkg/OvmfPkgIa32.dsc | 5 ++++- OvmfPkg/OvmfPkgIa32X64.dsc | 5 ++++- OvmfPkg/OvmfPkgX64.dsc | 5 ++++- - 4 files changed, 16 insertions(+), 4 deletions(-) + 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc index b4fb1554e7..97f595b38a 100644 @@ -78,27 +77,11 @@ index b4fb1554e7..97f595b38a 100644 MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf -diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 9e3f9673cf..ae18ef3ad1 100644 ---- a/OvmfPkg/OvmfPkgIa32.dsc -+++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -803,7 +803,10 @@ - MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf - MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf - MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf -- MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf -+ MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf { -+ -+ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F -+ } - MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf - MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf - MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index c9a19b8e58..4d9f28743e 100644 +index 935cbab30d..5bb2a7cef7 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -842,7 +842,10 @@ +@@ -843,7 +843,10 @@ MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf @@ -111,7 +94,7 @@ index c9a19b8e58..4d9f28743e 100644 MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index cb1ad574c2..dbb973cd13 100644 +index c27cf21deb..62d6a008c6 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -974,7 +974,10 @@ diff --git a/0012-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch b/0012-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch index 49c905c..d15f7a6 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 aeebf10a86cc381a49083992eda48b8333df668f Mon Sep 17 00:00:00 2001 +From 5b0bc2cc3e84b8951e82246b12c3aef80c433b70 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" @@ -32,18 +32,18 @@ Signed-off-by: Miroslav Rezanina 2 files changed, 18 insertions(+) diff --git a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c -index 646a9a5f15..98e2f1f74a 100644 +index 4598233ec1..66fba2d64d 100644 --- a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c +++ b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c -@@ -19,6 +19,7 @@ +@@ -20,6 +20,7 @@ #include #include #include +#include #include + #include #include - #include -@@ -1224,6 +1225,22 @@ QemuKernelLoaderFsDxeEntrypoint ( +@@ -1304,6 +1305,22 @@ QemuKernelLoaderFsDxeEntrypoint ( if ((Blob == NULL) && (mKernelNamedBlobCount == 0)) { DEBUG ((DEBUG_INFO, "%a: no kernel and no named blobs present -> quit\n", __func__)); Status = EFI_NOT_FOUND; @@ -67,7 +67,7 @@ index 646a9a5f15..98e2f1f74a 100644 } diff --git a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf -index a2f44bbca1..e46e5e47d1 100644 +index d24bd17c60..3794223524 100644 --- a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf +++ b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf @@ -28,6 +28,7 @@ @@ -76,5 +76,5 @@ index a2f44bbca1..e46e5e47d1 100644 DebugLib + DebugPrintErrorLevelLib DevicePathLib + HobLib MemoryAllocationLib - PrintLib 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 2ed0d98..fdd9a85 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 7997189087f6b062893f89c21dbe20eaa0159519 Mon Sep 17 00:00:00 2001 +From 28b4ba4dcd57eda5ef568ef6f4e08a0cb0007ab6 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 diff --git a/0014-OvmfPkg-Remove-EbcDxe-RHEL-only.patch b/0014-OvmfPkg-Remove-EbcDxe-RHEL-only.patch index 0280056..33b2efd 100644 --- a/0014-OvmfPkg-Remove-EbcDxe-RHEL-only.patch +++ b/0014-OvmfPkg-Remove-EbcDxe-RHEL-only.patch @@ -1,4 +1,4 @@ -From a5b492864ac47e1e08a8bde2972952fb47b83b24 Mon Sep 17 00:00:00 2001 +From 42fd784f17f7ce1c2d2fe1b29cd4ac9aff198f7b 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) @@ -20,13 +20,11 @@ Signed-off-by: Miroslav Rezanina --- OvmfPkg/AmdSev/AmdSevX64.dsc | 1 - OvmfPkg/AmdSev/AmdSevX64.fdf | 1 - - OvmfPkg/OvmfPkgIa32.dsc | 1 - - OvmfPkg/OvmfPkgIa32.fdf | 1 - OvmfPkg/OvmfPkgIa32X64.dsc | 1 - OvmfPkg/OvmfPkgIa32X64.fdf | 1 - OvmfPkg/OvmfPkgX64.dsc | 1 - OvmfPkg/OvmfPkgX64.fdf | 1 - - 8 files changed, 8 deletions(-) + 6 files changed, 6 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc index 97f595b38a..06b8bf7275 100644 @@ -41,34 +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 89b49ea768..7750c0fbe5 100644 +index dbb733310e..d49e51da69 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf -@@ -212,7 +212,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf - - INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf - INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf --INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf - INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf - INF UefiCpuPkg/CpuDxe/CpuDxe.inf - INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf -diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index ae18ef3ad1..c5c5b4d5c2 100644 ---- a/OvmfPkg/OvmfPkgIa32.dsc -+++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -735,7 +735,6 @@ - !include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc - } - -- MdeModulePkg/Universal/EbcDxe/EbcDxe.inf - UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf - UefiCpuPkg/CpuDxe/CpuDxe.inf - OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf -diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index ea693bf4a0..e4098005be 100644 ---- a/OvmfPkg/OvmfPkgIa32.fdf -+++ b/OvmfPkg/OvmfPkgIa32.fdf -@@ -216,7 +216,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf +@@ -149,7 +149,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf @@ -77,10 +51,10 @@ index ea693bf4a0..e4098005be 100644 INF UefiCpuPkg/CpuDxe/CpuDxe.inf INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 4d9f28743e..74000e1c28 100644 +index 5bb2a7cef7..59c205ead5 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -770,7 +770,6 @@ +@@ -771,7 +771,6 @@ !include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc } @@ -89,10 +63,10 @@ index 4d9f28743e..74000e1c28 100644 UefiCpuPkg/CpuDxe/CpuDxe.inf OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index 081faa5ee6..0d04e23c78 100644 +index 2ab9bcf45c..a6054701a7 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -226,7 +226,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf +@@ -187,7 +187,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf @@ -101,7 +75,7 @@ index 081faa5ee6..0d04e23c78 100644 INF UefiCpuPkg/CpuDxe/CpuDxe.inf INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index dbb973cd13..0d68f4064d 100644 +index 62d6a008c6..7342d5871e 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -879,7 +879,6 @@ @@ -113,10 +87,10 @@ index dbb973cd13..0d68f4064d 100644 UefiCpuPkg/CpuDxe/CpuDxe.inf { diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index b332d3bb8e..f081a28179 100644 +index 3eec3145ad..b9f88a32fc 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -257,7 +257,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf +@@ -197,7 +197,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf diff --git a/0015-OvmfPkg-Remove-VirtioGpu-device-driver-RHEL-only.patch b/0015-OvmfPkg-Remove-VirtioGpu-device-driver-RHEL-only.patch index feaddf7..742cda8 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 c5772ea42b123c9dc3233b578ae5453ed1a8c5ba Mon Sep 17 00:00:00 2001 +From 1abeb1fd3164d212d799d9a767eeeb15a5c911e3 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) @@ -20,13 +20,11 @@ Signed-off-by: Miroslav Rezanina --- OvmfPkg/AmdSev/AmdSevX64.dsc | 1 - OvmfPkg/AmdSev/AmdSevX64.fdf | 1 - - OvmfPkg/OvmfPkgIa32.dsc | 1 - - OvmfPkg/OvmfPkgIa32.fdf | 1 - OvmfPkg/OvmfPkgIa32X64.dsc | 1 - OvmfPkg/OvmfPkgIa32X64.fdf | 1 - OvmfPkg/OvmfPkgX64.dsc | 1 - OvmfPkg/OvmfPkgX64.fdf | 1 - - 8 files changed, 8 deletions(-) + 6 files changed, 6 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc index 06b8bf7275..6efc896439 100644 @@ -41,10 +39,10 @@ index 06b8bf7275..6efc896439 100644 # # ISA Support diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf -index 7750c0fbe5..c0468cf4d1 100644 +index d49e51da69..6177fb65c3 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf -@@ -291,7 +291,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf +@@ -228,7 +228,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf @@ -52,35 +50,11 @@ index 7750c0fbe5..c0468cf4d1 100644 INF OvmfPkg/PlatformDxe/Platform.inf INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf -diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index c5c5b4d5c2..694230cf88 100644 ---- a/OvmfPkg/OvmfPkgIa32.dsc -+++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -818,7 +818,6 @@ - - gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F - } -- OvmfPkg/VirtioGpuDxe/VirtioGpu.inf - OvmfPkg/VirtHstiDxe/VirtHstiDxe.inf - - # -diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index e4098005be..4017260b9e 100644 ---- a/OvmfPkg/OvmfPkgIa32.fdf -+++ b/OvmfPkg/OvmfPkgIa32.fdf -@@ -308,7 +308,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf - - INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf - INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf --INF OvmfPkg/VirtioGpuDxe/VirtioGpu.inf - INF OvmfPkg/PlatformDxe/Platform.inf - INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf - INF OvmfPkg/VirtHstiDxe/VirtHstiDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 74000e1c28..00a298b8d3 100644 +index 59c205ead5..24a27f34ea 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -857,7 +857,6 @@ +@@ -858,7 +858,6 @@ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F } @@ -89,10 +63,10 @@ index 74000e1c28..00a298b8d3 100644 # diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index 0d04e23c78..6e525fc76e 100644 +index a6054701a7..d8a1dcca04 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -324,7 +324,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf +@@ -285,7 +285,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf @@ -101,7 +75,7 @@ index 0d04e23c78..6e525fc76e 100644 INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 0d68f4064d..3d734421af 100644 +index 7342d5871e..5a8ffe8828 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -989,7 +989,6 @@ @@ -113,10 +87,10 @@ index 0d68f4064d..3d734421af 100644 # diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index f081a28179..2a0b192b24 100644 +index b9f88a32fc..84a77918ba 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -362,7 +362,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf +@@ -303,7 +303,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 a1c6a38..450c923 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 1087f1f600f1fc8eb8ffd484acb6d13cfccba969 Mon Sep 17 00:00:00 2001 +From 948e269f5424976af342eaed0725bcd7ee384706 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) @@ -18,43 +18,17 @@ Suggested-by: Laszlo Ersek Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Miroslav Rezanina --- - OvmfPkg/OvmfPkgIa32.dsc | 1 - - OvmfPkg/OvmfPkgIa32.fdf | 1 - OvmfPkg/OvmfPkgIa32X64.dsc | 1 - OvmfPkg/OvmfPkgIa32X64.fdf | 1 - OvmfPkg/OvmfPkgX64.dsc | 1 - OvmfPkg/OvmfPkgX64.fdf | 1 - - 6 files changed, 6 deletions(-) + 4 files changed, 4 deletions(-) -diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 694230cf88..0b7d1cb48e 100644 ---- a/OvmfPkg/OvmfPkgIa32.dsc -+++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -796,7 +796,6 @@ - MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf - FatPkg/EnhancedFatDxe/Fat.inf - MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf -- OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf - MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf - MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf - MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf -diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index 4017260b9e..80ee28444f 100644 ---- a/OvmfPkg/OvmfPkgIa32.fdf -+++ b/OvmfPkg/OvmfPkgIa32.fdf -@@ -281,7 +281,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour - - INF FatPkg/EnhancedFatDxe/Fat.inf - INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf --INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf - - INF MdeModulePkg/Logo/LogoDxe.inf - diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 00a298b8d3..0df428fab0 100644 +index 24a27f34ea..4c8d78ba80 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -835,7 +835,6 @@ +@@ -836,7 +836,6 @@ MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf @@ -63,10 +37,10 @@ index 00a298b8d3..0df428fab0 100644 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index 6e525fc76e..962f17d236 100644 +index d8a1dcca04..bf3411774f 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -292,7 +292,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour +@@ -253,7 +253,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour INF FatPkg/EnhancedFatDxe/Fat.inf INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf @@ -75,7 +49,7 @@ index 6e525fc76e..962f17d236 100644 INF MdeModulePkg/Logo/LogoDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 3d734421af..ed35b15fe2 100644 +index 5a8ffe8828..fee634edd3 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -967,7 +967,6 @@ @@ -87,10 +61,10 @@ index 3d734421af..ed35b15fe2 100644 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index 2a0b192b24..8c592f5f9e 100644 +index 84a77918ba..f0a3664339 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -328,7 +328,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour +@@ -269,7 +269,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour INF FatPkg/EnhancedFatDxe/Fat.inf INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf diff --git a/0017-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch b/0017-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch index 57c197f..70c4ddb 100644 --- a/0017-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch +++ b/0017-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch @@ -1,4 +1,4 @@ -From 1abfbfc7e4bef8346a9b71384f173b2b300c37da Mon Sep 17 00:00:00 2001 +From 78172198efd225c2b2d0d4de685e497e27ec7816 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 d14888508d..5630bf79d6 100644 +index 6432b03c27..a0bf583b54 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -487,7 +487,6 @@ +@@ -507,7 +507,6 @@ MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf @@ -36,7 +36,7 @@ index d14888508d..5630bf79d6 100644 # # Bds diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -index e25d6bbe07..6b444be30c 100644 +index df9fa67ddf..9d67ee607f 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc @@ -90,7 +90,6 @@ READ_LOCK_STATUS = TRUE @@ -48,10 +48,10 @@ index e25d6bbe07..6b444be30c 100644 # # Status Code Routing diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc -index eb9f4b9fca..281eb0680c 100644 +index 354d16ac28..f1aa5a78a9 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc -@@ -395,7 +395,6 @@ +@@ -391,7 +391,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 b61c82c..cc19f17 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 d5438203ad4c36f4a5e573950d2741de3aff731a Mon Sep 17 00:00:00 2001 +From 6a292afd406e0f596401865e045d07cbfb007e7d 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) @@ -20,13 +20,11 @@ Signed-off-by: Miroslav Rezanina --- OvmfPkg/AmdSev/AmdSevX64.dsc | 1 - OvmfPkg/AmdSev/AmdSevX64.fdf | 1 - - OvmfPkg/OvmfPkgIa32.dsc | 1 - - OvmfPkg/OvmfPkgIa32.fdf | 1 - OvmfPkg/OvmfPkgIa32X64.dsc | 1 - OvmfPkg/OvmfPkgIa32X64.fdf | 1 - OvmfPkg/OvmfPkgX64.dsc | 1 - OvmfPkg/OvmfPkgX64.fdf | 1 - - 8 files changed, 8 deletions(-) + 6 files changed, 6 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc index 6efc896439..717956cfc9 100644 @@ -41,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 c0468cf4d1..b8f32fe002 100644 +index 6177fb65c3..069dc40e97 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf -@@ -271,7 +271,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf +@@ -208,7 +208,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf INF FatPkg/EnhancedFatDxe/Fat.inf @@ -52,35 +50,11 @@ index c0468cf4d1..b8f32fe002 100644 INF OvmfPkg/AmdSev/SecretDxe/SecretDxe.inf INF OvmfPkg/AmdSev/Grub/Grub.inf -diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 0b7d1cb48e..7e4b7a50a2 100644 ---- a/OvmfPkg/OvmfPkgIa32.dsc -+++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -795,7 +795,6 @@ - MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf - MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf - FatPkg/EnhancedFatDxe/Fat.inf -- MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf - MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf - MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf - MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf -diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index 80ee28444f..6356996018 100644 ---- a/OvmfPkg/OvmfPkgIa32.fdf -+++ b/OvmfPkg/OvmfPkgIa32.fdf -@@ -280,7 +280,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf - INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf - - INF FatPkg/EnhancedFatDxe/Fat.inf --INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf - - INF MdeModulePkg/Logo/LogoDxe.inf - diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 0df428fab0..a32264227a 100644 +index 4c8d78ba80..2be6a1321c 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -834,7 +834,6 @@ +@@ -835,7 +835,6 @@ MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf @@ -89,10 +63,10 @@ index 0df428fab0..a32264227a 100644 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index 962f17d236..5db0e7c837 100644 +index bf3411774f..c1b9b9b6d7 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -291,7 +291,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf +@@ -252,7 +252,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf INF FatPkg/EnhancedFatDxe/Fat.inf @@ -101,7 +75,7 @@ index 962f17d236..5db0e7c837 100644 INF MdeModulePkg/Logo/LogoDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index ed35b15fe2..3694dbc2b5 100644 +index fee634edd3..724a84554c 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -966,7 +966,6 @@ @@ -113,10 +87,10 @@ index ed35b15fe2..3694dbc2b5 100644 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index 8c592f5f9e..67121bc684 100644 +index f0a3664339..9f24e6cd88 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -327,7 +327,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf +@@ -268,7 +268,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf INF FatPkg/EnhancedFatDxe/Fat.inf diff --git a/0019-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch b/0019-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch index a7fabdf..8d26811 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 a6bfbbfeeae914d6ec58ab7ab84e3358d403d264 Mon Sep 17 00:00:00 2001 +From 9dbf4272b3c0a23974806cb7956d10adf176ac55 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 5630bf79d6..ae021fad54 100644 +index a0bf583b54..a0a36632c2 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -486,7 +486,6 @@ +@@ -506,7 +506,6 @@ MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf @@ -36,7 +36,7 @@ index 5630bf79d6..ae021fad54 100644 # # Bds diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -index 6b444be30c..e487e15eb1 100644 +index 9d67ee607f..e476343401 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc @@ -89,7 +89,6 @@ READ_LOCK_STATUS = TRUE @@ -48,10 +48,10 @@ index 6b444be30c..e487e15eb1 100644 # # Status Code Routing diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc -index 281eb0680c..9a746ba75d 100644 +index f1aa5a78a9..8212cd2a00 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc -@@ -394,7 +394,6 @@ +@@ -390,7 +390,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 ef32f65..cfd6581 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 0a76a4f4a131e7e5432d8477647b3da327d7304d Mon Sep 17 00:00:00 2001 +From b7953417ba9a4db13049d2428b3ed43f48bbc6d2 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 839374e..12e14c2 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 e90dc4acad3bc00a08af2f0bb8a5685dc0225fd8 Mon Sep 17 00:00:00 2001 +From ecc0fc23de0ae74e90d50ae99cdde34a0eec9efe 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 cefe2ea..ac6146d 100644 --- a/0022-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch +++ b/0022-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch @@ -1,4 +1,4 @@ -From d430e75930ddf9532611d26509ea65bc921adc44 Mon Sep 17 00:00:00 2001 +From 33411781440d81b039a48637c0772ecaec88f7e4 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 1b4026a..922e968 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 7347ee13bc5e1eea267231a5d1e2fc4e7957e0fc Mon Sep 17 00:00:00 2001 +From 8f2163ec41344d311f9d985a7325b7fa4c4b122d 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 96438c1..c480db4 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 47aa6429eeccf793064cda3a450879977fb500ab Mon Sep 17 00:00:00 2001 +From c5d8df4e356938b081d0a42b5f127337b0d211cb 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 ca63bdd..4e44ada 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 b91946a0dc8bdc8c55005854e2177a1b6a1e9511 Mon Sep 17 00:00:00 2001 +From 555619114921a2e44fae3fb4e741b291e6b9de1b 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,10 +73,10 @@ index 8a8fdfefc7..11d01106d4 100644 getuid ( void diff --git a/CryptoPkg/Library/Include/CrtLibSupport.h b/CryptoPkg/Library/Include/CrtLibSupport.h -index 80e2fa9ca5..f344691d0d 100644 +index 4da2ef61f7..5cf2de58a9 100644 --- a/CryptoPkg/Library/Include/CrtLibSupport.h +++ b/CryptoPkg/Library/Include/CrtLibSupport.h -@@ -68,6 +68,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent +@@ -62,6 +62,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent // // Definitions for global constants used by CRT library routines // @@ -84,7 +84,7 @@ index 80e2fa9ca5..f344691d0d 100644 #define EINVAL 22 /* Invalid argument */ #define EAFNOSUPPORT 47 /* Address family not supported by protocol family */ #define INT_MAX 0x7FFFFFFF /* Maximum (signed) int value */ -@@ -96,6 +97,15 @@ SPDX-License-Identifier: BSD-2-Clause-Patent +@@ -90,6 +91,15 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #define NS_INADDRSZ 4 /*%< IPv4 T_A */ #define NS_IN6ADDRSZ 16 /*%< IPv6 T_AAAA */ @@ -100,7 +100,7 @@ index 80e2fa9ca5..f344691d0d 100644 // // Basic types mapping // -@@ -322,6 +332,37 @@ fprintf ( +@@ -316,6 +326,37 @@ fprintf ( ... ); diff --git a/0026-NetworkPkg-DxeNetLib-Reword-PseudoRandom-error-loggi.patch b/0026-NetworkPkg-DxeNetLib-Reword-PseudoRandom-error-loggi.patch index c7bf367..f54ddb9 100644 --- a/0026-NetworkPkg-DxeNetLib-Reword-PseudoRandom-error-loggi.patch +++ b/0026-NetworkPkg-DxeNetLib-Reword-PseudoRandom-error-loggi.patch @@ -1,4 +1,4 @@ -From 39bf29d3ac9fdeccef41cc77ba32af092f02121b Mon Sep 17 00:00:00 2001 +From a7adaad69c0af3dde7184ccb2c725ca84986d1c7 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 d88d04a..40d28b0 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 31dbf8ef1a2d46f22b387c3a8334be2c9b09bfcb Mon Sep 17 00:00:00 2001 +From a6f05c646722bb85de8b2f21af47e0f88e103010 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) @@ -315,7 +315,7 @@ index 0000000000..77332bc51c + +#endif diff --git a/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf -index 8257862662..50a9ee94ad 100644 +index 9675eb081f..0d4a7c83d6 100644 --- a/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf +++ b/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf @@ -25,6 +25,8 @@ 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 91e809e..c3f5704 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 0e021bb6df65419ea1f813501ad5781c63c5adab Mon Sep 17 00:00:00 2001 +From f3548d62625d5ad2728078e4188e9f40965dbfe2 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) @@ -67,7 +67,7 @@ index 2c24c65489..273e6f6a7e 100644 // Show the splash screen. // diff --git a/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBootManagerLib.inf b/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBootManagerLib.inf -index 6c5552da16..1de19eb507 100644 +index 9e89556b14..8ccd306780 100644 --- a/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBootManagerLib.inf +++ b/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBootManagerLib.inf @@ -27,6 +27,8 @@ diff --git a/0029-OvmfPkg-X64-add-opt-org.tianocore-UninstallMemAttrPr.patch b/0029-OvmfPkg-X64-add-opt-org.tianocore-UninstallMemAttrPr.patch index 4ac0279..8df837b 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 64f54ac01b844d2f3da42915a495b33600d0574a Mon Sep 17 00:00:00 2001 +From d66a5ff583903e27bd3851e41c3ee17f697f60af 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 @@ -102,7 +102,7 @@ index 2982b4f288..b1722a28dd 100644 // Process QEMU's -kernel command line option // diff --git a/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf -index 50a9ee94ad..46989ff39d 100644 +index 0d4a7c83d6..e9a0062b5d 100644 --- a/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf +++ b/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf @@ -67,6 +67,7 @@ diff --git a/0030-OvmfPkg-MemDebugLogLib-use-AcquireSpinLockOrFail.patch b/0030-OvmfPkg-MemDebugLogLib-use-AcquireSpinLockOrFail.patch new file mode 100644 index 0000000..2257b8c --- /dev/null +++ b/0030-OvmfPkg-MemDebugLogLib-use-AcquireSpinLockOrFail.patch @@ -0,0 +1,49 @@ +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/0030-SecurityPkg-Tpm2DeviceLibDTpm-Remove-global-variable.patch b/0030-SecurityPkg-Tpm2DeviceLibDTpm-Remove-global-variable.patch deleted file mode 100644 index f59a395..0000000 --- a/0030-SecurityPkg-Tpm2DeviceLibDTpm-Remove-global-variable.patch +++ /dev/null @@ -1,150 +0,0 @@ -From f959d0c58a7f9c8e8b2155a145328fec5cab1edf Mon Sep 17 00:00:00 2001 -From: Phil Noh -Date: Fri, 5 Sep 2025 15:11:15 -0500 -Subject: [PATCH] SecurityPkg/Tpm2DeviceLibDTpm: Remove global variable for - command code - -As a BASE type library, currently the TCG PEI driver, Tcg2Pei.inf links -the library. On edk2-stable202508 version, it is found that the driver -includes and updates the global variable of mLastCommandSent in debug -build. Also found that the previous commit (460f270) for the library adds -and uses the global variable. Updating the global variable in PEI drivers -could affect the following issues. To address these issues, remove the -global variable usage. - -PEI ROM Boot : Global variable is not updated -PEI RAM Boot : PEI FV integration/security check is failed - -Signed-off-by: Phil Noh ---- - .../Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpmDump.c | 13 +++++-------- - SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Ptp.c | 9 ++++++++- - SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Ptp.h | 4 +++- - SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Tis.c | 9 ++++++++- - 4 files changed, 24 insertions(+), 11 deletions(-) - -diff --git a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpmDump.c b/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpmDump.c -index 7b2e449130..56a9684299 100644 ---- a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpmDump.c -+++ b/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpmDump.c -@@ -218,8 +218,6 @@ TPM2_CODE_STRING ResponseCodeStrings[] = { - }; - UINTN ResponseCodeStringsCount = sizeof (ResponseCodeStrings) / sizeof (ResponseCodeStrings[0]); - --UINT32 mLastCommandSent = 0; -- - /** - This simple function will dump up to MAX_TPM_BUFFER_DUMP bytes - of a TPM data buffer and apppend '...' if buffer is larger. -@@ -678,9 +676,6 @@ DumpTpmInputBlock ( - // If verbose, dump all of the buffer contents for deeper analysis. - DumpTpmBuffer ("DATA: ", MIN (InputBlockSize, NativeSize), InputBlock); - -- // Update the last command sent so that response parsing can have some context. -- mLastCommandSent = NativeCode; -- - return; - } - -@@ -690,13 +685,15 @@ DumpTpmInputBlock ( - - @param[in] OutputBlockSize Size of the output buffer. - @param[in] OutputBlock Pointer to the output buffer itself. -+ @param[in] CommandCode Command code for the input block. - - **/ - VOID - EFIAPI - DumpTpmOutputBlock ( - IN UINT32 OutputBlockSize, -- IN CONST UINT8 *OutputBlock -+ IN CONST UINT8 *OutputBlock, -+ IN UINT32 CommandCode - ) - { - CONST TPM2_RESPONSE_HEADER *RespHeader; -@@ -716,8 +713,8 @@ DumpTpmOutputBlock ( - DEBUG ((DEBUG_SECURITY, "Size: %d (0x%X)\n", NativeSize, NativeSize)); - - // Debug anything else based on the Command context. -- if (mLastCommandSent != 0x00) { -- switch (mLastCommandSent) { -+ if (CommandCode != 0x00) { -+ switch (CommandCode) { - case TPM_CC_StartAuthSession: - DumpTpmStartAuthSessionResponse (OutputBlockSize, OutputBlock); - break; -diff --git a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Ptp.c b/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Ptp.c -index d3054690e2..dc67786736 100644 ---- a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Ptp.c -+++ b/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Ptp.c -@@ -162,6 +162,7 @@ PtpCrbTpmCommand ( - UINT16 Data16; - UINT32 Data32; - UINT8 RetryCnt; -+ UINT32 CommandCode; - - DEBUG_CODE_BEGIN (); - DumpTpmInputBlock (SizeIn, BufferIn); -@@ -336,7 +337,13 @@ PtpCrbTpmCommand ( - } - - DEBUG_CODE_BEGIN (); -- DumpTpmOutputBlock (TpmOutSize, BufferOut); -+ if (SizeIn >= sizeof (TPM2_COMMAND_HEADER)) { -+ CommandCode = SwapBytes32 (((TPM2_COMMAND_HEADER *)BufferIn)->commandCode); -+ } else { -+ CommandCode = 0; -+ } -+ -+ DumpTpmOutputBlock (TpmOutSize, BufferOut, CommandCode); - DEBUG_CODE_END (); - - // -diff --git a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Ptp.h b/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Ptp.h -index 8b7c37bb9b..7061414040 100644 ---- a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Ptp.h -+++ b/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Ptp.h -@@ -73,12 +73,14 @@ DumpTpmInputBlock ( - a response from the TPM for maximum user-readability. - @param[in] OutputBlockSize Size of the output buffer. - @param[in] OutputBlock Pointer to the output buffer itself. -+ @param[in] CommandCode Command code for the input block. - **/ - VOID - EFIAPI - DumpTpmOutputBlock ( - IN UINT32 OutputBlockSize, -- IN CONST UINT8 *OutputBlock -+ IN CONST UINT8 *OutputBlock, -+ IN UINT32 CommandCode - ); - - #endif // TPM2_PTP_H_ -diff --git a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Tis.c b/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Tis.c -index d2f0abd160..1e141c9272 100644 ---- a/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Tis.c -+++ b/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Tis.c -@@ -223,6 +223,7 @@ Tpm2TisTpmCommand ( - UINT32 TpmOutSize; - UINT16 Data16; - UINT32 Data32; -+ UINT32 CommandCode; - - DEBUG_CODE_BEGIN (); - DumpTpmInputBlock (SizeIn, BufferIn); -@@ -370,7 +371,13 @@ Tpm2TisTpmCommand ( - - Exit: - DEBUG_CODE_BEGIN (); -- DumpTpmOutputBlock (TpmOutSize, BufferOut); -+ if (SizeIn >= sizeof (TPM2_COMMAND_HEADER)) { -+ CommandCode = SwapBytes32 (((TPM2_COMMAND_HEADER *)BufferIn)->commandCode); -+ } else { -+ CommandCode = 0; -+ } -+ -+ DumpTpmOutputBlock (TpmOutSize, BufferOut, CommandCode); - DEBUG_CODE_END (); - MmioWrite8 ((UINTN)&TisReg->Status, TIS_PC_STS_READY); - return Status; diff --git a/0031-OvmfPkg-PlatformInitLib-reserve-igvm-parameter-area.patch b/0031-OvmfPkg-PlatformInitLib-reserve-igvm-parameter-area.patch new file mode 100644 index 0000000..46e5414 --- /dev/null +++ b/0031-OvmfPkg-PlatformInitLib-reserve-igvm-parameter-area.patch @@ -0,0 +1,91 @@ +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-build.rhel-10 b/edk2-build.rhel-10 index 3aaaa47..43279f6 100644 --- a/edk2-build.rhel-10 +++ b/edk2-build.rhel-10 @@ -12,6 +12,7 @@ CAVIUM_ERRATUM_27456 = TRUE [opts.ovmf.4m] FD_SIZE_4MB = TRUE +DEBUG_TO_MEM = TRUE [opts.ovmf.sb.smm] SECURE_BOOT_ENABLE = TRUE @@ -30,6 +31,7 @@ BUILD_SHELL = FALSE [opts.armvirt.verbose] DEBUG_PRINT_ERROR_LEVEL = 0x8040004F +DEBUG_TO_MEM = TRUE [opts.armvirt.silent] DEBUG_PRINT_ERROR_LEVEL = 0x80000000 @@ -139,7 +141,7 @@ arch = AARCH64 opts = ovmf.common armvirt.verbose pcds = nx.compat.aa64 -plat = ArmVirtQemu-AARCH64 +plat = ArmVirtQemu-AArch64 dest = RHEL-10/aarch64 cpy1 = FV/QEMU_EFI.fd cpy2 = FV/QEMU_VARS.fd @@ -155,7 +157,7 @@ arch = AARCH64 opts = ovmf.common armvirt.silent pcds = nx.compat.aa64 -plat = ArmVirtQemu-AARCH64 +plat = ArmVirtQemu-AArch64 dest = RHEL-10/aarch64 cpy1 = FV/QEMU_EFI.fd QEMU_EFI.silent.fd cpy2 = FV/QEMU_EFI.fd QEMU_EFI-silent-pflash.raw @@ -169,7 +171,7 @@ opts = ovmf.common ovmf.qemu.vars armvirt.silent pcds = nx.strict -plat = ArmVirtQemu-AARCH64 +plat = ArmVirtQemu-AArch64 dest = RHEL-10/aarch64 cpy1 = FV/QEMU_EFI.fd QEMU_EFI.qemuvars.fd cpy2 = FV/QEMU_EFI.fd QEMU_EFI-qemuvars-pflash.raw diff --git a/edk2.spec b/edk2.spec index 1365165..c7c6876 100644 --- a/edk2.spec +++ b/edk2.spec @@ -1,8 +1,8 @@ ExclusiveArch: x86_64 aarch64 riscv64 -# edk2-stable202508 -%define GITDATE 20250822 -%define GITCOMMIT d46aa46c8361 +# edk2-stable202511 +%define GITDATE 20251114 +%define GITCOMMIT 46548b1adac8 %define TOOLCHAIN GCC %define OPENSSL_VER 3.5.1 @@ -25,7 +25,7 @@ ExclusiveArch: x86_64 aarch64 riscv64 Name: edk2 Version: %{GITDATE} -Release: 4%{?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 @@ -86,7 +86,8 @@ 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-SecurityPkg-Tpm2DeviceLibDTpm-Remove-global-variable.patch +Patch28: 0030-OvmfPkg-MemDebugLogLib-use-AcquireSpinLockOrFail.patch +Patch29: 0031-OvmfPkg-PlatformInitLib-reserve-igvm-parameter-area.patch # python3-devel and libuuid-devel are required for building tools. # python3-devel is also needed for varstore template generation and @@ -464,6 +465,11 @@ install -m 0644 \ %changelog +* Tue 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 5ff26e1..b72991e 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ -SHA512 (openssl-rhel-4cf5738ac1c163d5ce2517250321da906492c40d.tar.xz) = 62993387684d0509d4f5b04f7369fdc9bec39aa84d9598b88971a2da46c636d0900612c51b2c9df14d9bbdd8399fb691c9d707efb177e82664408fc8b12b7c8a SHA512 (DBXUpdate-20251016.aa64.bin) = 2af6d22d139ff58cb2d0dc0883257b6131f1bd9cc04b4c062c21f1d0560508f8f4ea062e6946fd37c8ab47259772884e29c32a93844d5d6beadcf9e778e4ee51 SHA512 (DBXUpdate-20251016.x64.bin) = 0452d2c302f702eeb2d549fd5ac4b3c3623172de9559a881bc92875590f3c5b65e301b880f5f76786e22b1af145b2aa6e58c74fef00a279950f3d6641aef484e SHA512 (dtc-1.7.0.tar.xz) = d3ba6902a9a2f2cdbaff55f12fca3cfe4a1ec5779074a38e3d8b88097c7abc981835957e8ce72971e10c131e05fde0b1b961768e888ff96d89e42c75edb53afb -SHA512 (edk2-d46aa46c8361.tar.xz) = cfafa14c6f6c5ca4c16239c2a3c0e290a77a987b3c8c6847a6198bdacbd0d7f4e2f950a0e603c3eaa1d2dbf5312f04705be11c3c38cbd6bcb7377e24660e775d +SHA512 (edk2-46548b1adac8.tar.xz) = 56b340943585df5efacc31af564f865664ade5eb5ff443040518263dd36784045a383970e11d3925c8c33927829e00b82efbfd77447e2fb96ad50e16064e0827 +SHA512 (openssl-rhel-4cf5738ac1c163d5ce2517250321da906492c40d.tar.xz) = 62993387684d0509d4f5b04f7369fdc9bec39aa84d9598b88971a2da46c636d0900612c51b2c9df14d9bbdd8399fb691c9d707efb177e82664408fc8b12b7c8a