ArmPkg/Mmu: Remove handling of NONSECURE memory regions

Non-secure memory is a distinction that only matters when executing code
in the secure world that reasons about the secure vs non-secure address
spaces. EDK2 was not designed for that, and the AArch64 version of the
MMU handling library already treats them as identical, so let's just
drop the ARM memory region types that mark memory as 'non-secure'
explicitly.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Leif Lindholm <quic_llindhol@quicinc.com>

1 files changed, 6 insertions, 27 deletions

diff --git a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c
index 28cc9b2..1542983 100644
--- a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c
+++ b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c
@@ -100,24 +100,19 @@ PopulateLevel2PageTable (
 

   switch (Attributes) {

     case ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK:

-    case ARM_MEMORY_REGION_ATTRIBUTE_NONSECURE_WRITE_BACK:

       PageAttributes = TT_DESCRIPTOR_PAGE_WRITE_BACK;

       break;

     case ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK_NONSHAREABLE:

-    case ARM_MEMORY_REGION_ATTRIBUTE_NONSECURE_WRITE_BACK_NONSHAREABLE:

       PageAttributes  = TT_DESCRIPTOR_PAGE_WRITE_BACK;

       PageAttributes &= ~TT_DESCRIPTOR_PAGE_S_SHARED;

       break;

     case ARM_MEMORY_REGION_ATTRIBUTE_WRITE_THROUGH:

-    case ARM_MEMORY_REGION_ATTRIBUTE_NONSECURE_WRITE_THROUGH:

       PageAttributes = TT_DESCRIPTOR_PAGE_WRITE_THROUGH;

       break;

     case ARM_MEMORY_REGION_ATTRIBUTE_DEVICE:

-    case ARM_MEMORY_REGION_ATTRIBUTE_NONSECURE_DEVICE:

       PageAttributes = TT_DESCRIPTOR_PAGE_DEVICE;

       break;

     case ARM_MEMORY_REGION_ATTRIBUTE_UNCACHED_UNBUFFERED:

-    case ARM_MEMORY_REGION_ATTRIBUTE_NONSECURE_UNCACHED_UNBUFFERED:

       PageAttributes = TT_DESCRIPTOR_PAGE_UNCACHED;

       break;

     default:

@@ -239,39 +234,23 @@ FillTranslationTable (
 

   switch (MemoryRegion->Attributes) {

     case ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK:

-      Attributes = TT_DESCRIPTOR_SECTION_WRITE_BACK (0);

+      Attributes = TT_DESCRIPTOR_SECTION_WRITE_BACK;

       break;

     case ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK_NONSHAREABLE:

-      Attributes  = TT_DESCRIPTOR_SECTION_WRITE_BACK (0);

+      Attributes  = TT_DESCRIPTOR_SECTION_WRITE_BACK;

       Attributes &= ~TT_DESCRIPTOR_SECTION_S_SHARED;

       break;

     case ARM_MEMORY_REGION_ATTRIBUTE_WRITE_THROUGH:

-      Attributes = TT_DESCRIPTOR_SECTION_WRITE_THROUGH (0);

+      Attributes = TT_DESCRIPTOR_SECTION_WRITE_THROUGH;

       break;

     case ARM_MEMORY_REGION_ATTRIBUTE_DEVICE:

-      Attributes = TT_DESCRIPTOR_SECTION_DEVICE (0);

+      Attributes = TT_DESCRIPTOR_SECTION_DEVICE;

       break;

     case ARM_MEMORY_REGION_ATTRIBUTE_UNCACHED_UNBUFFERED:

-      Attributes = TT_DESCRIPTOR_SECTION_UNCACHED (0);

-      break;

-    case ARM_MEMORY_REGION_ATTRIBUTE_NONSECURE_WRITE_BACK:

-      Attributes = TT_DESCRIPTOR_SECTION_WRITE_BACK (1);

-      break;

-    case ARM_MEMORY_REGION_ATTRIBUTE_NONSECURE_WRITE_BACK_NONSHAREABLE:

-      Attributes  = TT_DESCRIPTOR_SECTION_WRITE_BACK (1);

-      Attributes &= ~TT_DESCRIPTOR_SECTION_S_SHARED;

-      break;

-    case ARM_MEMORY_REGION_ATTRIBUTE_NONSECURE_WRITE_THROUGH:

-      Attributes = TT_DESCRIPTOR_SECTION_WRITE_THROUGH (1);

-      break;

-    case ARM_MEMORY_REGION_ATTRIBUTE_NONSECURE_DEVICE:

-      Attributes = TT_DESCRIPTOR_SECTION_DEVICE (1);

-      break;

-    case ARM_MEMORY_REGION_ATTRIBUTE_NONSECURE_UNCACHED_UNBUFFERED:

-      Attributes = TT_DESCRIPTOR_SECTION_UNCACHED (1);

+      Attributes = TT_DESCRIPTOR_SECTION_UNCACHED;

       break;

     default:

-      Attributes = TT_DESCRIPTOR_SECTION_UNCACHED (0);

+      Attributes = TT_DESCRIPTOR_SECTION_UNCACHED;

       break;

   }