Merge remote-tracking branch 'rmt-1/linaro-topic-2014.04-backports' into release-prep

12 files changed, 326 insertions, 124 deletions

diff --git a/ArmPkg/Include/Library/BdsLib.h b/ArmPkg/Include/Library/BdsLib.h
index d16748da46..9fa6870418 100644
--- a/ArmPkg/Include/Library/BdsLib.h
+++ b/ArmPkg/Include/Library/BdsLib.h
@@ -66,6 +66,23 @@ BdsConnectAllDrivers (
   VOID

   );

 

+/**

+  Return the value of a global variable defined by its VariableName.

+  The variable must be defined with the VendorGuid gEfiGlobalVariableGuid.

+

+  @param  VariableName          A Null-terminated string that is the name of the vendor's

+                                variable.

+  @param  DefaultValue          Value returned by the function if the variable does not exist

+  @param  DataSize              On input, the size in bytes of the return Data buffer.

+                                On output the size of data returned in Data.

+  @param  Value                 Value read from the UEFI Variable or copy of the default value

+                                if the UEFI Variable does not exist

+

+  @retval EFI_SUCCESS           All drivers have been connected

+  @retval EFI_NOT_FOUND         No handles match the search.

+  @retval EFI_OUT_OF_RESOURCES  There is not resource pool memory to store the matching results.

+

+**/

 EFI_STATUS

 GetGlobalEnvironmentVariable (

   IN     CONST CHAR16*   VariableName,

@@ -74,6 +91,23 @@ GetGlobalEnvironmentVariable (
   OUT    VOID**          Value

   );

 

+/**

+  Return the value of the variable defined by its VariableName and VendorGuid

+

+  @param  VariableName          A Null-terminated string that is the name of the vendor's

+                                variable.

+  @param  VendorGuid            A unique identifier for the vendor.

+  @param  DefaultValue          Value returned by the function if the variable does not exist

+  @param  DataSize              On input, the size in bytes of the return Data buffer.

+                                On output the size of data returned in Data.

+  @param  Value                 Value read from the UEFI Variable or copy of the default value

+                                if the UEFI Variable does not exist

+

+  @retval EFI_SUCCESS           All drivers have been connected

+  @retval EFI_NOT_FOUND         No handles match the search.

+  @retval EFI_OUT_OF_RESOURCES  There is not resource pool memory to store the matching results.

+

+**/

 EFI_STATUS

 GetEnvironmentVariable (

   IN     CONST CHAR16*   VariableName,

diff --git a/ArmPkg/Library/BdsLib/BdsHelper.c b/ArmPkg/Library/BdsLib/BdsHelper.c
index fb2ac9b806..1d4aa35728 100644
--- a/ArmPkg/Library/BdsLib/BdsHelper.c
+++ b/ArmPkg/Library/BdsLib/BdsHelper.c
@@ -331,7 +331,7 @@ GetEnvironmentVariable (
                     *Size,

                     DefaultValue

                     );

-      *Value = DefaultValue;

+      *Value = AllocateCopyPool (*Size, DefaultValue);

     } else {

       return EFI_NOT_FOUND;

     }

@@ -352,7 +352,7 @@ GetEnvironmentVariable (
       *Size = VariableSize;

     }

   } else {

-    *Value = DefaultValue;

+    *Value = AllocateCopyPool (*Size, DefaultValue);

     return Status;

   }

 

