ArmPlatformPkg: Code cleaning

- Fix coding style to follow EDK2 coding convention
- Remove deprecated function
- Remove unused PCDs



git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11808 6f19259b-4bc3-4df7-8a09-765794883524

ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf

@@ -42,5 +42,3 @@
   gArmPlatformTokenSpaceGuid.PcdStandalone
 
 [FixedPcd]
-  gArmTokenSpaceGuid.PcdNormalFdBaseAddress
-  gArmTokenSpaceGuid.PcdNormalFdSize

ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c

@@ -18,6 +18,8 @@
 #include <Library/MemoryAllocationLib.h>
 #include <Library/IoLib.h>
 
+#define MAX_VIRTUAL_MEMORY_MAP_DESCRIPTORS          6
+
 // DDR attributes
 #define DDR_ATTRIBUTES_CACHED           ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK
 #define DDR_ATTRIBUTES_UNCACHED         ARM_MEMORY_REGION_ATTRIBUTE_UNCACHED_UNBUFFERED
@@ -34,7 +36,11 @@
                                     entry
 
 **/
-VOID ArmPlatformGetVirtualMemoryMap(ARM_MEMORY_REGION_DESCRIPTOR** VirtualMemoryMap) {
+VOID
+ArmPlatformGetVirtualMemoryMap (
+  IN ARM_MEMORY_REGION_DESCRIPTOR** VirtualMemoryMap
+  )
+{
   UINT32                        CacheAttributes;
   BOOLEAN                       bTrustzoneSupport = FALSE;
   UINTN                         Index = 0;
@@ -42,7 +48,7 @@ VOID ArmPlatformGetVirtualMemoryMap(ARM_MEMORY_REGION_DESCRIPTOR** VirtualMemory
 
   ASSERT(VirtualMemoryMap != NULL);
 
-    VirtualMemoryTable = (ARM_MEMORY_REGION_DESCRIPTOR*)AllocatePages(sizeof(ARM_MEMORY_REGION_DESCRIPTOR) * 9);
+  VirtualMemoryTable = (ARM_MEMORY_REGION_DESCRIPTOR*)AllocatePages(EFI_SIZE_TO_PAGES (sizeof(ARM_MEMORY_REGION_DESCRIPTOR) * MAX_VIRTUAL_MEMORY_MAP_DESCRIPTORS));
   if (VirtualMemoryTable == NULL) {
       return;
   }
@@ -95,6 +101,10 @@ VOID ArmPlatformGetVirtualMemoryMap(ARM_MEMORY_REGION_DESCRIPTOR** VirtualMemory
       VirtualMemoryTable[Index].VirtualBase  = ARM_EB_LOGIC_TILE_BASE;
       VirtualMemoryTable[Index].Length       = ARM_EB_LOGIC_TILE_SZ;
       VirtualMemoryTable[Index].Attributes   = (bTrustzoneSupport ? ARM_MEMORY_REGION_ATTRIBUTE_DEVICE : ARM_MEMORY_REGION_ATTRIBUTE_SECURE_DEVICE);
+
+      ASSERT((Index + 1) == (MAX_VIRTUAL_MEMORY_MAP_DESCRIPTORS + 1));
+  } else {
+    ASSERT((Index + 1) == MAX_VIRTUAL_MEMORY_MAP_DESCRIPTORS);
   }
 
   // End of Table
@@ -119,6 +129,7 @@ VOID ArmPlatformGetVirtualMemoryMap(ARM_MEMORY_REGION_DESCRIPTOR** VirtualMemory
 EFI_STATUS
 ArmPlatformGetAdditionalSystemMemory (
   OUT ARM_SYSTEM_MEMORY_REGION_DESCRIPTOR** EfiMemoryMap
-) {
+  )
+{
   return EFI_UNSUPPORTED;
 }

ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSecLib.inf

@@ -42,5 +42,3 @@
   gArmPlatformTokenSpaceGuid.PcdStandalone
 
 [FixedPcd]
-  gArmTokenSpaceGuid.PcdNormalFdBaseAddress
-  gArmTokenSpaceGuid.PcdNormalFdSize

ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/ArmVExpressLib.inf

@@ -47,7 +47,4 @@
   gArmPlatformTokenSpaceGuid.PcdNorFlashRemapping
 
 [FixedPcd]
-  gArmTokenSpaceGuid.PcdNormalFdBaseAddress
-  gArmTokenSpaceGuid.PcdNormalFdSize
-
   gArmTokenSpaceGuid.PcdL2x0ControllerBase

ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/ArmVExpressSecLib.inf

@@ -48,7 +48,4 @@
   gArmPlatformTokenSpaceGuid.PcdNorFlashRemapping
 
 [FixedPcd]
-  gArmTokenSpaceGuid.PcdNormalFdBaseAddress
-  gArmTokenSpaceGuid.PcdNormalFdSize
-
   gArmTokenSpaceGuid.PcdL2x0ControllerBase

ArmPlatformPkg/Include/Library/ArmPlatformLib.h

@@ -158,21 +158,6 @@ ArmPlatformTrustzoneInit (
   VOID
   );
 
-/**
-  Return the information about the memory region in permanent memory used by PEI
-
-  One of the PEI Module must install the permament memory used by PEI. This function returns the
-  information about this region for your platform to this PEIM module.
-
-  @param[out]   PeiMemoryBase       Base of the memory region used by PEI core and modules
-  @param[out]   PeiMemorySize       Size of the memory region used by PEI core and modules
-
-**/
-VOID ArmPlatformGetPeiMemory (
-    OUT UINTN*                                   PeiMemoryBase,
-    OUT UINTN*                                   PeiMemorySize
-    );
-
 /**
   Return the Virtual Memory Map of your platform
 

ArmPlatformPkg/MemoryInitPei/MemoryInit.c

@@ -16,6 +16,7 @@
 // The package level header files this module uses
 //
 #include <PiPei.h>
+
 //
 // The protocols, PPI and GUID defintions for this module
 //
@@ -35,10 +36,6 @@
 #include <Library/MemoryAllocationLib.h>
 #include <Library/ArmPlatformLib.h>
 
-//
-// Module globals
-//
-
 VOID
 InitMmu (
   VOID
@@ -56,7 +53,7 @@ InitMmu (
   ArmConfigureMmu (MemoryTable, &TranslationTableBase, &TranslationTableSize);
 }
 
-// May want to put this into a library so you only need the PCD setings if you are using the feature?
+// May want to put this into a library so you only need the PCD settings if you are using the feature?
 VOID
 BuildMemoryTypeInformationHob (
   VOID
@@ -87,10 +84,8 @@ BuildMemoryTypeInformationHob (
   Info[9].Type          = EfiMaxMemoryType;
   Info[9].NumberOfPages = 0;
 
-
   BuildGuidDataHob (&gEfiMemoryTypeInformationGuid, &Info, sizeof (Info));
 }
-
 /*++
 
 Routine Description:

ArmPlatformPkg/MemoryInitPei/MemoryInitPei.inf

@@ -1,6 +1,6 @@
 #/** @file
 #  
-#  Copyright (c) 2010, ARM Ltd. All rights reserved.<BR>
+#  Copyright (c) 2011, ARM Ltd. All rights reserved.<BR>
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
 #  which accompanies this distribution.  The full text of the license may be found at

ArmPlatformPkg/PrePeiCore/MainMPCore.c

@@ -12,13 +12,14 @@
 *
 **/
 
-#include <PiPei.h>
 #include <Library/DebugLib.h>
 #include <Library/PcdLib.h>
 #include <Library/ArmMPCoreMailBoxLib.h>
 #include <Chipset/ArmV7.h>
 #include <Drivers/PL390Gic.h>
 
+#include "PrePeiCore.h"
+
 extern EFI_PEI_PPI_DESCRIPTOR *gSecPpiTable;
 
 /*
@@ -32,31 +33,35 @@ extern EFI_PEI_PPI_DESCRIPTOR *gSecPpiTable;
  */
 VOID
 EFIAPI
-secondary_main(IN UINTN CoreId)
+SecondaryMain (
+  IN UINTN CoreId
+  )
 {
-	//Function pointer to Secondary Core entry point
+  // Function pointer to Secondary Core entry point
   VOID (*secondary_start)(VOID);
   UINTN secondary_entry_addr=0;
 
-	//Clear Secondary cores MailBox
+  // Clear Secondary cores MailBox
   ArmClearMPCoreMailbox();
 
   while (secondary_entry_addr = ArmGetMPCoreMailbox(), secondary_entry_addr == 0) {
     ArmCallWFI();
-	  //Acknowledge the interrupt and send End of Interrupt signal.
+    // Acknowledge the interrupt and send End of Interrupt signal.
     PL390GicAcknowledgeSgiFrom(PcdGet32(PcdGicInterruptInterfaceBase),0/*CoreId*/);
   }
 
   secondary_start = (VOID (*)())secondary_entry_addr;
 
-	//Jump to secondary core entry point.
+  // Jump to secondary core entry point.
   secondary_start();
 
-	//the secondaries shouldn't reach here
+  // The secondaries shouldn't reach here
   ASSERT(FALSE);
 }
 
-VOID primary_main (
+VOID
+EFIAPI
+PrimaryMain (
   IN  EFI_PEI_CORE_ENTRY_POINT  PeiCoreEntryPoint
   )
 {
@@ -86,6 +91,6 @@ VOID primary_main (
   SecCoreData.StackBase              = SecCoreData.TemporaryRamBase;
   SecCoreData.StackSize              = SecCoreData.TemporaryRamSize - SecCoreData.PeiTemporaryRamSize;
 
-	// jump to pei core entry point
+  // Jump to PEI core entry point
   (PeiCoreEntryPoint)(&SecCoreData, (VOID *)&gSecPpiTable);
 }

ArmPlatformPkg/PrePeiCore/MainUniCore.c

@@ -12,21 +12,26 @@
 *
 **/
 
-#include <PiPei.h>
 #include <Library/DebugLib.h>
 #include <Library/PcdLib.h>
 #include <Chipset/ArmV7.h>
 
+#include "PrePeiCore.h"
+
 extern EFI_PEI_PPI_DESCRIPTOR *gSecPpiTable;
 
 VOID
 EFIAPI
-secondary_main(IN UINTN CoreId)
+SecondaryMain (
+  IN UINTN CoreId
+  )
 {
   ASSERT(FALSE);
 }
 
-VOID primary_main (
+VOID
+EFIAPI
+PrimaryMain (
   IN  EFI_PEI_CORE_ENTRY_POINT  PeiCoreEntryPoint
   )
 {

ArmPlatformPkg/PrePeiCore/PrePeiCore.c

@@ -13,29 +13,17 @@
 *
 **/
 
-#include <PiPei.h>
-#include <Ppi/TemporaryRamSupport.h>
 #include <Library/DebugLib.h>
 #include <Library/PcdLib.h>
 #include <Library/IoLib.h>
 #include <Library/BaseLib.h>
 #include <Library/BaseMemoryLib.h>
+#include <Library/PrintLib.h>
 #include <Library/ArmLib.h>
+#include <Library/SerialPortLib.h>
 #include <Chipset/ArmV7.h>
 
-EFI_STATUS
+#include "PrePeiCore.h"
-EFIAPI
-SecTemporaryRamSupport (
-  IN CONST EFI_PEI_SERVICES   **PeiServices,
-  IN EFI_PHYSICAL_ADDRESS     TemporaryMemoryBase,
-  IN EFI_PHYSICAL_ADDRESS     PermanentMemoryBase,
-  IN UINTN                    CopySize
-  );
-
-VOID
-SecSwitchStack (
-  INTN    StackDelta
-  );
 
 EFI_PEI_TEMPORARY_RAM_SUPPORT_PPI   mSecTemporaryRamSupportPpi = {SecTemporaryRamSupport};
 
@@ -47,10 +35,6 @@ EFI_PEI_PPI_DESCRIPTOR      gSecPpiTable[] = {
   }
 };
 
-// Vector Table for Pei Phase
-VOID  PeiVectorTable (VOID);
-
-
 VOID
 CEntryPoint (
   IN  UINTN                     CoreId,
@@ -64,8 +48,8 @@ CEntryPoint (
   ArmInvalidateInstructionCache();
 
   // Enable Instruction & Data caches
-  ArmEnableDataCache();
+  ArmEnableDataCache ();
-  ArmEnableInstructionCache();
+  ArmEnableInstructionCache ();
 
   //
   // Note: Doesn't have to Enable CPU interface in non-secure world,
@@ -81,9 +65,9 @@ CEntryPoint (
   //If not primary Jump to Secondary Main
   if(0 == CoreId) {
     //Goto primary Main.
-    primary_main(PeiCoreEntryPoint);
+    PrimaryMain (PeiCoreEntryPoint);
   } else {
-    secondary_main(CoreId);
+    SecondaryMain (CoreId);
   }
 
   // PEI Core should always load and never return

ArmPlatformPkg/PrePeiCore/PrePeiCore.h

@@ -0,0 +1,60 @@
+/** @file
+*  Main file supporting the transition to PEI Core in Normal World for Versatile Express
+*
+*  Copyright (c) 2011, 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
+*  which accompanies this distribution.  The full text of the license may be found at
+*  http://opensource.org/licenses/bsd-license.php
+*
+*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+*
+**/
+#ifndef __PREPEICORE_H_
+#define __PREPEICORE_H_
+
+#include <PiPei.h>
+#include <Ppi/TemporaryRamSupport.h>
+
+
+EFI_STATUS
+EFIAPI
+SecTemporaryRamSupport (
+  IN CONST EFI_PEI_SERVICES   **PeiServices,
+  IN EFI_PHYSICAL_ADDRESS     TemporaryMemoryBase,
+  IN EFI_PHYSICAL_ADDRESS     PermanentMemoryBase,
+  IN UINTN                    CopySize
+  );
+
+VOID
+SecSwitchStack (
+  INTN    StackDelta
+  );
+
+// Vector Table for Pei Phase
+VOID  PeiVectorTable (VOID);
+
+VOID
+EFIAPI
+PrimaryMain (
+  IN  EFI_PEI_CORE_ENTRY_POINT  PeiCoreEntryPoint
+  );
+
+/*
+ * This is the main function for secondary cores. They loop around until a non Null value is written to
+ * SYS_FLAGS register.The SYS_FLAGS register is platform specific.
+ * Note:The secondary cores, while executing secondary_main, assumes that:
+ *      : SGI 0 is configured as Non-secure interrupt
+ *      : Priority Mask is configured to allow SGI 0
+ *      : Interrupt Distributor and CPU interfaces are enabled
+ *
+ */
+VOID
+EFIAPI
+SecondaryMain (
+  IN UINTN CoreId
+  );
+
+#endif