|
 |
4bec430 |
From 5068dd0dffb843c2fb8aad44471fcf56188af6a7 Mon Sep 17 00:00:00 2001
|
|
|
57d8f2d |
From: Oliver Steffen <osteffen@redhat.com>
|
|
|
57d8f2d |
Date: Mon, 19 Jun 2023 22:32:25 +0200
|
|
|
4bec430 |
Subject: [PATCH 14/14] ArmPkg: Add Pcd to disable
|
|
|
57d8f2d |
EFI_MEMORY_ATTRIBUTE_PROTOCOL
|
|
|
57d8f2d |
|
|
|
57d8f2d |
Recent versions of shim (15.6 and 15.7) crash when the newly added
|
|
|
57d8f2d |
EFI_MEMORY_ATTRIBUTE_PROTOCOL is provided by the firmware. To allow
|
|
|
57d8f2d |
existing installations to boot, provide a workaround in form of a Pcd
|
|
|
57d8f2d |
that allows tuning it off at build time (defaults to 'enabled').
|
|
|
57d8f2d |
|
|
|
57d8f2d |
Additionally, check the return code of the protocol installation calls.
|
|
|
57d8f2d |
|
|
|
57d8f2d |
Signed-off-by: Oliver Steffen <osteffen@redhat.com>
|
|
|
57d8f2d |
Message-ID: <20230619203244.228933-1-osteffen@redhat.com>
|
|
|
57d8f2d |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
57d8f2d |
---
|
|
|
57d8f2d |
ArmPkg/ArmPkg.dec | 3 +++
|
|
|
57d8f2d |
ArmPkg/Drivers/CpuDxe/CpuDxe.inf | 1 +
|
|
|
57d8f2d |
ArmPkg/Drivers/CpuDxe/CpuDxe.c | 13 +++++++++++--
|
|
|
57d8f2d |
3 files changed, 15 insertions(+), 2 deletions(-)
|
|
|
57d8f2d |
|
|
|
57d8f2d |
diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec
|
|
|
4bec430 |
index 1a16d044c94b..e8579c80bf08 100644
|
|
|
57d8f2d |
--- a/ArmPkg/ArmPkg.dec
|
|
|
57d8f2d |
+++ b/ArmPkg/ArmPkg.dec
|
|
|
4bec430 |
@@ -172,6 +172,9 @@ [PcdsFixedAtBuild.common]
|
|
|
57d8f2d |
gArmTokenSpaceGuid.PcdCpuVectorBaseAddress|0xffff0000|UINT64|0x00000004
|
|
|
57d8f2d |
gArmTokenSpaceGuid.PcdCpuResetAddress|0x00000000|UINT32|0x00000005
|
|
|
57d8f2d |
|
|
|
57d8f2d |
+ # Enable/Disable EFI_MEMORY_ATTRIBUTE_PROTOCOL
|
|
|
57d8f2d |
+ gArmTokenSpaceGuid.PcdEnableEfiMemoryAttributeProtocol|FALSE|BOOLEAN|0x000000EE
|
|
|
57d8f2d |
+
|
|
|
57d8f2d |
#
|
|
|
57d8f2d |
# ARM Secure Firmware PCDs
|
|
|
57d8f2d |
#
|
|
|
57d8f2d |
diff --git a/ArmPkg/Drivers/CpuDxe/CpuDxe.inf b/ArmPkg/Drivers/CpuDxe/CpuDxe.inf
|
|
|
4bec430 |
index 7d8132200e64..c5878c1ecc2e 100644
|
|
|
57d8f2d |
--- a/ArmPkg/Drivers/CpuDxe/CpuDxe.inf
|
|
|
57d8f2d |
+++ b/ArmPkg/Drivers/CpuDxe/CpuDxe.inf
|
|
|
4bec430 |
@@ -66,6 +66,7 @@ [Guids]
|
|
|
57d8f2d |
[Pcd.common]
|
|
|
57d8f2d |
gArmTokenSpaceGuid.PcdVFPEnabled
|
|
|
4bec430 |
gEfiMdeModulePkgTokenSpaceGuid.PcdDxeNxMemoryProtectionPolicy
|
|
|
57d8f2d |
+ gArmTokenSpaceGuid.PcdEnableEfiMemoryAttributeProtocol
|
|
|
57d8f2d |
|
|
|
57d8f2d |
[FeaturePcd.common]
|
|
|
57d8f2d |
gArmTokenSpaceGuid.PcdDebuggerExceptionSupport
|
|
|
57d8f2d |
diff --git a/ArmPkg/Drivers/CpuDxe/CpuDxe.c b/ArmPkg/Drivers/CpuDxe/CpuDxe.c
|
|
|
4bec430 |
index fc63e527846a..30c5963276e4 100644
|
|
|
57d8f2d |
--- a/ArmPkg/Drivers/CpuDxe/CpuDxe.c
|
|
|
57d8f2d |
+++ b/ArmPkg/Drivers/CpuDxe/CpuDxe.c
|
|
|
4bec430 |
@@ -331,10 +331,19 @@ CpuDxeInitialize (
|
|
|
57d8f2d |
&mCpuHandle,
|
|
|
57d8f2d |
&gEfiCpuArchProtocolGuid,
|
|
|
57d8f2d |
&mCpu,
|
|
|
57d8f2d |
- &gEfiMemoryAttributeProtocolGuid,
|
|
|
57d8f2d |
- &mMemoryAttribute,
|
|
|
57d8f2d |
NULL
|
|
|
57d8f2d |
);
|
|
|
57d8f2d |
+ ASSERT_EFI_ERROR (Status);
|
|
|
57d8f2d |
+
|
|
|
57d8f2d |
+ if (PcdGetBool (PcdEnableEfiMemoryAttributeProtocol)) {
|
|
|
57d8f2d |
+ Status = gBS->InstallMultipleProtocolInterfaces (
|
|
|
57d8f2d |
+ &mCpuHandle,
|
|
|
57d8f2d |
+ &gEfiMemoryAttributeProtocolGuid,
|
|
|
57d8f2d |
+ &mMemoryAttribute,
|
|
|
57d8f2d |
+ NULL
|
|
|
57d8f2d |
+ );
|
|
|
57d8f2d |
+ ASSERT_EFI_ERROR (Status);
|
|
|
57d8f2d |
+ }
|
|
|
57d8f2d |
|
|
|
57d8f2d |
//
|
|
|
57d8f2d |
// Make sure GCD and MMU settings match. This API calls gDS->SetMemorySpaceAttributes ()
|
|
|
57d8f2d |
--
|
|
|
57d8f2d |
2.41.0
|
|
|
57d8f2d |
|