OvmfPkg: Move SEC/PEI Temporary RAM from 0x70000 to 0x810000

Note: The Temporary RAM memory size is being reduced from
      64KB to 32KB. This still appears to be more than
      adequate for OVMF's early PEI phase. We will be adding
      another 32KB range of RAM just above this range for
      use on S3 resume.

The range is declared as part of MEMFD, so it is easier
to identify the memory range.

We also now assign PCDs to the memory range.

The PCDs are used to set the initial SEC/PEI stack in
SEC's assembly code.

The PCDs are also used in the SEC C code to setup
the Temporary RAM PPI.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

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

10 files changed, 147 insertions, 119 deletions

diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec
index c362e5f115..0e33b3b69c 100644
--- a/OvmfPkg/OvmfPkg.dec
+++ b/OvmfPkg/OvmfPkg.dec
@@ -80,6 +80,8 @@
   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFdBaseAddress|0x0|UINT32|0xf

   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesBase|0x0|UINT32|0x11

   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesSize|0x0|UINT32|0x12

+  gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamBase|0x0|UINT32|0x13

+  gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamSize|0x0|UINT32|0x14

 

 [PcdsDynamic, PcdsDynamicEx]

   gUefiOvmfPkgTokenSpaceGuid.PcdEmuVariableEvent|0|UINT64|2

diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
index 483ad85e64..210abdedeb 100644
--- a/OvmfPkg/OvmfPkgIa32.fdf
+++ b/OvmfPkg/OvmfPkgIa32.fdf
@@ -138,6 +138,9 @@ NumBlocks     = 0x80
 0x000000|0x006000

 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesSize

 

+0x010000|0x008000

+gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamSize

+

 0x020000|0x7E0000

 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvSize

 FV = MAINFV

diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index 9a0008066f..90f44a6237 100644
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -138,6 +138,9 @@ NumBlocks     = 0x80
 0x000000|0x006000

 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesSize

 

+0x010000|0x008000

+gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamSize

+

 0x020000|0x7E0000

 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvSize

 FV = MAINFV

diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index 09a91c1476..67c7415fda 100644
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -138,6 +138,9 @@ NumBlocks     = 0x80
 0x000000|0x006000

 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesSize

 

+0x010000|0x008000

+gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamSize

+

 0x020000|0x7E0000

 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvSize

 FV = MAINFV

diff --git a/OvmfPkg/Sec/Ia32/SecEntry.S b/OvmfPkg/Sec/Ia32/SecEntry.S
index a1b0c0d0f0..0771a87449 100644
--- a/OvmfPkg/Sec/Ia32/SecEntry.S
+++ b/OvmfPkg/Sec/Ia32/SecEntry.S
@@ -1,55 +1,59 @@
-#      TITLE   SecEntry.asm
-#------------------------------------------------------------------------------
-#*
-#*   Copyright (c) 2006 - 2009, Intel Corporation. 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
-#*   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.
-#*
-#*    CpuAsm.asm
-#*
-#*   Abstract:
-#*
-#------------------------------------------------------------------------------
-
-
-#include <Base.h>
-
-#EXTERN ASM_PFX(SecCoreStartupWithStack)
-
-#
-# SecCore Entry Point
-#
-# Processor is in flat protected mode
-#
-# @param[in]  EAX   Initial value of the EAX register (BIST: Built-in Self Test)
-# @param[in]  DI    'BP': boot-strap processor, or 'AP': application processor
-# @param[in]  EBP   Pointer to the start of the Boot Firmware Volume
-#
-# @return     None  This routine does not return
-#
-ASM_GLOBAL ASM_PFX(_ModuleEntryPoint)
-ASM_PFX(_ModuleEntryPoint):
-
-    #
-    # Load temporary stack top at very low memory.  The C code
-    # can reload to a better address.
-    #
-    movl    $BASE_512KB, %eax 
-    movl    %eax, %esp
-    nop
-
-    #
-    # Call into C code
-    #
-    pushl   %eax
-    pushl   %ebp
-    call    ASM_PFX(SecCoreStartupWithStack)
-
-
-#END
-
+#      TITLE   SecEntry.asm

+#------------------------------------------------------------------------------

+#*

+#*   Copyright (c) 2006 - 2013, Intel Corporation. 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

+#*   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.

+#*

+#*    CpuAsm.asm

+#*

+#*   Abstract:

+#*

+#------------------------------------------------------------------------------

+

+

+#include <Base.h>

+

+#EXTERN ASM_PFX(SecCoreStartupWithStack)

+

+#

+# SecCore Entry Point

+#

+# Processor is in flat protected mode

+#

+# @param[in]  EAX   Initial value of the EAX register (BIST: Built-in Self Test)

