Re: [edk2-devel] [PATCH] IntelFsp2Pkg: Update Function header to support IA32/X64.
Patch merged: https://github.com/tianocore/edk2/commit/c46204e25f5b929fae2b336c03c73fada632d4f4 Thanks, Chasel > -Original Message- > From: devel@edk2.groups.io On Behalf Of Chiu, > Chasel > Sent: Thursday, October 27, 2022 7:58 PM > To: devel@edk2.groups.io > Cc: Chiu, Chasel ; Desimone, Nathaniel L > ; Zeng, Star > Subject: [edk2-devel] [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 > Cc: Star Zeng > Signed-off-by: Chasel Chiu > --- > 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 ( VOIDdiff --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/1777047 > Group Owner: devel+ow...@edk2.groups.io > Unsubscribe: https://edk2.groups.io/g/devel/unsub [chasel.c...@intel.com] > -=-=-=-=-=-= > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#95870): https://edk2.groups.io/g/devel/message/95870 Mute This Topic: https://groups.io/mt/94619463/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] IntelFsp2Pkg: Update Function header to support IA32/X64.
The reason it started happening is because the VM images started coming with Python 3.11. -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#95833): https://edk2.groups.io/g/devel/message/95833 Mute This Topic: https://groups.io/mt/94619463/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] IntelFsp2Pkg: Update Function header to support IA32/X64.
Because edk2 pip-requirements.txt is out of date. I sent a patch to update them here. Reviews are appreciated. [PATCH v1 1/1] pip-requirements.txt: Bump pytool extensions and library (groups.io) ( https://edk2.groups.io/g/devel/message/95831 ) -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#95832): https://edk2.groups.io/g/devel/message/95832 Mute This Topic: https://groups.io/mt/94619463/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] IntelFsp2Pkg: Update Function header to support IA32/X64.
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.3475314ZFile
"/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.3479821ZFile
"/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.3482084ZFile
"/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.3484178ZFile
"/opt/hostedtoolcache/Python/3.11.0/x64/lib/python3.11/site-packages/edk2toollib/gitignore_parser.py",
line 68, in
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.3486488ZFile
"/opt/hostedtoolcache/Python/3.11.0/x64/lib/python3.11/site-packages/edk2toollib/gitignore_parser.py",
line 68, in
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.3488632ZFile
"/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.3491099ZFile
"/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.3493037ZFile
"/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.3494593ZFile
"/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.3496047ZFile
"/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.3497650ZFile
"/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.3499272ZFile
"/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
> Sent: Monday, October 31, 2022 5:52 PM
> To: Chiu, Chasel ; devel@edk2.groups.io
> Cc: Zeng, Star
> Subject: RE: [PATCH] IntelFsp2Pkg: Update Function header to support
> IA32/X64.
>
> Reviewed-by: Nate DeSimone
>
> > -Original Message-
> > From: Chiu, Chasel
> > Sent: Thursday, October 27, 2022 7:58 PM
> > To: devel@edk2.groups.io
> > Cc: Chiu, Chasel ; Desimone, Nathaniel L
> > ; Zeng, Star
> > Subject: [PATCH] IntelFsp2Pkg: Update Function header to support
> IA32/X64.
> >
> > REF:
Re: [edk2-devel] [PATCH] IntelFsp2Pkg: Update Function header to support IA32/X64.
Reviewed-by: Nate DeSimone > -Original Message- > From: Chiu, Chasel > Sent: Thursday, October 27, 2022 7:58 PM > To: devel@edk2.groups.io > Cc: Chiu, Chasel ; Desimone, Nathaniel L > ; Zeng, Star > 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 > Cc: Star Zeng > Signed-off-by: Chasel Chiu > --- > 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/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [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 Cc: Star Zeng Signed-off-by: Chasel Chiu --- 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/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