diff --git a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.c b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.c
index 7953b6c9f5..a03bf5749e 100644
--- a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.c
+++ b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.c
@@ -1,6 +1,6 @@
 /** @file  NorFlashDxe.c

 

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

+  Copyright (c) 2011 - 2014, 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

@@ -20,11 +20,13 @@
 

 #include "NorFlashDxe.h"

 

+STATIC EFI_EVENT mNorFlashVirtualAddrChangeEvent;

 

 //

 // Global variable declarations

 //

 NOR_FLASH_INSTANCE **mNorFlashInstances;

+UINT32               mNorFlashDeviceCount;

 

 NOR_FLASH_INSTANCE  mNorFlashInstanceTemplate = {

   NOR_FLASH_SIGNATURE, // Signature

@@ -72,7 +74,7 @@ NOR_FLASH_INSTANCE  mNorFlashInstanceTemplate = {
     FvbEraseBlocks, // EraseBlocks

     NULL, //ParentHandle

   }, //  FvbProtoccol;

-

+  NULL, // FvbBuffer

   {

     {

       {

@@ -109,7 +111,7 @@ NorFlashCreateInstance (
 

   ASSERT(NorFlashInstance != NULL);

 

-  Instance = AllocateCopyPool (sizeof(NOR_FLASH_INSTANCE),&mNorFlashInstanceTemplate);

+  Instance = AllocateRuntimeCopyPool (sizeof(NOR_FLASH_INSTANCE),&mNorFlashInstanceTemplate);

   if (Instance == NULL) {

     return EFI_OUT_OF_RESOURCES;

   }

@@ -123,11 +125,15 @@ NorFlashCreateInstance (
   Instance->Media.BlockSize = BlockSize;

   Instance->Media.LastBlock = (NorFlashSize / BlockSize)-1;

 

-  CopyGuid (&Instance->DevicePath.Vendor.Guid,NorFlashGuid);

+  CopyGuid (&Instance->DevicePath.Vendor.Guid, NorFlashGuid);

 

   if (SupportFvb) {

     Instance->SupportFvb = TRUE;

     Instance->Initialize = NorFlashFvbInitialize;

+    Instance->FvbBuffer = AllocateRuntimePool (BlockSize);;

+    if (Instance->FvbBuffer == NULL) {

+      return EFI_OUT_OF_RESOURCES;

+    }

 

     Status = gBS->InstallMultipleProtocolInterfaces (

                   &Instance->Handle,

@@ -137,7 +143,7 @@ NorFlashCreateInstance (
                   NULL

                   );

     if (EFI_ERROR(Status)) {

-      FreePool(Instance);

+      FreePool (Instance);

       return Status;

     }

   } else {

@@ -150,7 +156,7 @@ NorFlashCreateInstance (
                     NULL

                     );

     if (EFI_ERROR(Status)) {

-      FreePool(Instance);

+      FreePool (Instance);

       return Status;

     }

   }

@@ -340,8 +346,14 @@ NorFlashUnlockAndEraseSingleBlock (
   UINTN           Index;

   EFI_TPL         OriginalTPL;

 

-  // Raise TPL to TPL_HIGH to stop anyone from interrupting us.

-  OriginalTPL = gBS->RaiseTPL (TPL_HIGH_LEVEL);

+  if (!EfiAtRuntime ()) {

+    // Raise TPL to TPL_HIGH to stop anyone from interrupting us.

+    OriginalTPL = gBS->RaiseTPL (TPL_HIGH_LEVEL);

+  } else {

+    // This initialization is only to prevent the compiler to complain about the

+    // use of uninitialized variables

+    OriginalTPL = TPL_HIGH_LEVEL;

+  }

 

   Index = 0;

   // The block erase might fail a first time (SW bug ?). Retry it ...

@@ -358,8 +370,10 @@ NorFlashUnlockAndEraseSingleBlock (
     DEBUG((EFI_D_ERROR,"EraseSingleBlock(BlockAddress=0x%08x: Block Locked Error (try to erase %d times)\n", BlockAddress,Index));

   }

 

-  // Interruptions can resume.

-  gBS->RestoreTPL (OriginalTPL);

+  if (!EfiAtRuntime ()) {

+    // Interruptions can resume.

+    gBS->RestoreTPL (OriginalTPL);

+  }

 

   return Status;

 }

@@ -581,8 +595,14 @@ NorFlashWriteSingleBlock (
   // Start writing from the first address at the start of the block

   WordAddress = BlockAddress;

 

-  // Raise TPL to TPL_HIGH to stop anyone from interrupting us.

-  OriginalTPL = gBS->RaiseTPL (TPL_HIGH_LEVEL);

+  if (!EfiAtRuntime ()) {

+    // Raise TPL to TPL_HIGH to stop anyone from interrupting us.

+    OriginalTPL = gBS->RaiseTPL (TPL_HIGH_LEVEL);

+  } else {

+    // This initialization is only to prevent the compiler to complain about the

+    // use of uninitialized variables

+    OriginalTPL = TPL_HIGH_LEVEL;

+  }

 

   Status = NorFlashUnlockAndEraseSingleBlock (Instance, BlockAddress);

   if (EFI_ERROR(Status)) {

@@ -632,8 +652,10 @@ NorFlashWriteSingleBlock (
   }

 

 EXIT:

-  // Interruptions can resume.

-  gBS->RestoreTPL (OriginalTPL);

+  if (!EfiAtRuntime ()) {

+    // Interruptions can resume.

+    gBS->RestoreTPL (OriginalTPL);

+  }

 

   if (EFI_ERROR(Status)) {

     DEBUG((EFI_D_ERROR, "NOR FLASH Programming [WriteSingleBlock] failed at address 0x%08x. Exit Status = \"%r\".\n", WordAddress, Status));

@@ -772,6 +794,50 @@ NorFlashReset (
   return EFI_SUCCESS;

 }

 

+/**

+  Fixup internal data so that EFI can be call in virtual mode.

+  Call the passed in Child Notify event and convert any pointers in

+  lib to virtual mode.

+

+  @param[in]    Event   The Event that is being processed

+  @param[in]    Context Event Context

+**/

+VOID

+EFIAPI

+NorFlashVirtualNotifyEvent (

+  IN EFI_EVENT        Event,

+  IN VOID             *Context

+  )

+{

+  UINTN Index;

+

+  for (Index = 0; Index < mNorFlashDeviceCount; Index++) {

+    EfiConvertPointer (0x0, (VOID**)&mNorFlashInstances[Index]->DeviceBaseAddress);

+    EfiConvertPointer (0x0, (VOID**)&mNorFlashInstances[Index]->RegionBaseAddress);

+

+    // Convert BlockIo protocol

+    EfiConvertPointer (0x0, (VOID**)&mNorFlashInstances[Index]->BlockIoProtocol.FlushBlocks);

+    EfiConvertPointer (0x0, (VOID**)&mNorFlashInstances[Index]->BlockIoProtocol.ReadBlocks);

+    EfiConvertPointer (0x0, (VOID**)&mNorFlashInstances[Index]->BlockIoProtocol.Reset);

+    EfiConvertPointer (0x0, (VOID**)&mNorFlashInstances[Index]->BlockIoProtocol.WriteBlocks);

+

+    // Convert Fvb

+    EfiConvertPointer (0x0, (VOID**)&mNorFlashInstances[Index]->FvbProtocol.EraseBlocks);

+    EfiConvertPointer (0x0, (VOID**)&mNorFlashInstances[Index]->FvbProtocol.GetAttributes);

+    EfiConvertPointer (0x0, (VOID**)&mNorFlashInstances[Index]->FvbProtocol.GetBlockSize);

+    EfiConvertPointer (0x0, (VOID**)&mNorFlashInstances[Index]->FvbProtocol.GetPhysicalAddress);

+    EfiConvertPointer (0x0, (VOID**)&mNorFlashInstances[Index]->FvbProtocol.Read);

+    EfiConvertPointer (0x0, (VOID**)&mNorFlashInstances[Index]->FvbProtocol.SetAttributes);

+    EfiConvertPointer (0x0, (VOID**)&mNorFlashInstances[Index]->FvbProtocol.Write);

+

+    if (mNorFlashInstances[Index]->FvbBuffer != NULL) {

+      EfiConvertPointer (0x0, (VOID**)&mNorFlashInstances[Index]->FvbBuffer);

+    }

+  }

+

+  return;

+}