+# @param[in]  DI    'BP': boot-strap processor, or 'AP': application processor

+# @param[in]  EBP   Pointer to the start of the Boot Firmware Volume

+#

+# @return     None  This routine does not return

+#

+ASM_GLOBAL ASM_PFX(_ModuleEntryPoint)

+ASM_PFX(_ModuleEntryPoint):

+

+    #

+    # Load temporary RAM stack based on PCDs

+    #

+    .set    SEC_TOP_OF_STACK, FixedPcdGet32 (PcdOvmfSecPeiTempRamBase) + \

+                              FixedPcdGet32 (PcdOvmfSecPeiTempRamSize)

+    movl    $SEC_TOP_OF_STACK, %eax

+    movl    %eax, %esp

+    nop

+

+    #

+    # Setup parameters and call SecCoreStartupWithStack

+    #   [esp]   return address for call

+    #   [esp+4] BootFirmwareVolumePtr

+    #   [esp+8] TopOfCurrentStack

+    #

+    pushl   %eax

+    pushl   %ebp

+    call    ASM_PFX(SecCoreStartupWithStack)

+

+

+#END

+

diff --git a/OvmfPkg/Sec/Ia32/SecEntry.asm b/OvmfPkg/Sec/Ia32/SecEntry.asm
index 4b0e95af48..e9458adc49 100644
--- a/OvmfPkg/Sec/Ia32/SecEntry.asm
+++ b/OvmfPkg/Sec/Ia32/SecEntry.asm
@@ -1,7 +1,7 @@
       TITLE   SecEntry.asm

 ;------------------------------------------------------------------------------

 ;*

-;*   Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>

+;*   Copyright (c) 2006 - 2013, Intel Corporation. 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

@@ -38,15 +38,19 @@ EXTERN SecCoreStartupWithStack:PROC
 _ModuleEntryPoint PROC PUBLIC

 

     ;

-    ; Load temporary stack top at very low memory.  The C code

-    ; can reload to a better address.

+    ; Load temporary RAM stack based on PCDs

     ;

-    mov     eax, BASE_512KB

+    SEC_TOP_OF_STACK EQU (FixedPcdGet32 (PcdOvmfSecPeiTempRamBase) + \

+                          FixedPcdGet32 (PcdOvmfSecPeiTempRamSize))

+    mov     eax, SEC_TOP_OF_STACK

     mov     esp, eax

     nop

 

     ;

-    ; Call into C code

+    ; Setup parameters and call SecCoreStartupWithStack

+    ;   [esp]   return address for call

+    ;   [esp+4] BootFirmwareVolumePtr

+    ;   [esp+8] TopOfCurrentStack

     ;

     push    eax

     push    ebp

