render / rpms / edk2

Forked from rpms/edk2 3 months ago
Clone

Blame SOURCES/edk2-Revert-ArmVirtPkg-ArmVirtQemu-enable-initial-ID-map-.patch

8ff9b3
From fc45137e55e73a3ba59fd28868e24521a28a9a6e Mon Sep 17 00:00:00 2001
8ff9b3
From: Oliver Steffen <osteffen@redhat.com>
8ff9b3
Date: Tue, 31 Jan 2023 15:32:28 +0100
8ff9b3
Subject: [PATCH] Revert "ArmVirtPkg/ArmVirtQemu: enable initial ID map at
8ff9b3
 early boot"
8ff9b3
8ff9b3
RH-Author: Oliver Steffen <osteffen@redhat.com>
8ff9b3
RH-MergeRequest: 25: Revert "ArmVirtPkg/ArmVirtQemu: enable initial ID map at early boot"
8ff9b3
RH-Bugzilla: 2157656
8ff9b3
RH-Acked-by: Gerd Hoffmann <kraxel@redhat.com>
8ff9b3
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
8ff9b3
RH-Commit: [1/1] b236b89984f7b7890089ba65228073ab79063b34 (osteffen/edk2)
8ff9b3
8ff9b3
This reverts commit 07be1d34d95460a238fcd0f6693efb747c28b329,
8ff9b3
which causes the firmware to crash early on AARCH64.
8ff9b3
8ff9b3
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2157656
8ff9b3
8ff9b3
There is a potential fix upstream:
8ff9b3
https://github.com/tianocore/edk2/pull/3878/commits
8ff9b3
8ff9b3
We need to reevaluate on the next rebase if the fix works and if we can
8ff9b3
drop this revert-comment.
8ff9b3
8ff9b3
Signed-off-by: Oliver Steffen <osteffen@redhat.com>
8ff9b3
---
8ff9b3
 ArmVirtPkg/ArmVirtQemu.dsc | 17 +++--------------
8ff9b3
 ArmVirtPkg/ArmVirtQemu.fdf |  2 +-
8ff9b3
 2 files changed, 4 insertions(+), 15 deletions(-)
8ff9b3
8ff9b3
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
8ff9b3
index 76389e6bd4..3bf51b09aa 100644
8ff9b3
--- a/ArmVirtPkg/ArmVirtQemu.dsc
8ff9b3
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
8ff9b3
@@ -64,6 +64,8 @@
8ff9b3
   QemuFwCfgSimpleParserLib|OvmfPkg/Library/QemuFwCfgSimpleParserLib/QemuFwCfgSimpleParserLib.inf
8ff9b3
   QemuLoadImageLib|OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.inf
8ff9b3
 
8ff9b3
+  ArmPlatformLib|ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf
8ff9b3
+
8ff9b3
   TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf
8ff9b3
   VirtNorFlashPlatformLib|ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf
8ff9b3
 
8ff9b3
@@ -91,12 +93,6 @@
8ff9b3
   TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLibNull/PeiDxeTpmPlatformHierarchyLib.inf
8ff9b3
 !endif
8ff9b3
 
8ff9b3
-[LibraryClasses.AARCH64]
8ff9b3
-  ArmPlatformLib|ArmVirtPkg/Library/ArmPlatformLibQemu/ArmPlatformLibQemu.inf
8ff9b3
-
8ff9b3
-[LibraryClasses.ARM]
8ff9b3
-  ArmPlatformLib|ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf
8ff9b3
-
8ff9b3
 [LibraryClasses.common.PEIM]
8ff9b3
   ArmVirtMemInfoLib|ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf
8ff9b3
 
8ff9b3
@@ -117,8 +113,6 @@
8ff9b3
   UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
8ff9b3
 
8ff9b3
 [BuildOptions]
8ff9b3
-  GCC:*_*_AARCH64_CC_XIPFLAGS ==
8ff9b3
-
8ff9b3
 !include NetworkPkg/NetworkBuildOptions.dsc.inc
8ff9b3
 
8ff9b3
 ################################################################################
8ff9b3
@@ -330,12 +324,7 @@
8ff9b3
   ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
8ff9b3
   MdeModulePkg/Core/Pei/PeiMain.inf
8ff9b3
   ArmPlatformPkg/PlatformPei/PlatformPeim.inf
8ff9b3
-  ArmVirtPkg/MemoryInitPei/MemoryInitPeim.inf {
8ff9b3
-    <LibraryClasses>
8ff9b3
-!if $(ARCH) == AARCH64
8ff9b3
-      ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuPeiLib.inf
8ff9b3
-!endif
8ff9b3
-  }
8ff9b3
+  ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf
8ff9b3
   ArmPkg/Drivers/CpuPei/CpuPei.inf
8ff9b3
 
8ff9b3
 !if $(TPM2_ENABLE) == TRUE
8ff9b3
diff --git a/ArmVirtPkg/ArmVirtQemu.fdf b/ArmVirtPkg/ArmVirtQemu.fdf
8ff9b3
index 764f652afd..c61ed36d89 100644
8ff9b3
--- a/ArmVirtPkg/ArmVirtQemu.fdf
8ff9b3
+++ b/ArmVirtPkg/ArmVirtQemu.fdf
8ff9b3
@@ -107,7 +107,7 @@ READ_LOCK_STATUS   = TRUE
8ff9b3
   INF ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
8ff9b3
   INF MdeModulePkg/Core/Pei/PeiMain.inf
8ff9b3
   INF ArmPlatformPkg/PlatformPei/PlatformPeim.inf
8ff9b3
-  INF ArmVirtPkg/MemoryInitPei/MemoryInitPeim.inf
8ff9b3
+  INF ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf
8ff9b3
   INF ArmPkg/Drivers/CpuPei/CpuPei.inf
8ff9b3
   INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
8ff9b3
 
8ff9b3
-- 
8ff9b3
2.31.1
8ff9b3