From 5872fb18b4e645856614429dfffbb704858a9ea7 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Thu, 20 Jun 2024 04:31:02 -0400 Subject: [PATCH] * Thu Jun 20 2024 Miroslav Rezanina - 20240524-1 - Rebase to edk2-stable202405 - Bumo openssl to 8e5beb77088b - Resolves: RHEL-32486 (rebase to edk2-stable202405 [rhel-9]) - Resolves: RHEL-36446 (edk2: enable MOR [rhel-9]) - Resolves: RHEL-21653 (CVE-2023-6237 edk2: openssl: Excessive time spent checking invalid RSA public keys [rhel-9]) - Resolves: RHEL-21150 (CVE-2023-6129 edk2: mysql: openssl: POLY1305 MAC implementation corrupts vector registers on PowerPC) - Resolves: RHEL-22490 (CVE-2024-0727 edk2: openssl: denial of service via null dereference [rhel-9]) --- .gitignore | 1 + 0003-Remove-paths-leading-to-submodules.patch | 6 +- ...minalDxe-set-xterm-resolution-on-mod.patch | 6 +- ...ResizeXterm-from-the-QEMU-command-li.patch | 26 +- ...PcdResizeXterm-from-the-QEMU-command.patch | 8 +- ...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 | 10 +- ...elLoaderFsDxe-suppress-error-on-no-k.patch | 2 +- ...Dxe-suppress-error-on-no-swtpm-in-si.patch | 10 +- 0014-OvmfPkg-Remove-EbcDxe-RHEL-only.patch | 22 +- ...ve-VirtioGpu-device-driver-RHEL-only.patch | 32 +- ...irtioFsDxe-filesystem-driver-RHEL-on.patch | 28 +- ...e-VirtioFsDxe-filesystem-driver-RHEL.patch | 14 +- ...e-UdfDxe-filesystem-driver-RHEL-only.patch | 38 +-- ...e-UdfDxe-filesystem-driver-RHEL-only.patch | 14 +- ...ftpDynamicCommand-from-shell-RHEL-on.patch | 100 ++---- ...e-TftpDynamicCommand-from-shell-RHEL.patch | 10 +- ...ttpDynamicCommand-from-shell-RHEL-on.patch | 104 ++---- ...e-HttpDynamicCommand-from-shell-RHEL.patch | 10 +- ...inuxInitrdDynamicShellCommand-RHEL-o.patch | 127 ++------ ...e-LinuxInitrdDynamicShellCommand-RHE.patch | 10 +- ...nitLib-fix-apic-mode-for-cpu-hotplug.patch | 8 +- ...Dxe-Shim-Reboot-workaround-RHEL-only.patch | 6 +- ...toPkg-CrtLib-add-stat.h-include-file.patch | 2 +- ...-add-access-open-read-write-close-sy.patch | 2 +- ...Setup-MTRR-early-in-the-boot-process.patch | 20 +- ...uralMsr.h-add-defines-for-MTRR-cache.patch | 2 +- ...ib.h-use-cache-type-defines-from-Arc.patch | 2 +- ...cache-type-defines-from-Architectura.patch | 10 +- ...e-Fixed-system-stuck-on-PXE-boot-flo.patch | 54 ++++ 0035-OvmfPkg-add-morlock-support.patch | 127 ++++++++ ...b-Add-a-smoketest-for-RDRAND-and-che.patch | 192 +++++++++++ 0037-SecurityPkg-RngDxe-add-rng-test.patch | 43 +++ 0038-OvmfPkg-wire-up-RngDxe.patch | 301 ++++++++++++++++++ ...t-call-ProcessLibraryConstructorList.patch | 37 +++ ...X86UnitTestHost-set-rdrand-cpuid-bit.patch | 43 +++ ...Pei-consider-AP-stacks-for-pei-memor.patch | 64 ---- ...Pei-log-a-warning-when-memory-is-tig.patch | 41 --- ...atformPei-log-pei-memory-cap-details.patch | 57 ---- ...rmPei-rewrite-page-table-calculation.patch | 117 ------- ...b-Add-support-for-multiple-HOBs-t.p2.patch | 73 ----- ...b-Add-support-for-multiple-HOBs-t.p3.patch | 100 ------ ...b-Add-support-for-multiple-HOBs-t.p4.patch | 162 ---------- ...b-Add-support-for-multiple-HOBs-t.p5.patch | 98 ------ ...tLib-Add-support-for-multiple-HOBs-t.patch | 108 ------- ...InitLib-return-early-in-GetBspNumber.patch | 67 ---- edk2.spec | 52 +-- sources | 4 +- 51 files changed, 1067 insertions(+), 1341 deletions(-) create mode 100644 0034-NetworkPkg-TcpDxe-Fixed-system-stuck-on-PXE-boot-flo.patch create mode 100644 0035-OvmfPkg-add-morlock-support.patch create mode 100644 0036-MdePkg-BaseRngLib-Add-a-smoketest-for-RDRAND-and-che.patch create mode 100644 0037-SecurityPkg-RngDxe-add-rng-test.patch create mode 100644 0038-OvmfPkg-wire-up-RngDxe.patch create mode 100644 0039-CryptoPkg-Test-call-ProcessLibraryConstructorList.patch create mode 100644 0040-MdePkg-X86UnitTestHost-set-rdrand-cpuid-bit.patch delete mode 100644 edk2-OvmfPkg-PlatformPei-consider-AP-stacks-for-pei-memor.patch delete mode 100644 edk2-OvmfPkg-PlatformPei-log-a-warning-when-memory-is-tig.patch delete mode 100644 edk2-OvmfPkg-PlatformPei-log-pei-memory-cap-details.patch delete mode 100644 edk2-OvmfPkg-PlatformPei-rewrite-page-table-calculation.patch delete mode 100644 edk2-UefiCpuPkg-MpInitLib-Add-support-for-multiple-HOBs-t.p2.patch delete mode 100644 edk2-UefiCpuPkg-MpInitLib-Add-support-for-multiple-HOBs-t.p3.patch delete mode 100644 edk2-UefiCpuPkg-MpInitLib-Add-support-for-multiple-HOBs-t.p4.patch delete mode 100644 edk2-UefiCpuPkg-MpInitLib-Add-support-for-multiple-HOBs-t.p5.patch delete mode 100644 edk2-UefiCpuPkg-MpInitLib-Add-support-for-multiple-HOBs-t.patch delete mode 100644 edk2-UefiCpuPkg-MpInitLib-return-early-in-GetBspNumber.patch diff --git a/.gitignore b/.gitignore index 5f10226..a1c4252 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /DBXUpdate-20230509.x64.bin /*.src.rpm /openssl-rhel-db0287935122edceb91dcda8dfb53b4090734e22.tar.xz +/openssl-rhel-8e5beb77088bfec064d60506b1e76ddb0ac417fe.tar.xz diff --git a/0003-Remove-paths-leading-to-submodules.patch b/0003-Remove-paths-leading-to-submodules.patch index 2d8fcf4..d22a3b7 100644 --- a/0003-Remove-paths-leading-to-submodules.patch +++ b/0003-Remove-paths-leading-to-submodules.patch @@ -1,4 +1,4 @@ -From 3ab8a3e323e1bafb82266c0728e60a42d173764f Mon Sep 17 00:00:00 2001 +From de9f92d118c1374243d9d3f006088a29ec7dcf8d 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,7 +27,7 @@ index 5275f657ef..39d7199753 100644 EfiRom \ GenFfs \ diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec -index a2cd83345f..98b3acb703 100644 +index f7339f0aec..badb93238f 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -26,9 +26,6 @@ @@ -41,7 +41,7 @@ index a2cd83345f..98b3acb703 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 0459418906..bb347547f8 100644 +index bf94549cbf..605b0f1be8 100644 --- a/MdePkg/MdePkg.dec +++ b/MdePkg/MdePkg.dec @@ -29,7 +29,6 @@ diff --git a/0004-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch b/0004-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch index e8b1f20..0a57269 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 1a8cccb3be265d0c423bbb42511b1d9111b076e0 Mon Sep 17 00:00:00 2001 +From 5c48211bdce4b30c86e92636e852e9da4ede4c1e 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 @@ -99,10 +99,10 @@ Signed-off-by: Laszlo Ersek 3 files changed, 36 insertions(+) diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec -index 98b3acb703..71a2967646 100644 +index badb93238f..3a67acc090 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec -@@ -2164,6 +2164,10 @@ +@@ -2222,6 +2222,10 @@ # @Prompt The value is use for Usb Network rate limiting supported. gEfiMdeModulePkgTokenSpaceGuid.PcdUsbNetworkRateLimitingFactor|100|UINT32|0x10000028 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 c2f128b..16da78e 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 cf04a1c13e796013f0cb06447127cf5cf35eb0a0 Mon Sep 17 00:00:00 2001 +From 0976965c3dd6ac841f59dc09220a6637060ba901 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 @@ -83,7 +83,7 @@ Signed-off-by: Laszlo Ersek 9 files changed, 21 insertions(+), 1 deletion(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index a31a89344a..d6bfc43fe5 100644 +index 8eb6f4f24f..627fded641 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc @@ -484,6 +484,7 @@ @@ -95,10 +95,10 @@ index a31a89344a..d6bfc43fe5 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0 diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc -index b522fa1059..c5fd84027f 100644 +index 4996885301..51a49c09ad 100644 --- a/OvmfPkg/CloudHv/CloudHvX64.dsc +++ b/OvmfPkg/CloudHv/CloudHvX64.dsc -@@ -579,6 +579,7 @@ +@@ -581,6 +581,7 @@ # ($(SMM_REQUIRE) == FALSE) gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 @@ -107,7 +107,7 @@ index b522fa1059..c5fd84027f 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.dsc b/OvmfPkg/IntelTdx/IntelTdxX64.dsc -index 82e3e41cfc..6d72b80dc9 100644 +index 0931ce061a..9f49b60ff0 100644 --- a/OvmfPkg/IntelTdx/IntelTdxX64.dsc +++ b/OvmfPkg/IntelTdx/IntelTdxX64.dsc @@ -477,6 +477,7 @@ @@ -119,10 +119,10 @@ index 82e3e41cfc..6d72b80dc9 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0 diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc -index 063324cd05..53222d80be 100644 +index 69de4dd3f1..fb73f2e089 100644 --- a/OvmfPkg/Microvm/MicrovmX64.dsc +++ b/OvmfPkg/Microvm/MicrovmX64.dsc -@@ -582,7 +582,7 @@ +@@ -590,7 +590,7 @@ # only set when # ($(SMM_REQUIRE) == FALSE) gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 @@ -132,7 +132,7 @@ index 063324cd05..53222d80be 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0 diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 28379961a7..4f6dfedc2c 100644 +index 2ca005d768..dddef5ed0e 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -599,6 +599,7 @@ @@ -144,7 +144,7 @@ index 28379961a7..4f6dfedc2c 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 5e9eee628a..923e187942 100644 +index a39070a626..933abb258f 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -611,6 +611,7 @@ @@ -156,7 +156,7 @@ index 5e9eee628a..923e187942 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index bf4c7906c4..06b38b1715 100644 +index 1b90aa8f57..04157ab14b 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -629,6 +629,7 @@ @@ -168,7 +168,7 @@ index bf4c7906c4..06b38b1715 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c -index f5dc41c3a8..f244dcd24d 100644 +index df35726ff6..6c786bfc1e 100644 --- a/OvmfPkg/PlatformPei/Platform.c +++ b/OvmfPkg/PlatformPei/Platform.c @@ -41,6 +41,18 @@ @@ -199,10 +199,10 @@ index f5dc41c3a8..f244dcd24d 100644 InstallClearCacheCallback (); diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf -index ad52be3065..d7d688284b 100644 +index e036018eab..a2f59e8fc8 100644 --- a/OvmfPkg/PlatformPei/PlatformPei.inf +++ b/OvmfPkg/PlatformPei/PlatformPei.inf -@@ -100,6 +100,7 @@ +@@ -103,6 +103,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved diff --git a/0006-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch b/0006-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch index 51096ae..47be70d 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 65e47dac7f0c2cc4d5fa2513f4a217a060c9da3c Mon Sep 17 00:00:00 2001 +From 4c45a397402f58a67b1d4ea1348bb79f3716c7a5 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 e48c75b5e9..181265057e 100644 +index 64aa4e96e5..c37c4ba61e 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -309,6 +309,8 @@ +@@ -311,6 +311,8 @@ gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress|0x0 !endif @@ -108,7 +108,7 @@ index e48c75b5e9..181265057e 100644 [PcdsDynamicHii] gUefiOvmfPkgTokenSpaceGuid.PcdForceNoAcpi|L"ForceNoAcpi"|gOvmfVariableGuid|0x0|FALSE|NV,BS -@@ -418,7 +420,10 @@ +@@ -416,7 +418,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 560e9c3..c8fc3b2 100644 --- a/0007-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch +++ b/0007-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch @@ -1,4 +1,4 @@ -From cf51a0c4a259a505f58c1cf626864f41cf3f27ef Mon Sep 17 00:00:00 2001 +From 3dbb4913b3e1c0413dd3016681aca3a3d12edd0d 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) @@ -65,7 +65,7 @@ Signed-off-by: Paolo Bonzini 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index d6bfc43fe5..2b4c551773 100644 +index 627fded641..cef43b34b7 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc @@ -429,7 +429,7 @@ @@ -78,7 +78,7 @@ index d6bfc43fe5..2b4c551773 100644 !if $(SOURCE_DEBUG_ENABLE) == TRUE gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 4f6dfedc2c..ae3b446ff2 100644 +index dddef5ed0e..270bd612e5 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -535,7 +535,7 @@ @@ -91,7 +91,7 @@ index 4f6dfedc2c..ae3b446ff2 100644 !if $(SOURCE_DEBUG_ENABLE) == TRUE gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 923e187942..4a547f28c0 100644 +index 933abb258f..269a4b2b21 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -542,7 +542,7 @@ @@ -104,7 +104,7 @@ index 923e187942..4a547f28c0 100644 !if $(SOURCE_DEBUG_ENABLE) == TRUE gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 06b38b1715..68bd1f6dcb 100644 +index 04157ab14b..9614cc1c56 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -561,7 +561,7 @@ diff --git a/0008-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch b/0008-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch index 963581b..d433969 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 3ece2f792aec743c42c415809846ea1ac1f0aedf Mon Sep 17 00:00:00 2001 +From ac8f2a85bad100eaf42d3537b6fcb37fa3db5fd9 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 @@ -86,7 +86,7 @@ Signed-off-by: Paolo Bonzini 4 files changed, 32 insertions(+), 8 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index 2b4c551773..f81a0ac375 100644 +index cef43b34b7..f53380aca2 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc @@ -691,8 +691,14 @@ @@ -107,7 +107,7 @@ index 2b4c551773..f81a0ac375 100644 # diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index ae3b446ff2..7e07fbfd46 100644 +index 270bd612e5..d942c7354a 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -828,8 +828,14 @@ @@ -125,10 +125,10 @@ index ae3b446ff2..7e07fbfd46 100644 + gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F + } OvmfPkg/VirtioGpuDxe/VirtioGpu.inf + OvmfPkg/VirtHstiDxe/VirtHstiDxe.inf - # diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 4a547f28c0..f28c71a7a8 100644 +index 269a4b2b21..d915b847cb 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -842,8 +842,14 @@ @@ -146,10 +146,10 @@ index 4a547f28c0..f28c71a7a8 100644 + gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F + } OvmfPkg/VirtioGpuDxe/VirtioGpu.inf + OvmfPkg/VirtHstiDxe/VirtHstiDxe.inf - # diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 68bd1f6dcb..680bdb5f4c 100644 +index 9614cc1c56..12ee5510bd 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -910,8 +910,14 @@ @@ -167,5 +167,5 @@ index 68bd1f6dcb..680bdb5f4c 100644 + gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F + } OvmfPkg/VirtioGpuDxe/VirtioGpu.inf + OvmfPkg/VirtHstiDxe/VirtHstiDxe.inf - # diff --git a/0009-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch b/0009-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch index 0fa78ac..4de197b 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 33b60bfb25647368c761ae9d875c481086e147ce Mon Sep 17 00:00:00 2001 +From 511531fe074c28dd8139f722b25979df1995e492 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 181265057e..216b5a09cc 100644 +index c37c4ba61e..00e656d0c9 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -547,7 +547,10 @@ +@@ -546,7 +546,10 @@ # # Video support # @@ -77,10 +77,10 @@ index 181265057e..216b5a09cc 100644 OvmfPkg/PlatformDxe/Platform.inf diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc -index 668a65ba64..5f07ed4dcc 100644 +index 2cf96accbd..c7918c8cf3 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc -@@ -447,7 +447,10 @@ +@@ -450,7 +450,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 689d192..08fcb0b 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 d4be04b114213cc9b8ee4ce86a91a1c7e2c3928a Mon Sep 17 00:00:00 2001 +From 3bf394bd43a4cf00c2b52b965b47b8194a406166 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 e8608d1..d81f03a 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 e76b481430fc3ef2398cdbe4d21ce002050aa12b Mon Sep 17 00:00:00 2001 +From b9ac7e96d76caa161d1689c0436551e95728ac0e 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 @@ -63,7 +63,7 @@ Signed-off-by: Paolo Bonzini 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index f81a0ac375..bdb786d10d 100644 +index f53380aca2..32f47704bc 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc @@ -686,7 +686,10 @@ @@ -79,7 +79,7 @@ index f81a0ac375..bdb786d10d 100644 MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 7e07fbfd46..8a8c7a0b37 100644 +index d942c7354a..49540d54d0 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -823,7 +823,10 @@ @@ -95,7 +95,7 @@ index 7e07fbfd46..8a8c7a0b37 100644 MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index f28c71a7a8..4bde14a05a 100644 +index d915b847cb..1c4e0514ed 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -837,7 +837,10 @@ @@ -111,7 +111,7 @@ index f28c71a7a8..4bde14a05a 100644 MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 680bdb5f4c..a43352ede4 100644 +index 12ee5510bd..e50e63b3f6 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -905,7 +905,10 @@ diff --git a/0012-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch b/0012-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch index 48c53fc..8f928ba 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 47ad6974185793994d69620d989f6d695f513c9c Mon Sep 17 00:00:00 2001 +From 8c67b1b96e42c39a3562c8790ae5985a240edfce 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 c282c85..02d0290 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 26a8f215a1cee1b876105127ad22c68a7c07c6a8 Mon Sep 17 00:00:00 2001 +From de3d6fb999bd464f08c11b879cb4587295f3c0b1 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,10 +31,10 @@ 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 f6ea8b2bbf..1fd5e187fb 100644 +index b55b6c12d2..0be885c391 100644 --- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c +++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c -@@ -28,6 +28,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent +@@ -29,6 +29,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include #include @@ -42,7 +42,7 @@ index f6ea8b2bbf..1fd5e187fb 100644 #include #include #include -@@ -2691,6 +2692,22 @@ DriverEntry ( +@@ -2743,6 +2744,22 @@ DriverEntry ( CompareGuid (PcdGetPtr (PcdTpmInstanceGuid), &gEfiTpmDeviceInstanceTpm12Guid)) { DEBUG ((DEBUG_INFO, "No TPM2 instance required!\n")); @@ -66,7 +66,7 @@ index f6ea8b2bbf..1fd5e187fb 100644 } diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf -index 7dc7a2683d..ae90070b36 100644 +index a645474bf3..dbb7a52f33 100644 --- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf +++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf @@ -55,6 +55,7 @@ diff --git a/0014-OvmfPkg-Remove-EbcDxe-RHEL-only.patch b/0014-OvmfPkg-Remove-EbcDxe-RHEL-only.patch index 48713c7..24bdc73 100644 --- a/0014-OvmfPkg-Remove-EbcDxe-RHEL-only.patch +++ b/0014-OvmfPkg-Remove-EbcDxe-RHEL-only.patch @@ -1,4 +1,4 @@ -From 14feac56ff842b1a9940f370ebc624846841faec Mon Sep 17 00:00:00 2001 +From 3208551a4a7934a905ba33dde70bfea37c9a95af 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) @@ -29,7 +29,7 @@ Signed-off-by: Miroslav Rezanina 8 files changed, 8 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index bdb786d10d..e565430e6c 100644 +index 32f47704bc..6b6e108d11 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc @@ -611,7 +611,6 @@ @@ -41,10 +41,10 @@ index bdb786d10d..e565430e6c 100644 UefiCpuPkg/CpuDxe/CpuDxe.inf OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf -index 9dd4095967..78b4e1d528 100644 +index 595945181c..c176043482 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf -@@ -206,7 +206,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf +@@ -212,7 +212,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf @@ -53,7 +53,7 @@ index 9dd4095967..78b4e1d528 100644 INF UefiCpuPkg/CpuDxe/CpuDxe.inf INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 8a8c7a0b37..ee8da63252 100644 +index 49540d54d0..d368aa11fe 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -746,7 +746,6 @@ @@ -65,7 +65,7 @@ index 8a8c7a0b37..ee8da63252 100644 UefiCpuPkg/CpuDxe/CpuDxe.inf OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index 501b4de469..5e0bc9d2c5 100644 +index 0d4abb50a8..ef933def99 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -216,7 +216,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf @@ -77,7 +77,7 @@ index 501b4de469..5e0bc9d2c5 100644 INF UefiCpuPkg/CpuDxe/CpuDxe.inf INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 4bde14a05a..1c7b55a430 100644 +index 1c4e0514ed..cf09bdf785 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -760,7 +760,6 @@ @@ -89,7 +89,7 @@ index 4bde14a05a..1c7b55a430 100644 UefiCpuPkg/CpuDxe/CpuDxe.inf OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index 74cfb58f06..ed33c906f3 100644 +index 23a825a012..0cd98ada5a 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -217,7 +217,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf @@ -101,7 +101,7 @@ index 74cfb58f06..ed33c906f3 100644 INF UefiCpuPkg/CpuDxe/CpuDxe.inf INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index a43352ede4..9807c0a6b4 100644 +index e50e63b3f6..098d569381 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -805,7 +805,6 @@ @@ -113,10 +113,10 @@ index a43352ede4..9807c0a6b4 100644 UefiCpuPkg/CpuDxe/CpuDxe.inf { diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index f47ab1727e..feb3228ae2 100644 +index 4dcd6a033c..b201505214 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -239,7 +239,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf +@@ -245,7 +245,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 0e29d5a..c07086a 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 94f1e0809390547cbfb0ed0e650a773c24b553ed Mon Sep 17 00:00:00 2001 +From 42becc4c97abe443d06bb128a4b7d5e279842715 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) @@ -29,7 +29,7 @@ Signed-off-by: Miroslav Rezanina 8 files changed, 8 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index e565430e6c..c000cc8de8 100644 +index 6b6e108d11..5461c1290d 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc @@ -701,7 +701,6 @@ @@ -41,7 +41,7 @@ index e565430e6c..c000cc8de8 100644 # # ISA Support diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf -index 78b4e1d528..d6f785c205 100644 +index c176043482..10538a0465 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf @@ -300,7 +300,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf @@ -53,7 +53,7 @@ index 78b4e1d528..d6f785c205 100644 INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index ee8da63252..254d9f13f3 100644 +index d368aa11fe..40e78014c4 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -838,7 +838,6 @@ @@ -61,23 +61,23 @@ index ee8da63252..254d9f13f3 100644 gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F } - OvmfPkg/VirtioGpuDxe/VirtioGpu.inf + OvmfPkg/VirtHstiDxe/VirtHstiDxe.inf # - # ISA Support diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index 5e0bc9d2c5..dec1258714 100644 +index ef933def99..68d59968ec 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf -@@ -321,7 +321,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf +@@ -317,7 +317,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 1c7b55a430..a3a753bd8b 100644 +index cf09bdf785..6ade9aa0ef 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -852,7 +852,6 @@ @@ -85,14 +85,14 @@ index 1c7b55a430..a3a753bd8b 100644 gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F } - OvmfPkg/VirtioGpuDxe/VirtioGpu.inf + OvmfPkg/VirtHstiDxe/VirtHstiDxe.inf # - # ISA Support diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index ed33c906f3..00bd49c89d 100644 +index 0cd98ada5a..8891d96422 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -327,7 +327,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf +@@ -323,7 +323,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf @@ -101,7 +101,7 @@ index ed33c906f3..00bd49c89d 100644 INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 9807c0a6b4..17cc17cbde 100644 +index 098d569381..8563835ae5 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -920,7 +920,6 @@ @@ -109,14 +109,14 @@ index 9807c0a6b4..17cc17cbde 100644 gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F } - OvmfPkg/VirtioGpuDxe/VirtioGpu.inf + OvmfPkg/VirtHstiDxe/VirtHstiDxe.inf # - # ISA Support diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index feb3228ae2..bee30d8b4f 100644 +index b201505214..06ac4423da 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -354,7 +354,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf +@@ -356,7 +356,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 87d342d..9aec177 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 0a61aba4d91c63ca263f628093331f6178728ad1 Mon Sep 17 00:00:00 2001 +From 67e5739ca9ba906914aade6b5ad84c420ad9af29 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) @@ -27,7 +27,7 @@ Signed-off-by: Miroslav Rezanina 6 files changed, 6 deletions(-) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 254d9f13f3..ca07b40857 100644 +index 40e78014c4..afd2a3c5c0 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -816,7 +816,6 @@ @@ -39,7 +39,7 @@ index 254d9f13f3..ca07b40857 100644 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index dec1258714..55d0f1ae5f 100644 +index 68d59968ec..c392b96470 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -290,7 +290,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour @@ -48,10 +48,10 @@ index dec1258714..55d0f1ae5f 100644 INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf -INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf - !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5" - INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf + INF MdeModulePkg/Logo/LogoDxe.inf + diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index a3a753bd8b..a5322783e5 100644 +index 6ade9aa0ef..f5a4c57c8e 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -830,7 +830,6 @@ @@ -63,7 +63,7 @@ index a3a753bd8b..a5322783e5 100644 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index 00bd49c89d..fba268521b 100644 +index 8891d96422..6278daeeee 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -291,7 +291,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour @@ -72,10 +72,10 @@ index 00bd49c89d..fba268521b 100644 INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf -INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf - !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5" - INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf + INF MdeModulePkg/Logo/LogoDxe.inf + diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 17cc17cbde..190431b6fa 100644 +index 8563835ae5..08b73a64c9 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -898,7 +898,6 @@ @@ -87,14 +87,14 @@ index 17cc17cbde..190431b6fa 100644 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index bee30d8b4f..cea0e87cbf 100644 +index 06ac4423da..fc4b6dd3a4 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -316,7 +316,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour +@@ -322,7 +322,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour INF FatPkg/EnhancedFatDxe/Fat.inf INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf -INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf - !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5" - INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf + INF MdeModulePkg/Logo/LogoDxe.inf + diff --git a/0017-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch b/0017-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch index d4ede51..7936459 100644 --- a/0017-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch +++ b/0017-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch @@ -1,4 +1,4 @@ -From 068776b4d85587427fbceebf0e79938eea33f68e Mon Sep 17 00:00:00 2001 +From 9827ce562f432da36410ef0e9ce6d7971e502b99 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 216b5a09cc..1e6c76795b 100644 +index 00e656d0c9..d1deccaadc 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -465,7 +465,6 @@ +@@ -464,7 +464,6 @@ MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf @@ -36,10 +36,10 @@ index 216b5a09cc..1e6c76795b 100644 # # Bds diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -index c5d097ffb9..a814653dc4 100644 +index 38906004d7..7205274bed 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -@@ -84,7 +84,6 @@ READ_LOCK_STATUS = TRUE +@@ -85,7 +85,6 @@ READ_LOCK_STATUS = TRUE INF FatPkg/EnhancedFatDxe/Fat.inf INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf @@ -48,10 +48,10 @@ index c5d097ffb9..a814653dc4 100644 # # Status Code Routing diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc -index 5f07ed4dcc..e48bdf8deb 100644 +index c7918c8cf3..9643fd5427 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc -@@ -365,7 +365,6 @@ +@@ -368,7 +368,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 8c4cc32..33be900 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 6264a265fc50961c8d44a4c04b9c9e5ad07cc86c Mon Sep 17 00:00:00 2001 +From 98e35df340a8a5cd18cb386361c7da6350c54800 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) @@ -29,7 +29,7 @@ Signed-off-by: Miroslav Rezanina 8 files changed, 8 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index c000cc8de8..75bec7859e 100644 +index 5461c1290d..cf1ad83e09 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc @@ -679,7 +679,6 @@ @@ -41,19 +41,19 @@ index c000cc8de8..75bec7859e 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 d6f785c205..5d0cba1e13 100644 +index 10538a0465..c56c98dc85 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf -@@ -274,7 +274,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf +@@ -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 - !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE - INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf + INF OvmfPkg/AmdSev/SecretDxe/SecretDxe.inf + INF OvmfPkg/AmdSev/Grub/Grub.inf diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index ca07b40857..62907e9458 100644 +index afd2a3c5c0..d8ae542686 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -815,7 +815,6 @@ @@ -65,7 +65,7 @@ index ca07b40857..62907e9458 100644 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index 55d0f1ae5f..6c324943e4 100644 +index c392b96470..0ffa3be750 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -289,7 +289,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf @@ -74,10 +74,10 @@ index 55d0f1ae5f..6c324943e4 100644 INF FatPkg/EnhancedFatDxe/Fat.inf -INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf - !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5" - INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf + INF MdeModulePkg/Logo/LogoDxe.inf + diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index a5322783e5..28cf5ace70 100644 +index f5a4c57c8e..52ac2c96fc 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -829,7 +829,6 @@ @@ -89,7 +89,7 @@ index a5322783e5..28cf5ace70 100644 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index fba268521b..a890d4a3e3 100644 +index 6278daeeee..c4f3ec0735 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -290,7 +290,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf @@ -98,10 +98,10 @@ index fba268521b..a890d4a3e3 100644 INF FatPkg/EnhancedFatDxe/Fat.inf -INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf - !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5" - INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf + INF MdeModulePkg/Logo/LogoDxe.inf + diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 190431b6fa..ca0c007181 100644 +index 08b73a64c9..f76d0ef7bc 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -897,7 +897,6 @@ @@ -113,14 +113,14 @@ index 190431b6fa..ca0c007181 100644 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index cea0e87cbf..48da04eb9c 100644 +index fc4b6dd3a4..bedd85ef7a 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -315,7 +315,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf +@@ -321,7 +321,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 - !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5" - INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf + INF MdeModulePkg/Logo/LogoDxe.inf + diff --git a/0019-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch b/0019-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch index 385781d..a0c6376 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 2ddf7702dee6a1a0edab8154b085c36f8d84376f Mon Sep 17 00:00:00 2001 +From 9b039f2eb195f37b724f86efc31c8a4d6abd217d 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 1e6c76795b..9216faca8d 100644 +index d1deccaadc..f91bb09fa3 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -464,7 +464,6 @@ +@@ -463,7 +463,6 @@ MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf @@ -36,10 +36,10 @@ index 1e6c76795b..9216faca8d 100644 # # Bds diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -index a814653dc4..a411a8f68d 100644 +index 7205274bed..24a9dac2fd 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -@@ -83,7 +83,6 @@ READ_LOCK_STATUS = TRUE +@@ -84,7 +84,6 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf INF FatPkg/EnhancedFatDxe/Fat.inf INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf @@ -48,10 +48,10 @@ index a814653dc4..a411a8f68d 100644 # # Status Code Routing diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc -index e48bdf8deb..66ad4b6948 100644 +index 9643fd5427..c2825aa4c2 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc -@@ -364,7 +364,6 @@ +@@ -367,7 +367,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 074acd0..5c57a7d 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 90b02d61d206926d6b2687a4a94f600039ae2e7c Mon Sep 17 00:00:00 2001 +From d417cfeb0ed76b3187b44e2491611f55d6de33b3 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) @@ -6,6 +6,10 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +rebase to edk2-stable202405: + +rewrite due to shell build config being moved to an include file + RH-Author: Philippe Mathieu-Daudé RH-MergeRequest: 3: Disable features for RHEL9 RH-Commit: [13/19] cf9ef346386ac89fa05b29d429d8d1b27cf0e3b0 @@ -18,22 +22,18 @@ Suggested-by: Laszlo Ersek Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Miroslav Rezanina --- - OvmfPkg/OvmfPkgIa32.dsc | 4 ---- - OvmfPkg/OvmfPkgIa32.fdf | 1 - - OvmfPkg/OvmfPkgIa32X64.dsc | 4 ---- - OvmfPkg/OvmfPkgIa32X64.fdf | 1 - - OvmfPkg/OvmfPkgX64.dsc | 4 ---- - OvmfPkg/OvmfPkgX64.fdf | 1 - - 6 files changed, 15 deletions(-) + OvmfPkg/Include/Dsc/ShellComponents.dsc.inc | 4 ---- + OvmfPkg/Include/Fdf/ShellDxe.fdf.inc | 1 - + 2 files changed, 5 deletions(-) -diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 62907e9458..c2fe2e6042 100644 ---- a/OvmfPkg/OvmfPkgIa32.dsc -+++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -881,10 +881,6 @@ - MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf +diff --git a/OvmfPkg/Include/Dsc/ShellComponents.dsc.inc b/OvmfPkg/Include/Dsc/ShellComponents.dsc.inc +index 4075688e41..3663938054 100644 +--- a/OvmfPkg/Include/Dsc/ShellComponents.dsc.inc ++++ b/OvmfPkg/Include/Dsc/ShellComponents.dsc.inc +@@ -6,10 +6,6 @@ - !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE + !if $(TOOL_CHAIN_TAG) != "XCODE5" + !if $(NETWORK_ENABLE) == TRUE - ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { - - gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE @@ -41,69 +41,15 @@ index 62907e9458..c2fe2e6042 100644 ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf { gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE -diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index 6c324943e4..32a42c926b 100644 ---- a/OvmfPkg/OvmfPkgIa32.fdf -+++ b/OvmfPkg/OvmfPkgIa32.fdf -@@ -291,7 +291,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour - INF FatPkg/EnhancedFatDxe/Fat.inf +diff --git a/OvmfPkg/Include/Fdf/ShellDxe.fdf.inc b/OvmfPkg/Include/Fdf/ShellDxe.fdf.inc +index 38f69747b0..1637083ff1 100644 +--- a/OvmfPkg/Include/Fdf/ShellDxe.fdf.inc ++++ b/OvmfPkg/Include/Fdf/ShellDxe.fdf.inc +@@ -6,7 +6,6 @@ - !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5" + !if $(TOOL_CHAIN_TAG) != "XCODE5" + !if $(NETWORK_ENABLE) == TRUE -INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf - INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf - !endif -diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 28cf5ace70..5d74007599 100644 ---- a/OvmfPkg/OvmfPkgIa32X64.dsc -+++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -895,10 +895,6 @@ - MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf - - !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE -- ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { -- -- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE -- } - ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf { - - gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE -diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index a890d4a3e3..733f60ce7c 100644 ---- a/OvmfPkg/OvmfPkgIa32X64.fdf -+++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -292,7 +292,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour - INF FatPkg/EnhancedFatDxe/Fat.inf - - !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5" --INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf - INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf - INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf - !endif -diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index ca0c007181..f27932b38d 100644 ---- a/OvmfPkg/OvmfPkgX64.dsc -+++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -963,10 +963,6 @@ - MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf - - !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE -- ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { -- -- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE -- } - ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf { - - gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE -diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index 48da04eb9c..f562b5312b 100644 ---- a/OvmfPkg/OvmfPkgX64.fdf -+++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -317,7 +317,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour - INF FatPkg/EnhancedFatDxe/Fat.inf - - !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5" --INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf - INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf - INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf !endif + INF ShellPkg/DynamicCommand/VariablePolicyDynamicCommand/VariablePolicyDynamicCommand.inf diff --git a/0021-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch b/0021-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch index e6d8c20..ff09c46 100644 --- a/0021-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch +++ b/0021-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch @@ -1,4 +1,4 @@ -From f7abc9b87c6034ada69ed16fc644c578cea5af19 Mon Sep 17 00:00:00 2001 +From b548dd4acf23412e9266be15d65d7f8cfccbf028 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:29:28 +0200 Subject: [PATCH] ArmVirtPkg: Remove TftpDynamicCommand from shell (RHEL only) @@ -23,10 +23,10 @@ Signed-off-by: Miroslav Rezanina 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc -index 2bc6a29eb1..33f122f913 100644 +index 7044790a1e..ee98673e98 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc -@@ -388,10 +388,9 @@ +@@ -391,10 +391,9 @@ # MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf @@ -41,10 +41,10 @@ index 2bc6a29eb1..33f122f913 100644 gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -index a411a8f68d..4b00524fde 100644 +index 24a9dac2fd..1341de0a2f 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -@@ -99,7 +99,6 @@ READ_LOCK_STATUS = TRUE +@@ -100,7 +100,6 @@ READ_LOCK_STATUS = TRUE INF OvmfPkg/VirtioSerialDxe/VirtioSerial.inf INF ShellPkg/Application/Shell/Shell.inf diff --git a/0022-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch b/0022-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch index 21da358..9e5ba58 100644 --- a/0022-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch +++ b/0022-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch @@ -1,4 +1,4 @@ -From ab3da1407691781fb148e53d4b02e996a5dbca2f Mon Sep 17 00:00:00 2001 +From 8a68c775e8ba00da3d725396fd8c78f67fbc8697 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) @@ -6,6 +6,10 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +rebase to edk2-stable202405: + +rewrite due to shell build config being moved to an include file + Rebase to edk2-stable202311: Minor update, context change due to new variable policy shell command. @@ -22,92 +26,38 @@ Suggested-by: Laszlo Ersek Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Miroslav Rezanina --- - OvmfPkg/OvmfPkgIa32.dsc | 4 ---- - OvmfPkg/OvmfPkgIa32.fdf | 1 - - OvmfPkg/OvmfPkgIa32X64.dsc | 4 ---- - OvmfPkg/OvmfPkgIa32X64.fdf | 1 - - OvmfPkg/OvmfPkgX64.dsc | 4 ---- - OvmfPkg/OvmfPkgX64.fdf | 1 - - 6 files changed, 15 deletions(-) + OvmfPkg/Include/Dsc/ShellComponents.dsc.inc | 6 ------ + OvmfPkg/Include/Fdf/ShellDxe.fdf.inc | 3 --- + 2 files changed, 9 deletions(-) -diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index c2fe2e6042..44139c648c 100644 ---- a/OvmfPkg/OvmfPkgIa32.dsc -+++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -881,10 +881,6 @@ - MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf +diff --git a/OvmfPkg/Include/Dsc/ShellComponents.dsc.inc b/OvmfPkg/Include/Dsc/ShellComponents.dsc.inc +index 3663938054..a568f1ecc5 100644 +--- a/OvmfPkg/Include/Dsc/ShellComponents.dsc.inc ++++ b/OvmfPkg/Include/Dsc/ShellComponents.dsc.inc +@@ -5,12 +5,6 @@ + !if $(BUILD_SHELL) == TRUE - !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE + !if $(TOOL_CHAIN_TAG) != "XCODE5" +-!if $(NETWORK_ENABLE) == TRUE - ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf { - - gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE - } +-!endif ShellPkg/DynamicCommand/VariablePolicyDynamicCommand/VariablePolicyDynamicCommand.inf { gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE -diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index 32a42c926b..56520eaf99 100644 ---- a/OvmfPkg/OvmfPkgIa32.fdf -+++ b/OvmfPkg/OvmfPkgIa32.fdf -@@ -291,7 +291,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour - INF FatPkg/EnhancedFatDxe/Fat.inf +diff --git a/OvmfPkg/Include/Fdf/ShellDxe.fdf.inc b/OvmfPkg/Include/Fdf/ShellDxe.fdf.inc +index 1637083ff1..c0118a46e2 100644 +--- a/OvmfPkg/Include/Fdf/ShellDxe.fdf.inc ++++ b/OvmfPkg/Include/Fdf/ShellDxe.fdf.inc +@@ -5,9 +5,6 @@ + !if $(BUILD_SHELL) == TRUE && $(SECURE_BOOT_ENABLE) == FALSE - !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5" + !if $(TOOL_CHAIN_TAG) != "XCODE5" +-!if $(NETWORK_ENABLE) == TRUE -INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf +-!endif + INF ShellPkg/DynamicCommand/VariablePolicyDynamicCommand/VariablePolicyDynamicCommand.inf INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf !endif - !if $(BUILD_SHELL) == TRUE -diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 5d74007599..e2f13499cc 100644 ---- a/OvmfPkg/OvmfPkgIa32X64.dsc -+++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -895,10 +895,6 @@ - MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf - - !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE -- ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf { -- -- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE -- } - ShellPkg/DynamicCommand/VariablePolicyDynamicCommand/VariablePolicyDynamicCommand.inf { - - gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE -diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index 733f60ce7c..f04620418b 100644 ---- a/OvmfPkg/OvmfPkgIa32X64.fdf -+++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -292,7 +292,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour - INF FatPkg/EnhancedFatDxe/Fat.inf - - !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5" --INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf - INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf - !endif - !if $(BUILD_SHELL) == TRUE -diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index f27932b38d..f1dc48c3be 100644 ---- a/OvmfPkg/OvmfPkgX64.dsc -+++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -963,10 +963,6 @@ - MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf - - !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE -- ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf { -- -- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE -- } - ShellPkg/DynamicCommand/VariablePolicyDynamicCommand/VariablePolicyDynamicCommand.inf { - - gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE -diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index f562b5312b..61a3c63166 100644 ---- a/OvmfPkg/OvmfPkgX64.fdf -+++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -317,7 +317,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour - INF FatPkg/EnhancedFatDxe/Fat.inf - - !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5" --INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf - INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf - !endif - !if $(BUILD_SHELL) == TRUE diff --git a/0023-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch b/0023-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch index e039850..331cf73 100644 --- a/0023-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch +++ b/0023-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch @@ -1,4 +1,4 @@ -From 54c22fb545c567b4f99c81170ba8a4fc111e7646 Mon Sep 17 00:00:00 2001 +From 1f15cf34691e2f9604ee6efe142c2d710aad579c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:29:34 +0200 Subject: [PATCH] ArmVirtPkg: Remove HttpDynamicCommand from shell (RHEL only) @@ -27,10 +27,10 @@ Signed-off-by: Miroslav Rezanina 2 files changed, 5 deletions(-) diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc -index 33f122f913..2b9315f8b3 100644 +index ee98673e98..996b4ddfc4 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc -@@ -391,10 +391,6 @@ +@@ -394,10 +394,6 @@ # # UEFI application (Shell Embedded Boot Loader) # @@ -42,10 +42,10 @@ index 33f122f913..2b9315f8b3 100644 gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -index 4b00524fde..aa3acdeae6 100644 +index 1341de0a2f..b49bf7ad4e 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -@@ -99,7 +99,6 @@ READ_LOCK_STATUS = TRUE +@@ -100,7 +100,6 @@ READ_LOCK_STATUS = TRUE INF OvmfPkg/VirtioSerialDxe/VirtioSerial.inf INF ShellPkg/Application/Shell/Shell.inf diff --git a/0024-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch b/0024-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch index b46d9e1..c457ccc 100644 --- a/0024-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch +++ b/0024-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch @@ -1,4 +1,4 @@ -From 1025e8342c42c49d9b3bbffd6a923b4cb89ec76a Mon Sep 17 00:00:00 2001 +From cd1746c9920e93bf40994172881bc13cf185991c 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) @@ -6,6 +6,10 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +rebase to edk2-stable202405: + +rewrite due to shell build config being moved to an include file + Rebase to edk2-stable202311: Minor update, context change due to new variable policy shell command. @@ -27,48 +31,15 @@ Suggested-by: Laszlo Ersek Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Miroslav Rezanina --- - OvmfPkg/AmdSev/AmdSevX64.dsc | 4 ---- - OvmfPkg/AmdSev/AmdSevX64.fdf | 1 - - OvmfPkg/OvmfPkgIa32.dsc | 4 ---- - OvmfPkg/OvmfPkgIa32.fdf | 1 - - OvmfPkg/OvmfPkgIa32X64.dsc | 4 ---- - OvmfPkg/OvmfPkgIa32X64.fdf | 1 - - OvmfPkg/OvmfPkgX64.dsc | 4 ---- - OvmfPkg/OvmfPkgX64.fdf | 1 - - 8 files changed, 20 deletions(-) + OvmfPkg/Include/Dsc/ShellComponents.dsc.inc | 4 ---- + OvmfPkg/Include/Fdf/ShellDxe.fdf.inc | 1 - + 2 files changed, 5 deletions(-) -diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index 75bec7859e..753957bcc4 100644 ---- a/OvmfPkg/AmdSev/AmdSevX64.dsc -+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -737,10 +737,6 @@ - MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf - - !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE -- OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf { -- -- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE -- } - !endif - OvmfPkg/AmdSev/SecretDxe/SecretDxe.inf - OvmfPkg/AmdSev/Grub/Grub.inf -diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf -index 5d0cba1e13..9b65ebac56 100644 ---- a/OvmfPkg/AmdSev/AmdSevX64.fdf -+++ b/OvmfPkg/AmdSev/AmdSevX64.fdf -@@ -276,7 +276,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour - INF FatPkg/EnhancedFatDxe/Fat.inf - - !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE --INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf - !endif - INF OvmfPkg/AmdSev/SecretDxe/SecretDxe.inf - INF OvmfPkg/AmdSev/Grub/Grub.inf -diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 44139c648c..2825acec3e 100644 ---- a/OvmfPkg/OvmfPkgIa32.dsc -+++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -885,10 +885,6 @@ +diff --git a/OvmfPkg/Include/Dsc/ShellComponents.dsc.inc b/OvmfPkg/Include/Dsc/ShellComponents.dsc.inc +index a568f1ecc5..f7e0f5e90e 100644 +--- a/OvmfPkg/Include/Dsc/ShellComponents.dsc.inc ++++ b/OvmfPkg/Include/Dsc/ShellComponents.dsc.inc +@@ -9,10 +9,6 @@ gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE } @@ -77,71 +48,17 @@ index 44139c648c..2825acec3e 100644 - gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE - } !endif - !if $(BUILD_SHELL) == TRUE - ShellPkg/Application/Shell/Shell.inf { -diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index 56520eaf99..de73cabb6e 100644 ---- a/OvmfPkg/OvmfPkgIa32.fdf -+++ b/OvmfPkg/OvmfPkgIa32.fdf -@@ -291,7 +291,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour - INF FatPkg/EnhancedFatDxe/Fat.inf - !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5" + ShellPkg/Application/Shell/Shell.inf { +diff --git a/OvmfPkg/Include/Fdf/ShellDxe.fdf.inc b/OvmfPkg/Include/Fdf/ShellDxe.fdf.inc +index c0118a46e2..dced75e388 100644 +--- a/OvmfPkg/Include/Fdf/ShellDxe.fdf.inc ++++ b/OvmfPkg/Include/Fdf/ShellDxe.fdf.inc +@@ -6,7 +6,6 @@ + + !if $(TOOL_CHAIN_TAG) != "XCODE5" + INF ShellPkg/DynamicCommand/VariablePolicyDynamicCommand/VariablePolicyDynamicCommand.inf -INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf !endif - !if $(BUILD_SHELL) == TRUE - INF ShellPkg/Application/Shell/Shell.inf -diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index e2f13499cc..f1af88a9b5 100644 ---- a/OvmfPkg/OvmfPkgIa32X64.dsc -+++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -899,10 +899,6 @@ - - gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE - } -- OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf { -- -- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE -- } - !endif - !if $(BUILD_SHELL) == TRUE - ShellPkg/Application/Shell/Shell.inf { -diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index f04620418b..241019cb28 100644 ---- a/OvmfPkg/OvmfPkgIa32X64.fdf -+++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -292,7 +292,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour - INF FatPkg/EnhancedFatDxe/Fat.inf - !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5" --INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf - !endif - !if $(BUILD_SHELL) == TRUE - INF ShellPkg/Application/Shell/Shell.inf -diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index f1dc48c3be..908895354b 100644 ---- a/OvmfPkg/OvmfPkgX64.dsc -+++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -967,10 +967,6 @@ - - gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE - } -- OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf { -- -- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE -- } - !endif - !if $(BUILD_SHELL) == TRUE - ShellPkg/Application/Shell/Shell.inf { -diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index 61a3c63166..c1e7240076 100644 ---- a/OvmfPkg/OvmfPkgX64.fdf -+++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -317,7 +317,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour - INF FatPkg/EnhancedFatDxe/Fat.inf - - !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5" --INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf - !endif - !if $(BUILD_SHELL) == TRUE INF ShellPkg/Application/Shell/Shell.inf diff --git a/0025-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch b/0025-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch index 8143b7a..2eb4418 100644 --- a/0025-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch +++ b/0025-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch @@ -1,4 +1,4 @@ -From 1e792bb790474a68c6e63a6e0faa88f8e2647ae3 Mon Sep 17 00:00:00 2001 +From ec9c5e512252964f28c493d10b9f484b88c87c13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:29:46 +0200 Subject: [PATCH] ArmVirtPkg: Remove LinuxInitrdDynamicShellCommand (RHEL only) @@ -28,10 +28,10 @@ Signed-off-by: Miroslav Rezanina 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc -index 2b9315f8b3..5d40a3c3c7 100644 +index 996b4ddfc4..2561e10ff5 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc -@@ -388,17 +388,13 @@ +@@ -391,17 +391,13 @@ # MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf @@ -53,10 +53,10 @@ index 2b9315f8b3..5d40a3c3c7 100644 ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -index aa3acdeae6..49bd633850 100644 +index b49bf7ad4e..753afd799b 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -@@ -100,7 +100,6 @@ READ_LOCK_STATUS = TRUE +@@ -101,7 +101,6 @@ READ_LOCK_STATUS = TRUE INF ShellPkg/Application/Shell/Shell.inf INF ShellPkg/DynamicCommand/VariablePolicyDynamicCommand/VariablePolicyDynamicCommand.inf diff --git a/0026-UefiCpuPkg-MpInitLib-fix-apic-mode-for-cpu-hotplug.patch b/0026-UefiCpuPkg-MpInitLib-fix-apic-mode-for-cpu-hotplug.patch index 9be80a7..97dd035 100644 --- a/0026-UefiCpuPkg-MpInitLib-fix-apic-mode-for-cpu-hotplug.patch +++ b/0026-UefiCpuPkg-MpInitLib-fix-apic-mode-for-cpu-hotplug.patch @@ -1,4 +1,4 @@ -From d1572c35f13fd69f48c7c5adeb22eff09d3a1189 Mon Sep 17 00:00:00 2001 +From 3d02fb6da82331176952e480160223136679ce74 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Tue, 28 Feb 2023 15:47:00 +0100 Subject: [PATCH] UefiCpuPkg/MpInitLib: fix apic mode for cpu hotplug @@ -22,10 +22,10 @@ location_in_specfile: 38 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpInitLib/MpLib.c -index cdfb570e61..7bc93dfa13 100644 +index d724456502..c478878bb0 100644 --- a/UefiCpuPkg/Library/MpInitLib/MpLib.c +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c -@@ -533,7 +533,9 @@ CollectProcessorCount ( +@@ -534,7 +534,9 @@ CollectProcessorCount ( // // Enable x2APIC mode if // 1. Number of CPU is greater than 255; or @@ -36,7 +36,7 @@ index cdfb570e61..7bc93dfa13 100644 // X2Apic = FALSE; if (CpuMpData->CpuCount > 255) { -@@ -541,6 +543,10 @@ CollectProcessorCount ( +@@ -542,6 +544,10 @@ CollectProcessorCount ( // If there are more than 255 processor found, force to enable X2APIC // X2Apic = TRUE; diff --git a/0027-OvmfPkg-AmdSevDxe-Shim-Reboot-workaround-RHEL-only.patch b/0027-OvmfPkg-AmdSevDxe-Shim-Reboot-workaround-RHEL-only.patch index 67afebf..8148351 100644 --- a/0027-OvmfPkg-AmdSevDxe-Shim-Reboot-workaround-RHEL-only.patch +++ b/0027-OvmfPkg-AmdSevDxe-Shim-Reboot-workaround-RHEL-only.patch @@ -1,4 +1,4 @@ -From 89a0a96bcfe49ca87087850d0b070e351850f6e8 Mon Sep 17 00:00:00 2001 +From c916516d37fb50c187020bd01da21cca85c8e83a 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) @@ -27,7 +27,7 @@ location_in_specfile: 44 2 files changed, 44 insertions(+) diff --git a/OvmfPkg/AmdSevDxe/AmdSevDxe.c b/OvmfPkg/AmdSevDxe/AmdSevDxe.c -index db3675ae86..f639c093a2 100644 +index d497a343d3..0eb88e50ff 100644 --- a/OvmfPkg/AmdSevDxe/AmdSevDxe.c +++ b/OvmfPkg/AmdSevDxe/AmdSevDxe.c @@ -19,6 +19,7 @@ @@ -36,7 +36,7 @@ index db3675ae86..f639c093a2 100644 #include +#include #include - #include + #include #include @@ -28,6 +29,10 @@ // Present, initialized, tested bits defined in MdeModulePkg/Core/Dxe/DxeMain.h diff --git a/0028-CryptoPkg-CrtLib-add-stat.h-include-file.patch b/0028-CryptoPkg-CrtLib-add-stat.h-include-file.patch index 03f48e2..8b0a962 100644 --- a/0028-CryptoPkg-CrtLib-add-stat.h-include-file.patch +++ b/0028-CryptoPkg-CrtLib-add-stat.h-include-file.patch @@ -1,4 +1,4 @@ -From 1b7a4cb54f50883fee087fd85b7c9b86b5296fea Mon Sep 17 00:00:00 2001 +From 7a07b2f16eabf460891a21c05b30cd9c2f875a2a 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. diff --git a/0029-CryptoPkg-CrtLib-add-access-open-read-write-close-sy.patch b/0029-CryptoPkg-CrtLib-add-access-open-read-write-close-sy.patch index 114aa05..b32c5bd 100644 --- a/0029-CryptoPkg-CrtLib-add-access-open-read-write-close-sy.patch +++ b/0029-CryptoPkg-CrtLib-add-access-open-read-write-close-sy.patch @@ -1,4 +1,4 @@ -From e47e4f4efb118cf38f76c7abc8f1cb537e1f79e5 Mon Sep 17 00:00:00 2001 +From 168cfe83b250d3166817549c1e96e6b1f02bcab4 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 diff --git a/0030-OvmfPkg-Sec-Setup-MTRR-early-in-the-boot-process.patch b/0030-OvmfPkg-Sec-Setup-MTRR-early-in-the-boot-process.patch index 2f036a7..63facbb 100644 --- a/0030-OvmfPkg-Sec-Setup-MTRR-early-in-the-boot-process.patch +++ b/0030-OvmfPkg-Sec-Setup-MTRR-early-in-the-boot-process.patch @@ -1,4 +1,4 @@ -From 9388cc72866fc379d94cf3dc029292f4246bfe39 Mon Sep 17 00:00:00 2001 +From 4c49c1bcb2db128cc4d2ebb29b1ac53fe3ef6b18 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Tue, 30 Jan 2024 14:04:38 +0100 Subject: [PATCH] OvmfPkg/Sec: Setup MTRR early in the boot process. @@ -51,10 +51,10 @@ location_in_specfile: 49 3 files changed, 69 insertions(+), 5 deletions(-) diff --git a/OvmfPkg/IntelTdx/Sec/SecMain.c b/OvmfPkg/IntelTdx/Sec/SecMain.c -index 42a587adfa..0daddac0a0 100644 +index 4e750755bf..7094d86159 100644 --- a/OvmfPkg/IntelTdx/Sec/SecMain.c +++ b/OvmfPkg/IntelTdx/Sec/SecMain.c -@@ -27,6 +27,8 @@ +@@ -26,6 +26,8 @@ #include #include #include @@ -63,7 +63,7 @@ index 42a587adfa..0daddac0a0 100644 #define SEC_IDT_ENTRY_COUNT 34 -@@ -48,6 +50,31 @@ IA32_IDT_GATE_DESCRIPTOR mIdtEntryTemplate = { +@@ -47,6 +49,31 @@ IA32_IDT_GATE_DESCRIPTOR mIdtEntryTemplate = { } }; @@ -95,7 +95,7 @@ index 42a587adfa..0daddac0a0 100644 VOID EFIAPI SecCoreStartupWithStack ( -@@ -204,6 +231,11 @@ SecCoreStartupWithStack ( +@@ -203,6 +230,11 @@ SecCoreStartupWithStack ( InitializeApicTimer (0, MAX_UINT32, TRUE, 5); DisableApicTimerInterrupt (); @@ -108,10 +108,10 @@ index 42a587adfa..0daddac0a0 100644 ASSERT (FALSE); diff --git a/OvmfPkg/Library/PlatformInitLib/MemDetect.c b/OvmfPkg/Library/PlatformInitLib/MemDetect.c -index f042517bb6..313f5e1f7f 100644 +index e64c0ee324..b6ba63ef95 100644 --- a/OvmfPkg/Library/PlatformInitLib/MemDetect.c +++ b/OvmfPkg/Library/PlatformInitLib/MemDetect.c -@@ -1082,18 +1082,18 @@ PlatformQemuInitializeRam ( +@@ -1164,18 +1164,18 @@ PlatformQemuInitializeRam ( MtrrGetAllMtrrs (&MtrrSettings); // @@ -136,10 +136,10 @@ index f042517bb6..313f5e1f7f 100644 // diff --git a/OvmfPkg/Sec/SecMain.c b/OvmfPkg/Sec/SecMain.c -index 31da5d0ace..3b7dc7205d 100644 +index 60dfa61842..725b57e2fa 100644 --- a/OvmfPkg/Sec/SecMain.c +++ b/OvmfPkg/Sec/SecMain.c -@@ -30,6 +30,8 @@ +@@ -29,6 +29,8 @@ #include #include #include @@ -148,7 +148,7 @@ index 31da5d0ace..3b7dc7205d 100644 #include "AmdSev.h" #define SEC_IDT_ENTRY_COUNT 34 -@@ -744,6 +746,31 @@ FindAndReportEntryPoints ( +@@ -743,6 +745,31 @@ FindAndReportEntryPoints ( return; } diff --git a/0031-MdePkg-ArchitecturalMsr.h-add-defines-for-MTRR-cache.patch b/0031-MdePkg-ArchitecturalMsr.h-add-defines-for-MTRR-cache.patch index e231544..1b439a4 100644 --- a/0031-MdePkg-ArchitecturalMsr.h-add-defines-for-MTRR-cache.patch +++ b/0031-MdePkg-ArchitecturalMsr.h-add-defines-for-MTRR-cache.patch @@ -1,4 +1,4 @@ -From 625a70fc26d752b0025eae19682b386f44fa089b Mon Sep 17 00:00:00 2001 +From 3124da27dc460926f40477d247e021ceeabe0be3 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Tue, 30 Jan 2024 14:04:39 +0100 Subject: [PATCH] MdePkg/ArchitecturalMsr.h: add #defines for MTRR cache types diff --git a/0032-UefiCpuPkg-MtrrLib.h-use-cache-type-defines-from-Arc.patch b/0032-UefiCpuPkg-MtrrLib.h-use-cache-type-defines-from-Arc.patch index f4128b3..89772d7 100644 --- a/0032-UefiCpuPkg-MtrrLib.h-use-cache-type-defines-from-Arc.patch +++ b/0032-UefiCpuPkg-MtrrLib.h-use-cache-type-defines-from-Arc.patch @@ -1,4 +1,4 @@ -From d545c8ac6a7c96cb64661b2f5b6fccb97f9c02f8 Mon Sep 17 00:00:00 2001 +From f015a541308b2d752c399b9ef9597c4585218032 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Tue, 30 Jan 2024 14:04:40 +0100 Subject: [PATCH] UefiCpuPkg/MtrrLib.h: use cache type #defines from diff --git a/0033-OvmfPkg-Sec-use-cache-type-defines-from-Architectura.patch b/0033-OvmfPkg-Sec-use-cache-type-defines-from-Architectura.patch index dc32e31..4b65bd4 100644 --- a/0033-OvmfPkg-Sec-use-cache-type-defines-from-Architectura.patch +++ b/0033-OvmfPkg-Sec-use-cache-type-defines-from-Architectura.patch @@ -1,4 +1,4 @@ -From 77a0448486125a840a33e438e430d8e0844dab81 Mon Sep 17 00:00:00 2001 +From dd543686c34fc3c6ddfafc0104066889ad9d1813 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Tue, 30 Jan 2024 14:04:41 +0100 Subject: [PATCH] OvmfPkg/Sec: use cache type #defines from ArchitecturalMsr.h @@ -22,10 +22,10 @@ location_in_specfile: 52 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OvmfPkg/IntelTdx/Sec/SecMain.c b/OvmfPkg/IntelTdx/Sec/SecMain.c -index 0daddac0a0..c00b852f0e 100644 +index 7094d86159..1a19f26178 100644 --- a/OvmfPkg/IntelTdx/Sec/SecMain.c +++ b/OvmfPkg/IntelTdx/Sec/SecMain.c -@@ -70,7 +70,7 @@ SecMtrrSetup ( +@@ -69,7 +69,7 @@ SecMtrrSetup ( } DefType.Uint64 = AsmReadMsr64 (MSR_IA32_MTRR_DEF_TYPE); @@ -35,10 +35,10 @@ index 0daddac0a0..c00b852f0e 100644 AsmWriteMsr64 (MSR_IA32_MTRR_DEF_TYPE, DefType.Uint64); } diff --git a/OvmfPkg/Sec/SecMain.c b/OvmfPkg/Sec/SecMain.c -index 3b7dc7205d..aa0fa1b1ec 100644 +index 725b57e2fa..26963b924d 100644 --- a/OvmfPkg/Sec/SecMain.c +++ b/OvmfPkg/Sec/SecMain.c -@@ -766,7 +766,7 @@ SecMtrrSetup ( +@@ -765,7 +765,7 @@ SecMtrrSetup ( } DefType.Uint64 = AsmReadMsr64 (MSR_IA32_MTRR_DEF_TYPE); diff --git a/0034-NetworkPkg-TcpDxe-Fixed-system-stuck-on-PXE-boot-flo.patch b/0034-NetworkPkg-TcpDxe-Fixed-system-stuck-on-PXE-boot-flo.patch new file mode 100644 index 0000000..557b11d --- /dev/null +++ b/0034-NetworkPkg-TcpDxe-Fixed-system-stuck-on-PXE-boot-flo.patch @@ -0,0 +1,54 @@ +From bbd537bc6560494b0b08886364c38406b1e8107a Mon Sep 17 00:00:00 2001 +From: Sam +Date: Wed, 29 May 2024 07:46:03 +0800 +Subject: [PATCH] NetworkPkg TcpDxe: Fixed system stuck on PXE boot flow in + iPXE environment +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This bug fix is based on the following commit "NetworkPkg TcpDxe: SECURITY PATCH" +REF: 1904a64 + +Issue Description: +An "Invalid handle" error was detected during runtime when attempting to destroy a child instance of the hashing protocol. The problematic code segment was: + +NetworkPkg\TcpDxe\TcpDriver.c +Status = Hash2ServiceBinding->DestroyChild(Hash2ServiceBinding, ​&mHash2ServiceHandle); + +Root Cause Analysis: +The root cause of the error was the passing of an incorrect parameter type, a pointer to an EFI_HANDLE instead of an EFI_HANDLE itself, to the DestroyChild function. This mismatch resulted in the function receiving an invalid handle. + +Implemented Solution: +To resolve this issue, the function call was corrected to pass mHash2ServiceHandle directly: + +NetworkPkg\TcpDxe\TcpDriver.c +Status = Hash2ServiceBinding->DestroyChild(Hash2ServiceBinding, mHash2ServiceHandle); + +This modification ensures the correct handle type is used, effectively rectifying the "Invalid handle" error. + +Verification: +Testing has been conducted, confirming the efficacy of the fix. Additionally, the BIOS can boot into the OS in an iPXE environment. + +Cc: Doug Flick [MSFT] + +Signed-off-by: Sam Tsai [Wiwynn] +Reviewed-by: Saloni Kasbekar +(cherry picked from commit ced13b93afea87a8a1fe6ddbb67240a84cb2e3d3) +--- + NetworkPkg/TcpDxe/TcpDriver.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/NetworkPkg/TcpDxe/TcpDriver.c b/NetworkPkg/TcpDxe/TcpDriver.c +index 40bba4080c..c6e7c0df54 100644 +--- a/NetworkPkg/TcpDxe/TcpDriver.c ++++ b/NetworkPkg/TcpDxe/TcpDriver.c +@@ -509,7 +509,7 @@ TcpDestroyService ( + // + // Destroy the instance of the hashing protocol for this controller. + // +- Status = Hash2ServiceBinding->DestroyChild (Hash2ServiceBinding, &mHash2ServiceHandle); ++ Status = Hash2ServiceBinding->DestroyChild (Hash2ServiceBinding, mHash2ServiceHandle); + if (EFI_ERROR (Status)) { + return EFI_UNSUPPORTED; + } diff --git a/0035-OvmfPkg-add-morlock-support.patch b/0035-OvmfPkg-add-morlock-support.patch new file mode 100644 index 0000000..1ad1a30 --- /dev/null +++ b/0035-OvmfPkg-add-morlock-support.patch @@ -0,0 +1,127 @@ +From 3f8eab199430de18c1c6a98d1d0772499b17cc86 Mon Sep 17 00:00:00 2001 +From: Gerd Hoffmann +Date: Wed, 8 May 2024 13:14:26 +0200 +Subject: [PATCH] OvmfPkg: add morlock support + +Add dsc + fdf include files to add the MorLock drivers to the build. +Add the include files to OVMF build configurations. + +Signed-off-by: Gerd Hoffmann +(cherry picked from commit b45aff0dc9cb87f316eb17a11e5d4438175d9cca) +--- + OvmfPkg/Include/Dsc/MorLock.dsc.inc | 10 ++++++++++ + OvmfPkg/Include/Fdf/MorLock.fdf.inc | 10 ++++++++++ + 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, 26 insertions(+) + create mode 100644 OvmfPkg/Include/Dsc/MorLock.dsc.inc + create mode 100644 OvmfPkg/Include/Fdf/MorLock.fdf.inc + +diff --git a/OvmfPkg/Include/Dsc/MorLock.dsc.inc b/OvmfPkg/Include/Dsc/MorLock.dsc.inc +new file mode 100644 +index 0000000000..a8c5fb24b8 +--- /dev/null ++++ b/OvmfPkg/Include/Dsc/MorLock.dsc.inc +@@ -0,0 +1,10 @@ ++## ++# SPDX-License-Identifier: BSD-2-Clause-Patent ++# ++# MorLock support ++## ++ ++ SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf ++!if $(SMM_REQUIRE) == TRUE ++ SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLockSmm.inf ++!endif +diff --git a/OvmfPkg/Include/Fdf/MorLock.fdf.inc b/OvmfPkg/Include/Fdf/MorLock.fdf.inc +new file mode 100644 +index 0000000000..20b7d6619a +--- /dev/null ++++ b/OvmfPkg/Include/Fdf/MorLock.fdf.inc +@@ -0,0 +1,10 @@ ++## ++# SPDX-License-Identifier: BSD-2-Clause-Patent ++# ++# MorLock support ++## ++ ++INF SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf ++!if $(SMM_REQUIRE) == TRUE ++INF SecurityPkg/Tcg/MemoryOverwriteRequestControlLock/TcgMorLockSmm.inf ++!endif +diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc +index d8ae542686..65a866ae0c 100644 +--- a/OvmfPkg/OvmfPkgIa32.dsc ++++ b/OvmfPkg/OvmfPkgIa32.dsc +@@ -887,6 +887,7 @@ + MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf + + !include OvmfPkg/Include/Dsc/ShellComponents.dsc.inc ++!include OvmfPkg/Include/Dsc/MorLock.dsc.inc + + !if $(SECURE_BOOT_ENABLE) == TRUE + SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf +diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf +index 0ffa3be750..10eb6fe72b 100644 +--- a/OvmfPkg/OvmfPkgIa32.fdf ++++ b/OvmfPkg/OvmfPkgIa32.fdf +@@ -355,6 +355,7 @@ INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf + !include OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc + + !include OvmfPkg/Include/Fdf/ShellDxe.fdf.inc ++!include OvmfPkg/Include/Fdf/MorLock.fdf.inc + + !if $(LOAD_X64_ON_IA32_ENABLE) == TRUE + INF OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.inf +diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc +index 52ac2c96fc..679e25501b 100644 +--- a/OvmfPkg/OvmfPkgIa32X64.dsc ++++ b/OvmfPkg/OvmfPkgIa32X64.dsc +@@ -901,6 +901,7 @@ + MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf + + !include OvmfPkg/Include/Dsc/ShellComponents.dsc.inc ++!include OvmfPkg/Include/Dsc/MorLock.dsc.inc + + !if $(SECURE_BOOT_ENABLE) == TRUE + SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf +diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf +index c4f3ec0735..ff06bbfc6f 100644 +--- a/OvmfPkg/OvmfPkgIa32X64.fdf ++++ b/OvmfPkg/OvmfPkgIa32X64.fdf +@@ -362,6 +362,7 @@ INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf + !include OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc + + !include OvmfPkg/Include/Fdf/ShellDxe.fdf.inc ++!include OvmfPkg/Include/Fdf/MorLock.fdf.inc + + ################################################################################ + +diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc +index f76d0ef7bc..d294fd4625 100644 +--- a/OvmfPkg/OvmfPkgX64.dsc ++++ b/OvmfPkg/OvmfPkgX64.dsc +@@ -969,6 +969,7 @@ + MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf + + !include OvmfPkg/Include/Dsc/ShellComponents.dsc.inc ++!include OvmfPkg/Include/Dsc/MorLock.dsc.inc + + !if $(SECURE_BOOT_ENABLE) == TRUE + SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf +diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf +index bedd85ef7a..f3b787201f 100644 +--- a/OvmfPkg/OvmfPkgX64.fdf ++++ b/OvmfPkg/OvmfPkgX64.fdf +@@ -402,6 +402,7 @@ INF OvmfPkg/Tcg/TdTcg2Dxe/TdTcg2Dxe.inf + !include OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc + + !include OvmfPkg/Include/Fdf/ShellDxe.fdf.inc ++!include OvmfPkg/Include/Fdf/MorLock.fdf.inc + + ################################################################################ + diff --git a/0036-MdePkg-BaseRngLib-Add-a-smoketest-for-RDRAND-and-che.patch b/0036-MdePkg-BaseRngLib-Add-a-smoketest-for-RDRAND-and-che.patch new file mode 100644 index 0000000..653b277 --- /dev/null +++ b/0036-MdePkg-BaseRngLib-Add-a-smoketest-for-RDRAND-and-che.patch @@ -0,0 +1,192 @@ +From 3899f089b8197f52ca63fe1561f8e5e1341f8198 Mon Sep 17 00:00:00 2001 +From: Pedro Falcato +Date: Tue, 22 Nov 2022 22:31:03 +0000 +Subject: [PATCH] MdePkg/BaseRngLib: Add a smoketest for RDRAND and check CPUID + +RDRAND has notoriously been broken many times over its lifespan. +Add a smoketest to RDRAND, in order to better sniff out potential +security concerns. + +Also add a proper CPUID test in order to support older CPUs which may +not have it; it was previously being tested but then promptly ignored. + +Testing algorithm inspired by linux's arch/x86/kernel/cpu/rdrand.c +:x86_init_rdrand() per commit 049f9ae9.. + +Many thanks to Jason Donenfeld for relicensing his linux RDRAND detection +code to MIT and the public domain. + +>On Tue, Nov 22, 2022 at 2:21 PM Jason A. Donenfeld wrote: + <..> +> I (re)wrote that function in Linux. I hereby relicense it as MIT, and +> also place it into public domain. Do with it what you will now. +> +> Jason + +BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=4163 + +Signed-off-by: Pedro Falcato +Cc: Michael D Kinney +Cc: Liming Gao +Cc: Zhiguang Liu +Cc: Jason A. Donenfeld +(cherry picked from commit c3a8ca7b54a9fd17acdf16c6282a92cc989fa92a) +--- + MdePkg/Library/BaseRngLib/Rand/RdRand.c | 99 +++++++++++++++++++++++-- + 1 file changed, 91 insertions(+), 8 deletions(-) + +diff --git a/MdePkg/Library/BaseRngLib/Rand/RdRand.c b/MdePkg/Library/BaseRngLib/Rand/RdRand.c +index 9bd68352f9..06d2a6f12d 100644 +--- a/MdePkg/Library/BaseRngLib/Rand/RdRand.c ++++ b/MdePkg/Library/BaseRngLib/Rand/RdRand.c +@@ -3,6 +3,7 @@ + to provide high-quality random numbers. + + Copyright (c) 2023, Arm Limited. All rights reserved.
++Copyright (c) 2022, Pedro Falcato. All rights reserved.
+ Copyright (c) 2021, NUVIA Inc. All rights reserved.
+ Copyright (c) 2015, Intel Corporation. All rights reserved.
+ +@@ -24,6 +25,88 @@ SPDX-License-Identifier: BSD-2-Clause-Patent + + STATIC BOOLEAN mRdRandSupported; + ++// ++// Intel SDM says 10 tries is good enough for reliable RDRAND usage. ++// ++#define RDRAND_RETRIES 10 ++ ++#define RDRAND_TEST_SAMPLES 8 ++ ++#define RDRAND_MIN_CHANGE 5 ++ ++// ++// Add a define for native-word RDRAND, just for the test. ++// ++#ifdef MDE_CPU_X64 ++#define ASM_RDRAND AsmRdRand64 ++#else ++#define ASM_RDRAND AsmRdRand32 ++#endif ++ ++/** ++ Tests RDRAND for broken implementations. ++ ++ @retval TRUE RDRAND is reliable (and hopefully safe). ++ @retval FALSE RDRAND is unreliable and should be disabled, despite CPUID. ++ ++**/ ++STATIC ++BOOLEAN ++TestRdRand ( ++ VOID ++ ) ++{ ++ // ++ // Test for notoriously broken rdrand implementations that always return the same ++ // value, like the Zen 3 uarch (all-1s) or other several AMD families on suspend/resume (also all-1s). ++ // Note that this should be expanded to extensively test for other sorts of possible errata. ++ // ++ ++ // ++ // Our algorithm samples rdrand $RDRAND_TEST_SAMPLES times and expects ++ // a different result $RDRAND_MIN_CHANGE times for reliable RDRAND usage. ++ // ++ UINTN Prev; ++ UINT8 Idx; ++ UINT8 TestIteration; ++ UINT32 Changed; ++ ++ Changed = 0; ++ ++ for (TestIteration = 0; TestIteration < RDRAND_TEST_SAMPLES; TestIteration++) { ++ UINTN Sample; ++ // ++ // Note: We use a retry loop for rdrand. Normal users get this in BaseRng.c ++ // Any failure to get a random number will assume RDRAND does not work. ++ // ++ for (Idx = 0; Idx < RDRAND_RETRIES; Idx++) { ++ if (ASM_RDRAND (&Sample)) { ++ break; ++ } ++ } ++ ++ if (Idx == RDRAND_RETRIES) { ++ DEBUG ((DEBUG_ERROR, "BaseRngLib/x86: CPU BUG: Failed to get an RDRAND random number - disabling\n")); ++ return FALSE; ++ } ++ ++ if (TestIteration != 0) { ++ Changed += Sample != Prev; ++ } ++ ++ Prev = Sample; ++ } ++ ++ if (Changed < RDRAND_MIN_CHANGE) { ++ DEBUG ((DEBUG_ERROR, "BaseRngLib/x86: CPU BUG: RDRAND not reliable - disabling\n")); ++ return FALSE; ++ } ++ ++ return TRUE; ++} ++ ++#undef ASM_RDRAND ++ + /** + The constructor function checks whether or not RDRAND instruction is supported + by the host hardware. +@@ -48,10 +131,13 @@ BaseRngLibConstructor ( + // CPUID. A value of 1 indicates that processor support RDRAND instruction. + // + AsmCpuid (1, 0, 0, &RegEcx, 0); +- ASSERT ((RegEcx & RDRAND_MASK) == RDRAND_MASK); + + mRdRandSupported = ((RegEcx & RDRAND_MASK) == RDRAND_MASK); + ++ if (mRdRandSupported) { ++ mRdRandSupported = TestRdRand (); ++ } ++ + return EFI_SUCCESS; + } + +@@ -70,6 +156,7 @@ ArchGetRandomNumber16 ( + OUT UINT16 *Rand + ) + { ++ ASSERT (mRdRandSupported); + return AsmRdRand16 (Rand); + } + +@@ -88,6 +175,7 @@ ArchGetRandomNumber32 ( + OUT UINT32 *Rand + ) + { ++ ASSERT (mRdRandSupported); + return AsmRdRand32 (Rand); + } + +@@ -106,6 +194,7 @@ ArchGetRandomNumber64 ( + OUT UINT64 *Rand + ) + { ++ ASSERT (mRdRandSupported); + return AsmRdRand64 (Rand); + } + +@@ -122,13 +211,7 @@ ArchIsRngSupported ( + VOID + ) + { +- /* +- Existing software depends on this always returning TRUE, so for +- now hard-code it. +- +- return mRdRandSupported; +- */ +- return TRUE; ++ return mRdRandSupported; + } + + /** diff --git a/0037-SecurityPkg-RngDxe-add-rng-test.patch b/0037-SecurityPkg-RngDxe-add-rng-test.patch new file mode 100644 index 0000000..b894821 --- /dev/null +++ b/0037-SecurityPkg-RngDxe-add-rng-test.patch @@ -0,0 +1,43 @@ +From 4947d363211159647e9266fa20ad9d4c8bc52f71 Mon Sep 17 00:00:00 2001 +From: Gerd Hoffmann +Date: Fri, 31 May 2024 09:49:13 +0200 +Subject: [PATCH] SecurityPkg/RngDxe: add rng test + +Check whenever RngLib actually returns random numbers, only return +a non-zero number of Algorithms if that is the case. + +This has the effect that RndDxe loads and installs EFI_RNG_PROTOCOL +only in case it can actually deliver random numbers. + +Signed-off-by: Gerd Hoffmann +(cherry picked from commit a61bc0accb8a76edba4f073fdc7bafc908df045d) +--- + SecurityPkg/RandomNumberGenerator/RngDxe/Rand/RngDxe.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/SecurityPkg/RandomNumberGenerator/RngDxe/Rand/RngDxe.c b/SecurityPkg/RandomNumberGenerator/RngDxe/Rand/RngDxe.c +index 5723ed6957..8b0742bab6 100644 +--- a/SecurityPkg/RandomNumberGenerator/RngDxe/Rand/RngDxe.c ++++ b/SecurityPkg/RandomNumberGenerator/RngDxe/Rand/RngDxe.c +@@ -23,6 +23,7 @@ + + #include + #include ++#include + + #include "RngDxeInternals.h" + +@@ -43,7 +44,12 @@ GetAvailableAlgorithms ( + VOID + ) + { +- mAvailableAlgoArrayCount = RNG_ALGORITHM_COUNT; ++ UINT64 RngTest; ++ ++ if (GetRandomNumber64 (&RngTest)) { ++ mAvailableAlgoArrayCount = RNG_ALGORITHM_COUNT; ++ } ++ + return EFI_SUCCESS; + } + diff --git a/0038-OvmfPkg-wire-up-RngDxe.patch b/0038-OvmfPkg-wire-up-RngDxe.patch new file mode 100644 index 0000000..71d66be --- /dev/null +++ b/0038-OvmfPkg-wire-up-RngDxe.patch @@ -0,0 +1,301 @@ +From 0aa96c512c689426838ec1cf4aa78ff088c03a1e Mon Sep 17 00:00:00 2001 +From: Gerd Hoffmann +Date: Fri, 24 May 2024 12:51:17 +0200 +Subject: [PATCH] OvmfPkg: wire up RngDxe + +Add OvmfRng include snippets with the random number generator +configuration for OVMF. Include RngDxe, build with BaseRngLib, +so the rdrand instruction is used (if available). + +Also move VirtioRng to the include snippets. + +Use the new include snippets for OVMF builds. + +Signed-off-by: Gerd Hoffmann +(cherry picked from commit 712797cf19acd292bf203522a79e40e7e13d268b) +--- + OvmfPkg/AmdSev/AmdSevX64.dsc | 2 +- + OvmfPkg/AmdSev/AmdSevX64.fdf | 2 +- + OvmfPkg/Include/Dsc/OvmfRngComponents.dsc.inc | 9 +++++++++ + OvmfPkg/Include/Fdf/OvmfRngDxe.fdf.inc | 6 ++++++ + OvmfPkg/IntelTdx/IntelTdxX64.dsc | 2 +- + OvmfPkg/IntelTdx/IntelTdxX64.fdf | 2 +- + OvmfPkg/Microvm/MicrovmX64.dsc | 2 +- + OvmfPkg/Microvm/MicrovmX64.fdf | 2 +- + OvmfPkg/OvmfPkgIa32.dsc | 2 +- + OvmfPkg/OvmfPkgIa32.fdf | 2 +- + OvmfPkg/OvmfPkgIa32X64.dsc | 2 +- + OvmfPkg/OvmfPkgIa32X64.fdf | 2 +- + OvmfPkg/OvmfPkgX64.dsc | 2 +- + OvmfPkg/OvmfPkgX64.fdf | 2 +- + 14 files changed, 27 insertions(+), 12 deletions(-) + create mode 100644 OvmfPkg/Include/Dsc/OvmfRngComponents.dsc.inc + create mode 100644 OvmfPkg/Include/Fdf/OvmfRngDxe.fdf.inc + +diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc +index cf1ad83e09..4edc2a9069 100644 +--- a/OvmfPkg/AmdSev/AmdSevX64.dsc ++++ b/OvmfPkg/AmdSev/AmdSevX64.dsc +@@ -649,7 +649,6 @@ + OvmfPkg/Virtio10Dxe/Virtio10.inf + OvmfPkg/VirtioBlkDxe/VirtioBlk.inf + OvmfPkg/VirtioScsiDxe/VirtioScsi.inf +- OvmfPkg/VirtioRngDxe/VirtioRng.inf + !if $(PVSCSI_ENABLE) == TRUE + OvmfPkg/PvScsiDxe/PvScsiDxe.inf + !endif +@@ -740,6 +739,7 @@ + OvmfPkg/AmdSev/Grub/Grub.inf + + !include OvmfPkg/Include/Dsc/ShellComponents.dsc.inc ++!include OvmfPkg/Include/Dsc/OvmfRngComponents.dsc.inc + + OvmfPkg/PlatformDxe/Platform.inf + OvmfPkg/AmdSevDxe/AmdSevDxe.inf { +diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf +index c56c98dc85..480837b0fa 100644 +--- a/OvmfPkg/AmdSev/AmdSevX64.fdf ++++ b/OvmfPkg/AmdSev/AmdSevX64.fdf +@@ -227,7 +227,6 @@ INF OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf + INF OvmfPkg/Virtio10Dxe/Virtio10.inf + INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf + INF OvmfPkg/VirtioScsiDxe/VirtioScsi.inf +-INF OvmfPkg/VirtioRngDxe/VirtioRng.inf + !if $(PVSCSI_ENABLE) == TRUE + INF OvmfPkg/PvScsiDxe/PvScsiDxe.inf + !endif +@@ -318,6 +317,7 @@ INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf + !include OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc + + !include OvmfPkg/Include/Fdf/ShellDxe.fdf.inc ++!include OvmfPkg/Include/Fdf/OvmfRngDxe.fdf.inc + + ################################################################################ + +diff --git a/OvmfPkg/Include/Dsc/OvmfRngComponents.dsc.inc b/OvmfPkg/Include/Dsc/OvmfRngComponents.dsc.inc +new file mode 100644 +index 0000000000..68839a0caa +--- /dev/null ++++ b/OvmfPkg/Include/Dsc/OvmfRngComponents.dsc.inc +@@ -0,0 +1,9 @@ ++## ++# SPDX-License-Identifier: BSD-2-Clause-Patent ++## ++ ++ SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf { ++ ++ RngLib|MdePkg/Library/BaseRngLib/BaseRngLib.inf ++ } ++ OvmfPkg/VirtioRngDxe/VirtioRng.inf +diff --git a/OvmfPkg/Include/Fdf/OvmfRngDxe.fdf.inc b/OvmfPkg/Include/Fdf/OvmfRngDxe.fdf.inc +new file mode 100644 +index 0000000000..99cb4a32b1 +--- /dev/null ++++ b/OvmfPkg/Include/Fdf/OvmfRngDxe.fdf.inc +@@ -0,0 +1,6 @@ ++## ++# SPDX-License-Identifier: BSD-2-Clause-Patent ++## ++ ++INF SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf ++INF OvmfPkg/VirtioRngDxe/VirtioRng.inf +diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.dsc b/OvmfPkg/IntelTdx/IntelTdxX64.dsc +index 9f49b60ff0..4b7e1596fc 100644 +--- a/OvmfPkg/IntelTdx/IntelTdxX64.dsc ++++ b/OvmfPkg/IntelTdx/IntelTdxX64.dsc +@@ -636,7 +636,6 @@ + OvmfPkg/Virtio10Dxe/Virtio10.inf + OvmfPkg/VirtioBlkDxe/VirtioBlk.inf + OvmfPkg/VirtioScsiDxe/VirtioScsi.inf +- OvmfPkg/VirtioRngDxe/VirtioRng.inf + !if $(PVSCSI_ENABLE) == TRUE + OvmfPkg/PvScsiDxe/PvScsiDxe.inf + !endif +@@ -719,6 +718,7 @@ + MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf + + !include OvmfPkg/Include/Dsc/ShellComponents.dsc.inc ++!include OvmfPkg/Include/Dsc/OvmfRngComponents.dsc.inc + + !if $(SECURE_BOOT_ENABLE) == TRUE + SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf +diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.fdf b/OvmfPkg/IntelTdx/IntelTdxX64.fdf +index ce5d542048..88d0f75ae2 100644 +--- a/OvmfPkg/IntelTdx/IntelTdxX64.fdf ++++ b/OvmfPkg/IntelTdx/IntelTdxX64.fdf +@@ -285,7 +285,6 @@ READ_LOCK_STATUS = TRUE + # + INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf + INF OvmfPkg/VirtioScsiDxe/VirtioScsi.inf +-INF OvmfPkg/VirtioRngDxe/VirtioRng.inf + !if $(PVSCSI_ENABLE) == TRUE + INF OvmfPkg/PvScsiDxe/PvScsiDxe.inf + !endif +@@ -326,6 +325,7 @@ INF OvmfPkg/VirtioGpuDxe/VirtioGpu.inf + INF OvmfPkg/PlatformDxe/Platform.inf + + !include OvmfPkg/Include/Fdf/ShellDxe.fdf.inc ++!include OvmfPkg/Include/Fdf/OvmfRngDxe.fdf.inc + + ################################################################################ + +diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc +index fb73f2e089..9206f01816 100644 +--- a/OvmfPkg/Microvm/MicrovmX64.dsc ++++ b/OvmfPkg/Microvm/MicrovmX64.dsc +@@ -760,7 +760,6 @@ + OvmfPkg/Virtio10Dxe/Virtio10.inf + OvmfPkg/VirtioBlkDxe/VirtioBlk.inf + OvmfPkg/VirtioScsiDxe/VirtioScsi.inf +- OvmfPkg/VirtioRngDxe/VirtioRng.inf + OvmfPkg/VirtioSerialDxe/VirtioSerial.inf + MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf + MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf +@@ -846,6 +845,7 @@ + MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf + + !include OvmfPkg/Include/Dsc/ShellComponents.dsc.inc ++!include OvmfPkg/Include/Dsc/OvmfRngComponents.dsc.inc + + !if $(SECURE_BOOT_ENABLE) == TRUE + SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf +diff --git a/OvmfPkg/Microvm/MicrovmX64.fdf b/OvmfPkg/Microvm/MicrovmX64.fdf +index 055e659a35..c8268d7e8c 100644 +--- a/OvmfPkg/Microvm/MicrovmX64.fdf ++++ b/OvmfPkg/Microvm/MicrovmX64.fdf +@@ -207,7 +207,6 @@ INF OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf + INF OvmfPkg/Virtio10Dxe/Virtio10.inf + INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf + INF OvmfPkg/VirtioScsiDxe/VirtioScsi.inf +-INF OvmfPkg/VirtioRngDxe/VirtioRng.inf + INF OvmfPkg/VirtioSerialDxe/VirtioSerial.inf + + !if $(SECURE_BOOT_ENABLE) == TRUE +@@ -299,6 +298,7 @@ INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf + INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf + + !include OvmfPkg/Include/Fdf/ShellDxe.fdf.inc ++!include OvmfPkg/Include/Fdf/OvmfRngDxe.fdf.inc + + ################################################################################ + +diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc +index 65a866ae0c..b64c215585 100644 +--- a/OvmfPkg/OvmfPkgIa32.dsc ++++ b/OvmfPkg/OvmfPkgIa32.dsc +@@ -784,7 +784,6 @@ + OvmfPkg/Virtio10Dxe/Virtio10.inf + OvmfPkg/VirtioBlkDxe/VirtioBlk.inf + OvmfPkg/VirtioScsiDxe/VirtioScsi.inf +- OvmfPkg/VirtioRngDxe/VirtioRng.inf + OvmfPkg/VirtioSerialDxe/VirtioSerial.inf + !if $(PVSCSI_ENABLE) == TRUE + OvmfPkg/PvScsiDxe/PvScsiDxe.inf +@@ -888,6 +887,7 @@ + + !include OvmfPkg/Include/Dsc/ShellComponents.dsc.inc + !include OvmfPkg/Include/Dsc/MorLock.dsc.inc ++!include OvmfPkg/Include/Dsc/OvmfRngComponents.dsc.inc + + !if $(SECURE_BOOT_ENABLE) == TRUE + SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf +diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf +index 10eb6fe72b..c31276e4a3 100644 +--- a/OvmfPkg/OvmfPkgIa32.fdf ++++ b/OvmfPkg/OvmfPkgIa32.fdf +@@ -231,7 +231,6 @@ INF OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf + INF OvmfPkg/Virtio10Dxe/Virtio10.inf + INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf + INF OvmfPkg/VirtioScsiDxe/VirtioScsi.inf +-INF OvmfPkg/VirtioRngDxe/VirtioRng.inf + INF OvmfPkg/VirtioSerialDxe/VirtioSerial.inf + !if $(PVSCSI_ENABLE) == TRUE + INF OvmfPkg/PvScsiDxe/PvScsiDxe.inf +@@ -356,6 +355,7 @@ INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf + + !include OvmfPkg/Include/Fdf/ShellDxe.fdf.inc + !include OvmfPkg/Include/Fdf/MorLock.fdf.inc ++!include OvmfPkg/Include/Fdf/OvmfRngDxe.fdf.inc + + !if $(LOAD_X64_ON_IA32_ENABLE) == TRUE + INF OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.inf +diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc +index 679e25501b..ececac3757 100644 +--- a/OvmfPkg/OvmfPkgIa32X64.dsc ++++ b/OvmfPkg/OvmfPkgIa32X64.dsc +@@ -798,7 +798,6 @@ + OvmfPkg/Virtio10Dxe/Virtio10.inf + OvmfPkg/VirtioBlkDxe/VirtioBlk.inf + OvmfPkg/VirtioScsiDxe/VirtioScsi.inf +- OvmfPkg/VirtioRngDxe/VirtioRng.inf + OvmfPkg/VirtioSerialDxe/VirtioSerial.inf + !if $(PVSCSI_ENABLE) == TRUE + OvmfPkg/PvScsiDxe/PvScsiDxe.inf +@@ -902,6 +901,7 @@ + + !include OvmfPkg/Include/Dsc/ShellComponents.dsc.inc + !include OvmfPkg/Include/Dsc/MorLock.dsc.inc ++!include OvmfPkg/Include/Dsc/OvmfRngComponents.dsc.inc + + !if $(SECURE_BOOT_ENABLE) == TRUE + SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf +diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf +index ff06bbfc6f..a7b4aeac08 100644 +--- a/OvmfPkg/OvmfPkgIa32X64.fdf ++++ b/OvmfPkg/OvmfPkgIa32X64.fdf +@@ -232,7 +232,6 @@ INF OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf + INF OvmfPkg/Virtio10Dxe/Virtio10.inf + INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf + INF OvmfPkg/VirtioScsiDxe/VirtioScsi.inf +-INF OvmfPkg/VirtioRngDxe/VirtioRng.inf + INF OvmfPkg/VirtioSerialDxe/VirtioSerial.inf + !if $(PVSCSI_ENABLE) == TRUE + INF OvmfPkg/PvScsiDxe/PvScsiDxe.inf +@@ -363,6 +362,7 @@ INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf + + !include OvmfPkg/Include/Fdf/ShellDxe.fdf.inc + !include OvmfPkg/Include/Fdf/MorLock.fdf.inc ++!include OvmfPkg/Include/Fdf/OvmfRngDxe.fdf.inc + + ################################################################################ + +diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc +index d294fd4625..0ab4d3df06 100644 +--- a/OvmfPkg/OvmfPkgX64.dsc ++++ b/OvmfPkg/OvmfPkgX64.dsc +@@ -866,7 +866,6 @@ + OvmfPkg/Virtio10Dxe/Virtio10.inf + OvmfPkg/VirtioBlkDxe/VirtioBlk.inf + OvmfPkg/VirtioScsiDxe/VirtioScsi.inf +- OvmfPkg/VirtioRngDxe/VirtioRng.inf + OvmfPkg/VirtioSerialDxe/VirtioSerial.inf + !if $(PVSCSI_ENABLE) == TRUE + OvmfPkg/PvScsiDxe/PvScsiDxe.inf +@@ -970,6 +969,7 @@ + + !include OvmfPkg/Include/Dsc/ShellComponents.dsc.inc + !include OvmfPkg/Include/Dsc/MorLock.dsc.inc ++!include OvmfPkg/Include/Dsc/OvmfRngComponents.dsc.inc + + !if $(SECURE_BOOT_ENABLE) == TRUE + SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf +diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf +index f3b787201f..ae08ac4fe9 100644 +--- a/OvmfPkg/OvmfPkgX64.fdf ++++ b/OvmfPkg/OvmfPkgX64.fdf +@@ -263,7 +263,6 @@ INF OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf + INF OvmfPkg/Virtio10Dxe/Virtio10.inf + INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf + INF OvmfPkg/VirtioScsiDxe/VirtioScsi.inf +-INF OvmfPkg/VirtioRngDxe/VirtioRng.inf + INF OvmfPkg/VirtioSerialDxe/VirtioSerial.inf + !if $(PVSCSI_ENABLE) == TRUE + INF OvmfPkg/PvScsiDxe/PvScsiDxe.inf +@@ -403,6 +402,7 @@ INF OvmfPkg/Tcg/TdTcg2Dxe/TdTcg2Dxe.inf + + !include OvmfPkg/Include/Fdf/ShellDxe.fdf.inc + !include OvmfPkg/Include/Fdf/MorLock.fdf.inc ++!include OvmfPkg/Include/Fdf/OvmfRngDxe.fdf.inc + + ################################################################################ + diff --git a/0039-CryptoPkg-Test-call-ProcessLibraryConstructorList.patch b/0039-CryptoPkg-Test-call-ProcessLibraryConstructorList.patch new file mode 100644 index 0000000..0194b84 --- /dev/null +++ b/0039-CryptoPkg-Test-call-ProcessLibraryConstructorList.patch @@ -0,0 +1,37 @@ +From d5d19043e62a268a492f9a1ef6a11380d8f7e784 Mon Sep 17 00:00:00 2001 +From: Gerd Hoffmann +Date: Fri, 14 Jun 2024 11:45:49 +0200 +Subject: [PATCH] CryptoPkg/Test: call ProcessLibraryConstructorList + +Needed to properly initialize BaseRngLib. + +Signed-off-by: Gerd Hoffmann +(cherry picked from commit 94961b8817eec6f8d0434555ac50a7aa51c22201) +--- + .../Test/UnitTest/Library/BaseCryptLib/UnitTestMain.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/UnitTestMain.c b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/UnitTestMain.c +index d0c1c7a4f7..48d463b8ad 100644 +--- a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/UnitTestMain.c ++++ b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/UnitTestMain.c +@@ -8,6 +8,12 @@ + **/ + #include "TestBaseCryptLib.h" + ++VOID ++EFIAPI ++ProcessLibraryConstructorList ( ++ VOID ++ ); ++ + /** + Initialize the unit test framework, suite, and unit tests for the + sample unit tests and run the unit tests. +@@ -76,5 +82,6 @@ main ( + char *argv[] + ) + { ++ ProcessLibraryConstructorList (); + return UefiTestMain (); + } diff --git a/0040-MdePkg-X86UnitTestHost-set-rdrand-cpuid-bit.patch b/0040-MdePkg-X86UnitTestHost-set-rdrand-cpuid-bit.patch new file mode 100644 index 0000000..d32e748 --- /dev/null +++ b/0040-MdePkg-X86UnitTestHost-set-rdrand-cpuid-bit.patch @@ -0,0 +1,43 @@ +From 320207a3df995771af36639c7bdf89c4203cf1c2 Mon Sep 17 00:00:00 2001 +From: Gerd Hoffmann +Date: Fri, 14 Jun 2024 11:45:53 +0200 +Subject: [PATCH] MdePkg/X86UnitTestHost: set rdrand cpuid bit + +Set the rdrand feature bit when faking cpuid for host test cases. +Needed to make the CryptoPkg test cases work. + +Signed-off-by: Gerd Hoffmann +(cherry picked from commit 5e776299a2604b336a947e68593012ab2cc16eb4) +--- + MdePkg/Library/BaseLib/X86UnitTestHost.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/MdePkg/Library/BaseLib/X86UnitTestHost.c b/MdePkg/Library/BaseLib/X86UnitTestHost.c +index 8ba4f54a38..7f7276f7f4 100644 +--- a/MdePkg/Library/BaseLib/X86UnitTestHost.c ++++ b/MdePkg/Library/BaseLib/X86UnitTestHost.c +@@ -66,6 +66,15 @@ UnitTestHostBaseLibAsmCpuid ( + OUT UINT32 *Edx OPTIONAL + ) + { ++ UINT32 RetEcx; ++ ++ RetEcx = 0; ++ switch (Index) { ++ case 1: ++ RetEcx |= BIT30; /* RdRand */ ++ break; ++ } ++ + if (Eax != NULL) { + *Eax = 0; + } +@@ -75,7 +84,7 @@ UnitTestHostBaseLibAsmCpuid ( + } + + if (Ecx != NULL) { +- *Ecx = 0; ++ *Ecx = RetEcx; + } + + if (Edx != NULL) { diff --git a/edk2-OvmfPkg-PlatformPei-consider-AP-stacks-for-pei-memor.patch b/edk2-OvmfPkg-PlatformPei-consider-AP-stacks-for-pei-memor.patch deleted file mode 100644 index e0afe7d..0000000 --- a/edk2-OvmfPkg-PlatformPei-consider-AP-stacks-for-pei-memor.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 9ecb56fbd704c4471b3485c08c1cbabeef5ee137 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Wed, 14 Feb 2024 11:45:02 +0100 -Subject: [PATCH 02/10] OvmfPkg/PlatformPei: consider AP stacks for pei memory - cap - -RH-Author: Gerd Hoffmann -RH-MergeRequest: 59: backport 4096 vcpu patches for c9s -RH-Jira: RHEL-22202 -RH-Acked-by: Oliver Steffen -RH-Commit: [2/10] e2c5325678de49e455de33581735d0275fb6b3b7 (kraxel.rh/centos-src-edk2) - -Needed to avoid running out of memory when booting -with a large (~2048) number of vcpus. - -Signed-off-by: Gerd Hoffmann -Reviewed-by: Laszlo Ersek -Message-Id: <20240214104504.2931339-3-kraxel@redhat.com> -(cherry picked from commit 8757e648d11357b663331f6ed1cdb2ab017df178) ---- - OvmfPkg/PlatformPei/MemDetect.c | 17 ++++++++++++++--- - 1 file changed, 14 insertions(+), 3 deletions(-) - -diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDetect.c -index e0ecca10b6..d6c46ffc89 100644 ---- a/OvmfPkg/PlatformPei/MemDetect.c -+++ b/OvmfPkg/PlatformPei/MemDetect.c -@@ -187,6 +187,8 @@ GetPeiMemoryCap ( - UINT32 Pml4Entries; - UINT32 PdpEntries; - UINTN TotalPages; -+ UINT64 ApStacks; -+ UINT64 MemoryCap; - - // - // If DXE is 32-bit, then just return the traditional 64 MB cap. -@@ -234,12 +236,21 @@ GetPeiMemoryCap ( - (PdpEntries + 1) * Pml4Entries + 1; - ASSERT (TotalPages <= 0x40201); - -+ // -+ // With 32k stacks and 4096 vcpus this lands at 128 MB (far away -+ // from MAX_UINT32). -+ // -+ ApStacks = PlatformInfoHob->PcdCpuMaxLogicalProcessorNumber * PcdGet32 (PcdCpuApStackSize); -+ - // - // Add 64 MB for miscellaneous allocations. Note that for -- // PhysMemAddressWidth values close to 36, the cap will actually be -- // dominated by this increment. -+ // PhysMemAddressWidth values close to 36 and a small number of -+ // CPUs, the cap will actually be dominated by this increment. - // -- return (UINT32)(EFI_PAGES_TO_SIZE (TotalPages) + SIZE_64MB); -+ MemoryCap = EFI_PAGES_TO_SIZE (TotalPages) + ApStacks + SIZE_64MB; -+ -+ ASSERT (MemoryCap <= MAX_UINT32); -+ return (UINT32)MemoryCap; - } - - /** --- -2.39.3 - diff --git a/edk2-OvmfPkg-PlatformPei-log-a-warning-when-memory-is-tig.patch b/edk2-OvmfPkg-PlatformPei-log-a-warning-when-memory-is-tig.patch deleted file mode 100644 index 8d5bffe..0000000 --- a/edk2-OvmfPkg-PlatformPei-log-a-warning-when-memory-is-tig.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6bafe5fb1b432b88396913c7feda272970e67002 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Wed, 14 Feb 2024 11:45:01 +0100 -Subject: [PATCH 01/10] OvmfPkg/PlatformPei: log a warning when memory is tight - -RH-Author: Gerd Hoffmann -RH-MergeRequest: 59: backport 4096 vcpu patches for c9s -RH-Jira: RHEL-22202 -RH-Acked-by: Oliver Steffen -RH-Commit: [1/10] 2ade669e2b69eaed11d054f181808d6c3158f8f3 (kraxel.rh/centos-src-edk2) - -Signed-off-by: Gerd Hoffmann -Reviewed-by: Laszlo Ersek -Message-Id: <20240214104504.2931339-2-kraxel@redhat.com> -(cherry picked from commit 9d32a02a724c79215a00bb2d2563c7fd026b0726) ---- - OvmfPkg/PlatformPei/MemDetect.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDetect.c -index 493cb1fbeb..e0ecca10b6 100644 ---- a/OvmfPkg/PlatformPei/MemDetect.c -+++ b/OvmfPkg/PlatformPei/MemDetect.c -@@ -319,6 +319,14 @@ PublishPeiMemory ( - if (MemorySize > PeiMemoryCap) { - MemoryBase = LowerMemorySize - PeiMemoryCap; - MemorySize = PeiMemoryCap; -+ } else { -+ DEBUG (( -+ DEBUG_WARN, -+ "%a: Not enough memory for PEI (have %lu KB, estimated need %u KB)\n", -+ __func__, -+ RShiftU64 (MemorySize, 10), -+ PeiMemoryCap >> 10 -+ )); - } - } - --- -2.39.3 - diff --git a/edk2-OvmfPkg-PlatformPei-log-pei-memory-cap-details.patch b/edk2-OvmfPkg-PlatformPei-log-pei-memory-cap-details.patch deleted file mode 100644 index b31a9ca..0000000 --- a/edk2-OvmfPkg-PlatformPei-log-pei-memory-cap-details.patch +++ /dev/null @@ -1,57 +0,0 @@ -From d80ea2ea86698de8e38629352a765c60c391a5d3 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Wed, 14 Feb 2024 11:45:04 +0100 -Subject: [PATCH 04/10] OvmfPkg/PlatformPei: log pei memory cap details - -RH-Author: Gerd Hoffmann -RH-MergeRequest: 59: backport 4096 vcpu patches for c9s -RH-Jira: RHEL-22202 -RH-Acked-by: Oliver Steffen -RH-Commit: [4/10] 640b85027aaf2df96c892bef5d15d87b09a7554a (kraxel.rh/centos-src-edk2) - -Signed-off-by: Gerd Hoffmann -Message-Id: <20240214104504.2931339-5-kraxel@redhat.com> -Reviewed-by: Laszlo Ersek -(cherry picked from commit aceb3490a2a350b128156fd4e36e53fc19739e4e) ---- - OvmfPkg/PlatformPei/MemDetect.c | 24 ++++++++++++++++++++++++ - 1 file changed, 24 insertions(+) - -diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDetect.c -index 81c29c626b..04409b28ba 100644 ---- a/OvmfPkg/PlatformPei/MemDetect.c -+++ b/OvmfPkg/PlatformPei/MemDetect.c -@@ -263,6 +263,30 @@ GetPeiMemoryCap ( - // - MemoryCap = EFI_PAGES_TO_SIZE ((UINTN)TotalPages) + ApStacks + SIZE_64MB; - -+ DEBUG (( -+ DEBUG_INFO, -+ "%a: page tables: %6lu KB (%u/%u/%u/%u pages for levels 5/4/3/2)\n", -+ __func__, -+ RShiftU64 (EFI_PAGES_TO_SIZE ((UINTN)TotalPages), 10), -+ Level5Pages, -+ Level4Pages, -+ Level3Pages, -+ Level2Pages -+ )); -+ DEBUG (( -+ DEBUG_INFO, -+ "%a: ap stacks: %6lu KB (%u cpus)\n", -+ __func__, -+ RShiftU64 (ApStacks, 10), -+ PlatformInfoHob->PcdCpuMaxLogicalProcessorNumber -+ )); -+ DEBUG (( -+ DEBUG_INFO, -+ "%a: memory cap: %6lu KB\n", -+ __func__, -+ RShiftU64 (MemoryCap, 10) -+ )); -+ - ASSERT (MemoryCap <= MAX_UINT32); - return (UINT32)MemoryCap; - } --- -2.39.3 - diff --git a/edk2-OvmfPkg-PlatformPei-rewrite-page-table-calculation.patch b/edk2-OvmfPkg-PlatformPei-rewrite-page-table-calculation.patch deleted file mode 100644 index d047bfe..0000000 --- a/edk2-OvmfPkg-PlatformPei-rewrite-page-table-calculation.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 4f7561085f7333777392543915b6da801c624aab Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Wed, 14 Feb 2024 11:45:03 +0100 -Subject: [PATCH 03/10] OvmfPkg/PlatformPei: rewrite page table calculation - -RH-Author: Gerd Hoffmann -RH-MergeRequest: 59: backport 4096 vcpu patches for c9s -RH-Jira: RHEL-22202 -RH-Acked-by: Oliver Steffen -RH-Commit: [3/10] faaac541239856514781c0e9eec38edc25a6c1f8 (kraxel.rh/centos-src-edk2) - -Consider 5-level paging. Simplify calculation to make it easier -to understand. Add some comments, improve ASSERTs. - -Signed-off-by: Gerd Hoffmann -Reviewed-by: Laszlo Ersek -Message-Id: <20240214104504.2931339-4-kraxel@redhat.com> -(cherry picked from commit 3ad1d7eb7bcb12d7b4967a27c6dec80395517797) ---- - OvmfPkg/PlatformPei/MemDetect.c | 58 ++++++++++++++++++++------------- - 1 file changed, 36 insertions(+), 22 deletions(-) - -diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDetect.c -index d6c46ffc89..81c29c626b 100644 ---- a/OvmfPkg/PlatformPei/MemDetect.c -+++ b/OvmfPkg/PlatformPei/MemDetect.c -@@ -184,9 +184,12 @@ GetPeiMemoryCap ( - BOOLEAN Page1GSupport; - UINT32 RegEax; - UINT32 RegEdx; -- UINT32 Pml4Entries; -- UINT32 PdpEntries; -- UINTN TotalPages; -+ UINT64 MaxAddr; -+ UINT32 Level5Pages; -+ UINT32 Level4Pages; -+ UINT32 Level3Pages; -+ UINT32 Level2Pages; -+ UINT32 TotalPages; - UINT64 ApStacks; - UINT64 MemoryCap; - -@@ -203,8 +206,7 @@ GetPeiMemoryCap ( - // - // Dependent on physical address width, PEI memory allocations can be - // dominated by the page tables built for 64-bit DXE. So we key the cap off -- // of those. The code below is based on CreateIdentityMappingPageTables() in -- // "MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.c". -+ // of those. - // - Page1GSupport = FALSE; - if (PcdGetBool (PcdUse1GPageTable)) { -@@ -217,24 +219,36 @@ GetPeiMemoryCap ( - } - } - -- if (PlatformInfoHob->PhysMemAddressWidth <= 39) { -- Pml4Entries = 1; -- PdpEntries = 1 << (PlatformInfoHob->PhysMemAddressWidth - 30); -- ASSERT (PdpEntries <= 0x200); -- } else { -- if (PlatformInfoHob->PhysMemAddressWidth > 48) { -- Pml4Entries = 0x200; -- } else { -- Pml4Entries = 1 << (PlatformInfoHob->PhysMemAddressWidth - 39); -- } -+ // -+ // - A 4KB page accommodates the least significant 12 bits of the -+ // virtual address. -+ // - A page table entry at any level consumes 8 bytes, so a 4KB page -+ // table page (at any level) contains 512 entries, and -+ // accommodates 9 bits of the virtual address. -+ // - we minimally cover the phys address space with 2MB pages, so -+ // level 1 never exists. -+ // - If 1G paging is available, then level 2 doesn't exist either. -+ // - Start with level 2, where a page table page accommodates -+ // 9 + 9 + 12 = 30 bits of the virtual address (and covers 1GB of -+ // physical address space). -+ // - -- ASSERT (Pml4Entries <= 0x200); -- PdpEntries = 512; -- } -+ MaxAddr = LShiftU64 (1, PlatformInfoHob->PhysMemAddressWidth); -+ Level2Pages = (UINT32)RShiftU64 (MaxAddr, 30); -+ Level3Pages = MAX (Level2Pages >> 9, 1u); -+ Level4Pages = MAX (Level3Pages >> 9, 1u); -+ Level5Pages = 1; - -- TotalPages = Page1GSupport ? Pml4Entries + 1 : -- (PdpEntries + 1) * Pml4Entries + 1; -- ASSERT (TotalPages <= 0x40201); -+ if (Page1GSupport) { -+ Level2Pages = 0; -+ TotalPages = Level5Pages + Level4Pages + Level3Pages; -+ ASSERT (TotalPages <= 0x40201); -+ } else { -+ TotalPages = Level5Pages + Level4Pages + Level3Pages + Level2Pages; -+ // PlatformAddressWidthFromCpuid() caps at 40 phys bits without 1G pages. -+ ASSERT (PlatformInfoHob->PhysMemAddressWidth <= 40); -+ ASSERT (TotalPages <= 0x404); -+ } - - // - // With 32k stacks and 4096 vcpus this lands at 128 MB (far away -@@ -247,7 +261,7 @@ GetPeiMemoryCap ( - // PhysMemAddressWidth values close to 36 and a small number of - // CPUs, the cap will actually be dominated by this increment. - // -- MemoryCap = EFI_PAGES_TO_SIZE (TotalPages) + ApStacks + SIZE_64MB; -+ MemoryCap = EFI_PAGES_TO_SIZE ((UINTN)TotalPages) + ApStacks + SIZE_64MB; - - ASSERT (MemoryCap <= MAX_UINT32); - return (UINT32)MemoryCap; --- -2.39.3 - diff --git a/edk2-UefiCpuPkg-MpInitLib-Add-support-for-multiple-HOBs-t.p2.patch b/edk2-UefiCpuPkg-MpInitLib-Add-support-for-multiple-HOBs-t.p2.patch deleted file mode 100644 index f884338..0000000 --- a/edk2-UefiCpuPkg-MpInitLib-Add-support-for-multiple-HOBs-t.p2.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 4c9151fa8f06c42f04459f79ae45bf9c01bba08a Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Thu, 22 Feb 2024 17:01:02 +0100 -Subject: [PATCH 06/10] UefiCpuPkg/MpInitLib: Add support for multiple HOBs to - GetBspNumber() - -RH-Author: Gerd Hoffmann -RH-MergeRequest: 59: backport 4096 vcpu patches for c9s -RH-Jira: RHEL-22202 -RH-Acked-by: Oliver Steffen -RH-Commit: [6/10] 41754f3533416e10c3057b3b31ac2829002d115c (kraxel.rh/centos-src-edk2) - -Rename the MpHandOff parameter to FirstMpHandOff. Add a loop so the -function inspects all HOBs present in the system. - -Signed-off-by: Gerd Hoffmann -Reviewed-by: Ray Ni -Reviewed-by: Laszlo Ersek -Message-Id: <20240222160106.686484-3-kraxel@redhat.com> -(cherry picked from commit b48523046283e8ef670b5d2b9f53de6855f7d3bf) ---- - UefiCpuPkg/Library/MpInitLib/MpLib.c | 23 +++++++++++++++-------- - 1 file changed, 15 insertions(+), 8 deletions(-) - -diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpInitLib/MpLib.c -index 00b36b0e18..770874b09d 100644 ---- a/UefiCpuPkg/Library/MpInitLib/MpLib.c -+++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c -@@ -1900,26 +1900,33 @@ CheckAllAPs ( - /** - This function Get BspNumber. - -- @param[in] MpHandOff Pointer to MpHandOff -+ @param[in] FirstMpHandOff Pointer to first MpHandOff HOB body. - @return BspNumber - **/ - UINT32 - GetBspNumber ( -- IN CONST MP_HAND_OFF *MpHandOff -+ IN CONST MP_HAND_OFF *FirstMpHandOff - ) - { -- UINT32 ApicId; -- UINT32 BspNumber; -- UINT32 Index; -+ UINT32 ApicId; -+ UINT32 BspNumber; -+ UINT32 Index; -+ CONST MP_HAND_OFF *MpHandOff; - - // - // Get the processor number for the BSP - // - BspNumber = MAX_UINT32; - ApicId = GetInitialApicId (); -- for (Index = 0; Index < MpHandOff->CpuCount; Index++) { -- if (MpHandOff->Info[Index].ApicId == ApicId) { -- BspNumber = Index; -+ -+ for (MpHandOff = FirstMpHandOff; -+ MpHandOff != NULL; -+ MpHandOff = GetNextMpHandOffHob (MpHandOff)) -+ { -+ for (Index = 0; Index < MpHandOff->CpuCount; Index++) { -+ if (MpHandOff->Info[Index].ApicId == ApicId) { -+ BspNumber = MpHandOff->ProcessorIndex + Index; -+ } - } - } - --- -2.39.3 - diff --git a/edk2-UefiCpuPkg-MpInitLib-Add-support-for-multiple-HOBs-t.p3.patch b/edk2-UefiCpuPkg-MpInitLib-Add-support-for-multiple-HOBs-t.p3.patch deleted file mode 100644 index 1ba30e6..0000000 --- a/edk2-UefiCpuPkg-MpInitLib-Add-support-for-multiple-HOBs-t.p3.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 9b609dba20e4ff82b83e73b9a61a36710a8014b8 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Thu, 22 Feb 2024 17:01:03 +0100 -Subject: [PATCH 07/10] UefiCpuPkg/MpInitLib: Add support for multiple HOBs to - SwitchApContext() - -RH-Author: Gerd Hoffmann -RH-MergeRequest: 59: backport 4096 vcpu patches for c9s -RH-Jira: RHEL-22202 -RH-Acked-by: Oliver Steffen -RH-Commit: [7/10] faa8253e80a08b71e0adc0fed6a5d17fada30402 (kraxel.rh/centos-src-edk2) - -Rename the MpHandOff parameter to FirstMpHandOff. Add loops so the -function inspects all HOBs present in the system. - -Signed-off-by: Gerd Hoffmann -Reviewed-by: Ray Ni -Reviewed-by: Laszlo Ersek -Message-Id: <20240222160106.686484-4-kraxel@redhat.com> -(cherry picked from commit e2c9d8eba49754b644ed4599331395d777afc379) ---- - UefiCpuPkg/Library/MpInitLib/MpLib.c | 35 ++++++++++++++++++---------- - UefiCpuPkg/Library/MpInitLib/MpLib.h | 2 +- - 2 files changed, 24 insertions(+), 13 deletions(-) - -diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpInitLib/MpLib.c -index 770874b09d..1494355f49 100644 ---- a/UefiCpuPkg/Library/MpInitLib/MpLib.c -+++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c -@@ -1944,31 +1944,42 @@ GetBspNumber ( - This procedure allows the AP to switch to another section of - memory and continue its loop there. - -- @param[in] MpHandOff Pointer to MP hand-off data structure. -+ @param[in] FirstMpHandOff Pointer to first MP hand-off HOB body. - **/ - VOID - SwitchApContext ( -- IN MP_HAND_OFF *MpHandOff -+ IN CONST MP_HAND_OFF *FirstMpHandOff - ) - { -- UINTN Index; -- UINT32 BspNumber; -+ UINTN Index; -+ UINT32 BspNumber; -+ CONST MP_HAND_OFF *MpHandOff; - -- BspNumber = GetBspNumber (MpHandOff); -+ BspNumber = GetBspNumber (FirstMpHandOff); - -- for (Index = 0; Index < MpHandOff->CpuCount; Index++) { -- if (Index != BspNumber) { -- *(UINTN *)(UINTN)MpHandOff->Info[Index].StartupProcedureAddress = (UINTN)SwitchContextPerAp; -- *(UINT32 *)(UINTN)MpHandOff->Info[Index].StartupSignalAddress = MpHandOff->StartupSignalValue; -+ for (MpHandOff = FirstMpHandOff; -+ MpHandOff != NULL; -+ MpHandOff = GetNextMpHandOffHob (MpHandOff)) -+ { -+ for (Index = 0; Index < MpHandOff->CpuCount; Index++) { -+ if (MpHandOff->ProcessorIndex + Index != BspNumber) { -+ *(UINTN *)(UINTN)MpHandOff->Info[Index].StartupProcedureAddress = (UINTN)SwitchContextPerAp; -+ *(UINT32 *)(UINTN)MpHandOff->Info[Index].StartupSignalAddress = MpHandOff->StartupSignalValue; -+ } - } - } - - // - // Wait all APs waken up if this is not the 1st broadcast of SIPI - // -- for (Index = 0; Index < MpHandOff->CpuCount; Index++) { -- if (Index != BspNumber) { -- WaitApWakeup ((UINT32 *)(UINTN)(MpHandOff->Info[Index].StartupSignalAddress)); -+ for (MpHandOff = FirstMpHandOff; -+ MpHandOff != NULL; -+ MpHandOff = GetNextMpHandOffHob (MpHandOff)) -+ { -+ for (Index = 0; Index < MpHandOff->CpuCount; Index++) { -+ if (MpHandOff->ProcessorIndex + Index != BspNumber) { -+ WaitApWakeup ((UINT32 *)(UINTN)(MpHandOff->Info[Index].StartupSignalAddress)); -+ } - } - } - } -diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.h b/UefiCpuPkg/Library/MpInitLib/MpLib.h -index fab2b2d493..3a7b9896cf 100644 ---- a/UefiCpuPkg/Library/MpInitLib/MpLib.h -+++ b/UefiCpuPkg/Library/MpInitLib/MpLib.h -@@ -482,7 +482,7 @@ GetWakeupBuffer ( - **/ - VOID - SwitchApContext ( -- IN MP_HAND_OFF *MpHandOff -+ IN CONST MP_HAND_OFF *FirstMpHandOff - ); - - /** --- -2.39.3 - diff --git a/edk2-UefiCpuPkg-MpInitLib-Add-support-for-multiple-HOBs-t.p4.patch b/edk2-UefiCpuPkg-MpInitLib-Add-support-for-multiple-HOBs-t.p4.patch deleted file mode 100644 index ef52d6b..0000000 --- a/edk2-UefiCpuPkg-MpInitLib-Add-support-for-multiple-HOBs-t.p4.patch +++ /dev/null @@ -1,162 +0,0 @@ -From 3ec2efae40a9a7c552c60e6c60b05b74ce5a6fbb Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Thu, 22 Feb 2024 17:01:04 +0100 -Subject: [PATCH 08/10] UefiCpuPkg/MpInitLib: Add support for multiple HOBs to - MpInitLibInitialize - -RH-Author: Gerd Hoffmann -RH-MergeRequest: 59: backport 4096 vcpu patches for c9s -RH-Jira: RHEL-22202 -RH-Acked-by: Oliver Steffen -RH-Commit: [8/10] 9ae7e900f38bfa95694841b68520560e02b0f927 (kraxel.rh/centos-src-edk2) - -Loop over all MP_HAND_OFF HOBs instead of expecting a single HOB -covering all CPUs in the system. - -Add a new FirstMpHandOff variable, which caches the first HOB body for -faster lookups. It is also used to check whenever MP_HAND_OFF HOBs are -present. Using the MpHandOff pointer for that does not work any more -because the variable will be NULL at the end of HOB loops. - -Signed-off-by: Gerd Hoffmann -Reviewed-by: Ray Ni -Message-Id: <20240222160106.686484-5-kraxel@redhat.com> -Reviewed-by: Laszlo Ersek -(cherry picked from commit c8e77454b5ffccfc39f48d5a792bc0aac311b634) ---- - UefiCpuPkg/Library/MpInitLib/MpLib.c | 68 +++++++++++++++++++--------- - 1 file changed, 47 insertions(+), 21 deletions(-) - -diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpInitLib/MpLib.c -index 1494355f49..a50981c9d1 100644 ---- a/UefiCpuPkg/Library/MpInitLib/MpLib.c -+++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c -@@ -2031,6 +2031,7 @@ MpInitLibInitialize ( - VOID - ) - { -+ MP_HAND_OFF *FirstMpHandOff; - MP_HAND_OFF *MpHandOff; - CPU_INFO_IN_HOB *CpuInfoInHob; - UINT32 MaxLogicalProcessorNumber; -@@ -2044,17 +2045,31 @@ MpInitLibInitialize ( - CPU_MP_DATA *CpuMpData; - UINT8 ApLoopMode; - UINT8 *MonitorBuffer; -- UINTN Index; -+ UINT32 Index, HobIndex; - UINTN ApResetVectorSizeBelow1Mb; - UINTN ApResetVectorSizeAbove1Mb; - UINTN BackupBufferAddr; - UINTN ApIdtBase; - -- MpHandOff = GetNextMpHandOffHob (NULL); -- if (MpHandOff == NULL) { -- MaxLogicalProcessorNumber = PcdGet32 (PcdCpuMaxLogicalProcessorNumber); -+ FirstMpHandOff = GetNextMpHandOffHob (NULL); -+ if (FirstMpHandOff != NULL) { -+ MaxLogicalProcessorNumber = 0; -+ for (MpHandOff = FirstMpHandOff; -+ MpHandOff != NULL; -+ MpHandOff = GetNextMpHandOffHob (MpHandOff)) -+ { -+ DEBUG (( -+ DEBUG_INFO, -+ "%a: ProcessorIndex=%u CpuCount=%u\n", -+ __func__, -+ MpHandOff->ProcessorIndex, -+ MpHandOff->CpuCount -+ )); -+ ASSERT (MaxLogicalProcessorNumber == MpHandOff->ProcessorIndex); -+ MaxLogicalProcessorNumber += MpHandOff->CpuCount; -+ } - } else { -- MaxLogicalProcessorNumber = MpHandOff->CpuCount; -+ MaxLogicalProcessorNumber = PcdGet32 (PcdCpuMaxLogicalProcessorNumber); - } - - ASSERT (MaxLogicalProcessorNumber != 0); -@@ -2198,7 +2213,7 @@ MpInitLibInitialize ( - // - ProgramVirtualWireMode (); - -- if (MpHandOff == NULL) { -+ if (FirstMpHandOff == NULL) { - if (MaxLogicalProcessorNumber > 1) { - // - // Wakeup all APs and calculate the processor count in system -@@ -2214,21 +2229,32 @@ MpInitLibInitialize ( - AmdSevUpdateCpuMpData (CpuMpData); - } - -- CpuMpData->CpuCount = MpHandOff->CpuCount; -- CpuMpData->BspNumber = GetBspNumber (MpHandOff); -+ CpuMpData->CpuCount = MaxLogicalProcessorNumber; -+ CpuMpData->BspNumber = GetBspNumber (FirstMpHandOff); - CpuInfoInHob = (CPU_INFO_IN_HOB *)(UINTN)CpuMpData->CpuInfoInHob; -- for (Index = 0; Index < CpuMpData->CpuCount; Index++) { -- InitializeSpinLock (&CpuMpData->CpuData[Index].ApLock); -- CpuMpData->CpuData[Index].CpuHealthy = (MpHandOff->Info[Index].Health == 0) ? TRUE : FALSE; -- CpuMpData->CpuData[Index].ApFunction = 0; -- CpuInfoInHob[Index].InitialApicId = MpHandOff->Info[Index].ApicId; -- CpuInfoInHob[Index].ApTopOfStack = CpuMpData->Buffer + (Index + 1) * CpuMpData->CpuApStackSize; -- CpuInfoInHob[Index].ApicId = MpHandOff->Info[Index].ApicId; -- CpuInfoInHob[Index].Health = MpHandOff->Info[Index].Health; -+ for (MpHandOff = FirstMpHandOff; -+ MpHandOff != NULL; -+ MpHandOff = GetNextMpHandOffHob (MpHandOff)) -+ { -+ for (HobIndex = 0; HobIndex < MpHandOff->CpuCount; HobIndex++) { -+ Index = MpHandOff->ProcessorIndex + HobIndex; -+ InitializeSpinLock (&CpuMpData->CpuData[Index].ApLock); -+ CpuMpData->CpuData[Index].CpuHealthy = (MpHandOff->Info[HobIndex].Health == 0) ? TRUE : FALSE; -+ CpuMpData->CpuData[Index].ApFunction = 0; -+ CpuInfoInHob[Index].InitialApicId = MpHandOff->Info[HobIndex].ApicId; -+ CpuInfoInHob[Index].ApTopOfStack = CpuMpData->Buffer + (Index + 1) * CpuMpData->CpuApStackSize; -+ CpuInfoInHob[Index].ApicId = MpHandOff->Info[HobIndex].ApicId; -+ CpuInfoInHob[Index].Health = MpHandOff->Info[HobIndex].Health; -+ } - } - -- DEBUG ((DEBUG_INFO, "MpHandOff->WaitLoopExecutionMode: %04d, sizeof (VOID *): %04d\n", MpHandOff->WaitLoopExecutionMode, sizeof (VOID *))); -- if (MpHandOff->WaitLoopExecutionMode == sizeof (VOID *)) { -+ DEBUG (( -+ DEBUG_INFO, -+ "FirstMpHandOff->WaitLoopExecutionMode: %04d, sizeof (VOID *): %04d\n", -+ FirstMpHandOff->WaitLoopExecutionMode, -+ sizeof (VOID *) -+ )); -+ if (FirstMpHandOff->WaitLoopExecutionMode == sizeof (VOID *)) { - ASSERT (CpuMpData->ApLoopMode != ApInHltLoop); - - CpuMpData->FinishedCount = 0; -@@ -2244,7 +2270,7 @@ MpInitLibInitialize ( - // enables the APs to switch to a different memory section and continue their - // looping process there. - // -- SwitchApContext (MpHandOff); -+ SwitchApContext (FirstMpHandOff); - // - // Wait for all APs finished initialization - // -@@ -2293,7 +2319,7 @@ MpInitLibInitialize ( - // Wakeup APs to do some AP initialize sync (Microcode & MTRR) - // - if (CpuMpData->CpuCount > 1) { -- if (MpHandOff != NULL) { -+ if (FirstMpHandOff != NULL) { - // - // Only needs to use this flag for DXE phase to update the wake up - // buffer. Wakeup buffer allocated in PEI phase is no longer valid -@@ -2310,7 +2336,7 @@ MpInitLibInitialize ( - CpuPause (); - } - -- if (MpHandOff != NULL) { -+ if (FirstMpHandOff != NULL) { - CpuMpData->InitFlag = ApInitDone; - } - --- -2.39.3 - diff --git a/edk2-UefiCpuPkg-MpInitLib-Add-support-for-multiple-HOBs-t.p5.patch b/edk2-UefiCpuPkg-MpInitLib-Add-support-for-multiple-HOBs-t.p5.patch deleted file mode 100644 index 4832885..0000000 --- a/edk2-UefiCpuPkg-MpInitLib-Add-support-for-multiple-HOBs-t.p5.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 529cf9e805df50d45cd56dfb96b373057f9b0557 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Thu, 22 Feb 2024 17:01:05 +0100 -Subject: [PATCH 09/10] UefiCpuPkg/MpInitLib: Add support for multiple HOBs to - SaveCpuMpData() - -RH-Author: Gerd Hoffmann -RH-MergeRequest: 59: backport 4096 vcpu patches for c9s -RH-Jira: RHEL-22202 -RH-Acked-by: Oliver Steffen -RH-Commit: [9/10] 764ed13aaaa7e01c056773e9fe82555eb9476a16 (kraxel.rh/centos-src-edk2) - -Add support for splitting Hand-Off data into multiple HOBs. -This is required for VMs with thousands of CPUs. - -Signed-off-by: Gerd Hoffmann -Message-Id: <20240222160106.686484-6-kraxel@redhat.com> -Reviewed-by: Ray Ni -Reviewed-by: Laszlo Ersek -[lersek@redhat.com: define one local variable per line [Ray]] -(cherry picked from commit 5e09b5d6d7eda2c88d12ee27db18b3c75ed24dd3) ---- - UefiCpuPkg/Library/MpInitLib/PeiMpLib.c | 48 +++++++++++++++---------- - 1 file changed, 30 insertions(+), 18 deletions(-) - -diff --git a/UefiCpuPkg/Library/MpInitLib/PeiMpLib.c b/UefiCpuPkg/Library/MpInitLib/PeiMpLib.c -index f80e00edcf..ec1aa66692 100644 ---- a/UefiCpuPkg/Library/MpInitLib/PeiMpLib.c -+++ b/UefiCpuPkg/Library/MpInitLib/PeiMpLib.c -@@ -126,35 +126,47 @@ SaveCpuMpData ( - IN CPU_MP_DATA *CpuMpData - ) - { -+ UINT32 MaxCpusPerHob; -+ UINT32 CpusInHob; - UINT64 Data64; -- UINTN Index; -+ UINT32 Index; -+ UINT32 HobBase; - CPU_INFO_IN_HOB *CpuInfoInHob; - MP_HAND_OFF *MpHandOff; - UINTN MpHandOffSize; - -+ MaxCpusPerHob = (0xFFF8 - sizeof (EFI_HOB_GUID_TYPE) - sizeof (MP_HAND_OFF)) / sizeof (PROCESSOR_HAND_OFF); -+ - // - // When APs are in a state that can be waken up by a store operation to a memory address, - // report the MP_HAND_OFF data for DXE to use. - // -- CpuInfoInHob = (CPU_INFO_IN_HOB *)(UINTN)CpuMpData->CpuInfoInHob; -- MpHandOffSize = sizeof (MP_HAND_OFF) + sizeof (PROCESSOR_HAND_OFF) * CpuMpData->CpuCount; -- MpHandOff = (MP_HAND_OFF *)BuildGuidHob (&mMpHandOffGuid, MpHandOffSize); -- ASSERT (MpHandOff != NULL); -- ZeroMem (MpHandOff, MpHandOffSize); -- MpHandOff->ProcessorIndex = 0; -- -- MpHandOff->CpuCount = CpuMpData->CpuCount; -- if (CpuMpData->ApLoopMode != ApInHltLoop) { -- MpHandOff->StartupSignalValue = MP_HAND_OFF_SIGNAL; -- MpHandOff->WaitLoopExecutionMode = sizeof (VOID *); -- } -+ CpuInfoInHob = (CPU_INFO_IN_HOB *)(UINTN)CpuMpData->CpuInfoInHob; -+ -+ for (Index = 0; Index < CpuMpData->CpuCount; Index++) { -+ if (Index % MaxCpusPerHob == 0) { -+ HobBase = Index; -+ CpusInHob = MIN (CpuMpData->CpuCount - HobBase, MaxCpusPerHob); -+ -+ MpHandOffSize = sizeof (MP_HAND_OFF) + sizeof (PROCESSOR_HAND_OFF) * CpusInHob; -+ MpHandOff = (MP_HAND_OFF *)BuildGuidHob (&mMpHandOffGuid, MpHandOffSize); -+ ASSERT (MpHandOff != NULL); -+ ZeroMem (MpHandOff, MpHandOffSize); -+ -+ MpHandOff->ProcessorIndex = HobBase; -+ MpHandOff->CpuCount = CpusInHob; -+ -+ if (CpuMpData->ApLoopMode != ApInHltLoop) { -+ MpHandOff->StartupSignalValue = MP_HAND_OFF_SIGNAL; -+ MpHandOff->WaitLoopExecutionMode = sizeof (VOID *); -+ } -+ } - -- for (Index = 0; Index < MpHandOff->CpuCount; Index++) { -- MpHandOff->Info[Index].ApicId = CpuInfoInHob[Index].ApicId; -- MpHandOff->Info[Index].Health = CpuInfoInHob[Index].Health; -+ MpHandOff->Info[Index-HobBase].ApicId = CpuInfoInHob[Index].ApicId; -+ MpHandOff->Info[Index-HobBase].Health = CpuInfoInHob[Index].Health; - if (CpuMpData->ApLoopMode != ApInHltLoop) { -- MpHandOff->Info[Index].StartupSignalAddress = (UINT64)(UINTN)CpuMpData->CpuData[Index].StartupApSignal; -- MpHandOff->Info[Index].StartupProcedureAddress = (UINT64)(UINTN)&CpuMpData->CpuData[Index].ApFunction; -+ MpHandOff->Info[Index-HobBase].StartupSignalAddress = (UINT64)(UINTN)CpuMpData->CpuData[Index].StartupApSignal; -+ MpHandOff->Info[Index-HobBase].StartupProcedureAddress = (UINT64)(UINTN)&CpuMpData->CpuData[Index].ApFunction; - } - } - --- -2.39.3 - diff --git a/edk2-UefiCpuPkg-MpInitLib-Add-support-for-multiple-HOBs-t.patch b/edk2-UefiCpuPkg-MpInitLib-Add-support-for-multiple-HOBs-t.patch deleted file mode 100644 index f950b41..0000000 --- a/edk2-UefiCpuPkg-MpInitLib-Add-support-for-multiple-HOBs-t.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 78881a773805298141feaeaf5670ebce616a8338 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Thu, 22 Feb 2024 17:01:01 +0100 -Subject: [PATCH 05/10] UefiCpuPkg/MpInitLib: Add support for multiple HOBs to - GetMpHandOffHob - -RH-Author: Gerd Hoffmann -RH-MergeRequest: 59: backport 4096 vcpu patches for c9s -RH-Jira: RHEL-22202 -RH-Acked-by: Oliver Steffen -RH-Commit: [5/10] d738dc794cf7f5b8440bb9c23f21a11eb220add3 (kraxel.rh/centos-src-edk2) - -Rename the function to GetNextMpHandOffHob(), add MP_HAND_OFF parameter. -When called with NULL pointer return the body of the first HOB, otherwise -return the next in the chain. - -Also add the function prototype to the MpLib.h header file. - -Signed-off-by: Gerd Hoffmann -Message-Id: <20240222160106.686484-2-kraxel@redhat.com> -Reviewed-by: Ray Ni -Reviewed-by: Laszlo Ersek -(cherry picked from commit a3ee1eea96752cf2d4e0f70310facc109b7c4352) ---- - UefiCpuPkg/Library/MpInitLib/MpLib.c | 26 ++++++++++++++++---------- - UefiCpuPkg/Library/MpInitLib/MpLib.h | 12 ++++++++++++ - 2 files changed, 28 insertions(+), 10 deletions(-) - -diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpInitLib/MpLib.c -index 7bc93dfa13..00b36b0e18 100644 ---- a/UefiCpuPkg/Library/MpInitLib/MpLib.c -+++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c -@@ -1967,25 +1967,31 @@ SwitchApContext ( - } - - /** -- Get pointer to MP_HAND_OFF GUIDed HOB. -+ Get pointer to next MP_HAND_OFF GUIDed HOB body. -+ -+ @param[in] MpHandOff Previous HOB body. Pass NULL to get the first HOB. - - @return The pointer to MP_HAND_OFF structure. - **/ - MP_HAND_OFF * --GetMpHandOffHob ( -- VOID -+GetNextMpHandOffHob ( -+ IN CONST MP_HAND_OFF *MpHandOff - ) - { - EFI_HOB_GUID_TYPE *GuidHob; -- MP_HAND_OFF *MpHandOff; - -- MpHandOff = NULL; -- GuidHob = GetFirstGuidHob (&mMpHandOffGuid); -- if (GuidHob != NULL) { -- MpHandOff = (MP_HAND_OFF *)GET_GUID_HOB_DATA (GuidHob); -+ if (MpHandOff == NULL) { -+ GuidHob = GetFirstGuidHob (&mMpHandOffGuid); -+ } else { -+ GuidHob = (VOID *)(((UINT8 *)MpHandOff) - sizeof (EFI_HOB_GUID_TYPE)); -+ GuidHob = GetNextGuidHob (&mMpHandOffGuid, GET_NEXT_HOB (GuidHob)); -+ } -+ -+ if (GuidHob == NULL) { -+ return NULL; - } - -- return MpHandOff; -+ return (MP_HAND_OFF *)GET_GUID_HOB_DATA (GuidHob); - } - - /** -@@ -2026,7 +2032,7 @@ MpInitLibInitialize ( - UINTN BackupBufferAddr; - UINTN ApIdtBase; - -- MpHandOff = GetMpHandOffHob (); -+ MpHandOff = GetNextMpHandOffHob (NULL); - if (MpHandOff == NULL) { - MaxLogicalProcessorNumber = PcdGet32 (PcdCpuMaxLogicalProcessorNumber); - } else { -diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.h b/UefiCpuPkg/Library/MpInitLib/MpLib.h -index a96a6389c1..fab2b2d493 100644 ---- a/UefiCpuPkg/Library/MpInitLib/MpLib.h -+++ b/UefiCpuPkg/Library/MpInitLib/MpLib.h -@@ -485,6 +485,18 @@ SwitchApContext ( - IN MP_HAND_OFF *MpHandOff - ); - -+/** -+ Get pointer to next MP_HAND_OFF GUIDed HOB body. -+ -+ @param[in] MpHandOff Previous HOB body. Pass NULL to get the first HOB. -+ -+ @return The pointer to MP_HAND_OFF structure. -+**/ -+MP_HAND_OFF * -+GetNextMpHandOffHob ( -+ IN CONST MP_HAND_OFF *MpHandOff -+ ); -+ - /** - Get available EfiBootServicesCode memory below 4GB by specified size. - --- -2.39.3 - diff --git a/edk2-UefiCpuPkg-MpInitLib-return-early-in-GetBspNumber.patch b/edk2-UefiCpuPkg-MpInitLib-return-early-in-GetBspNumber.patch deleted file mode 100644 index 5f49d67..0000000 --- a/edk2-UefiCpuPkg-MpInitLib-return-early-in-GetBspNumber.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 364b11a2cc6c37ce66af2bbeb70591f98d8b14d2 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Thu, 22 Feb 2024 17:01:06 +0100 -Subject: [PATCH 10/10] UefiCpuPkg/MpInitLib: return early in GetBspNumber() - -RH-Author: Gerd Hoffmann -RH-MergeRequest: 59: backport 4096 vcpu patches for c9s -RH-Jira: RHEL-22202 -RH-Acked-by: Oliver Steffen -RH-Commit: [10/10] 0695e52ad712025a0cfb097926dcf14a498664ae (kraxel.rh/centos-src-edk2) - -After finding the BSP Number return the result instead of -continuing to loop over the remaining processors. - -Suggested-by: Laszlo Ersek -Signed-off-by: Gerd Hoffmann -Message-Id: <20240222160106.686484-7-kraxel@redhat.com> -Reviewed-by: Ray Ni -Reviewed-by: Laszlo Ersek -[lersek@redhat.com: s/ASSERT (FALSE)/ASSERT_EFI_ERROR (EFI_NOT_FOUND)/ [Ray]] -(cherry picked from commit d25421d0d8cd2493b30215ef80d2424ecb19c870) ---- - UefiCpuPkg/Library/MpInitLib/MpLib.c | 11 ++++------- - 1 file changed, 4 insertions(+), 7 deletions(-) - -diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpInitLib/MpLib.c -index a50981c9d1..b408585fcc 100644 ---- a/UefiCpuPkg/Library/MpInitLib/MpLib.c -+++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c -@@ -1909,15 +1909,13 @@ GetBspNumber ( - ) - { - UINT32 ApicId; -- UINT32 BspNumber; - UINT32 Index; - CONST MP_HAND_OFF *MpHandOff; - - // - // Get the processor number for the BSP - // -- BspNumber = MAX_UINT32; -- ApicId = GetInitialApicId (); -+ ApicId = GetInitialApicId (); - - for (MpHandOff = FirstMpHandOff; - MpHandOff != NULL; -@@ -1925,14 +1923,13 @@ GetBspNumber ( - { - for (Index = 0; Index < MpHandOff->CpuCount; Index++) { - if (MpHandOff->Info[Index].ApicId == ApicId) { -- BspNumber = MpHandOff->ProcessorIndex + Index; -+ return MpHandOff->ProcessorIndex + Index; - } - } - } - -- ASSERT (BspNumber != MAX_UINT32); -- -- return BspNumber; -+ ASSERT_EFI_ERROR (EFI_NOT_FOUND); -+ return 0; - } - - /** --- -2.39.3 - diff --git a/edk2.spec b/edk2.spec index cfc7736..40fae26 100644 --- a/edk2.spec +++ b/edk2.spec @@ -1,12 +1,12 @@ ExclusiveArch: x86_64 aarch64 -# edk2-stable202402 -%define GITDATE 20240214 -%define GITCOMMIT edc6681206 +# edk2-stable202405 +%define GITDATE 20240524 +%define GITCOMMIT 3e722403cd %define TOOLCHAIN GCC %define OPENSSL_VER 3.0.7 -%define OPENSSL_HASH db0287935122edceb91dcda8dfb53b4090734e22 +%define OPENSSL_HASH 8e5beb77088bfec064d60506b1e76ddb0ac417fe %define DBXDATE 20230509 @@ -21,7 +21,7 @@ ExclusiveArch: x86_64 aarch64 Name: edk2 Version: %{GITDATE} -Release: 2%{?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 @@ -82,26 +82,13 @@ Patch28: 0030-OvmfPkg-Sec-Setup-MTRR-early-in-the-boot-process.patch Patch29: 0031-MdePkg-ArchitecturalMsr.h-add-defines-for-MTRR-cache.patch Patch30: 0032-UefiCpuPkg-MtrrLib.h-use-cache-type-defines-from-Arc.patch Patch31: 0033-OvmfPkg-Sec-use-cache-type-defines-from-Architectura.patch -# For RHEL-22202 - [EDK2] Support booting with 4096 vcpus -Patch32: edk2-OvmfPkg-PlatformPei-log-a-warning-when-memory-is-tig.patch -# For RHEL-22202 - [EDK2] Support booting with 4096 vcpus -Patch33: edk2-OvmfPkg-PlatformPei-consider-AP-stacks-for-pei-memor.patch -# For RHEL-22202 - [EDK2] Support booting with 4096 vcpus -Patch34: edk2-OvmfPkg-PlatformPei-rewrite-page-table-calculation.patch -# For RHEL-22202 - [EDK2] Support booting with 4096 vcpus -Patch35: edk2-OvmfPkg-PlatformPei-log-pei-memory-cap-details.patch -# For RHEL-22202 - [EDK2] Support booting with 4096 vcpus -Patch36: edk2-UefiCpuPkg-MpInitLib-Add-support-for-multiple-HOBs-t.patch -# For RHEL-22202 - [EDK2] Support booting with 4096 vcpus -Patch37: edk2-UefiCpuPkg-MpInitLib-Add-support-for-multiple-HOBs-t.p2.patch -# For RHEL-22202 - [EDK2] Support booting with 4096 vcpus -Patch38: edk2-UefiCpuPkg-MpInitLib-Add-support-for-multiple-HOBs-t.p3.patch -# For RHEL-22202 - [EDK2] Support booting with 4096 vcpus -Patch39: edk2-UefiCpuPkg-MpInitLib-Add-support-for-multiple-HOBs-t.p4.patch -# For RHEL-22202 - [EDK2] Support booting with 4096 vcpus -Patch40: edk2-UefiCpuPkg-MpInitLib-Add-support-for-multiple-HOBs-t.p5.patch -# For RHEL-22202 - [EDK2] Support booting with 4096 vcpus -Patch41: edk2-UefiCpuPkg-MpInitLib-return-early-in-GetBspNumber.patch +Patch32: 0034-NetworkPkg-TcpDxe-Fixed-system-stuck-on-PXE-boot-flo.patch +Patch33: 0035-OvmfPkg-add-morlock-support.patch +Patch34: 0036-MdePkg-BaseRngLib-Add-a-smoketest-for-RDRAND-and-che.patch +Patch35: 0037-SecurityPkg-RngDxe-add-rng-test.patch +Patch36: 0038-OvmfPkg-wire-up-RngDxe.patch +Patch37: 0039-CryptoPkg-Test-call-ProcessLibraryConstructorList.patch +Patch38: 0040-MdePkg-X86UnitTestHost-set-rdrand-cpuid-bit.patch # python3-devel and libuuid-devel are required for building tools. # python3-devel is also needed for varstore template generation and @@ -262,6 +249,7 @@ python3 CryptoPkg/Library/OpensslLib/configure.py mkdir -p CryptoPkg/Library/MbedTlsLib/mbedtls/include mkdir -p CryptoPkg/Library/MbedTlsLib/mbedtls/include/mbedtls mkdir -p CryptoPkg/Library/MbedTlsLib/mbedtls/library +mkdir -p SecurityPkg/DeviceSecurity/SpdmLib/libspdm/include %if %{build_ovmf} ./edk2-build.py --config edk2-build.rhel-9 -m ovmf --release-date "$RELEASE_DATE" @@ -435,6 +423,20 @@ install -m 0644 \ %changelog +* Thu Jun 20 2024 Miroslav Rezanina - 20240524-1 +- Rebase to edk2-stable202405 +- Bumo openssl to 8e5beb77088b +- Resolves: RHEL-32486 + (rebase to edk2-stable202405 [rhel-9]) +- Resolves: RHEL-36446 + (edk2: enable MOR [rhel-9]) +- Resolves: RHEL-21653 + (CVE-2023-6237 edk2: openssl: Excessive time spent checking invalid RSA public keys [rhel-9]) +- Resolves: RHEL-21150 + (CVE-2023-6129 edk2: mysql: openssl: POLY1305 MAC implementation corrupts vector registers on PowerPC) +- Resolves: RHEL-22490 + (CVE-2024-0727 edk2: openssl: denial of service via null dereference [rhel-9]) + * Mon Apr 08 2024 Miroslav Rezanina - 20240214-2 - edk2-OvmfPkg-PlatformPei-log-a-warning-when-memory-is-tig.patch [RHEL-22202] - edk2-OvmfPkg-PlatformPei-consider-AP-stacks-for-pei-memor.patch [RHEL-22202] diff --git a/sources b/sources index 18fa3eb..54697a3 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (DBXUpdate-20230509.x64.bin) = 71fb6e8cd6918126b3acd78b95651913336df372e13fdfdfdd20d5d23f0e509050c6c88c8a2c43f8ac44f987df86bd45174bb3065d5a7a8c7e3b8772fd06d624 -SHA512 (edk2-edc6681206.tar.xz) = 6cb8812ae80702125f3b7ac3721eaed805eaa7997f486012fa4b83ac5b6a422ca31f8b34b7cc712750ab5d402d9d6e3f9d9aacf3dc9065833afc3fe555bb9021 -SHA512 (openssl-rhel-db0287935122edceb91dcda8dfb53b4090734e22.tar.xz) = 7958f06cd36b74215feec13a11c86026568f51650d598e048d94598cdc227ac7d2b97eceb1910f3c19e3525c3199b8b5a438b5098156871f9feb3550f677ca58 +SHA512 (edk2-3e722403cd.tar.xz) = 55afa1275a579c3c620c10fe78758f952e5f6c73425c56034e28f05ad6ae2d8b9480d6f0133e2320fb6d3bc3f016daf6e0cb1fbdb737176b9cfa51fce076207d +SHA512 (openssl-rhel-8e5beb77088bfec064d60506b1e76ddb0ac417fe.tar.xz) = 5b4281ed4307611620803b7fa880cc734dc6ebf08ae7b4ae4249123ec3fa17652d678d80c5b3e6f6ea7d71c6c7916f188545a628ee78db2fc68094cc09bc09d8