Clean up SEC implementation for Ovmf.

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

3 files changed, 4 insertions, 169 deletions

diff --git a/OvmfPkg/Sec/X64/SecEntry.S b/OvmfPkg/Sec/X64/SecEntry.S
index 33715b7c96..de0859bcfb 100644
--- a/OvmfPkg/Sec/X64/SecEntry.S
+++ b/OvmfPkg/Sec/X64/SecEntry.S
@@ -17,7 +17,7 @@
 #------------------------------------------------------------------------------
 
 
-#include "SecMain.h"
+#include <Base.h>
 
 #EXTERN ASM_PFX(SecCoreStartupWithStack)
 
@@ -39,7 +39,7 @@ ASM_PFX(_ModuleEntryPoint):
     # Load temporary stack top at very low memory.  The C code
     # can reload to a better address.
     #
-    movq    $INITIAL_TOP_OF_STACK, %rsp 
+    movq    $BASE_512KB, %rsp 
     nop
 
     #
diff --git a/OvmfPkg/Sec/X64/SecEntry.asm b/OvmfPkg/Sec/X64/SecEntry.asm
index f8ea9fcedc..55f5eabbfd 100644
--- a/OvmfPkg/Sec/X64/SecEntry.asm
+++ b/OvmfPkg/Sec/X64/SecEntry.asm
@@ -16,7 +16,7 @@
 ;*

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

 

-#include "SecMain.h"

+#include <Base.h>

 

 .code

 

@@ -39,7 +39,7 @@ _ModuleEntryPoint PROC PUBLIC
     ; Load temporary stack top at very low memory.  The C code

     ; can reload to a better address.

     ;

-    mov     rsp, INITIAL_TOP_OF_STACK

+    mov     rsp, BASE_512KB

     nop

 

     ;

diff --git a/OvmfPkg/Sec/X64/SwitchStack.c b/OvmfPkg/Sec/X64/SwitchStack.c
deleted file mode 100644
index ca228ce7f3..0000000000
--- a/OvmfPkg/Sec/X64/SwitchStack.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/** @file

-  Switch Stack functions.

-

-  Copyright (c) 2006 - 2007, 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.

-

-**/

-

-//

-// Include common header file for this module.

-//

-

-

-#include <Library/BaseLib.h>

-#include <Library/BaseMemoryLib.h>

-#include <Library/DebugLib.h>

-#include <Library/PeiServicesLib.h>

-

-//

-// Type define for PEI Core Entry Point function

-//

-typedef

-VOID

-(EFIAPI *PEI_CORE_ENTRY_POINT)(

-  IN CONST EFI_SEC_PEI_HAND_OFF        *SecCoreData,

-  IN CONST EFI_PEI_PPI_DESCRIPTOR      *PpiList,

-  IN VOID                              *Data

-  )

-;

-

-/**

-  Transfers control to a function starting with a new stack.

-

-  Transfers control to the function specified by EntryPoint using the new stack

-  specified by NewStack and passing in the parameters specified by Context1 and

-  Context2. Context1 and Context2 are optional and may be NULL. The function

-  EntryPoint must never return.

-

-  If EntryPoint is NULL, then ASSERT().

-  If NewStack is NULL, then ASSERT().

-

-  @param  EntryPoint  A pointer to function to call with the new stack.

-  @param  Context1    A pointer to the context to pass into the EntryPoint

-                      function.

-  @param  Context2    A pointer to the context to pass into the EntryPoint

-                      function.

-  @param  NewStack    A pointer to the new stack to use for the EntryPoint

-                      function.

-  @param  NewBsp      A pointer to the new BSP for the EntryPoint on IPF. It's

-                      Reserved on other architectures.

-

-**/

-VOID

-EFIAPI

-PeiSwitchStacks (

-  IN      SWITCH_STACK_ENTRY_POINT  EntryPoint,

-  IN      VOID                      *Context1,  OPTIONAL

-  IN      VOID                      *Context2,  OPTIONAL

-  IN      VOID                      *Context3,  OPTIONAL

-  IN      VOID                      *OldTopOfStack,

-  IN      VOID                      *NewStack

-  )

