rpm/ovmf
SHA256
1
0
Fork 0
forked from pool/ovmf
Code Pull Requests Activity

Accepting request 1039618 from home:joeyli:branches:Virtualization

Browse Source 
Add ovmf-Revert-OvmfPkg-PlatformInitLib-dynamic-mmio-window-s.patch to avoid Page-Fault exception when booting with edk2-stable202211 ovmf. (bsc#1205978)

OBS-URL: https://build.opensuse.org/request/show/1039618
OBS-URL: https://build.opensuse.org/package/show/Virtualization/ovmf?expand=0&rev=241
This commit is contained in:
Joey Lee 2022-12-02 16:49:44 +00:00 committed by Git OBS Bridge
parent 41df701ed4
commit 5b53b2e6a1
3 changed files with 72 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
ovmf-Revert-OvmfPkg-PlatformInitLib-dynamic-mmio-window-s.patch Normal file
View File

@ -0,0 +1,61 @@
From 0e12a96d9f8475e164c634be9d672ca7cdb26567 Mon Sep 17 00:00:00 2001
From: "Lee, Chun-Yi" <jlee@suse.com>
Date: Fri, 2 Dec 2022 20:11:45 +0800
Subject: [PATCH] Revert "OvmfPkg/PlatformInitLib: dynamic mmio window size"
This reverts commit ecb778d0ac62560aa172786ba19521f27bc3f650.
Signed-off-by: Lee, Chun-Yi <jlee@suse.com>
---
OvmfPkg/Library/PlatformInitLib/MemDetect.c | 28 ---------------------
1 file changed, 28 deletions(-)
diff --git a/OvmfPkg/Library/PlatformInitLib/MemDetect.c b/OvmfPkg/Library/PlatformInitLib/MemDetect.c
index b8feae4309..822e4aefc3 100644
--- a/OvmfPkg/Library/PlatformInitLib/MemDetect.c
+++ b/OvmfPkg/Library/PlatformInitLib/MemDetect.c
@@ -606,33 +606,6 @@ PlatformAddressWidthFromCpuid (
}
}
-VOID
-EFIAPI
-PlatformDynamicMmioWindow (
- IN OUT EFI_HOB_PLATFORM_INFO *PlatformInfoHob
- )
-{
- UINT64 AddrSpace, MmioSpace;
-
- AddrSpace = LShiftU64 (1, PlatformInfoHob->PhysMemAddressWidth);
- MmioSpace = LShiftU64 (1, PlatformInfoHob->PhysMemAddressWidth - 3);
-
- if ((PlatformInfoHob->PcdPciMmio64Size < MmioSpace) &&
- (PlatformInfoHob->PcdPciMmio64Base + MmioSpace < AddrSpace))
- {
- DEBUG ((DEBUG_INFO, "%a: using dynamic mmio window\n", __func__));
- DEBUG ((DEBUG_INFO, "%a: Addr Space 0x%Lx (%Ld GB)\n", __func__, AddrSpace, RShiftU64 (AddrSpace, 30)));
- DEBUG ((DEBUG_INFO, "%a: MMIO Space 0x%Lx (%Ld GB)\n", __func__, MmioSpace, RShiftU64 (MmioSpace, 30)));
- PlatformInfoHob->PcdPciMmio64Size = MmioSpace;
- PlatformInfoHob->PcdPciMmio64Base = AddrSpace - MmioSpace;
- } else {
- DEBUG ((DEBUG_INFO, "%a: using classic mmio window\n", __func__));
- }
-
- DEBUG ((DEBUG_INFO, "%a: Pci64 Base 0x%Lx\n", __func__, PlatformInfoHob->PcdPciMmio64Base));
- DEBUG ((DEBUG_INFO, "%a: Pci64 Size 0x%Lx\n", __func__, PlatformInfoHob->PcdPciMmio64Size));
-}
-
/**
Iterate over the PCI host bridges resources information optionally provided
in fw-cfg and find the highest address contained in the PCI MMIO windows. If
@@ -794,7 +767,6 @@ PlatformAddressWidthInitialization (
if (PlatformInfoHob->PhysMemAddressWidth != 0) {
// physical address width is known
PlatformInfoHob->FirstNonAddress = FirstNonAddress;
- PlatformDynamicMmioWindow (PlatformInfoHob);
return;
}
--
2.35.3

8
ovmf.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Dec 2 12:27:15 UTC 2022 - Joey Lee <jlee@suse.com>
- Add ovmf-Revert-OvmfPkg-PlatformInitLib-dynamic-mmio-window-s.patch
to avoid Page-Fault exception when booting with edk2-stable202211
ovmf. (bsc#1205978)
- This is a revert patch for workaround problem temporary.
-------------------------------------------------------------------
Tue Nov 29 14:48:03 UTC 2022 - Joey Lee <jlee@suse.com>

3
ovmf.spec
View File

@ -58,6 +58,8 @@ Patch9: %{name}-Revert-UefiCpuPkg-Replace-Opcode-with-the-correspond.pat
Patch10: %{name}-Revert-SourceLevelDebugPkg-Replace-Opcode-with-the-c.patch
Patch11: %{name}-Revert-MdePkg-Replace-Opcode-with-the-corresponding-.patch
Patch12: %{name}-Revert-MdeModulePkg-Replace-Opcode-with-the-correspo.patch
# Bug 1205978 - Got Page-Fault exception when VM is booting with edk2-stable202211 ovmf
Patch13: %{name}-Revert-OvmfPkg-PlatformInitLib-dynamic-mmio-window-s.patch
BuildRequires: bc
BuildRequires: cross-arm-binutils
BuildRequires: cross-arm-gcc%{gcc_version}
@ -181,6 +183,7 @@ rm -rf $PKG_TO_REMOVE
%patch11 -p1
%patch12 -p1
%endif
%patch13 -p1
# add openssl
pushd CryptoPkg/Library/OpensslLib/openssl