1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [PATCH] IntelFsp2Pkg: Update Function header to support IA32/X64.

Chiu, Chasel posted 1 patch 1 year, 6 months ago
Failed in applying to current master (apply log)
IntelFsp2Pkg/FspSecCore/SecFsp.h                 |  4 ++--
IntelFsp2Pkg/Include/Library/FspSecPlatformLib.h | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
[edk2-devel] [PATCH] IntelFsp2Pkg: Update Function header to support IA32/X64.
Posted by Chiu, Chasel 1 year, 6 months ago 
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4126

Common functions will have either 32bit or 64bit instances which
having different return code size. Function header should support both
scenarios.

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/FspSecCore/SecFsp.h                 |  4 ++--
 IntelFsp2Pkg/Include/Library/FspSecPlatformLib.h | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/IntelFsp2Pkg/FspSecCore/SecFsp.h b/IntelFsp2Pkg/FspSecCore/SecFsp.h
index e84528b378..d7a5976c12 100644
--- a/IntelFsp2Pkg/FspSecCore/SecFsp.h
+++ b/IntelFsp2Pkg/FspSecCore/SecFsp.h
@@ -70,7 +70,7 @@ FspDataPointerFixUp (
   @return   FSP binary base address.
 
 **/
-UINT32
+UINTN
 EFIAPI
 AsmGetFspBaseAddress (
   VOID
@@ -82,7 +82,7 @@ AsmGetFspBaseAddress (
   @return   FSP binary base address.
 
 **/
-UINT32
+UINTN
 EFIAPI
 AsmGetFspInfoHeader (
   VOID
diff --git a/IntelFsp2Pkg/Include/Library/FspSecPlatformLib.h b/IntelFsp2Pkg/Include/Library/FspSecPlatformLib.h
index c91ea4a78f..598fdb9ec5 100644
--- a/IntelFsp2Pkg/Include/Library/FspSecPlatformLib.h
+++ b/IntelFsp2Pkg/Include/Library/FspSecPlatformLib.h
@@ -17,10 +17,10 @@
   The callee should not use XMM6/XMM7.
   The return address is saved in MM7.
 
-  @retval in saved in EAX - 0 means platform initialization success.
+  @retval in saved in EAX/RAX - 0 means platform initialization success.
                             other means platform initialization fail.
 **/
-UINT32
+UINTN
 EFIAPI
 SecPlatformInit (
   VOID
@@ -37,10 +37,10 @@ SecPlatformInit (
 
   @param[in] FsptUpdDataPtr     Address pointer to the FSPT_UPD data structure. It is saved in ESP.
 
-  @retval in saved in EAX - 0 means Microcode is loaded successfully.
+  @retval in saved in EAX/RAX - 0 means Microcode is loaded successfully.
                             other means Microcode is not loaded successfully.
 **/
-UINT32
+UINTN
 EFIAPI
 LoadMicrocode (
   IN  VOID  *FsptUpdDataPtr
@@ -56,10 +56,10 @@ LoadMicrocode (
 
   @param[in] FsptUpdDataPtr     Address pointer to the FSPT_UPD data structure. It is saved in ESP.
 
-  @retval in saved in EAX - 0 means CAR initialization success.
+  @retval in saved in EAX/RAX - 0 means CAR initialization success.
                             other means CAR initialization fail.
 **/
-UINT32
+UINTN
 EFIAPI
 SecCarInit (
   IN  VOID  *FsptUpdDataPtr
-- 
2.35.0.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#95662): https://edk2.groups.io/g/devel/message/95662
Mute This Topic: https://groups.io/mt/94619463/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] IntelFsp2Pkg: Update Function header to support IA32/X64.
Posted by Nate DeSimone 1 year, 5 months ago 
Reviewed-by: Nate DeSimone <nathaniel.l.desimone@intel.com>

> -----Original Message-----
> From: Chiu, Chasel <chasel.chiu@intel.com>
> Sent: Thursday, October 27, 2022 7:58 PM
> To: devel@edk2.groups.io
> Cc: Chiu, Chasel <chasel.chiu@intel.com>; Desimone, Nathaniel L
> <nathaniel.l.desimone@intel.com>; Zeng, Star <star.zeng@intel.com>
> Subject: [PATCH] IntelFsp2Pkg: Update Function header to support IA32/X64.
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4126
> 
> Common functions will have either 32bit or 64bit instances which having
> different return code size. Function header should support both scenarios.
> 
> 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/FspSecCore/SecFsp.h                 |  4 ++--
>  IntelFsp2Pkg/Include/Library/FspSecPlatformLib.h | 12 ++++++------
>  2 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/IntelFsp2Pkg/FspSecCore/SecFsp.h b/IntelFsp2Pkg/FspSecCore/SecFsp.h
> index e84528b378..d7a5976c12 100644
> --- a/IntelFsp2Pkg/FspSecCore/SecFsp.h
> +++ b/IntelFsp2Pkg/FspSecCore/SecFsp.h
> @@ -70,7 +70,7 @@ FspDataPointerFixUp (
>    @return   FSP binary base address.
>  
>  **/
> -UINT32
> +UINTN
>  EFIAPI
>  AsmGetFspBaseAddress (
>    VOID
> @@ -82,7 +82,7 @@ AsmGetFspBaseAddress (
>    @return   FSP binary base address.
>  
>  **/
> -UINT32
> +UINTN
>  EFIAPI
>  AsmGetFspInfoHeader (
>    VOID
> diff --git a/IntelFsp2Pkg/Include/Library/FspSecPlatformLib.h b/IntelFsp2Pkg/Include/Library/FspSecPlatformLib.h
> index c91ea4a78f..598fdb9ec5 100644
> --- a/IntelFsp2Pkg/Include/Library/FspSecPlatformLib.h
> +++ b/IntelFsp2Pkg/Include/Library/FspSecPlatformLib.h
> @@ -17,10 +17,10 @@
>    The callee should not use XMM6/XMM7.
>    The return address is saved in MM7.
>  
> -  @retval in saved in EAX - 0 means platform initialization success.
> +  @retval in saved in EAX/RAX - 0 means platform initialization success.
>                              other means platform initialization fail.
>  **/
> -UINT32
> +UINTN
>  EFIAPI
>  SecPlatformInit (
>    VOID
> @@ -37,10 +37,10 @@ SecPlatformInit (
>  
>    @param[in] FsptUpdDataPtr     Address pointer to the FSPT_UPD data structure. It is saved in ESP.
>  
> -  @retval in saved in EAX - 0 means Microcode is loaded successfully.
> +  @retval in saved in EAX/RAX - 0 means Microcode is loaded successfully.
>                              other means Microcode is not loaded successfully.
>  **/
> -UINT32
> +UINTN
>  EFIAPI
>  LoadMicrocode (
>    IN  VOID  *FsptUpdDataPtr
> @@ -56,10 +56,10 @@ LoadMicrocode (
>  
>    @param[in] FsptUpdDataPtr     Address pointer to the FSPT_UPD data structure. It is saved in ESP.
>  
> -  @retval in saved in EAX - 0 means CAR initialization success.
> +  @retval in saved in EAX/RAX - 0 means CAR initialization success.
>                              other means CAR initialization fail.
>  **/
> -UINT32
> +UINTN
>  EFIAPI
>  SecCarInit (
>    IN  VOID  *FsptUpdDataPtr
> -- 
> 2.35.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#95785): https://edk2.groups.io/g/devel/message/95785
Mute This Topic: https://groups.io/mt/94619463/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] IntelFsp2Pkg: Update Function header to support IA32/X64.
Posted by Chiu, Chasel 1 year, 5 months ago 
Hi Michael D and Michael,

Could you please help me to clarify why CI build failed in this PR? https://github.com/tianocore/edk2/pull/3575
From log file it seems to be some CI script crashed but I have no idea what caused that failure.

Thanks,
Chasel

CI Failing log:
2022-11-01T18:58:09.3441767Z PROGRESS - --Running IntelFsp2Pkg: Guid Check Test NO-TARGET --
2022-11-01T18:58:09.3448996Z CRITICAL - EXCEPTION: global flags not at the start of the expression at position 1
2022-11-01T18:58:09.3474186Z CRITICAL - Traceback (most recent call last):
2022-11-01T18:58:09.3475314Z    File "/opt/hostedtoolcache/Python/3.11.0/x64/lib/python3.11/site-packages/edk2toolext/invocables/edk2_ci_build.py", line 174, in Go
2022-11-01T18:58:09.3478154Z     rc = Descriptor.Obj.RunBuildPlugin(pkgToRunOn, edk2path, pkg_plugin_configuration,
2022-11-01T18:58:09.3479182Z          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2022-11-01T18:58:09.3479821Z    File "/home/vsts/work/1/s/.pytool/Plugin/GuidCheck/GuidCheck.py", line 133, in RunBuildPlugin
2022-11-01T18:58:09.3480427Z     gs = GuidList.guidlist_from_filesystem(
2022-11-01T18:58:09.3480971Z          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2022-11-01T18:58:09.3482084Z    File "/opt/hostedtoolcache/Python/3.11.0/x64/lib/python3.11/site-packages/edk2toollib/uefi/edk2/guid_list.py", line 47, in guidlist_from_filesystem
2022-11-01T18:58:09.3482840Z     if(ignore(fullpath)):
2022-11-01T18:58:09.3483313Z        ^^^^^^^^^^^^^^^^
2022-11-01T18:58:09.3484178Z    File "/opt/hostedtoolcache/Python/3.11.0/x64/lib/python3.11/site-packages/edk2toollib/gitignore_parser.py", line 68, in <lambda>
2022-11-01T18:58:09.3485030Z     return lambda file_path: any(r.match(file_path) for r in rules)
2022-11-01T18:58:09.3485564Z                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2022-11-01T18:58:09.3486488Z    File "/opt/hostedtoolcache/Python/3.11.0/x64/lib/python3.11/site-packages/edk2toollib/gitignore_parser.py", line 68, in <genexpr>
2022-11-01T18:58:09.3487221Z     return lambda file_path: any(r.match(file_path) for r in rules)
2022-11-01T18:58:09.3487773Z                                  ^^^^^^^^^^^^^^^^^^
2022-11-01T18:58:09.3488632Z    File "/opt/hostedtoolcache/Python/3.11.0/x64/lib/python3.11/site-packages/edk2toollib/gitignore_parser.py", line 163, in match
2022-11-01T18:58:09.3489366Z     if re.search(self.regex, rel_path):
2022-11-01T18:58:09.3490472Z        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2022-11-01T18:58:09.3491099Z    File "/opt/hostedtoolcache/Python/3.11.0/x64/lib/python3.11/re/__init__.py", line 176, in search
2022-11-01T18:58:09.3491662Z     return _compile(pattern, flags).search(string)
2022-11-01T18:58:09.3492114Z            ^^^^^^^^^^^^^^^^^^^^^^^^
2022-11-01T18:58:09.3493037Z    File "/opt/hostedtoolcache/Python/3.11.0/x64/lib/python3.11/re/__init__.py", line 294, in _compile
2022-11-01T18:58:09.3493661Z     p = _compiler.compile(pattern, flags)
2022-11-01T18:58:09.3494047Z         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2022-11-01T18:58:09.3494593Z    File "/opt/hostedtoolcache/Python/3.11.0/x64/lib/python3.11/re/_compiler.py", line 743, in compile
2022-11-01T18:58:09.3495110Z     p = _parser.parse(p, flags)
2022-11-01T18:58:09.3495570Z         ^^^^^^^^^^^^^^^^^^^^^^^
2022-11-01T18:58:09.3496047Z    File "/opt/hostedtoolcache/Python/3.11.0/x64/lib/python3.11/re/_parser.py", line 980, in parse
2022-11-01T18:58:09.3496665Z     p = _parse_sub(source, state, flags & SRE_FLAG_VERBOSE, 0)
2022-11-01T18:58:09.3497100Z         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2022-11-01T18:58:09.3497650Z    File "/opt/hostedtoolcache/Python/3.11.0/x64/lib/python3.11/re/_parser.py", line 455, in _parse_sub
2022-11-01T18:58:09.3498286Z     itemsappend(_parse(source, state, verbose, nested + 1,
2022-11-01T18:58:09.3498727Z                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2022-11-01T18:58:09.3499272Z    File "/opt/hostedtoolcache/Python/3.11.0/x64/lib/python3.11/re/_parser.py", line 841, in _parse
2022-11-01T18:58:09.3500126Z     raise source.error('global flags not at the start '
2022-11-01T18:58:09.3500721Z  re.error: global flags not at the start of the expression at position 1
2022-11-01T18:58:09.3501035Z 
2022-11-01T18:58:09.3501615Z ERROR - --->Test Failed: Guid Check Test NO-TARGET returned 1 






> -----Original Message-----
> From: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>
> Sent: Monday, October 31, 2022 5:52 PM
> To: Chiu, Chasel <chasel.chiu@intel.com>; devel@edk2.groups.io
> Cc: Zeng, Star <star.zeng@intel.com>
> Subject: RE: [PATCH] IntelFsp2Pkg: Update Function header to support
> IA32/X64.
> 
> Reviewed-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
> 
> > -----Original Message-----
> > From: Chiu, Chasel <chasel.chiu@intel.com>
> > Sent: Thursday, October 27, 2022 7:58 PM
> > To: devel@edk2.groups.io
> > Cc: Chiu, Chasel <chasel.chiu@intel.com>; Desimone, Nathaniel L
> > <nathaniel.l.desimone@intel.com>; Zeng, Star <star.zeng@intel.com>
> > Subject: [PATCH] IntelFsp2Pkg: Update Function header to support
> IA32/X64.
> >
> > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4126
> >
> > Common functions will have either 32bit or 64bit instances which
> > having different return code size. Function header should support both
> scenarios.
> >
> > 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/FspSecCore/SecFsp.h                 |  4 ++--
> >  IntelFsp2Pkg/Include/Library/FspSecPlatformLib.h | 12 ++++++------
> >  2 files changed, 8 insertions(+), 8 deletions(-)
> >
> > diff --git a/IntelFsp2Pkg/FspSecCore/SecFsp.h
> > b/IntelFsp2Pkg/FspSecCore/SecFsp.h
> > index e84528b378..d7a5976c12 100644
> > --- a/IntelFsp2Pkg/FspSecCore/SecFsp.h
> > +++ b/IntelFsp2Pkg/FspSecCore/SecFsp.h
> > @@ -70,7 +70,7 @@ FspDataPointerFixUp (
> >    @return   FSP binary base address.
> >
> >  **/
> > -UINT32
> > +UINTN
> >  EFIAPI
> >  AsmGetFspBaseAddress (
> >    VOID
> > @@ -82,7 +82,7 @@ AsmGetFspBaseAddress (
> >    @return   FSP binary base address.
> >
> >  **/
> > -UINT32
> > +UINTN
> >  EFIAPI
> >  AsmGetFspInfoHeader (
> >    VOID
> > diff --git a/IntelFsp2Pkg/Include/Library/FspSecPlatformLib.h
> > b/IntelFsp2Pkg/Include/Library/FspSecPlatformLib.h
> > index c91ea4a78f..598fdb9ec5 100644
> > --- a/IntelFsp2Pkg/Include/Library/FspSecPlatformLib.h
> > +++ b/IntelFsp2Pkg/Include/Library/FspSecPlatformLib.h
> > @@ -17,10 +17,10 @@
> >    The callee should not use XMM6/XMM7.
> >    The return address is saved in MM7.
> >
> > -  @retval in saved in EAX - 0 means platform initialization success.
> > +  @retval in saved in EAX/RAX - 0 means platform initialization success.
> >                              other means platform initialization fail.
> >  **/
> > -UINT32
> > +UINTN
> >  EFIAPI
> >  SecPlatformInit (
> >    VOID
> > @@ -37,10 +37,10 @@ SecPlatformInit (
> >
> >    @param[in] FsptUpdDataPtr     Address pointer to the FSPT_UPD data
> structure. It is saved in ESP.
> >
> > -  @retval in saved in EAX - 0 means Microcode is loaded successfully.
> > +  @retval in saved in EAX/RAX - 0 means Microcode is loaded
> successfully.
> >                              other means Microcode is not loaded successfully.
> >  **/
> > -UINT32
> > +UINTN
> >  EFIAPI
> >  LoadMicrocode (
> >    IN  VOID  *FsptUpdDataPtr
> > @@ -56,10 +56,10 @@ LoadMicrocode (
> >
> >    @param[in] FsptUpdDataPtr     Address pointer to the FSPT_UPD data
> structure. It is saved in ESP.
> >
> > -  @retval in saved in EAX - 0 means CAR initialization success.
> > +  @retval in saved in EAX/RAX - 0 means CAR initialization success.
> >                              other means CAR initialization fail.
> >  **/
> > -UINT32
> > +UINTN
> >  EFIAPI
> >  SecCarInit (
> >    IN  VOID  *FsptUpdDataPtr
> > --
> > 2.35.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#95830): https://edk2.groups.io/g/devel/message/95830
Mute This Topic: https://groups.io/mt/94619463/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.