-{

-  BASE_LIBRARY_JUMP_BUFFER  JumpBuffer;

-  UINTN                     SizeOfStackUsed;

-  UINTN                     SetJumpFlag;

-  

-  ASSERT (EntryPoint != NULL);

-  ASSERT (NewStack != NULL);

-

-  SetJumpFlag = SetJump (&JumpBuffer);

-  //

-  // The initial call to SetJump() must always return 0.

-  // Subsequent calls to LongJump() may cause a non-zero value to be returned by SetJump().

-  //

-  if (SetJumpFlag == 0) {

-    //

-    // Stack should be aligned with CPU_STACK_ALIGNMENT

-    //

-    ASSERT (((UINTN)NewStack & (CPU_STACK_ALIGNMENT - 1)) == 0);

-  

-    //JumpBuffer.Rip = (UINTN)EntryPoint;

-    SizeOfStackUsed = (UINTN)OldTopOfStack - JumpBuffer.Rsp;

-    JumpBuffer.Rsp = (UINTN)NewStack - SizeOfStackUsed;

-    MemoryFence ();

-    CopyMem (

-      (VOID*) ((UINTN)NewStack - SizeOfStackUsed),

-      (VOID*) ((UINTN)OldTopOfStack - SizeOfStackUsed),

-      SizeOfStackUsed

-      );

-    LongJump (&JumpBuffer, (UINTN)-1);

-  } else {

-    (*(PEI_CORE_ENTRY_POINT)(EntryPoint)) (

-      (EFI_SEC_PEI_HAND_OFF *) Context1,

-      (EFI_PEI_PPI_DESCRIPTOR *) Context2,

-      Context3

-      );

-  }

-

-  //

-  // InternalSwitchStack () will never return

-  //

-  ASSERT (FALSE);  

-}

-

-/**

-  Transfers control to a function starting with a new stack.

-

-  Transfers control to the function specified by EntryPoint using the new stack

-  specified by NewStack and passing in the parameters specified by Context1 and

-  Context2. Context1 and Context2 are optional and may be NULL. The function

-  EntryPoint must never return.

-

-  If EntryPoint is NULL, then ASSERT().

-  If NewStack is NULL, then ASSERT().

-

-  @param  EntryPoint  A pointer to function to call with the new stack.

-  @param  Context1    A pointer to the context to pass into the EntryPoint

-                      function.

-  @param  Context2    A pointer to the context to pass into the EntryPoint

-                      function.

-  @param  NewStack    A pointer to the new stack to use for the EntryPoint

-                      function.

-  @param  NewBsp      A pointer to the new BSP for the EntryPoint on IPF. It's

-                      Reserved on other architectures.

-

-**/

-VOID

-EFIAPI

-SecSwitchStack (

-  IN UINTN   TemporaryMemoryBase,

-  IN UINTN   PermanentMemoryBase,

-  IN UINTN   CopySize

-  )

-{

-  BASE_LIBRARY_JUMP_BUFFER  JumpBuffer;

-  UINTN                     SetJumpFlag;

-

-  ASSERT ((VOID*)TemporaryMemoryBase != NULL);

-  ASSERT ((VOID*)PermanentMemoryBase != NULL);

-

-  SetJumpFlag = SetJump (&JumpBuffer);

-  //

-  // The initial call to SetJump() must always return 0.

-  // Subsequent calls to LongJump() may cause a non-zero value to be returned by SetJump().

-  //

-  if (SetJumpFlag == 0) {

-    DEBUG ((EFI_D_ERROR, "SecSwitchStack+%d: Rsp: 0x%xL\n", __LINE__, JumpBuffer.Rsp));

-    JumpBuffer.Rsp =

-      (INTN)JumpBuffer.Rsp -

-      (INTN)TemporaryMemoryBase +

-      (INTN)PermanentMemoryBase;

-    MemoryFence ();

-    CopyMem((VOID*)PermanentMemoryBase, (VOID*)TemporaryMemoryBase, CopySize);

-    LongJump (&JumpBuffer, (UINTN)-1);

-  }

-

-}

-