Merging linaro-tracking-2013.06 into linaro-releaselinaro-uefi-2013.06

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>

9 files changed, 101 insertions, 42 deletions

diff --git a/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.S b/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.S
index 286327956a..49f3fde667 100644
--- a/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.S
+++ b/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.S
@@ -1,5 +1,5 @@
 //

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

+//  Copyright (c) 2012-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

@@ -11,12 +11,22 @@
 //

 //

 

+#include <AsmMacroIoLib.h>

 #include <Library/ArmLib.h>

 

 .text 

-.align 3

+.align 2

 

+GCC_ASM_EXPORT(ArmPlatformPeiBootAction)

 GCC_ASM_EXPORT(ArmPlatformGetCorePosition)

+GCC_ASM_EXPORT(ArmPlatformGetPrimaryCoreMpId)

+GCC_ASM_EXPORT(ArmPlatformIsPrimaryCore)

+

+GCC_ASM_IMPORT(_gPcd_FixedAtBuild_PcdArmPrimaryCore)

+GCC_ASM_IMPORT(_gPcd_FixedAtBuild_PcdArmPrimaryCoreMask)

+

+ASM_PFX(ArmPlatformPeiBootAction):

+  bx    lr

 

 //UINTN

 //ArmPlatformGetCorePosition (

@@ -28,3 +38,26 @@ ASM_PFX(ArmPlatformGetCorePosition):
   add	r0, r1, r0, LSR #7

   bx 	lr

 

+//UINTN

+//ArmPlatformGetPrimaryCoreMpId (

+//  VOID

+//  );

+ASM_PFX(ArmPlatformGetPrimaryCoreMpId):

+  LoadConstantToReg (_gPcd_FixedAtBuild_PcdArmPrimaryCoreMask, r0)

+  ldr   r0, [r0]

+  bx    lr

+

+//UINTN

+//ArmPlatformIsPrimaryCore (

+//  IN UINTN MpId

+//  );

+ASM_PFX(ArmPlatformIsPrimaryCore):

+  LoadConstantToReg (_gPcd_FixedAtBuild_PcdArmPrimaryCoreMask, r1)

+  ldr   r1, [r1]

+  and   r0, r0, r1

+  LoadConstantToReg (_gPcd_FixedAtBuild_PcdArmPrimaryCore, r1)

+  ldr   r1, [r1]

+  cmp   r0, r1

+  moveq r0, #1

+  movne r0, #0

+  bx    lr

diff --git a/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.asm b/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.asm
index 620562136e..6047ca25c4 100644
--- a/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.asm
+++ b/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.asm
@@ -1,5 +1,5 @@
 //

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

+//  Copyright (c) 2012-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

@@ -16,11 +16,21 @@
 

   INCLUDE AsmMacroIoLib.inc

 

+  EXPORT  ArmPlatformPeiBootAction

   EXPORT  ArmPlatformGetCorePosition

+  EXPORT  ArmPlatformGetPrimaryCoreMpId

+  EXPORT  ArmPlatformIsPrimaryCore

 

+  IMPORT  _gPcd_FixedAtBuild_PcdArmPrimaryCore

+  IMPORT  _gPcd_FixedAtBuild_PcdArmPrimaryCoreMask

+  

   PRESERVE8

   AREA    ArmPlatformNullHelper, CODE, READONLY

 

+ArmPlatformPeiBootAction FUNCTION

+  bx    lr

+  ENDFUNC

+

 //UINTN

 //ArmPlatformGetCorePosition (

 //  IN UINTN MpId

@@ -32,5 +42,31 @@ ArmPlatformGetCorePosition FUNCTION
   bx 	lr

   ENDFUNC

 

+//UINTN

+//ArmPlatformGetPrimaryCoreMpId (

+//  VOID

+//  );

+ArmPlatformGetPrimaryCoreMpId FUNCTION

+  LoadConstantToReg (_gPcd_FixedAtBuild_PcdArmPrimaryCoreMask, r0)

+  ldr   r0, [r0]

+  bx    lr

+  ENDFUNC

+

+//UINTN

+//ArmPlatformIsPrimaryCore (

+//  IN UINTN MpId

+//  );

+ArmPlatformIsPrimaryCore FUNCTION

+  LoadConstantToReg (_gPcd_FixedAtBuild_PcdArmPrimaryCoreMask, r1)