diff --git a/OvmfPkg/Sec/SecMain.c b/OvmfPkg/Sec/SecMain.c
index ece1c9b517..8bdf6e5238 100644
--- a/OvmfPkg/Sec/SecMain.c
+++ b/OvmfPkg/Sec/SecMain.c
@@ -631,12 +631,16 @@ SecCoreStartupWithStack (
   // |-------------|       <-- SecCoreData.TemporaryRamBase

   //

 

+  ASSERT ((UINTN) (PcdGet32 (PcdOvmfSecPeiTempRamBase) +

+                   PcdGet32 (PcdOvmfSecPeiTempRamSize)) ==

+          (UINTN) TopOfCurrentStack);

+

   //

   // Initialize SEC hand-off state

   //

   SecCoreData.DataSize = sizeof(EFI_SEC_PEI_HAND_OFF);

 

-  SecCoreData.TemporaryRamSize       = SIZE_64KB;

+  SecCoreData.TemporaryRamSize       = (UINTN) PcdGet32 (PcdOvmfSecPeiTempRamSize);

   SecCoreData.TemporaryRamBase       = (VOID*)((UINT8 *)TopOfCurrentStack - SecCoreData.TemporaryRamSize);

 

   SecCoreData.PeiTemporaryRamBase    = SecCoreData.TemporaryRamBase;

diff --git a/OvmfPkg/Sec/SecMain.inf b/OvmfPkg/Sec/SecMain.inf
index 68dfeaaa4b..0b1cda83df 100644
--- a/OvmfPkg/Sec/SecMain.inf
+++ b/OvmfPkg/Sec/SecMain.inf
@@ -67,3 +67,5 @@
   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvBase

   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvSize

   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesBase

+  gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamBase

+  gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamSize

diff --git a/OvmfPkg/Sec/X64/SecEntry.S b/OvmfPkg/Sec/X64/SecEntry.S
index de0859bcfb..37354d9f3c 100644
--- a/OvmfPkg/Sec/X64/SecEntry.S
+++ b/OvmfPkg/Sec/X64/SecEntry.S
@@ -1,54 +1,56 @@
-#      TITLE   SecEntry.asm
-#------------------------------------------------------------------------------
-#*
-#*   Copyright (c) 2006 - 2009, Intel Corporation. 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
-#*   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.
-#*
-#*    CpuAsm.asm
-#*
-#*   Abstract:
-#*
-#------------------------------------------------------------------------------
-
-
-#include <Base.h>
-
-#EXTERN ASM_PFX(SecCoreStartupWithStack)
-
-#
-# SecCore Entry Point
-#
-# Processor is in flat protected mode
-#
-# @param[in]  RAX   Initial value of the EAX register (BIST: Built-in Self Test)
-# @param[in]  DI    'BP': boot-strap processor, or 'AP': application processor
-# @param[in]  RBP   Pointer to the start of the Boot Firmware Volume
-#
-# @return     None  This routine does not return
-#
-ASM_GLOBAL ASM_PFX(_ModuleEntryPoint)
-ASM_PFX(_ModuleEntryPoint):
-
-    #
-    # Load temporary stack top at very low memory.  The C code
-    # can reload to a better address.
-    #
-    movq    $BASE_512KB, %rsp 
-    nop
-
-    #
-    # Setup parameters and call SecCoreStartupWithStack
-    #   rcx: BootFirmwareVolumePtr
-    #   rdx: TopOfCurrentStack
-    #
-    movq    %rbp, %rcx
-    movq    %rsp, %rdx
-    subq    $0x20, %rsp
-    call    ASM_PFX(SecCoreStartupWithStack)
-
+#      TITLE   SecEntry.asm

+#------------------------------------------------------------------------------

+#*

+#*   Copyright (c) 2006 - 2013, Intel Corporation. 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

+#*   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.

+#*

+#*    CpuAsm.asm

+#*

+#*   Abstract:

+#*

+#------------------------------------------------------------------------------

+

+

+#include <Base.h>

+

+#EXTERN ASM_PFX(SecCoreStartupWithStack)

+

+#

+# SecCore Entry Point

+#

+# Processor is in flat protected mode

+#

+# @param[in]  RAX   Initial value of the EAX register (BIST: Built-in Self Test)

+# @param[in]  DI    'BP': boot-strap processor, or 'AP': application processor

+# @param[in]  RBP   Pointer to the start of the Boot Firmware Volume

+#

+# @return     None  This routine does not return

+#

+ASM_GLOBAL ASM_PFX(_ModuleEntryPoint)

+ASM_PFX(_ModuleEntryPoint):

+

+    #

+    # Load temporary stack top at very low memory.  The C code

+    # can reload to a better address.

+    #

+    .set    SEC_TOP_OF_STACK, FixedPcdGet32 (PcdOvmfSecPeiTempRamBase) + \

+                              FixedPcdGet32 (PcdOvmfSecPeiTempRamSize)

+    movq    $SEC_TOP_OF_STACK, %rsp 

+    nop

+

+    #

+    # Setup parameters and call SecCoreStartupWithStack

+    #   rcx: BootFirmwareVolumePtr

+    #   rdx: TopOfCurrentStack

+    #

+    movq    %rbp, %rcx

+    movq    %rsp, %rdx

+    subq    $0x20, %rsp

+    call    ASM_PFX(SecCoreStartupWithStack)

+

diff --git a/OvmfPkg/Sec/X64/SecEntry.asm b/OvmfPkg/Sec/X64/SecEntry.asm
index 55f5eabbfd..4135208a3a 100644
--- a/OvmfPkg/Sec/X64/SecEntry.asm
+++ b/OvmfPkg/Sec/X64/SecEntry.asm
@@ -1,7 +1,7 @@
       TITLE   SecEntry.asm

 ;------------------------------------------------------------------------------

 ;*

-;*   Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>

+;*   Copyright (c) 2006 - 2013, Intel Corporation. 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

@@ -36,10 +36,11 @@ EXTERN SecCoreStartupWithStack:PROC
 _ModuleEntryPoint PROC PUBLIC

 

     ;

-    ; Load temporary stack top at very low memory.  The C code

-    ; can reload to a better address.

+    ; Load temporary RAM stack based on PCDs

     ;

-    mov     rsp, BASE_512KB

+    SEC_TOP_OF_STACK EQU (FixedPcdGet32 (PcdOvmfSecPeiTempRamBase) + \

+                          FixedPcdGet32 (PcdOvmfSecPeiTempRamSize))

+    mov     rsp, SEC_TOP_OF_STACK

     nop

 

     ;