Add dual FSP binaries support.

There are two FSP images at different locations in a flash (one factory version is read only and other in updatable version)
TempRamInit, FspMemoryInit and TempRamExit are executed from factory version and FspSiliconInit/NotifyPhase will be executed from updatable version.

Also update FSP specification version to v1.1.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: "Ma, Maurice" <maurice.ma@intel.com>
Reviewed-by: "Yao, Jiewen" <Jiewen.Yao@intel.com>



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

3 files changed, 53 insertions, 11 deletions

diff --git a/IntelFspPkg/Library/BaseFspCommonLib/FspCommonLib.c b/IntelFspPkg/Library/BaseFspCommonLib/FspCommonLib.c
index f80dff1a56..7de84a0a7e 100644
--- a/IntelFspPkg/Library/BaseFspCommonLib/FspCommonLib.c
+++ b/IntelFspPkg/Library/BaseFspCommonLib/FspCommonLib.c
@@ -27,7 +27,7 @@
 //   API Parameter                +0x34

 //   API return address           +0x30

 //

-//   push    offset exit          +0x2C

+//   push    FspInfoHeader        +0x2C

 //   pushfd                       +0x28

 //   cli

 //   pushad                       +0x24

@@ -47,7 +47,7 @@ typedef struct {
   UINT32    Ecx;

   UINT32    Eax;

   UINT16    Flags[2];

-  UINT32    ExitOff;

+  UINT32    FspInfoHeader;

   UINT32    ApiRet;

   UINT32    ApiParam;

 } CONTEXT_STACK;

@@ -332,6 +332,23 @@ GetFspInfoHeader (
 }

 

 /**

+  This function gets the FSP info header pointer using the API stack context.

+

+  @retval FspInfoHeader   FSP info header pointer using the API stack context

+**/

+FSP_INFO_HEADER *

+EFIAPI

+GetFspInfoHeaderFromApiContext (

+  VOID

+  )

+{

+  FSP_GLOBAL_DATA  *FspData;

+

+  FspData  = GetFspGlobalDataPointer ();

+  return  (FSP_INFO_HEADER *)(*(UINT32 *)(UINTN)(FspData->CoreStack + CONTEXT_STACK_OFFSET(FspInfoHeader)));

+}

+

+/**

   This function gets the VPD data pointer.

 

   @return VpdDataRgnPtr   VPD data pointer.

diff --git a/IntelFspPkg/Library/BaseFspSwitchStackLib/Ia32/Stack.asm b/IntelFspPkg/Library/BaseFspSwitchStackLib/Ia32/Stack.asm
index d04f229a6b..1efab52059 100644
--- a/IntelFspPkg/Library/BaseFspSwitchStackLib/Ia32/Stack.asm
+++ b/IntelFspPkg/Library/BaseFspSwitchStackLib/Ia32/Stack.asm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------

 ;

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

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

@@ -28,7 +28,8 @@
 ;------------------------------------------------------------------------------

 EXTERNDEF  C   MeasurePoint:PROC

 Pei2LoaderSwitchStack   PROC C PUBLIC

-    jmp     Loader2PeiSwitchStack

+    xor     eax, eax

+    jmp     FspSwitchStack

 Pei2LoaderSwitchStack   ENDP

 

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

@@ -38,10 +39,21 @@ Pei2LoaderSwitchStack   ENDP
 ;   VOID

 ;   )

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

-EXTERNDEF  C   SwapStack:PROC

 Loader2PeiSwitchStack   PROC C PUBLIC

+    jmp     FspSwitchStack

+Loader2PeiSwitchStack   ENDP

+

+;------------------------------------------------------------------------------

+; UINT32

+; EFIAPI

+; FspSwitchStack (

+;   VOID

+;   )

+;------------------------------------------------------------------------------

+EXTERNDEF  C   SwapStack:PROC

+FspSwitchStack   PROC C PUBLIC

     ; Save current contexts

-    push    offset exit

+    push    eax

     pushfd

     cli

     pushad

@@ -58,8 +70,8 @@ Loader2PeiSwitchStack   PROC C PUBLIC
     add     esp, 8

     popad

     popfd

-exit:

+    add     esp, 4

     ret

-Loader2PeiSwitchStack   ENDP

+FspSwitchStack   ENDP

 

     END

diff --git a/IntelFspPkg/Library/BaseFspSwitchStackLib/Ia32/Stack.s b/IntelFspPkg/Library/BaseFspSwitchStackLib/Ia32/Stack.s
index 4773fe94c2..a21a5b6c61 100644
--- a/IntelFspPkg/Library/BaseFspSwitchStackLib/Ia32/Stack.s
+++ b/IntelFspPkg/Library/BaseFspSwitchStackLib/Ia32/Stack.s
@@ -25,20 +25,33 @@
 #------------------------------------------------------------------------------

 ASM_GLOBAL ASM_PFX(Pei2LoaderSwitchStack)

 ASM_PFX(Pei2LoaderSwitchStack):

-    jmp     ASM_PFX(Loader2PeiSwitchStack)

+    xorl    %eax, %eax

+    jmp     ASM_PFX(FspSwitchStack)

 

 #------------------------------------------------------------------------------

 # UINT32

 # EFIAPI

 # Loader2PeiSwitchStack (

+#   VOID

 #   )

 #------------------------------------------------------------------------------

 ASM_GLOBAL ASM_PFX(Loader2PeiSwitchStack)

 ASM_PFX(Loader2PeiSwitchStack):

+    jmp     ASM_PFX(FspSwitchStack)

+

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

+# UINT32

+# EFIAPI

+# FspSwitchStack (

+#   VOID

+#   )

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

+ASM_GLOBAL ASM_PFX(FspSwitchStack)

+ASM_PFX(FspSwitchStack):

     #

     #Save current contexts

     #

-    push    $exit

+    push    %eax

     pushf

     cli

     pusha

@@ -59,7 +72,7 @@ ASM_PFX(Loader2PeiSwitchStack):
     add     $0x08,%esp

     popa

     popf

-exit:

+    add     $0x04,%esp

     ret