ArmPkg: Made ArmConfigureMmu() returns a status code

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>



git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14445 6f19259b-4bc3-4df7-8a09-765794883524

5 files changed, 48 insertions, 35 deletions

diff --git a/ArmPkg/Drivers/CpuPei/CpuPei.c b/ArmPkg/Drivers/CpuPei/CpuPei.c
index f358cb845..e984f5f1b 100755
--- a/ArmPkg/Drivers/CpuPei/CpuPei.c
+++ b/ArmPkg/Drivers/CpuPei/CpuPei.c
@@ -2,7 +2,7 @@
 

 Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>

 Copyright (c) 2011 Hewlett Packard Corporation. All rights reserved.<BR>

-Copyright (c) 2011, ARM Limited. All rights reserved.<BR>

+Copyright (c) 2011-2013, ARM Limited. All rights reserved.<BR>

 

 This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

@@ -137,7 +137,10 @@ ConfigureMmu (
     SystemMemoryBase, SystemMemoryLength/1024/1024,

     (CacheAttributes == DDR_ATTRIBUTES_CACHED) ? "cacheable" : "uncacheable"));

 

-  ArmConfigureMmu (MemoryTable, &TranslationTableBase, &TranslationTableSize);

+  Status = ArmConfigureMmu (MemoryTable, &TranslationTableBase, &TranslationTableSize);

+  if (EFI_ERROR (Status)) {

+    DEBUG ((EFI_D_ERROR, "Error: Failed to enable MMU (error code: %r)\n", Status));

+  }

   

   BuildMemoryAllocationHob((EFI_PHYSICAL_ADDRESS)(UINTN)TranslationTableBase, TranslationTableSize, EfiBootServicesData);

 }

diff --git a/ArmPkg/Include/Library/ArmLib.h b/ArmPkg/Include/Library/ArmLib.h
index 5663844b1..8174845c6 100644
--- a/ArmPkg/Include/Library/ArmLib.h
+++ b/ArmPkg/Include/Library/ArmLib.h
@@ -382,11 +382,11 @@ ArmGetTTBR0BaseAddress (
   VOID

   );

 

-VOID

+RETURN_STATUS

 EFIAPI

 ArmConfigureMmu (

   IN  ARM_MEMORY_REGION_DESCRIPTOR  *MemoryTable,

-  OUT VOID                          **TranslationTableBase OPTIONAL,

+  OUT VOID                         **TranslationTableBase OPTIONAL,

   OUT UINTN                         *TranslationTableSize  OPTIONAL

   );

   