+  ldr   r1, [r1]

+  and   r0, r0, r1

+  LoadConstantToReg (_gPcd_FixedAtBuild_PcdArmPrimaryCore, r1)

+  ldr   r1, [r1]

+  cmp   r0, r1

+  moveq r0, #1

+  movne r0, #0

+  bx    lr

+  ENDFUNC

+

   END

 

diff --git a/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.c b/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.c
index f3a7efcae0..b45c11b4e1 100644
--- a/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.c
+++ b/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.c
@@ -97,7 +97,7 @@ ArmPlatformInitialize (
   IN  UINTN                     MpId

   )

 {

-  if (!IS_PRIMARY_CORE(MpId)) {

+  if (!ArmPlatformIsPrimaryCore (MpId)) {

     return RETURN_SUCCESS;

   }

 

diff --git a/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNullMem.c b/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNullMem.c
index 3b44f82f39..aafb797683 100644
--- a/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNullMem.c
+++ b/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNullMem.c
@@ -32,21 +32,3 @@ ArmPlatformGetVirtualMemoryMap (
 {

   ASSERT(0);

 }

-

-/**

-  Return the EFI Memory Map of your platform

-

-  This EFI Memory Map of the System Memory is used by MemoryInitPei module to create the Resource

-  Descriptor HOBs used by DXE core.

-

-  @param[out]   EfiMemoryMap        Array of ARM_SYSTEM_MEMORY_REGION_DESCRIPTOR describing an

-                                    EFI Memory region. This array must be ended by a zero-filled entry

-

-**/

-EFI_STATUS

-ArmPlatformGetAdditionalSystemMemory (

-  OUT ARM_SYSTEM_MEMORY_REGION_DESCRIPTOR** EfiMemoryMap

-  )

-{

-  return EFI_UNSUPPORTED;

-}

diff --git a/ArmPlatformPkg/Library/ArmPlatformSecLibNull/ArmPlatformLibNullSec.c b/ArmPlatformPkg/Library/ArmPlatformSecLibNull/ArmPlatformLibNullSec.c
index 1a83882030..41f4f74085 100644
--- a/ArmPlatformPkg/Library/ArmPlatformSecLibNull/ArmPlatformLibNullSec.c
+++ b/ArmPlatformPkg/Library/ArmPlatformSecLibNull/ArmPlatformLibNullSec.c
@@ -29,7 +29,7 @@ ArmPlatformSecTrustzoneInit (
   )

 {

   // Secondary cores might have to set the Secure SGIs into the GICD_IGROUPR0

-  if (!IS_PRIMARY_CORE(MpId)) {

+  if (!ArmPlatformIsPrimaryCore (MpId)) {

     return;

   }

 

@@ -49,7 +49,7 @@ ArmPlatformSecInitialize (
   )

 {

   // If it is not the primary core then there is nothing to do

-  if (!IS_PRIMARY_CORE(MpId)) {

+  if (!ArmPlatformIsPrimaryCore (MpId)) {

     return RETURN_SUCCESS;

   }

 

diff --git a/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.c b/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.c
index 9e78d7eadf..f7c3ab214c 100755
--- a/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.c
+++ b/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.c
@@ -16,6 +16,7 @@
 

 #include <Library/ArmLib.h>

 #include <Library/ArmGicLib.h>

+#include <Library/ArmPlatformLib.h>

 #include <Library/ArmPlatformSecLib.h>

 #include <Library/DebugLib.h>

 #include <Library/PcdLib.h>

@@ -70,7 +71,7 @@ ArmPlatformSecExtraAction (
     // Warning: This code assumes the DRAM has already been initialized by ArmPlatformSecLib

     //

 

-    if (IS_PRIMARY_CORE(MpId)) {

+    if (ArmPlatformIsPrimaryCore (MpId)) {

       UINTN*   StartAddress = (UINTN*)PcdGet32(PcdFvBaseAddress);

 

       // Patch the DRAM to make an infinite loop at the start address

@@ -96,7 +97,7 @@ ArmPlatformSecExtraAction (
     // Warning: This code assumes the DRAM has already been initialized by ArmPlatformSecLib

     //

 

-    if (IS_PRIMARY_CORE(MpId)) {

+    if (ArmPlatformIsPrimaryCore (MpId)) {

       // Signal the secondary cores they can jump to PEI phase

       ArmGicSendSgiTo (PcdGet32(PcdGicDistributorBase), ARM_GIC_ICDSGIR_FILTER_EVERYONEELSE, 0x0E, PcdGet32 (PcdGicSgiIntId));

 

diff --git a/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.inf b/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.inf
index 26afb34b23..5a2d28876a 100755
--- a/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.inf
+++ b/ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.inf
@@ -30,10 +30,12 @@
 

 [Packages]

   MdePkg/MdePkg.dec

+  MdeModulePkg/MdeModulePkg.dec

   ArmPkg/ArmPkg.dec

   ArmPlatformPkg/ArmPlatformPkg.dec

 

 [LibraryClasses]

+  ArmPlatformLib

   DebugLib

   PcdLib

   ArmGicLib

@@ -46,9 +48,6 @@
 

 [FixedPcd]

   gArmTokenSpaceGuid.PcdFvBaseAddress

-  

-  gArmTokenSpaceGuid.PcdArmPrimaryCoreMask

-  gArmTokenSpaceGuid.PcdArmPrimaryCore

 

   gArmTokenSpaceGuid.PcdGicDistributorBase

   gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase

diff --git a/ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortExtLib.c b/ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortExtLib.c
index 9bfe42e60c..57f3fa0eea 100644
--- a/ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortExtLib.c
+++ b/ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortExtLib.c
@@ -1,7 +1,7 @@
 /** @file

   Serial I/O Port library functions with no library constructor/destructor

 

-  Copyright (c) 2012, ARM Ltd. All rights reserved.<BR>

+  Copyright (c) 2012-2013, 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

@@ -47,12 +47,12 @@
 RETURN_STATUS

 EFIAPI

 SerialPortSetAttributes (

-  IN UINT64              BaudRate,

-  IN UINT32              ReceiveFifoDepth,

-  IN UINT32              Timeout,

-  IN EFI_PARITY_TYPE     Parity,

-  IN UINT8               DataBits,

-  IN EFI_STOP_BITS_TYPE  StopBits

+  IN OUT UINT64              *BaudRate,

+  IN OUT UINT32              *ReceiveFifoDepth,

+  IN OUT UINT32              *Timeout,

+  IN OUT EFI_PARITY_TYPE     *Parity,

+  IN OUT UINT8               *DataBits,

+  IN OUT EFI_STOP_BITS_TYPE  *StopBits

   )

 {

   return PL011UartInitializePort (

diff --git a/ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.c b/ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.c
index 09033dbd76..4f628086ac 100644
--- a/ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.c
+++ b/ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.c
@@ -2,7 +2,7 @@
   Serial I/O Port library functions with no library constructor/destructor

 

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

-  Copyright (c) 2012, ARM Ltd. All rights reserved.<BR>

+  Copyright (c) 2012 - 2013, 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

@@ -37,13 +37,21 @@ SerialPortInitialize (
   VOID

   )

 {

+  UINT64              BaudRate;

+  UINT32              ReceiveFifoDepth;

+  EFI_PARITY_TYPE     Parity;

+  UINT8               DataBits;

+  EFI_STOP_BITS_TYPE  StopBits;

+

+  BaudRate = (UINTN)PcdGet64 (PcdUartDefaultBaudRate);

+  ReceiveFifoDepth = 0; // Use the default value for Fifo depth

+  Parity = (EFI_PARITY_TYPE)PcdGet8 (PcdUartDefaultParity);

+  DataBits = PcdGet8 (PcdUartDefaultDataBits);

+  StopBits = (EFI_STOP_BITS_TYPE) PcdGet8 (PcdUartDefaultStopBits);

+

   return PL011UartInitializePort (

       (UINTN)PcdGet64 (PcdSerialRegisterBase),

-      (UINTN)PcdGet64 (PcdUartDefaultBaudRate),

-      0, // Use the default value for Fifo depth

-      (EFI_PARITY_TYPE)PcdGet8 (PcdUartDefaultParity),

-      PcdGet8 (PcdUartDefaultDataBits),

-      (EFI_STOP_BITS_TYPE) PcdGet8 (PcdUartDefaultStopBits));

+      &BaudRate, &ReceiveFifoDepth, &Parity, &DataBits, &StopBits);

 }

 

 /**