diff --git a/edk2-OvmfPkg-disable-dynamic-mmio-window-rhel-only.patch b/edk2-OvmfPkg-disable-dynamic-mmio-window-rhel-only.patch new file mode 100644 index 0000000..1f06b3a --- /dev/null +++ b/edk2-OvmfPkg-disable-dynamic-mmio-window-rhel-only.patch @@ -0,0 +1,33 @@ +From 5722005baa03df51b9376f05274981524e513d93 Mon Sep 17 00:00:00 2001 +From: Gerd Hoffmann +Date: Thu, 2 Mar 2023 12:01:36 +0100 +Subject: [PATCH] OvmfPkg: disable dynamic mmio window (rhel only) + +RH-Author: Gerd Hoffmann +RH-MergeRequest: 29: OvmfPkg: disable dynamic mmio window (rhel only) +RH-Bugzilla: 2174605 +RH-Acked-by: Laszlo Ersek +RH-Commit: [1/1] a1faf2d01025e5f5be7dbc29af1b0b57631d6230 (kraxel/centos-edk2) + +Signed-off-by: Gerd Hoffmann +--- + OvmfPkg/Library/PlatformInitLib/MemDetect.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/OvmfPkg/Library/PlatformInitLib/MemDetect.c b/OvmfPkg/Library/PlatformInitLib/MemDetect.c +index b8feae4309..55e02417e4 100644 +--- a/OvmfPkg/Library/PlatformInitLib/MemDetect.c ++++ b/OvmfPkg/Library/PlatformInitLib/MemDetect.c +@@ -617,7 +617,8 @@ PlatformDynamicMmioWindow ( + AddrSpace = LShiftU64 (1, PlatformInfoHob->PhysMemAddressWidth); + MmioSpace = LShiftU64 (1, PlatformInfoHob->PhysMemAddressWidth - 3); + +- if ((PlatformInfoHob->PcdPciMmio64Size < MmioSpace) && ++ if (FALSE /* disable for RHEL-9.2, libvirt is not ready yet */ && ++ (PlatformInfoHob->PcdPciMmio64Size < MmioSpace) && + (PlatformInfoHob->PcdPciMmio64Base + MmioSpace < AddrSpace)) + { + DEBUG ((DEBUG_INFO, "%a: using dynamic mmio window\n", __func__)); +-- +2.39.1 + diff --git a/edk2.spec b/edk2.spec index 6ecfac6..5f547de 100644 --- a/edk2.spec +++ b/edk2.spec @@ -16,7 +16,7 @@ ExclusiveArch: x86_64 aarch64 Name: edk2 Version: %{GITDATE}git%{GITCOMMIT} -Release: 7%{?dist} +Release: 8%{?dist} Summary: UEFI firmware for 64-bit virtual machines License: BSD-2-Clause-Patent and OpenSSL and MIT URL: http://www.tianocore.org @@ -86,6 +86,8 @@ Patch37: edk2-Revert-ArmVirtPkg-ArmVirtQemu-enable-initial-ID-map-.patch Patch38: edk2-rh-openssl-add-crypto-bn-rsa_sup_mul.c-to-file-list.patch # For bz#2162307 - Broken GRUB output on a serial console Patch39: edk2-Revert-MdeModulePkg-TerminalDxe-add-other-text-resol.patch +# For bz#2174605 - [EDK2] disable dynamic mmio window +Patch40: edk2-OvmfPkg-disable-dynamic-mmio-window-rhel-only.patch # python3-devel and libuuid-devel are required for building tools. @@ -391,6 +393,11 @@ install -m 0644 \ %changelog +* Fri Mar 10 2023 Miroslav Rezanina - 20221207gitfff6d81270b5-8 +- edk2-OvmfPkg-disable-dynamic-mmio-window-rhel-only.patch [bz#2174605] +- Resolves: bz#2174605 + ([EDK2] disable dynamic mmio window) + * Tue Feb 21 2023 Miroslav Rezanina - 20221207gitfff6d81270b5-7 - edk2-Revert-MdeModulePkg-TerminalDxe-add-other-text-resol.patch [bz#2162307] - Resolves: bz#2162307