diff --git a/ArmPkg/Library/ArmLib/Arm11/Arm11LibMem.c b/ArmPkg/Library/ArmLib/Arm11/Arm11LibMem.c
index c683861cb..6b94c4186 100644
--- a/ArmPkg/Library/ArmLib/Arm11/Arm11LibMem.c
+++ b/ArmPkg/Library/ArmLib/Arm11/Arm11LibMem.c
@@ -1,6 +1,7 @@
 /** @file

 

   Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>

+  Copyright (c) 2011 - 2013, ARM Limited. All rights reserved.

   

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

@@ -63,18 +64,21 @@ FillTranslationTable (
   }

 }

 

-VOID

+RETURN_STATUS

 EFIAPI

 ArmConfigureMmu (

   IN  ARM_MEMORY_REGION_DESCRIPTOR  *MemoryTable,

-  OUT VOID                          **TranslationTableBase OPTIONAL,

-  OUT UINTN                         *TranslationTableSize  OPTIONAL

+  OUT VOID                         **TranslationTableBase OPTIONAL,

+  OUT UINTN                         *TranslationTableSize OPTIONAL

   )

 {

   VOID  *TranslationTable;

 

   // Allocate pages for translation table.

-  TranslationTable = AllocatePages(EFI_SIZE_TO_PAGES(TRANSLATION_TABLE_SIZE + TRANSLATION_TABLE_ALIGNMENT));

+  TranslationTable = AllocatePages (EFI_SIZE_TO_PAGES (TRANSLATION_TABLE_SIZE + TRANSLATION_TABLE_ALIGNMENT));

+  if (TranslationTable == NULL) {

+    return RETURN_OUT_OF_RESOURCES;

+  }

   TranslationTable = (VOID *)(((UINTN)TranslationTable + TRANSLATION_TABLE_ALIGNMENT_MASK) & ~TRANSLATION_TABLE_ALIGNMENT_MASK);

 

   if (TranslationTableBase != NULL) {

@@ -125,9 +129,7 @@ ArmConfigureMmu (
     

   ArmEnableInstructionCache();

   ArmEnableDataCache();

-  ArmEnableMmu();  

-}

-

-

-

+  ArmEnableMmu();

 

+  return RETURN_SUCCESS;

+}

diff --git a/ArmPkg/Library/ArmLib/Arm9/Arm9Lib.c b/ArmPkg/Library/ArmLib/Arm9/Arm9Lib.c
index c92f9159c..1acb15801 100644
--- a/ArmPkg/Library/ArmLib/Arm9/Arm9Lib.c
+++ b/ArmPkg/Library/ArmLib/Arm9/Arm9Lib.c
@@ -1,6 +1,7 @@
 /** @file

 

   Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>

+  Copyright (c) 2011 - 2013, ARM Limited. All rights reserved.

   

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

@@ -62,18 +63,21 @@ FillTranslationTable (
   }

 }

 

-VOID

+RETURN_STATUS

 EFIAPI

 ArmConfigureMmu (

   IN  ARM_MEMORY_REGION_DESCRIPTOR  *MemoryTable,

-  OUT VOID                          **TranslationTableBase OPTIONAL,

-  OUT UINTN                         *TranslationTableSize  OPTIONAL

+  OUT VOID                         **TranslationTableBase OPTIONAL,

+  OUT UINTN                         *TranslationTableSize OPTIONAL

   )

 {

   VOID  *TranslationTable;

 

   // Allocate pages for translation table.

-  TranslationTable = AllocatePages(EFI_SIZE_TO_PAGES(TRANSLATION_TABLE_SIZE + TRANSLATION_TABLE_ALIGNMENT));

+  TranslationTable = AllocatePages (EFI_SIZE_TO_PAGES (TRANSLATION_TABLE_SIZE + TRANSLATION_TABLE_ALIGNMENT));

+  if (TranslationTable == NULL) {

+    return RETURN_OUT_OF_RESOURCES;

+  }

   TranslationTable = (VOID *)(((UINTN)TranslationTable + TRANSLATION_TABLE_ALIGNMENT_MASK) & ~TRANSLATION_TABLE_ALIGNMENT_MASK);

 

   if (TranslationTableBase != NULL) {

@@ -125,7 +129,6 @@ ArmConfigureMmu (
   ArmEnableInstructionCache();

   ArmEnableDataCache();

   ArmEnableMmu();

-}

-

-

 

+  return RETURN_SUCCESS;

+}

diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Mmu.c b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Mmu.c
index 7881a9b9f..61183f1f1 100644
--- a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Mmu.c
+++ b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Mmu.c
@@ -1,7 +1,7 @@
 /** @file

 *  File managing the MMU for ARMv7 architecture

 *

-*  Copyright (c) 2011-2012, ARM Limited. All rights reserved.

+*  Copyright (c) 2011-2013, ARM Limited. All rights reserved.

 *  

 *  This program and the accompanying materials                          

 *  are licensed and made available under the terms and conditions of the BSD License         

@@ -194,31 +194,34 @@ FillTranslationTable (
   }

 }

 

-VOID

+RETURN_STATUS

 EFIAPI

 ArmConfigureMmu (

   IN  ARM_MEMORY_REGION_DESCRIPTOR  *MemoryTable,

-  OUT VOID                          **TranslationTableBase OPTIONAL,

-  OUT UINTN                         *TranslationTableSize  OPTIONAL

+  OUT VOID                         **TranslationTableBase OPTIONAL,

+  OUT UINTN                         *TranslationTableSize OPTIONAL

   )

 {

-  UINTN                         TranslationTable;

+  VOID*                         TranslationTable;

   ARM_MEMORY_REGION_ATTRIBUTES  TranslationTableAttribute;

   UINT32                        TTBRAttributes;

 

   // Allocate pages for translation table.

-  TranslationTable = (UINTN)AllocatePages (EFI_SIZE_TO_PAGES(TRANSLATION_TABLE_SECTION_SIZE + TRANSLATION_TABLE_SECTION_ALIGNMENT));

-  TranslationTable = ((UINTN)TranslationTable + TRANSLATION_TABLE_SECTION_ALIGNMENT_MASK) & ~TRANSLATION_TABLE_SECTION_ALIGNMENT_MASK;

+  TranslationTable = AllocatePages (EFI_SIZE_TO_PAGES (TRANSLATION_TABLE_SECTION_SIZE + TRANSLATION_TABLE_SECTION_ALIGNMENT));

+  if (TranslationTable == NULL) {

+    return RETURN_OUT_OF_RESOURCES;

+  }

+  TranslationTable = (VOID*)(((UINTN)TranslationTable + TRANSLATION_TABLE_SECTION_ALIGNMENT_MASK) & ~TRANSLATION_TABLE_SECTION_ALIGNMENT_MASK);

 

   if (TranslationTableBase != NULL) {

-    *TranslationTableBase = (VOID *)TranslationTable;

+    *TranslationTableBase = TranslationTable;

   }

   

   if (TranslationTableSize != NULL) {

     *TranslationTableSize = TRANSLATION_TABLE_SECTION_SIZE;

   }

 

-  ZeroMem ((VOID *)TranslationTable, TRANSLATION_TABLE_SECTION_SIZE);

+  ZeroMem (TranslationTable, TRANSLATION_TABLE_SECTION_SIZE);

 

   ArmCleanInvalidateDataCache ();

   ArmInvalidateInstructionCache ();

@@ -232,14 +235,15 @@ ArmConfigureMmu (
   ArmCleanInvalidateDataCache ();

   ArmInvalidateInstructionCache ();

 

-  TranslationTableAttribute = (ARM_MEMORY_REGION_ATTRIBUTES)0;

+  // By default, mark the translation table as belonging to a uncached region

+  TranslationTableAttribute = ARM_MEMORY_REGION_ATTRIBUTE_UNCACHED_UNBUFFERED;

   while (MemoryTable->Length != 0) {

     // Find the memory attribute for the Translation Table

-    if ((TranslationTable >= MemoryTable->PhysicalBase) && (TranslationTable <= MemoryTable->PhysicalBase - 1 + MemoryTable->Length)) {

+    if (((UINTN)TranslationTable >= MemoryTable->PhysicalBase) && ((UINTN)TranslationTable <= MemoryTable->PhysicalBase - 1 + MemoryTable->Length)) {

       TranslationTableAttribute = MemoryTable->Attributes;

     }

 

-    FillTranslationTable ((VOID *)TranslationTable, MemoryTable);

+    FillTranslationTable (TranslationTable, MemoryTable);

     MemoryTable++;

   }

 

@@ -254,11 +258,11 @@ ArmConfigureMmu (
       (TranslationTableAttribute == ARM_MEMORY_REGION_ATTRIBUTE_NONSECURE_WRITE_THROUGH)) {

     TTBRAttributes = TTBR_WRITE_THROUGH_NO_ALLOC;

   } else {

-    //TODO: We should raise an error here

-    TTBRAttributes = TTBR_NON_CACHEABLE;

+    ASSERT (0); // No support has been found for the attributes of the memory region that the translation table belongs to.

+    return RETURN_UNSUPPORTED;

   }

 

-  ArmSetTTBR0 ((VOID *)(UINTN)((TranslationTable & ~TRANSLATION_TABLE_SECTION_ALIGNMENT_MASK) | (TTBRAttributes & 0x7F)));

+  ArmSetTTBR0 ((VOID *)(UINTN)(((UINTN)TranslationTable & ~TRANSLATION_TABLE_SECTION_ALIGNMENT_MASK) | (TTBRAttributes & 0x7F)));

     

   ArmSetDomainAccessControl (DOMAIN_ACCESS_CONTROL_NONE(15) |

                              DOMAIN_ACCESS_CONTROL_NONE(14) |

@@ -280,4 +284,5 @@ ArmConfigureMmu (
   ArmEnableInstructionCache();

   ArmEnableDataCache();

   ArmEnableMmu();

+  return RETURN_SUCCESS;

 }