summaryrefslogtreecommitdiffstats
path: root/ArmPkg/Drivers
diff options
context:
space:
mode:
authorArd Biesheuvel <ardb@kernel.org>2023-06-25 11:21:55 +0200
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2023-06-27 16:40:07 +0000
commit8a1f5405964fe6c09e768ae576a023be2e2e7b08 (patch)
treed139fd6c3bfca30450122861322fcc8b2e103e91 /ArmPkg/Drivers
parent7054f1a54e94c79bea98636f027f929639d7cbbe (diff)
downloadedk2-8a1f5405964fe6c09e768ae576a023be2e2e7b08.tar.gz
edk2-8a1f5405964fe6c09e768ae576a023be2e2e7b08.tar.bz2
edk2-8a1f5405964fe6c09e768ae576a023be2e2e7b08.zip
ArmPkg: Drop individual memory permission helpers
Now that we have a sane API to set and clear memory permissions that works the same on ARM and AArch64, we no longer have a need for the individual set/clear no-access/read-only/no-exec helpers so let's drop them. Signed-off-by: Ard Biesheuvel <ardb@kernel.org> Reviewed-by: Leif Lindholm <quic_llindhol@quicinc.com>
Diffstat (limited to 'ArmPkg/Drivers')
-rw-r--r--ArmPkg/Drivers/CpuDxe/CpuDxe.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/ArmPkg/Drivers/CpuDxe/CpuDxe.c b/ArmPkg/Drivers/CpuDxe/CpuDxe.c
index f820f3f621..fc63e52784 100644
--- a/ArmPkg/Drivers/CpuDxe/CpuDxe.c
+++ b/ArmPkg/Drivers/CpuDxe/CpuDxe.c
@@ -288,9 +288,11 @@ RemapUnusedMemoryNx (
MemoryMapEnd = (EFI_MEMORY_DESCRIPTOR *)((UINT8 *)MemoryMap + MemoryMapSize);
while ((UINTN)MemoryMapEntry < (UINTN)MemoryMapEnd) {
if (MemoryMapEntry->Type == EfiConventionalMemory) {
- ArmSetMemoryRegionNoExec (
+ ArmSetMemoryAttributes (
MemoryMapEntry->PhysicalStart,
- EFI_PAGES_TO_SIZE (MemoryMapEntry->NumberOfPages)
+ EFI_PAGES_TO_SIZE (MemoryMapEntry->NumberOfPages),
+ EFI_MEMORY_XP,
+ EFI_MEMORY_XP
);
}