+

 EFI_STATUS

 EFIAPI

 NorFlashInitialise (

@@ -782,7 +848,6 @@ NorFlashInitialise (
   EFI_STATUS              Status;

   UINT32                  Index;

   NOR_FLASH_DESCRIPTION*  NorFlashDevices;

-  UINT32                  NorFlashDeviceCount;

   BOOLEAN                 ContainVariableStorage;

 

   Status = NorFlashPlatformInitialization ();

@@ -791,15 +856,15 @@ NorFlashInitialise (
     return Status;

   }

 

-  Status = NorFlashPlatformGetDevices (&NorFlashDevices,&NorFlashDeviceCount);

+  Status = NorFlashPlatformGetDevices (&NorFlashDevices, &mNorFlashDeviceCount);

   if (EFI_ERROR(Status)) {

     DEBUG((EFI_D_ERROR,"NorFlashInitialise: Fail to get Nor Flash devices\n"));

     return Status;

   }

 

-  mNorFlashInstances = AllocatePool (sizeof(NOR_FLASH_INSTANCE*) * NorFlashDeviceCount);

+  mNorFlashInstances = AllocateRuntimePool (sizeof(NOR_FLASH_INSTANCE*) * mNorFlashDeviceCount);

 

-  for (Index = 0; Index < NorFlashDeviceCount; Index++) {

+  for (Index = 0; Index < mNorFlashDeviceCount; Index++) {

     // Check if this NOR Flash device contain the variable storage region

     ContainVariableStorage =

         (NorFlashDevices[Index].RegionBaseAddress <= PcdGet32 (PcdFlashNvStorageVariableBase)) &&

@@ -820,5 +885,18 @@ NorFlashInitialise (
     }

   }

 

+  //

+  // Register for the virtual address change event

+  //

+  Status = gBS->CreateEventEx (

+                  EVT_NOTIFY_SIGNAL,

+                  TPL_NOTIFY,

+                  NorFlashVirtualNotifyEvent,

+                  NULL,

+                  &gEfiEventVirtualAddressChangeGuid,

+                  &mNorFlashVirtualAddrChangeEvent

+                  );

+  ASSERT_EFI_ERROR (Status);

+

   return Status;

 }

diff --git a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.h b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.h
index 959c0c1905..e4d767bf94 100644
--- a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.h
+++ b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.h
@@ -1,6 +1,6 @@
 /** @file  NorFlashDxe.h

 

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

+  Copyright (c) 2011 - 2014, 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

@@ -19,6 +19,8 @@
 #include <Base.h>

 #include <PiDxe.h>

 

+#include <Guid/EventGroup.h>

+

 #include <Protocol/BlockIo.h>

 #include <Protocol/FirmwareVolumeBlock.h>

 

@@ -26,6 +28,7 @@
 #include <Library/IoLib.h>

 #include <Library/NorFlashPlatformLib.h>

 #include <Library/UefiLib.h>

+#include <Library/UefiRuntimeLib.h>

 

 #define NOR_FLASH_ERASE_RETRY                     10

 

@@ -141,6 +144,7 @@ struct _NOR_FLASH_INSTANCE {
 

   BOOLEAN                             SupportFvb;

   EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL FvbProtocol;

+  VOID*                               FvbBuffer;

 

   NOR_FLASH_DEVICE_PATH	              DevicePath;

 };

diff --git a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf
index 97c66008f6..a2eb27e8f6 100644
--- a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf
+++ b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf
@@ -2,7 +2,7 @@
 #  

 #  Component description file for NorFlashDxe module

 #  

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

+#  Copyright (c) 2011 - 2014, 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

@@ -18,7 +18,7 @@
   INF_VERSION                    = 0x00010005

   BASE_NAME                      = ArmVeNorFlashDxe

   FILE_GUID                      = 93E34C7E-B50E-11DF-9223-2443DFD72085

-  MODULE_TYPE                    = DXE_DRIVER

+  MODULE_TYPE                    = DXE_RUNTIME_DRIVER

   VERSION_STRING                 = 1.0

   ENTRY_POINT                    = NorFlashInitialise

 

@@ -41,10 +41,13 @@
   UefiLib

   UefiDriverEntryPoint

   UefiBootServicesTableLib

+  UefiRuntimeLib

+  DxeServicesTableLib

 

 [Guids]

   gEfiSystemNvDataFvGuid

   gEfiVariableGuid

+  gEfiEventVirtualAddressChangeGuid

 

 [Protocols]

   gEfiBlockIoProtocolGuid

diff --git a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashFvbDxe.c b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashFvbDxe.c
index 4b56f2a40a..84890cbfce 100644
--- a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashFvbDxe.c
+++ b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashFvbDxe.c
@@ -1,6 +1,6 @@
 /*++ @file  NorFlashFvbDxe.c

 

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

+ Copyright (c) 2011 - 2014, 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

@@ -20,6 +20,7 @@
 #include <Library/UefiLib.h>

 #include <Library/BaseMemoryLib.h>

 #include <Library/MemoryAllocationLib.h>

+#include <Library/DxeServicesTableLib.h>

 #include <Library/UefiBootServicesTableLib.h>

 

 #include <Guid/VariableFormat.h>

@@ -27,6 +28,8 @@
 

 #include "NorFlashDxe.h"

 

+STATIC EFI_EVENT mFvbVirtualAddrChangeEvent;

+STATIC UINTN     mFlashNvStorageVariableBase;

 

 ///

 /// The Firmware Volume Block Protocol is the low-level interface

@@ -301,7 +304,7 @@ FvbGetPhysicalAddress (
 

   ASSERT(Address != NULL);

 

-  *Address = PcdGet32 (PcdFlashNvStorageVariableBase);

+  *Address = mFlashNvStorageVariableBase;

   return EFI_SUCCESS;

 }

 

@@ -417,7 +420,6 @@ FvbRead (
   EFI_STATUS    Status;

   EFI_STATUS    TempStatus;

   UINTN         BlockSize;

-  UINT8         *BlockBuffer;

   NOR_FLASH_INSTANCE *Instance;

 

   Instance = INSTANCE_FROM_FVB_THIS(This);

@@ -450,32 +452,24 @@ FvbRead (
     return EFI_BAD_BUFFER_SIZE;

   }

 

-  // FixMe: Allow an arbitrary number of bytes to be read out, not just a multiple of block size.

-

-  // Allocate runtime memory to read in the NOR Flash data. Variable Services are runtime.

-  BlockBuffer = AllocateRuntimePool (BlockSize);

-

-  // Check if the memory allocation was successful

-  if (BlockBuffer == NULL) {

-    DEBUG ((EFI_D_ERROR, "FvbRead: ERROR - Could not allocate BlockBuffer @ 0x%08x.\n", BlockBuffer));

+  // Check we did get some memory

+  if (Instance->FvbBuffer == NULL) {

+    DEBUG ((EFI_D_ERROR, "FvbRead: ERROR - Buffer not ready\n"));

     return EFI_DEVICE_ERROR;

   }

 

   // Read NOR Flash data into shadow buffer

-  TempStatus = NorFlashReadBlocks (Instance, Instance->StartLba + Lba, BlockSize, BlockBuffer);

+  TempStatus = NorFlashReadBlocks (Instance, Instance->StartLba + Lba, BlockSize, Instance->FvbBuffer);

   if (EFI_ERROR (TempStatus)) {

     // Return one of the pre-approved error statuses

-    Status = EFI_DEVICE_ERROR;

-    goto FREE_MEMORY;

+    return EFI_DEVICE_ERROR;

   }

 

   // Put the data at the appropriate location inside the buffer area

-  DEBUG ((DEBUG_BLKIO, "FvbRead: CopyMem( Dst=0x%08x, Src=0x%08x, Size=0x%x ).\n", Buffer, BlockBuffer + Offset, *NumBytes));

+  DEBUG ((DEBUG_BLKIO, "FvbRead: CopyMem( Dst=0x%08x, Src=0x%08x, Size=0x%x ).\n", Buffer, (UINTN)Instance->FvbBuffer + Offset, *NumBytes));

 

-  CopyMem(Buffer, BlockBuffer + Offset, *NumBytes);

+  CopyMem (Buffer, (VOID*)((UINTN)Instance->FvbBuffer + Offset), *NumBytes);

 

-FREE_MEMORY:

-  FreePool(BlockBuffer);

   return Status;

 }

 

@@ -546,7 +540,6 @@ FvbWrite (
   EFI_STATUS  Status;

   EFI_STATUS  TempStatus;

   UINTN       BlockSize;

-  UINT8       *BlockBuffer;

   NOR_FLASH_INSTANCE *Instance;

 

   Instance = INSTANCE_FROM_FVB_THIS(This);

@@ -585,38 +578,29 @@ FvbWrite (
     return EFI_BAD_BUFFER_SIZE;

   }

 

-  // Allocate runtime memory to read in the NOR Flash data.

-  // Since the intention is to use this with Variable Services and since these are runtime,

-  // allocate the memory from the runtime pool.

-  BlockBuffer = AllocateRuntimePool (BlockSize);

-

   // Check we did get some memory

-  if( BlockBuffer == NULL ) {

-    DEBUG ((EFI_D_ERROR, "FvbWrite: ERROR - Can not allocate BlockBuffer @ 0x%08x.\n", BlockBuffer));

+  if (Instance->FvbBuffer == NULL) {

+    DEBUG ((EFI_D_ERROR, "FvbWrite: ERROR - Buffer not ready\n"));

     return EFI_DEVICE_ERROR;

   }

 

   // Read NOR Flash data into shadow buffer

-  TempStatus = NorFlashReadBlocks (Instance, Instance->StartLba + Lba, BlockSize, BlockBuffer);

+  TempStatus = NorFlashReadBlocks (Instance, Instance->StartLba + Lba, BlockSize, Instance->FvbBuffer);

   if (EFI_ERROR (TempStatus)) {

     // Return one of the pre-approved error statuses

-    Status = EFI_DEVICE_ERROR;

-    goto FREE_MEMORY;

+    return EFI_DEVICE_ERROR;

   }

 

   // Put the data at the appropriate location inside the buffer area

-  CopyMem((BlockBuffer + Offset), Buffer, *NumBytes);

+  CopyMem ((VOID*)((UINTN)Instance->FvbBuffer + Offset), Buffer, *NumBytes);

 

   // Write the modified buffer back to the NorFlash

-  TempStatus = NorFlashWriteBlocks (Instance, Instance->StartLba + Lba, BlockSize, BlockBuffer);

+  TempStatus = NorFlashWriteBlocks (Instance, Instance->StartLba + Lba, BlockSize, Instance->FvbBuffer);

   if (EFI_ERROR (TempStatus)) {

     // Return one of the pre-approved error statuses

-    Status = EFI_DEVICE_ERROR;

-    goto FREE_MEMORY;

+    return EFI_DEVICE_ERROR;

   }

 

-FREE_MEMORY:

-  FreePool(BlockBuffer);

   return Status;

 }

 

@@ -764,6 +748,25 @@ EXIT:
   return Status;

 }

 

+/**

+  Fixup internal data so that EFI can be call in virtual mode.

+  Call the passed in Child Notify event and convert any pointers in

+  lib to virtual mode.

+

+  @param[in]    Event   The Event that is being processed

+  @param[in]    Context Event Context

+**/

+VOID

+EFIAPI

+FvbVirtualNotifyEvent (

+  IN EFI_EVENT        Event,

+  IN VOID             *Context

+  )

+{

+  EfiConvertPointer (0x0, (VOID**)&mFlashNvStorageVariableBase);

+  return;

+}

+

 EFI_STATUS

 EFIAPI

 NorFlashFvbInitialize (

@@ -773,10 +776,12 @@ NorFlashFvbInitialize (
   EFI_STATUS  Status;

   UINT32      FvbNumLba;

   EFI_BOOT_MODE BootMode;

+  UINTN       RuntimeMmioRegionSize;

 

   DEBUG((DEBUG_BLKIO,"NorFlashFvbInitialize\n"));

 

   Instance->Initialized = TRUE;

+  mFlashNvStorageVariableBase = FixedPcdGet32 (PcdFlashNvStorageVariableBase);

 

   // Set the index of the first LBA for the FVB

   Instance->StartLba = (PcdGet32 (PcdFlashNvStorageVariableBase) - Instance->RegionBaseAddress) / Instance->Media.BlockSize;

@@ -808,5 +813,41 @@ NorFlashFvbInitialize (
       return Status;

     }

   }

+

+  //

+  // Declare the Non-Volatile storage as EFI_MEMORY_RUNTIME

+  //

+

+  // Note: all the NOR Flash region needs to be reserved into the UEFI Runtime memory;

+  //       even if we only use the small block region at the top of the NOR Flash.

+  //       The reason is when the NOR Flash memory is set into program mode, the command

+  //       is written as the base of the flash region (ie: Instance->DeviceBaseAddress)

+  RuntimeMmioRegionSize = (Instance->RegionBaseAddress - Instance->DeviceBaseAddress) + Instance->Size;

+

+  Status = gDS->AddMemorySpace (

+      EfiGcdMemoryTypeMemoryMappedIo,

+      Instance->DeviceBaseAddress, RuntimeMmioRegionSize,

+      EFI_MEMORY_UC | EFI_MEMORY_RUNTIME

+      );

+  ASSERT_EFI_ERROR (Status);

+

+  Status = gDS->SetMemorySpaceAttributes (

+      Instance->DeviceBaseAddress, RuntimeMmioRegionSize,

+      EFI_MEMORY_UC | EFI_MEMORY_RUNTIME);

+  ASSERT_EFI_ERROR (Status);

+

+  //

+  // Register for the virtual address change event

+  //

+  Status = gBS->CreateEventEx (

+                  EVT_NOTIFY_SIGNAL,

+                  TPL_NOTIFY,

+                  FvbVirtualNotifyEvent,

+                  NULL,

+                  &gEfiEventVirtualAddressChangeGuid,

+                  &mFvbVirtualAddrChangeEvent

+                  );

+  ASSERT_EFI_ERROR (Status);

+

   return Status;

 }

diff --git a/ArmPlatformPkg/Include/Drivers/PL031RealTimeClock.h b/ArmPlatformPkg/Include/Drivers/PL031RealTimeClock.h
index 4c559c0c95..76fbd0eb82 100644
--- a/ArmPlatformPkg/Include/Drivers/PL031RealTimeClock.h
+++ b/ArmPlatformPkg/Include/Drivers/PL031RealTimeClock.h
@@ -1,6 +1,6 @@
 /** @file

 *

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

+*  Copyright (c) 2011 - 2014, 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

@@ -17,22 +17,22 @@
 #define __PL031_REAL_TIME_CLOCK_H__

 

 // PL031 Registers

-#define PL031_RTC_DR_DATA_REGISTER                      ((UINT32)PcdGet32(PcdPL031RtcBase) + 0x000)

-#define PL031_RTC_MR_MATCH_REGISTER                     ((UINT32)PcdGet32(PcdPL031RtcBase) + 0x004)

-#define PL031_RTC_LR_LOAD_REGISTER                      ((UINT32)PcdGet32(PcdPL031RtcBase) + 0x008)

-#define PL031_RTC_CR_CONTROL_REGISTER                   ((UINT32)PcdGet32(PcdPL031RtcBase) + 0x00C)

-#define PL031_RTC_IMSC_IRQ_MASK_SET_CLEAR_REGISTER      ((UINT32)PcdGet32(PcdPL031RtcBase) + 0x010)

-#define PL031_RTC_RIS_RAW_IRQ_STATUS_REGISTER           ((UINT32)PcdGet32(PcdPL031RtcBase) + 0x014)

-#define PL031_RTC_MIS_MASKED_IRQ_STATUS_REGISTER        ((UINT32)PcdGet32(PcdPL031RtcBase) + 0x018)

-#define PL031_RTC_ICR_IRQ_CLEAR_REGISTER                ((UINT32)PcdGet32(PcdPL031RtcBase) + 0x01C)

-#define PL031_RTC_PERIPH_ID0                            ((UINT32)PcdGet32(PcdPL031RtcBase) + 0xFE0)

-#define PL031_RTC_PERIPH_ID1                            ((UINT32)PcdGet32(PcdPL031RtcBase) + 0xFE4)

-#define PL031_RTC_PERIPH_ID2                            ((UINT32)PcdGet32(PcdPL031RtcBase) + 0xFE8)

-#define PL031_RTC_PERIPH_ID3                            ((UINT32)PcdGet32(PcdPL031RtcBase) + 0xFEC)

-#define PL031_RTC_PCELL_ID0                             ((UINT32)PcdGet32(PcdPL031RtcBase) + 0xFF0)

-#define PL031_RTC_PCELL_ID1                             ((UINT32)PcdGet32(PcdPL031RtcBase) + 0xFF4)

-#define PL031_RTC_PCELL_ID2                             ((UINT32)PcdGet32(PcdPL031RtcBase) + 0xFF8)

-#define PL031_RTC_PCELL_ID3                             ((UINT32)PcdGet32(PcdPL031RtcBase) + 0xFFC)

+#define PL031_RTC_DR_DATA_REGISTER                      0x000

+#define PL031_RTC_MR_MATCH_REGISTER                     0x004

+#define PL031_RTC_LR_LOAD_REGISTER                      0x008

+#define PL031_RTC_CR_CONTROL_REGISTER                   0x00C

+#define PL031_RTC_IMSC_IRQ_MASK_SET_CLEAR_REGISTER      0x010

+#define PL031_RTC_RIS_RAW_IRQ_STATUS_REGISTER           0x014

+#define PL031_RTC_MIS_MASKED_IRQ_STATUS_REGISTER        0x018

+#define PL031_RTC_ICR_IRQ_CLEAR_REGISTER                0x01C

+#define PL031_RTC_PERIPH_ID0                            0xFE0

+#define PL031_RTC_PERIPH_ID1                            0xFE4

+#define PL031_RTC_PERIPH_ID2                            0xFE8

+#define PL031_RTC_PERIPH_ID3                            0xFEC

+#define PL031_RTC_PCELL_ID0                             0xFF0

+#define PL031_RTC_PCELL_ID1                             0xFF4

+#define PL031_RTC_PCELL_ID2                             0xFF8

+#define PL031_RTC_PCELL_ID3                             0xFFC

 

 // PL031 Values

 #define PL031_RTC_ENABLED                               0x00000001

diff --git a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c
index 980f809b2c..b43d8dc4ba 100644
--- a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c
+++ b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c
@@ -4,7 +4,7 @@
   Currently this driver does not support runtime virtual calling.

 

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

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

+  Copyright (c) 2011 - 2014, 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

@@ -26,10 +26,16 @@
 #include <Library/MemoryAllocationLib.h>

 #include <Library/PcdLib.h>

 #include <Library/ArmPlatformSysConfigLib.h>

+#include <Library/DxeServicesTableLib.h>

 #include <Library/UefiBootServicesTableLib.h>

 #include <Library/UefiRuntimeServicesTableLib.h>

+#include <Library/UefiRuntimeLib.h>

+

 #include <Protocol/RealTimeClock.h>

+

 #include <Guid/GlobalVariable.h>

+#include <Guid/EventGroup.h>

+

 #include <Drivers/PL031RealTimeClock.h>

 

 #include <ArmPlatform.h>

@@ -37,6 +43,8 @@
 STATIC CONST CHAR16  mTimeZoneVariableName[] = L"PL031RtcTimeZone";

 STATIC CONST CHAR16  mDaylightVariableName[] = L"PL031RtcDaylight";

 STATIC BOOLEAN       mPL031Initialized = FALSE;

+STATIC EFI_EVENT     mRtcVirtualAddrChangeEvent;

+STATIC UINTN         mPL031RtcBase;

 

 EFI_STATUS

 IdentifyPL031 (

@@ -46,19 +54,19 @@ IdentifyPL031 (
   EFI_STATUS    Status;

 

   // Check if this is a PrimeCell Peripheral

-  if (  (MmioRead8 (PL031_RTC_PCELL_ID0) != 0x0D)

-      || (MmioRead8 (PL031_RTC_PCELL_ID1) != 0xF0)

-      || (MmioRead8 (PL031_RTC_PCELL_ID2) != 0x05)

-      || (MmioRead8 (PL031_RTC_PCELL_ID3) != 0xB1)) {

+  if (  (MmioRead8 (mPL031RtcBase + PL031_RTC_PCELL_ID0) != 0x0D)

+      || (MmioRead8 (mPL031RtcBase + PL031_RTC_PCELL_ID1) != 0xF0)

+      || (MmioRead8 (mPL031RtcBase + PL031_RTC_PCELL_ID2) != 0x05)

+      || (MmioRead8 (mPL031RtcBase + PL031_RTC_PCELL_ID3) != 0xB1)) {

     Status = EFI_NOT_FOUND;

     goto EXIT;

   }

 

   // Check if this PrimeCell Peripheral is the PL031 Real Time Clock

-  if (  (MmioRead8 (PL031_RTC_PERIPH_ID0) != 0x31)

-      || (MmioRead8 (PL031_RTC_PERIPH_ID1) != 0x10)

-      || ((MmioRead8 (PL031_RTC_PERIPH_ID2) & 0xF) != 0x04)

-      || (MmioRead8 (PL031_RTC_PERIPH_ID3) != 0x00)) {

+  if (  (MmioRead8 (mPL031RtcBase + PL031_RTC_PERIPH_ID0) != 0x31)

+      || (MmioRead8 (mPL031RtcBase + PL031_RTC_PERIPH_ID1) != 0x10)

+      || ((MmioRead8 (mPL031RtcBase + PL031_RTC_PERIPH_ID2) & 0xF) != 0x04)

+      || (MmioRead8 (mPL031RtcBase + PL031_RTC_PERIPH_ID3) != 0x00)) {

     Status = EFI_NOT_FOUND;

     goto EXIT;

   }

@@ -83,18 +91,18 @@ InitializePL031 (
   }

 

   // Ensure interrupts are masked. We do not want RTC interrupts in UEFI

-  if ((MmioRead32 (PL031_RTC_IMSC_IRQ_MASK_SET_CLEAR_REGISTER) & PL031_SET_IRQ_MASK) != PL031_SET_IRQ_MASK) {

-    MmioOr32 (PL031_RTC_IMSC_IRQ_MASK_SET_CLEAR_REGISTER, PL031_SET_IRQ_MASK);

+  if ((MmioRead32 (mPL031RtcBase + PL031_RTC_IMSC_IRQ_MASK_SET_CLEAR_REGISTER) & PL031_SET_IRQ_MASK) != PL031_SET_IRQ_MASK) {

+    MmioOr32 (mPL031RtcBase + PL031_RTC_IMSC_IRQ_MASK_SET_CLEAR_REGISTER, PL031_SET_IRQ_MASK);

   }

 

   // Clear any existing interrupts

-  if ((MmioRead32 (PL031_RTC_RIS_RAW_IRQ_STATUS_REGISTER) & PL031_IRQ_TRIGGERED) == PL031_IRQ_TRIGGERED) {

-    MmioOr32 (PL031_RTC_ICR_IRQ_CLEAR_REGISTER, PL031_CLEAR_IRQ);

+  if ((MmioRead32 (mPL031RtcBase + PL031_RTC_RIS_RAW_IRQ_STATUS_REGISTER) & PL031_IRQ_TRIGGERED) == PL031_IRQ_TRIGGERED) {

+    MmioOr32 (mPL031RtcBase + PL031_RTC_ICR_IRQ_CLEAR_REGISTER, PL031_CLEAR_IRQ);

   }

 

   // Start the clock counter

-  if ((MmioRead32 (PL031_RTC_CR_CONTROL_REGISTER) & PL031_RTC_ENABLED) != PL031_RTC_ENABLED) {

-    MmioOr32 (PL031_RTC_CR_CONTROL_REGISTER, PL031_RTC_ENABLED);

+  if ((MmioRead32 (mPL031RtcBase + PL031_RTC_CR_CONTROL_REGISTER) & PL031_RTC_ENABLED) != PL031_RTC_ENABLED) {

+    MmioOr32 (mPL031RtcBase + PL031_RTC_CR_CONTROL_REGISTER, PL031_RTC_ENABLED);

   }

 

   mPL031Initialized = TRUE;

@@ -267,7 +275,7 @@ LibGetTime (
   Status = ArmPlatformSysConfigGet (SYS_CFG_RTC, &EpochSeconds);

   if (Status == EFI_UNSUPPORTED) {

     // Battery backed up hardware RTC does not exist, revert to PL031

-    EpochSeconds = MmioRead32 (PL031_RTC_DR_DATA_REGISTER);

+    EpochSeconds = MmioRead32 (mPL031RtcBase + PL031_RTC_DR_DATA_REGISTER);

     Status = EFI_SUCCESS;

   } else if (EFI_ERROR (Status)) {

     // Battery backed up hardware RTC exists but could not be read due to error. Abort.

@@ -275,7 +283,7 @@ LibGetTime (
   } else {

     // Battery backed up hardware RTC exists and we read the time correctly from it.

     // Now sync the PL031 to the new time.

-    MmioWrite32 (PL031_RTC_LR_LOAD_REGISTER, EpochSeconds);

+    MmioWrite32 (mPL031RtcBase + PL031_RTC_LR_LOAD_REGISTER, EpochSeconds);

   }

 

   // Ensure Time is a valid pointer

@@ -484,7 +492,7 @@ LibSetTime (
 

 

   // Set the PL031

-  MmioWrite32 (PL031_RTC_LR_LOAD_REGISTER, EpochSeconds);

+  MmioWrite32 (mPL031RtcBase + PL031_RTC_LR_LOAD_REGISTER, EpochSeconds);

 

   // The accesses to Variable Services can be very slow, because we may be writing to Flash.

   // Do this after having set the RTC.

@@ -579,7 +587,30 @@ LibSetWakeupTime (
   return EFI_UNSUPPORTED;

 }

 

+/**

+  Fixup internal data so that EFI can be call in virtual mode.

+  Call the passed in Child Notify event and convert any pointers in

+  lib to virtual mode.

 

+  @param[in]    Event   The Event that is being processed

+  @param[in]    Context Event Context

+**/

+VOID

+EFIAPI

+LibRtcVirtualNotifyEvent (

+  IN EFI_EVENT        Event,

+  IN VOID             *Context

+  )

+{

+  //

+  // Only needed if you are going to support the OS calling RTC functions in virtual mode.

+  // You will need to call EfiConvertPointer (). To convert any stored physical addresses

+  // to virtual address. After the OS transitions to calling in virtual mode, all future

+  // runtime calls will be made in virtual mode.

+  //

+  EfiConvertPointer (0x0, (VOID**)&mPL031RtcBase);

+  return;

+}

 

 /**

   This is the declaration of an EFI image entry point. This can be the entry point to an application

@@ -601,6 +632,24 @@ LibRtcInitialize (
   EFI_STATUS    Status;

   EFI_HANDLE    Handle;

 

+  // Initialize RTC Base Address

+  mPL031RtcBase = PcdGet32 (PcdPL031RtcBase);

+

+  // Declare the controller as EFI_MEMORY_RUNTIME

+  Status = gDS->AddMemorySpace (

+                  EfiGcdMemoryTypeMemoryMappedIo,

+                  mPL031RtcBase, SIZE_4KB,

+                  EFI_MEMORY_UC | EFI_MEMORY_RUNTIME

+                  );

+  if (EFI_ERROR (Status)) {

+    return Status;

+  }

+

+  Status = gDS->SetMemorySpaceAttributes (mPL031RtcBase, SIZE_4KB, EFI_MEMORY_UC | EFI_MEMORY_RUNTIME);

+  if (EFI_ERROR (Status)) {

+    return Status;

+  }

+

   // Setup the setters and getters

   gRT->GetTime       = LibGetTime;

   gRT->SetTime       = LibSetTime;

@@ -614,31 +663,20 @@ LibRtcInitialize (
                   &gEfiRealTimeClockArchProtocolGuid,  NULL,

                   NULL

                  );

+  ASSERT_EFI_ERROR (Status);

 

-  return Status;

-}

-

-

-/**

-  Fixup internal data so that EFI can be call in virtual mode.

-  Call the passed in Child Notify event and convert any pointers in

-  lib to virtual mode.

-

-  @param[in]    Event   The Event that is being processed

-  @param[in]    Context Event Context

-**/

-VOID

-EFIAPI

-LibRtcVirtualNotifyEvent (

-  IN EFI_EVENT        Event,

-  IN VOID             *Context

-  )

-{

   //

-  // Only needed if you are going to support the OS calling RTC functions in virtual mode.

-  // You will need to call EfiConvertPointer (). To convert any stored physical addresses

-  // to virtual address. After the OS transitions to calling in virtual mode, all future

-  // runtime calls will be made in virtual mode.

+  // Register for the virtual address change event

   //

-  return;

+  Status = gBS->CreateEventEx (

+                  EVT_NOTIFY_SIGNAL,

+                  TPL_NOTIFY,

+                  LibRtcVirtualNotifyEvent,

+                  NULL,

+                  &gEfiEventVirtualAddressChangeGuid,

+                  &mRtcVirtualAddrChangeEvent

+                  );

+  ASSERT_EFI_ERROR (Status);

+

+  return Status;

 }

diff --git a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
index add982ce8e..3a98fc757e 100644
--- a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
+++ b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
@@ -1,7 +1,7 @@
 #/** @file

 #

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

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

+# Copyright (c) 2011 - 2014, 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

@@ -35,6 +35,11 @@
   DebugLib

   PcdLib

   ArmPlatformSysConfigLib

+  DxeServicesTableLib

+  UefiRuntimeLib

+

+[Guids]

+  gEfiEventVirtualAddressChangeGuid

 

 [Pcd]

   gArmPlatformTokenSpaceGuid.PcdPL031RtcBase

diff --git a/ArmPlatformPkg/PrePi/PeiMPCore.inf b/ArmPlatformPkg/PrePi/PeiMPCore.inf
index 276a37226d..45c00b8df0 100755
--- a/ArmPlatformPkg/PrePi/PeiMPCore.inf
+++ b/ArmPlatformPkg/PrePi/PeiMPCore.inf
@@ -1,6 +1,6 @@
 #/** @file

 #  

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

+#  Copyright (c) 2011-2014, 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

@@ -98,7 +98,6 @@
   gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize

   

   gArmPlatformTokenSpaceGuid.PcdCoreCount

-  gArmPlatformTokenSpaceGuid.PcdClusterCount

   gArmTokenSpaceGuid.PcdArmPrimaryCore

 

   gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize

diff --git a/ArmPlatformPkg/PrePi/PeiUniCore.inf b/ArmPlatformPkg/PrePi/PeiUniCore.inf
index 160374eab4..6079ec506f 100755
--- a/ArmPlatformPkg/PrePi/PeiUniCore.inf
+++ b/ArmPlatformPkg/PrePi/PeiUniCore.inf
@@ -1,6 +1,6 @@
 #/** @file

 #  

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

+#  Copyright (c) 2011-2014, 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

@@ -93,7 +93,6 @@
   gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize

   

   gArmPlatformTokenSpaceGuid.PcdCoreCount

-  gArmPlatformTokenSpaceGuid.PcdClusterCount

 

   gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize

   gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize

diff --git a/ArmPlatformPkg/PrePi/PrePi.c b/ArmPlatformPkg/PrePi/PrePi.c
index d54ebf9337..84b01b3fbe 100755
--- a/ArmPlatformPkg/PrePi/PrePi.c
+++ b/ArmPlatformPkg/PrePi/PrePi.c
@@ -1,6 +1,6 @@
 /** @file

 *

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

+*  Copyright (c) 2011-2014, 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

@@ -139,7 +139,8 @@ PrePiMain (
 

   // Create the Stacks HOB (reserve the memory for all stacks)

   if (ArmIsMpCore ()) {

-    StacksSize = PcdGet32 (PcdCPUCorePrimaryStackSize) + (FixedPcdGet32(PcdClusterCount) * 4 * FixedPcdGet32(PcdCPUCoreSecondaryStackSize));

+    StacksSize = PcdGet32 (PcdCPUCorePrimaryStackSize) +

+                 ((FixedPcdGet32 (PcdCoreCount) - 1) * FixedPcdGet32 (PcdCPUCoreSecondaryStackSize));

   } else {

     StacksSize = PcdGet32 (PcdCPUCorePrimaryStackSize);

   }