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