[edk2-devel] [PATCH] IntelFsp2Pkg: Add FunctionParametePtr to FspGlobalData.

Chiu, Chasel posted 1 patch 5 days ago
Failed in applying to current master (apply log)
IntelFsp2Pkg/Include/FspGlobalData.h             | 12 ++++++++++--
IntelFsp2Pkg/Include/Library/FspSwitchStackLib.h | 18 +++++++++++++++++-
2 files changed, 27 insertions(+), 3 deletions(-)

[edk2-devel] [PATCH] IntelFsp2Pkg: Add FunctionParametePtr to FspGlobalData.

Posted by Chiu, Chasel 5 days ago
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2726

When FSP switching stack and calling bootloader functions,
the function parameter in stack may not be accessible easily.
We can store the function parameter pointer to FspGlobalData
and retrieve it after stack switched.

Also need to add Loader2PeiSwitchStack () to header file
as public function for platform FSP code to consume.

Cc: Maurice Ma <maurice.ma@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Signed-off-by: Chasel Chiu <chasel.chiu@intel.com>
---
 IntelFsp2Pkg/Include/FspGlobalData.h             | 12 ++++++++++--
 IntelFsp2Pkg/Include/Library/FspSwitchStackLib.h | 18 +++++++++++++++++-
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/IntelFsp2Pkg/Include/FspGlobalData.h b/IntelFsp2Pkg/Include/FspGlobalData.h
index 5bde316893..dba9b48e1a 100644
--- a/IntelFsp2Pkg/Include/FspGlobalData.h
+++ b/IntelFsp2Pkg/Include/FspGlobalData.h
@@ -52,12 +52,20 @@ typedef struct  {
    VOID               *MemoryInitUpdPtr;
    VOID               *SiliconInitUpdPtr;
    UINT8              ApiIdx;
-   UINT8              FspMode; // 0: FSP in API mode; 1: FSP in DISPATCH mode
+   ///
+   /// 0: FSP in API mode; 1: FSP in DISPATCH mode
+   ///
+   UINT8              FspMode;
    UINT8              OnSeparateStack;
    UINT8              Reserved3;
    UINT32             NumberOfPhases;
    UINT32             PhasesExecuted;
-   UINT8              Reserved4[20];
+   ///
+   /// To store function parameters pointer
+   /// so it can be retrieved after stack switched.
+   ///
+   VOID               *FunctionParameterPtr;
+   UINT8              Reserved4[16];
    UINT32             PerfSig;
    UINT16             PerfLen;
    UINT16             Reserved5;
diff --git a/IntelFsp2Pkg/Include/Library/FspSwitchStackLib.h b/IntelFsp2Pkg/Include/Library/FspSwitchStackLib.h
index 0c76e9f022..bed2a5d677 100644
--- a/IntelFsp2Pkg/Include/Library/FspSwitchStackLib.h
+++ b/IntelFsp2Pkg/Include/Library/FspSwitchStackLib.h
@@ -1,6 +1,6 @@
 /** @file
 
-  Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2014 - 2020, Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -36,4 +36,20 @@ Pei2LoaderSwitchStack (
   VOID
   );
 
+/**
+
+  This function is equilivant to Pei2LoaderSwitchStack () but just indicates
+  the stack after switched is FSP stack.
+
+  @return ReturnKey          After switching to the saved stack,
+                             this value will be saved in eax before returning.
+
+
+**/
+UINT32
+EFIAPI
+Loader2PeiSwitchStack (
+  VOID
+  );
+
 #endif
-- 
2.13.3.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#59921): https://edk2.groups.io/g/devel/message/59921
Mute This Topic: https://groups.io/mt/74342444/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH] IntelFsp2Pkg: Add FunctionParametePtr to FspGlobalData.

Posted by Nate DeSimone 5 days ago
Reviewed-by: Nate DeSimone <nathaniel.l.desimone@intel.com>

> -----Original Message-----
> From: Chiu, Chasel <chasel.chiu@intel.com>
> Sent: Tuesday, May 19, 2020 8:34 PM
> To: devel@edk2.groups.io
> Cc: Ma, Maurice <maurice.ma@intel.com>; Desimone, Nathaniel L
> <nathaniel.l.desimone@intel.com>; Zeng, Star <star.zeng@intel.com>
> Subject: [PATCH] IntelFsp2Pkg: Add FunctionParametePtr to FspGlobalData.
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2726
> 
> When FSP switching stack and calling bootloader functions, the function
> parameter in stack may not be accessible easily.
> We can store the function parameter pointer to FspGlobalData and retrieve it
> after stack switched.
> 
> Also need to add Loader2PeiSwitchStack () to header file as public function
> for platform FSP code to consume.
> 
> Cc: Maurice Ma <maurice.ma@intel.com>
> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> Cc: Star Zeng <star.zeng@intel.com>
> Signed-off-by: Chasel Chiu <chasel.chiu@intel.com>
> ---
>  IntelFsp2Pkg/Include/FspGlobalData.h             | 12 ++++++++++--
>  IntelFsp2Pkg/Include/Library/FspSwitchStackLib.h | 18
> +++++++++++++++++-
>  2 files changed, 27 insertions(+), 3 deletions(-)
> 
> diff --git a/IntelFsp2Pkg/Include/FspGlobalData.h
> b/IntelFsp2Pkg/Include/FspGlobalData.h
> index 5bde316893..dba9b48e1a 100644
> --- a/IntelFsp2Pkg/Include/FspGlobalData.h
> +++ b/IntelFsp2Pkg/Include/FspGlobalData.h
> @@ -52,12 +52,20 @@ typedef struct  {
>     VOID               *MemoryInitUpdPtr;
>     VOID               *SiliconInitUpdPtr;
>     UINT8              ApiIdx;
> -   UINT8              FspMode; // 0: FSP in API mode; 1: FSP in DISPATCH mode
> +   ///
> +   /// 0: FSP in API mode; 1: FSP in DISPATCH mode
> +   ///
> +   UINT8              FspMode;
>     UINT8              OnSeparateStack;
>     UINT8              Reserved3;
>     UINT32             NumberOfPhases;
>     UINT32             PhasesExecuted;
> -   UINT8              Reserved4[20];
> +   ///
> +   /// To store function parameters pointer
> +   /// so it can be retrieved after stack switched.
> +   ///
> +   VOID               *FunctionParameterPtr;
> +   UINT8              Reserved4[16];
>     UINT32             PerfSig;
>     UINT16             PerfLen;
>     UINT16             Reserved5;
> diff --git a/IntelFsp2Pkg/Include/Library/FspSwitchStackLib.h
> b/IntelFsp2Pkg/Include/Library/FspSwitchStackLib.h
> index 0c76e9f022..bed2a5d677 100644
> --- a/IntelFsp2Pkg/Include/Library/FspSwitchStackLib.h
> +++ b/IntelFsp2Pkg/Include/Library/FspSwitchStackLib.h
> @@ -1,6 +1,6 @@
>  /** @file
> 
> -  Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2014 - 2020, Intel Corporation. All rights
> + reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> @@ -36,4 +36,20 @@ Pei2LoaderSwitchStack (
>    VOID
>    );
> 
> +/**
> +
> +  This function is equilivant to Pei2LoaderSwitchStack () but just
> + indicates  the stack after switched is FSP stack.
> +
> +  @return ReturnKey          After switching to the saved stack,
> +                             this value will be saved in eax before returning.
> +
> +
> +**/
> +UINT32
> +EFIAPI
> +Loader2PeiSwitchStack (
> +  VOID
> +  );
> +
>  #endif
> --
> 2.13.3.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#59932): https://edk2.groups.io/g/devel/message/59932
Mute This Topic: https://groups.io/mt/74342444/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH] IntelFsp2Pkg: Add FunctionParametePtr to FspGlobalData.

Posted by Zeng, Star 5 days ago
equilivant is a typo?

> -----Original Message-----
> From: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>
> Sent: Wednesday, May 20, 2020 12:12 PM
> To: Chiu, Chasel <chasel.chiu@intel.com>; devel@edk2.groups.io
> Cc: Ma, Maurice <maurice.ma@intel.com>; Zeng, Star <star.zeng@intel.com>
> Subject: RE: [PATCH] IntelFsp2Pkg: Add FunctionParametePtr to
> FspGlobalData.
> 
> Reviewed-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
> 
> > -----Original Message-----
> > From: Chiu, Chasel <chasel.chiu@intel.com>
> > Sent: Tuesday, May 19, 2020 8:34 PM
> > To: devel@edk2.groups.io
> > Cc: Ma, Maurice <maurice.ma@intel.com>; Desimone, Nathaniel L
> > <nathaniel.l.desimone@intel.com>; Zeng, Star <star.zeng@intel.com>
> > Subject: [PATCH] IntelFsp2Pkg: Add FunctionParametePtr to FspGlobalData.
> >
> > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2726
> >
> > When FSP switching stack and calling bootloader functions, the
> > function parameter in stack may not be accessible easily.
> > We can store the function parameter pointer to FspGlobalData and
> > retrieve it after stack switched.
> >
> > Also need to add Loader2PeiSwitchStack () to header file as public
> > function for platform FSP code to consume.
> >
> > Cc: Maurice Ma <maurice.ma@intel.com>
> > Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> > Cc: Star Zeng <star.zeng@intel.com>
> > Signed-off-by: Chasel Chiu <chasel.chiu@intel.com>
> > ---
> >  IntelFsp2Pkg/Include/FspGlobalData.h             | 12 ++++++++++--
> >  IntelFsp2Pkg/Include/Library/FspSwitchStackLib.h | 18
> > +++++++++++++++++-
> >  2 files changed, 27 insertions(+), 3 deletions(-)
> >
> > diff --git a/IntelFsp2Pkg/Include/FspGlobalData.h
> > b/IntelFsp2Pkg/Include/FspGlobalData.h
> > index 5bde316893..dba9b48e1a 100644
> > --- a/IntelFsp2Pkg/Include/FspGlobalData.h
> > +++ b/IntelFsp2Pkg/Include/FspGlobalData.h
> > @@ -52,12 +52,20 @@ typedef struct  {
> >     VOID               *MemoryInitUpdPtr;
> >     VOID               *SiliconInitUpdPtr;
> >     UINT8              ApiIdx;
> > -   UINT8              FspMode; // 0: FSP in API mode; 1: FSP in
> DISPATCH mode
> > +   ///
> > +   /// 0: FSP in API mode; 1: FSP in DISPATCH mode
> > +   ///
> > +   UINT8              FspMode;
> >     UINT8              OnSeparateStack;
> >     UINT8              Reserved3;
> >     UINT32             NumberOfPhases;
> >     UINT32             PhasesExecuted;
> > -   UINT8              Reserved4[20];
> > +   ///
> > +   /// To store function parameters pointer
> > +   /// so it can be retrieved after stack switched.
> > +   ///
> > +   VOID               *FunctionParameterPtr;
> > +   UINT8              Reserved4[16];
> >     UINT32             PerfSig;
> >     UINT16             PerfLen;
> >     UINT16             Reserved5;
> > diff --git a/IntelFsp2Pkg/Include/Library/FspSwitchStackLib.h
> > b/IntelFsp2Pkg/Include/Library/FspSwitchStackLib.h
> > index 0c76e9f022..bed2a5d677 100644
> > --- a/IntelFsp2Pkg/Include/Library/FspSwitchStackLib.h
> > +++ b/IntelFsp2Pkg/Include/Library/FspSwitchStackLib.h
> > @@ -1,6 +1,6 @@
> >  /** @file
> >
> > -  Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
> > +  Copyright (c) 2014 - 2020, Intel Corporation. All rights
> > + reserved.<BR>
> >    SPDX-License-Identifier: BSD-2-Clause-Patent
> >
> >  **/
> > @@ -36,4 +36,20 @@ Pei2LoaderSwitchStack (
> >    VOID
> >    );
> >
> > +/**
> > +
> > +  This function is equilivant to Pei2LoaderSwitchStack () but just
> > + indicates  the stack after switched is FSP stack.
> > +
> > +  @return ReturnKey          After switching to the saved stack,
> > +                             this value will be saved in eax before
> returning.
> > +
> > +
> > +**/
> > +UINT32
> > +EFIAPI
> > +Loader2PeiSwitchStack (
> > +  VOID
> > +  );
> > +
> >  #endif
> > --
> > 2.13.3.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#59933): https://edk2.groups.io/g/devel/message/59933
Mute This Topic: https://groups.io/mt/74342444/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH] IntelFsp2Pkg: Add FunctionParametePtr to FspGlobalData.

Posted by Chiu, Chasel 5 days ago
Yes, thanks for good catch! I will correct it.

> -----Original Message-----
> From: Zeng, Star <star.zeng@intel.com>
> Sent: Wednesday, May 20, 2020 12:21 PM
> To: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Chiu, Chasel
> <chasel.chiu@intel.com>; devel@edk2.groups.io
> Cc: Ma, Maurice <maurice.ma@intel.com>; Zeng, Star <star.zeng@intel.com>
> Subject: RE: [PATCH] IntelFsp2Pkg: Add FunctionParametePtr to
> FspGlobalData.
> 
> equilivant is a typo?
> 
> > -----Original Message-----
> > From: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>
> > Sent: Wednesday, May 20, 2020 12:12 PM
> > To: Chiu, Chasel <chasel.chiu@intel.com>; devel@edk2.groups.io
> > Cc: Ma, Maurice <maurice.ma@intel.com>; Zeng, Star
> > <star.zeng@intel.com>
> > Subject: RE: [PATCH] IntelFsp2Pkg: Add FunctionParametePtr to
> > FspGlobalData.
> >
> > Reviewed-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
> >
> > > -----Original Message-----
> > > From: Chiu, Chasel <chasel.chiu@intel.com>
> > > Sent: Tuesday, May 19, 2020 8:34 PM
> > > To: devel@edk2.groups.io
> > > Cc: Ma, Maurice <maurice.ma@intel.com>; Desimone, Nathaniel L
> > > <nathaniel.l.desimone@intel.com>; Zeng, Star <star.zeng@intel.com>
> > > Subject: [PATCH] IntelFsp2Pkg: Add FunctionParametePtr to
> FspGlobalData.
> > >
> > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2726
> > >
> > > When FSP switching stack and calling bootloader functions, the
> > > function parameter in stack may not be accessible easily.
> > > We can store the function parameter pointer to FspGlobalData and
> > > retrieve it after stack switched.
> > >
> > > Also need to add Loader2PeiSwitchStack () to header file as public
> > > function for platform FSP code to consume.
> > >
> > > Cc: Maurice Ma <maurice.ma@intel.com>
> > > Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> > > Cc: Star Zeng <star.zeng@intel.com>
> > > Signed-off-by: Chasel Chiu <chasel.chiu@intel.com>
> > > ---
> > >  IntelFsp2Pkg/Include/FspGlobalData.h             | 12
> ++++++++++--
> > >  IntelFsp2Pkg/Include/Library/FspSwitchStackLib.h | 18
> > > +++++++++++++++++-
> > >  2 files changed, 27 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/IntelFsp2Pkg/Include/FspGlobalData.h
> > > b/IntelFsp2Pkg/Include/FspGlobalData.h
> > > index 5bde316893..dba9b48e1a 100644
> > > --- a/IntelFsp2Pkg/Include/FspGlobalData.h
> > > +++ b/IntelFsp2Pkg/Include/FspGlobalData.h
> > > @@ -52,12 +52,20 @@ typedef struct  {
> > >     VOID               *MemoryInitUpdPtr;
> > >     VOID               *SiliconInitUpdPtr;
> > >     UINT8              ApiIdx;
> > > -   UINT8              FspMode; // 0: FSP in API mode; 1: FSP in
> > DISPATCH mode
> > > +   ///
> > > +   /// 0: FSP in API mode; 1: FSP in DISPATCH mode
> > > +   ///
> > > +   UINT8              FspMode;
> > >     UINT8              OnSeparateStack;
> > >     UINT8              Reserved3;
> > >     UINT32             NumberOfPhases;
> > >     UINT32             PhasesExecuted;
> > > -   UINT8              Reserved4[20];
> > > +   ///
> > > +   /// To store function parameters pointer
> > > +   /// so it can be retrieved after stack switched.
> > > +   ///
> > > +   VOID               *FunctionParameterPtr;
> > > +   UINT8              Reserved4[16];
> > >     UINT32             PerfSig;
> > >     UINT16             PerfLen;
> > >     UINT16             Reserved5;
> > > diff --git a/IntelFsp2Pkg/Include/Library/FspSwitchStackLib.h
> > > b/IntelFsp2Pkg/Include/Library/FspSwitchStackLib.h
> > > index 0c76e9f022..bed2a5d677 100644
> > > --- a/IntelFsp2Pkg/Include/Library/FspSwitchStackLib.h
> > > +++ b/IntelFsp2Pkg/Include/Library/FspSwitchStackLib.h
> > > @@ -1,6 +1,6 @@
> > >  /** @file
> > >
> > > -  Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
> > > +  Copyright (c) 2014 - 2020, Intel Corporation. All rights
> > > + reserved.<BR>
> > >    SPDX-License-Identifier: BSD-2-Clause-Patent
> > >
> > >  **/
> > > @@ -36,4 +36,20 @@ Pei2LoaderSwitchStack (
> > >    VOID
> > >    );
> > >
> > > +/**
> > > +
> > > +  This function is equilivant to Pei2LoaderSwitchStack () but just
> > > + indicates  the stack after switched is FSP stack.
> > > +
> > > +  @return ReturnKey          After switching to the saved stack,
> > > +                             this value will be saved in eax before
> > returning.
> > > +
> > > +
> > > +**/
> > > +UINT32
> > > +EFIAPI
> > > +Loader2PeiSwitchStack (
> > > +  VOID
> > > +  );
> > > +
> > >  #endif
> > > --
> > > 2.13.3.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#59934): https://edk2.groups.io/g/devel/message/59934
Mute This Topic: https://groups.io/mt/74342444/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH] IntelFsp2Pkg: Add FunctionParametePtr to FspGlobalData.

Posted by Zeng, Star 5 days ago
No need to resend new patch, you can go ahead with Nate's review after the correction.

> -----Original Message-----
> From: Chiu, Chasel <chasel.chiu@intel.com>
> Sent: Wednesday, May 20, 2020 12:25 PM
> To: Zeng, Star <star.zeng@intel.com>; Desimone, Nathaniel L
> <nathaniel.l.desimone@intel.com>; devel@edk2.groups.io
> Cc: Ma, Maurice <maurice.ma@intel.com>
> Subject: RE: [PATCH] IntelFsp2Pkg: Add FunctionParametePtr to
> FspGlobalData.
> 
> 
> Yes, thanks for good catch! I will correct it.
> 
> > -----Original Message-----
> > From: Zeng, Star <star.zeng@intel.com>
> > Sent: Wednesday, May 20, 2020 12:21 PM
> > To: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Chiu,
> > Chasel <chasel.chiu@intel.com>; devel@edk2.groups.io
> > Cc: Ma, Maurice <maurice.ma@intel.com>; Zeng, Star
> > <star.zeng@intel.com>
> > Subject: RE: [PATCH] IntelFsp2Pkg: Add FunctionParametePtr to
> > FspGlobalData.
> >
> > equilivant is a typo?
> >
> > > -----Original Message-----
> > > From: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>
> > > Sent: Wednesday, May 20, 2020 12:12 PM
> > > To: Chiu, Chasel <chasel.chiu@intel.com>; devel@edk2.groups.io
> > > Cc: Ma, Maurice <maurice.ma@intel.com>; Zeng, Star
> > > <star.zeng@intel.com>
> > > Subject: RE: [PATCH] IntelFsp2Pkg: Add FunctionParametePtr to
> > > FspGlobalData.
> > >
> > > Reviewed-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
> > >
> > > > -----Original Message-----
> > > > From: Chiu, Chasel <chasel.chiu@intel.com>
> > > > Sent: Tuesday, May 19, 2020 8:34 PM
> > > > To: devel@edk2.groups.io
> > > > Cc: Ma, Maurice <maurice.ma@intel.com>; Desimone, Nathaniel L
> > > > <nathaniel.l.desimone@intel.com>; Zeng, Star <star.zeng@intel.com>
> > > > Subject: [PATCH] IntelFsp2Pkg: Add FunctionParametePtr to
> > FspGlobalData.
> > > >
> > > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2726
> > > >
> > > > When FSP switching stack and calling bootloader functions, the
> > > > function parameter in stack may not be accessible easily.
> > > > We can store the function parameter pointer to FspGlobalData and
> > > > retrieve it after stack switched.
> > > >
> > > > Also need to add Loader2PeiSwitchStack () to header file as public
> > > > function for platform FSP code to consume.
> > > >
> > > > Cc: Maurice Ma <maurice.ma@intel.com>
> > > > Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> > > > Cc: Star Zeng <star.zeng@intel.com>
> > > > Signed-off-by: Chasel Chiu <chasel.chiu@intel.com>
> > > > ---
> > > >  IntelFsp2Pkg/Include/FspGlobalData.h             | 12
> > ++++++++++--
> > > >  IntelFsp2Pkg/Include/Library/FspSwitchStackLib.h | 18
> > > > +++++++++++++++++-
> > > >  2 files changed, 27 insertions(+), 3 deletions(-)
> > > >
> > > > diff --git a/IntelFsp2Pkg/Include/FspGlobalData.h
> > > > b/IntelFsp2Pkg/Include/FspGlobalData.h
> > > > index 5bde316893..dba9b48e1a 100644
> > > > --- a/IntelFsp2Pkg/Include/FspGlobalData.h
> > > > +++ b/IntelFsp2Pkg/Include/FspGlobalData.h
> > > > @@ -52,12 +52,20 @@ typedef struct  {
> > > >     VOID               *MemoryInitUpdPtr;
> > > >     VOID               *SiliconInitUpdPtr;
> > > >     UINT8              ApiIdx;
> > > > -   UINT8              FspMode; // 0: FSP in API mode; 1: FSP in
> > > DISPATCH mode
> > > > +   ///
> > > > +   /// 0: FSP in API mode; 1: FSP in DISPATCH mode
> > > > +   ///
> > > > +   UINT8              FspMode;
> > > >     UINT8              OnSeparateStack;
> > > >     UINT8              Reserved3;
> > > >     UINT32             NumberOfPhases;
> > > >     UINT32             PhasesExecuted;
> > > > -   UINT8              Reserved4[20];
> > > > +   ///
> > > > +   /// To store function parameters pointer
> > > > +   /// so it can be retrieved after stack switched.
> > > > +   ///
> > > > +   VOID               *FunctionParameterPtr;
> > > > +   UINT8              Reserved4[16];
> > > >     UINT32             PerfSig;
> > > >     UINT16             PerfLen;
> > > >     UINT16             Reserved5;
> > > > diff --git a/IntelFsp2Pkg/Include/Library/FspSwitchStackLib.h
> > > > b/IntelFsp2Pkg/Include/Library/FspSwitchStackLib.h
> > > > index 0c76e9f022..bed2a5d677 100644
> > > > --- a/IntelFsp2Pkg/Include/Library/FspSwitchStackLib.h
> > > > +++ b/IntelFsp2Pkg/Include/Library/FspSwitchStackLib.h
> > > > @@ -1,6 +1,6 @@
> > > >  /** @file
> > > >
> > > > -  Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
> > > > +  Copyright (c) 2014 - 2020, Intel Corporation. All rights
> > > > + reserved.<BR>
> > > >    SPDX-License-Identifier: BSD-2-Clause-Patent
> > > >
> > > >  **/
> > > > @@ -36,4 +36,20 @@ Pei2LoaderSwitchStack (
> > > >    VOID
> > > >    );
> > > >
> > > > +/**
> > > > +
> > > > +  This function is equilivant to Pei2LoaderSwitchStack () but
> > > > + just indicates  the stack after switched is FSP stack.
> > > > +
> > > > +  @return ReturnKey          After switching to the saved stack,
> > > > +                             this value will be saved in eax
> > > > + before
> > > returning.
> > > > +
> > > > +
> > > > +**/
> > > > +UINT32
> > > > +EFIAPI
> > > > +Loader2PeiSwitchStack (
> > > > +  VOID
> > > > +  );
> > > > +
> > > >  #endif
> > > > --
> > > > 2.13.3.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#59935): https://edk2.groups.io/g/devel/message/59935
Mute This Topic: https://groups.io/mt/74342444/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH] IntelFsp2Pkg: Add FunctionParametePtr to FspGlobalData.

Posted by Chiu, Chasel 5 days ago
Thanks!

> -----Original Message-----
> From: Zeng, Star <star.zeng@intel.com>
> Sent: Wednesday, May 20, 2020 12:34 PM
> To: Chiu, Chasel <chasel.chiu@intel.com>; Desimone, Nathaniel L
> <nathaniel.l.desimone@intel.com>; devel@edk2.groups.io
> Cc: Ma, Maurice <maurice.ma@intel.com>; Zeng, Star <star.zeng@intel.com>
> Subject: RE: [PATCH] IntelFsp2Pkg: Add FunctionParametePtr to
> FspGlobalData.
> 
> No need to resend new patch, you can go ahead with Nate's review after the
> correction.
> 
> > -----Original Message-----
> > From: Chiu, Chasel <chasel.chiu@intel.com>
> > Sent: Wednesday, May 20, 2020 12:25 PM
> > To: Zeng, Star <star.zeng@intel.com>; Desimone, Nathaniel L
> > <nathaniel.l.desimone@intel.com>; devel@edk2.groups.io
> > Cc: Ma, Maurice <maurice.ma@intel.com>
> > Subject: RE: [PATCH] IntelFsp2Pkg: Add FunctionParametePtr to
> > FspGlobalData.
> >
> >
> > Yes, thanks for good catch! I will correct it.
> >
> > > -----Original Message-----
> > > From: Zeng, Star <star.zeng@intel.com>
> > > Sent: Wednesday, May 20, 2020 12:21 PM
> > > To: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Chiu,
> > > Chasel <chasel.chiu@intel.com>; devel@edk2.groups.io
> > > Cc: Ma, Maurice <maurice.ma@intel.com>; Zeng, Star
> > > <star.zeng@intel.com>
> > > Subject: RE: [PATCH] IntelFsp2Pkg: Add FunctionParametePtr to
> > > FspGlobalData.
> > >
> > > equilivant is a typo?
> > >
> > > > -----Original Message-----
> > > > From: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>
> > > > Sent: Wednesday, May 20, 2020 12:12 PM
> > > > To: Chiu, Chasel <chasel.chiu@intel.com>; devel@edk2.groups.io
> > > > Cc: Ma, Maurice <maurice.ma@intel.com>; Zeng, Star
> > > > <star.zeng@intel.com>
> > > > Subject: RE: [PATCH] IntelFsp2Pkg: Add FunctionParametePtr to
> > > > FspGlobalData.
> > > >
> > > > Reviewed-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
> > > >
> > > > > -----Original Message-----
> > > > > From: Chiu, Chasel <chasel.chiu@intel.com>
> > > > > Sent: Tuesday, May 19, 2020 8:34 PM
> > > > > To: devel@edk2.groups.io
> > > > > Cc: Ma, Maurice <maurice.ma@intel.com>; Desimone, Nathaniel L
> > > > > <nathaniel.l.desimone@intel.com>; Zeng, Star
> > > > > <star.zeng@intel.com>
> > > > > Subject: [PATCH] IntelFsp2Pkg: Add FunctionParametePtr to
> > > FspGlobalData.
> > > > >
> > > > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2726
> > > > >
> > > > > When FSP switching stack and calling bootloader functions, the
> > > > > function parameter in stack may not be accessible easily.
> > > > > We can store the function parameter pointer to FspGlobalData and
> > > > > retrieve it after stack switched.
> > > > >
> > > > > Also need to add Loader2PeiSwitchStack () to header file as
> > > > > public function for platform FSP code to consume.
> > > > >
> > > > > Cc: Maurice Ma <maurice.ma@intel.com>
> > > > > Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> > > > > Cc: Star Zeng <star.zeng@intel.com>
> > > > > Signed-off-by: Chasel Chiu <chasel.chiu@intel.com>
> > > > > ---
> > > > >  IntelFsp2Pkg/Include/FspGlobalData.h             | 12
> > > ++++++++++--
> > > > >  IntelFsp2Pkg/Include/Library/FspSwitchStackLib.h | 18
> > > > > +++++++++++++++++-
> > > > >  2 files changed, 27 insertions(+), 3 deletions(-)
> > > > >
> > > > > diff --git a/IntelFsp2Pkg/Include/FspGlobalData.h
> > > > > b/IntelFsp2Pkg/Include/FspGlobalData.h
> > > > > index 5bde316893..dba9b48e1a 100644
> > > > > --- a/IntelFsp2Pkg/Include/FspGlobalData.h
> > > > > +++ b/IntelFsp2Pkg/Include/FspGlobalData.h
> > > > > @@ -52,12 +52,20 @@ typedef struct  {
> > > > >     VOID               *MemoryInitUpdPtr;
> > > > >     VOID               *SiliconInitUpdPtr;
> > > > >     UINT8              ApiIdx;
> > > > > -   UINT8              FspMode; // 0: FSP in API mode; 1: FSP in
> > > > DISPATCH mode
> > > > > +   ///
> > > > > +   /// 0: FSP in API mode; 1: FSP in DISPATCH mode
> > > > > +   ///
> > > > > +   UINT8              FspMode;
> > > > >     UINT8              OnSeparateStack;
> > > > >     UINT8              Reserved3;
> > > > >     UINT32             NumberOfPhases;
> > > > >     UINT32             PhasesExecuted;
> > > > > -   UINT8              Reserved4[20];
> > > > > +   ///
> > > > > +   /// To store function parameters pointer
> > > > > +   /// so it can be retrieved after stack switched.
> > > > > +   ///
> > > > > +   VOID               *FunctionParameterPtr;
> > > > > +   UINT8              Reserved4[16];
> > > > >     UINT32             PerfSig;
> > > > >     UINT16             PerfLen;
> > > > >     UINT16             Reserved5;
> > > > > diff --git a/IntelFsp2Pkg/Include/Library/FspSwitchStackLib.h
> > > > > b/IntelFsp2Pkg/Include/Library/FspSwitchStackLib.h
> > > > > index 0c76e9f022..bed2a5d677 100644
> > > > > --- a/IntelFsp2Pkg/Include/Library/FspSwitchStackLib.h
> > > > > +++ b/IntelFsp2Pkg/Include/Library/FspSwitchStackLib.h
> > > > > @@ -1,6 +1,6 @@
> > > > >  /** @file
> > > > >
> > > > > -  Copyright (c) 2014, Intel Corporation. All rights
> > > > > reserved.<BR>
> > > > > +  Copyright (c) 2014 - 2020, Intel Corporation. All rights
> > > > > + reserved.<BR>
> > > > >    SPDX-License-Identifier: BSD-2-Clause-Patent
> > > > >
> > > > >  **/
> > > > > @@ -36,4 +36,20 @@ Pei2LoaderSwitchStack (
> > > > >    VOID
> > > > >    );
> > > > >
> > > > > +/**
> > > > > +
> > > > > +  This function is equilivant to Pei2LoaderSwitchStack () but
> > > > > + just indicates  the stack after switched is FSP stack.
> > > > > +
> > > > > +  @return ReturnKey          After switching to the saved stack,
> > > > > +                             this value will be saved in eax
> > > > > + before
> > > > returning.
> > > > > +
> > > > > +
> > > > > +**/
> > > > > +UINT32
> > > > > +EFIAPI
> > > > > +Loader2PeiSwitchStack (
> > > > > +  VOID
> > > > > +  );
> > > > > +
> > > > >  #endif
> > > > > --
> > > > > 2.13.3.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#59942): https://edk2.groups.io/g/devel/message/59942
Mute This Topic: https://groups.io/mt/74342444/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-