* [PATCH v1 1/7] IntelFsp2Pkg: Fix code formatting errors
2022-09-07 3:19 [PATCH v1 0/7] Enable CI in Intel FSP Packages Michael Kubacki
@ 2022-09-07 3:19 ` Michael Kubacki
2022-09-07 3:36 ` [edk2-devel] " Chiu, Chasel
2022-09-07 3:19 ` [PATCH v1 2/7] IntelFsp2Pkg/BaseFspMultiPhaseLib: Replace duplicate GUID Michael Kubacki
` (5 subsequent siblings)
6 siblings, 1 reply; 15+ messages in thread
From: Michael Kubacki @ 2022-09-07 3:19 UTC (permalink / raw)
To: devel; +Cc: Chasel Chiu, Nate DeSimone, Star Zeng
From: Michael Kubacki <michael.kubacki@microsoft.com>
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4048
This package did not have CI enabled so code changes were merged
that fail uncrustify formatting. This change updates those files
to include uncustify formatting.
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
---
IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/DebugLib.c | 9 +++++----
IntelFsp2Pkg/Library/BaseFspSwitchStackLib/FspSwitchStackLib.c | 2 +-
IntelFsp2Pkg/Include/Ppi/Variable.h | 8 ++++----
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/DebugLib.c b/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/DebugLib.c
index cb2317bfb240..8e24b946cd88 100644
--- a/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/DebugLib.c
+++ b/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/DebugLib.c
@@ -193,8 +193,8 @@ DebugBPrint (
**/
VOID
FillHex (
- UINTN Value,
- CHAR8 *Buffer
+ UINTN Value,
+ CHAR8 *Buffer
)
{
INTN Idx;
@@ -227,8 +227,8 @@ DebugAssertInternal (
VOID
)
{
- CHAR8 Buffer[MAX_DEBUG_MESSAGE_LENGTH];
- UINTN *Frame;
+ CHAR8 Buffer[MAX_DEBUG_MESSAGE_LENGTH];
+ UINTN *Frame;
Frame = (UINTN *)GetStackFramePointer ();
@@ -250,6 +250,7 @@ DebugAssertInternal (
sizeof (Buffer) / sizeof (CHAR8) - 1
);
}
+
SerialPortWrite ((UINT8 *)"ASSERT DUMP:\n", 13);
while (Frame != NULL) {
FillHex ((UINTN)Frame, Buffer + 9);
diff --git a/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/FspSwitchStackLib.c b/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/FspSwitchStackLib.c
index 69a021f42b39..a0b2193bdeab 100644
--- a/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/FspSwitchStackLib.c
+++ b/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/FspSwitchStackLib.c
@@ -31,6 +31,6 @@ SwapStack (
FspData = GetFspGlobalDataPointer ();
OldStack = FspData->CoreStack;
- FspData->CoreStack = (UINTN) NewStack;
+ FspData->CoreStack = (UINTN)NewStack;
return OldStack;
}
diff --git a/IntelFsp2Pkg/Include/Ppi/Variable.h b/IntelFsp2Pkg/Include/Ppi/Variable.h
index 3e1f4b98a999..581f14880813 100644
--- a/IntelFsp2Pkg/Include/Ppi/Variable.h
+++ b/IntelFsp2Pkg/Include/Ppi/Variable.h
@@ -184,10 +184,10 @@ EFI_STATUS
/// to store data in the PEI environment.
///
struct _EDKII_PEI_VARIABLE_PPI {
- EDKII_PEI_GET_VARIABLE GetVariable;
- EDKII_PEI_GET_NEXT_VARIABLE_NAME GetNextVariableName;
- EDKII_PEI_SET_VARIABLE SetVariable;
- EDKII_PEI_QUERY_VARIABLE_INFO QueryVariableInfo;
+ EDKII_PEI_GET_VARIABLE GetVariable;
+ EDKII_PEI_GET_NEXT_VARIABLE_NAME GetNextVariableName;
+ EDKII_PEI_SET_VARIABLE SetVariable;
+ EDKII_PEI_QUERY_VARIABLE_INFO QueryVariableInfo;
};
extern EFI_GUID gEdkiiPeiVariablePpiGuid;
--
2.28.0.windows.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [edk2-devel] [PATCH v1 1/7] IntelFsp2Pkg: Fix code formatting errors
2022-09-07 3:19 ` [PATCH v1 1/7] IntelFsp2Pkg: Fix code formatting errors Michael Kubacki
@ 2022-09-07 3:36 ` Chiu, Chasel
0 siblings, 0 replies; 15+ messages in thread
From: Chiu, Chasel @ 2022-09-07 3:36 UTC (permalink / raw)
To: devel@edk2.groups.io, mikuback@linux.microsoft.com
Cc: Desimone, Nathaniel L, Zeng, Star
Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>
Thanks,
Chasel
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Michael
> Kubacki
> Sent: Tuesday, September 6, 2022 8:19 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: [edk2-devel] [PATCH v1 1/7] IntelFsp2Pkg: Fix code formatting errors
>
> From: Michael Kubacki <michael.kubacki@microsoft.com>
>
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4048
>
> This package did not have CI enabled so code changes were merged that fail
> uncrustify formatting. This change updates those files to include uncustify
> formatting.
>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> Cc: Star Zeng <star.zeng@intel.com>
> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
> ---
> IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/DebugLib.c | 9 +++++----
> IntelFsp2Pkg/Library/BaseFspSwitchStackLib/FspSwitchStackLib.c | 2 +-
> IntelFsp2Pkg/Include/Ppi/Variable.h | 8 ++++----
> 3 files changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/DebugLib.c
> b/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/DebugLib.c
> index cb2317bfb240..8e24b946cd88 100644
> --- a/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/DebugLib.c
> +++ b/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/DebugLib.c
> @@ -193,8 +193,8 @@ DebugBPrint (
> **/
> VOID
> FillHex (
> - UINTN Value,
> - CHAR8 *Buffer
> + UINTN Value,
> + CHAR8 *Buffer
> )
> {
> INTN Idx;
> @@ -227,8 +227,8 @@ DebugAssertInternal (
> VOID
> )
> {
> - CHAR8 Buffer[MAX_DEBUG_MESSAGE_LENGTH];
> - UINTN *Frame;
> + CHAR8 Buffer[MAX_DEBUG_MESSAGE_LENGTH]; UINTN *Frame;
>
> Frame = (UINTN *)GetStackFramePointer ();
>
> @@ -250,6 +250,7 @@ DebugAssertInternal (
> sizeof (Buffer) / sizeof (CHAR8) - 1
> );
> }
> +
> SerialPortWrite ((UINT8 *)"ASSERT DUMP:\n", 13);
> while (Frame != NULL) {
> FillHex ((UINTN)Frame, Buffer + 9); diff --git
> a/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/FspSwitchStackLib.c
> b/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/FspSwitchStackLib.c
> index 69a021f42b39..a0b2193bdeab 100644
> --- a/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/FspSwitchStackLib.c
> +++ b/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/FspSwitchStackLib.c
> @@ -31,6 +31,6 @@ SwapStack (
>
> FspData = GetFspGlobalDataPointer ();
> OldStack = FspData->CoreStack;
> - FspData->CoreStack = (UINTN) NewStack;
> + FspData->CoreStack = (UINTN)NewStack;
> return OldStack;
> }
> diff --git a/IntelFsp2Pkg/Include/Ppi/Variable.h
> b/IntelFsp2Pkg/Include/Ppi/Variable.h
> index 3e1f4b98a999..581f14880813 100644
> --- a/IntelFsp2Pkg/Include/Ppi/Variable.h
> +++ b/IntelFsp2Pkg/Include/Ppi/Variable.h
> @@ -184,10 +184,10 @@ EFI_STATUS
> /// to store data in the PEI environment.
> ///
> struct _EDKII_PEI_VARIABLE_PPI {
> - EDKII_PEI_GET_VARIABLE GetVariable;
> - EDKII_PEI_GET_NEXT_VARIABLE_NAME GetNextVariableName;
> - EDKII_PEI_SET_VARIABLE SetVariable;
> - EDKII_PEI_QUERY_VARIABLE_INFO QueryVariableInfo;
> + EDKII_PEI_GET_VARIABLE GetVariable;
> + EDKII_PEI_GET_NEXT_VARIABLE_NAME GetNextVariableName;
> + EDKII_PEI_SET_VARIABLE SetVariable;
> + EDKII_PEI_QUERY_VARIABLE_INFO QueryVariableInfo;
> };
>
> extern EFI_GUID gEdkiiPeiVariablePpiGuid;
> --
> 2.28.0.windows.1
>
>
>
> -=-=-=-=-=-=
> Groups.io Links: You receive all messages sent to this group.
> View/Reply Online (#93315): https://edk2.groups.io/g/devel/message/93315
> Mute This Topic: https://groups.io/mt/93518036/1777047
> Group Owner: devel+owner@edk2.groups.io
> Unsubscribe: https://edk2.groups.io/g/devel/unsub [chasel.chiu@intel.com]
> -=-=-=-=-=-=
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v1 2/7] IntelFsp2Pkg/BaseFspMultiPhaseLib: Replace duplicate GUID
2022-09-07 3:19 [PATCH v1 0/7] Enable CI in Intel FSP Packages Michael Kubacki
2022-09-07 3:19 ` [PATCH v1 1/7] IntelFsp2Pkg: Fix code formatting errors Michael Kubacki
@ 2022-09-07 3:19 ` Michael Kubacki
2022-09-07 3:33 ` Chiu, Chasel
2022-09-07 3:19 ` [PATCH v1 3/7] IntelFsp2Pkg: Add CI YAML file Michael Kubacki
` (4 subsequent siblings)
6 siblings, 1 reply; 15+ messages in thread
From: Michael Kubacki @ 2022-09-07 3:19 UTC (permalink / raw)
To: devel; +Cc: Chasel Chiu, Nate DeSimone, Star Zeng
From: Michael Kubacki <michael.kubacki@microsoft.com>
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4048
The FILE_GUID for this library instance file is a duplicate of
Library/SecFspSecPlatformLibNull/SecFspSecPlatformLibNull.inf.
This change replaces the duplicated GUID value with a unique GUID.
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
---
IntelFsp2Pkg/Library/BaseFspMultiPhaseLib/BaseFspMultiPhaseLib.inf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/IntelFsp2Pkg/Library/BaseFspMultiPhaseLib/BaseFspMultiPhaseLib.inf b/IntelFsp2Pkg/Library/BaseFspMultiPhaseLib/BaseFspMultiPhaseLib.inf
index a79f6aecda6d..b9dd132ea863 100644
--- a/IntelFsp2Pkg/Library/BaseFspMultiPhaseLib/BaseFspMultiPhaseLib.inf
+++ b/IntelFsp2Pkg/Library/BaseFspMultiPhaseLib/BaseFspMultiPhaseLib.inf
@@ -15,7 +15,7 @@
[Defines]
INF_VERSION = 0x00010005
BASE_NAME = BaseFspMultiPhaseLib
- FILE_GUID = C128CADC-623E-4E41-97CB-A7138E627460
+ FILE_GUID = 74C14477-E742-4A0A-9787-27B1CF34F698
MODULE_TYPE = SEC
VERSION_STRING = 1.0
LIBRARY_CLASS = FspMultiPhaseLib
--
2.28.0.windows.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH v1 2/7] IntelFsp2Pkg/BaseFspMultiPhaseLib: Replace duplicate GUID
2022-09-07 3:19 ` [PATCH v1 2/7] IntelFsp2Pkg/BaseFspMultiPhaseLib: Replace duplicate GUID Michael Kubacki
@ 2022-09-07 3:33 ` Chiu, Chasel
0 siblings, 0 replies; 15+ messages in thread
From: Chiu, Chasel @ 2022-09-07 3:33 UTC (permalink / raw)
To: mikuback@linux.microsoft.com, devel@edk2.groups.io
Cc: Desimone, Nathaniel L, Zeng, Star
Thanks for fixing this bug.
Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>
> -----Original Message-----
> From: mikuback@linux.microsoft.com <mikuback@linux.microsoft.com>
> Sent: Tuesday, September 6, 2022 8:19 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 v1 2/7] IntelFsp2Pkg/BaseFspMultiPhaseLib: Replace duplicate
> GUID
>
> From: Michael Kubacki <michael.kubacki@microsoft.com>
>
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4048
>
> The FILE_GUID for this library instance file is a duplicate of
> Library/SecFspSecPlatformLibNull/SecFspSecPlatformLibNull.inf.
>
> This change replaces the duplicated GUID value with a unique GUID.
>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> Cc: Star Zeng <star.zeng@intel.com>
> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
> ---
> IntelFsp2Pkg/Library/BaseFspMultiPhaseLib/BaseFspMultiPhaseLib.inf | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git
> a/IntelFsp2Pkg/Library/BaseFspMultiPhaseLib/BaseFspMultiPhaseLib.inf
> b/IntelFsp2Pkg/Library/BaseFspMultiPhaseLib/BaseFspMultiPhaseLib.inf
> index a79f6aecda6d..b9dd132ea863 100644
> --- a/IntelFsp2Pkg/Library/BaseFspMultiPhaseLib/BaseFspMultiPhaseLib.inf
> +++ b/IntelFsp2Pkg/Library/BaseFspMultiPhaseLib/BaseFspMultiPhaseLib.inf
> @@ -15,7 +15,7 @@
> [Defines]
> INF_VERSION = 0x00010005
> BASE_NAME = BaseFspMultiPhaseLib
> - FILE_GUID = C128CADC-623E-4E41-97CB-A7138E627460
> + FILE_GUID = 74C14477-E742-4A0A-9787-27B1CF34F698
> MODULE_TYPE = SEC
> VERSION_STRING = 1.0
> LIBRARY_CLASS = FspMultiPhaseLib
> --
> 2.28.0.windows.1
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v1 3/7] IntelFsp2Pkg: Add CI YAML file
2022-09-07 3:19 [PATCH v1 0/7] Enable CI in Intel FSP Packages Michael Kubacki
2022-09-07 3:19 ` [PATCH v1 1/7] IntelFsp2Pkg: Fix code formatting errors Michael Kubacki
2022-09-07 3:19 ` [PATCH v1 2/7] IntelFsp2Pkg/BaseFspMultiPhaseLib: Replace duplicate GUID Michael Kubacki
@ 2022-09-07 3:19 ` Michael Kubacki
2022-09-07 3:19 ` [PATCH v1 4/7] IntelFsp2WrapperPkg: Fix code formatting errors Michael Kubacki
` (3 subsequent siblings)
6 siblings, 0 replies; 15+ messages in thread
From: Michael Kubacki @ 2022-09-07 3:19 UTC (permalink / raw)
To: devel; +Cc: Chasel Chiu, Nate DeSimone, Star Zeng
From: Michael Kubacki <michael.kubacki@microsoft.com>
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4048
Adds IntelFsp2Pkg to the list of supported build packages for edk2
CI and defines an initial set of CI configuration options.
The compiler plugin is disabled as the package currently does not
build due to some changes in the FSP 2.4 interface addition.
Specifically, in commit df25a54 "Fsp24SecCore<API>.inf" files were
added to IntelFspPkg.dsc but the actual files were not added.
Simply removing these files from the DSC exposes a linker failure.
Recommendation:
1. Enable package CI (accept this change)
2. Add IntelFsp2Pkg.dsc to the "CompilerPlugin" "DscPath" in
IntelFsp2Pkg/IntelFsp2Pkg.ci.yaml to enable compilation
3. Verify compilation and all currently enabled package CI checks
pass
4. Check-in fixes in (3) with change in (2)
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
---
.pytool/CISettings.py | 1 +
IntelFsp2Pkg/IntelFsp2Pkg.ci.yaml | 90 ++++++++++++++++++++
2 files changed, 91 insertions(+)
diff --git a/.pytool/CISettings.py b/.pytool/CISettings.py
index cf9e0d77b19b..0205c26a58f8 100644
--- a/.pytool/CISettings.py
+++ b/.pytool/CISettings.py
@@ -54,6 +54,7 @@ class Settings(CiBuildSettingsManager, UpdateSettingsManager, SetupSettingsManag
"ArmVirtPkg",
"DynamicTablesPkg",
"EmulatorPkg",
+ "IntelFsp2Pkg",
"MdePkg",
"MdeModulePkg",
"NetworkPkg",
diff --git a/IntelFsp2Pkg/IntelFsp2Pkg.ci.yaml b/IntelFsp2Pkg/IntelFsp2Pkg.ci.yaml
new file mode 100644
index 000000000000..fedc40bc985c
--- /dev/null
+++ b/IntelFsp2Pkg/IntelFsp2Pkg.ci.yaml
@@ -0,0 +1,90 @@
+## @file
+# Core CI configuration for IntelFsp2Pkg
+#
+# Copyright (c) Microsoft Corporation
+#
+# SPDX-License-Identifier: BSD-2-Clause-Patent
+##
+{
+ ## options defined .pytool/Plugin/LicenseCheck
+ "LicenseCheck": {
+ "IgnoreFiles": []
+ },
+
+ "EccCheck": {
+ ## Exception sample looks like below:
+ ## "ExceptionList": [
+ ## "<ErrorID>", "<KeyWord>"
+ ## ]
+ "ExceptionList": [
+ ],
+ ## Both file path and directory path are accepted.
+ "IgnoreFiles": []
+ },
+
+ ## options defined .pytool/Plugin/CompilerPlugin
+ "CompilerPlugin": {
+ "DscPath": "" # Test is currently disabled due to build error
+ },
+
+ ## options defined .pytool/Plugin/HostUnitTestCompilerPlugin
+ "HostUnitTestCompilerPlugin": {
+ "DscPath": "" # Don't support this test
+ },
+
+ ## options defined .pytool/Plugin/CharEncodingCheck
+ "CharEncodingCheck": {
+ "IgnoreFiles": []
+ },
+
+ ## options defined .pytool/Plugin/DependencyCheck
+ "DependencyCheck": {
+ "AcceptableDependencies": [
+ "IntelFsp2Pkg/IntelFsp2Pkg.dec",
+ "MdeModulePkg/MdeModulePkg.dec",
+ "MdePkg/MdePkg.dec",
+ "UefiCpuPkg/UefiCpuPkg.dec"
+ ],
+ # For host based unit tests
+ "AcceptableDependencies-HOST_APPLICATION":[
+ "UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec"
+ ],
+ # For UEFI shell based apps
+ "AcceptableDependencies-UEFI_APPLICATION":[],
+ "IgnoreInf": []
+ },
+
+ ## options defined .pytool/Plugin/DscCompleteCheck
+ "DscCompleteCheck": {
+ "IgnoreInf": [""],
+ "DscPath": "IntelFsp2Pkg.dsc"
+ },
+
+ ## options defined .pytool/Plugin/HostUnitTestDscCompleteCheck
+ "HostUnitTestDscCompleteCheck": {
+ "IgnoreInf": [""],
+ "DscPath": "" # Don't support this test
+ },
+
+ ## options defined .pytool/Plugin/GuidCheck
+ "GuidCheck": {
+ "IgnoreGuidName": [],
+ "IgnoreGuidValue": [],
+ "IgnoreFoldersAndFiles": [],
+ "IgnoreDuplicates": [],
+ },
+
+ ## options defined .pytool/Plugin/LibraryClassCheck
+ "LibraryClassCheck": {
+ "IgnoreHeaderFile": []
+ },
+
+ ## options defined .pytool/Plugin/SpellCheck
+ "SpellCheck": {
+ "AuditOnly": True, # Fails right now with over 270 errors
+ "IgnoreFiles": [], # use gitignore syntax to ignore errors in matching files
+ "ExtendWords": [], # words to extend to the dictionary for this package
+ "IgnoreStandardPaths": [], # Standard Plugin defined paths that should be ignore
+ "AdditionalIncludePaths": [] # Additional paths to spell check (wildcards supported)
+ }
+}
--
2.28.0.windows.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v1 4/7] IntelFsp2WrapperPkg: Fix code formatting errors
2022-09-07 3:19 [PATCH v1 0/7] Enable CI in Intel FSP Packages Michael Kubacki
` (2 preceding siblings ...)
2022-09-07 3:19 ` [PATCH v1 3/7] IntelFsp2Pkg: Add CI YAML file Michael Kubacki
@ 2022-09-07 3:19 ` Michael Kubacki
2022-09-07 3:34 ` Chiu, Chasel
2022-09-07 3:19 ` [PATCH v1 5/7] IntelFsp2WrapperPkg.dec: Remove duplicate LibraryClasses entry Michael Kubacki
` (2 subsequent siblings)
6 siblings, 1 reply; 15+ messages in thread
From: Michael Kubacki @ 2022-09-07 3:19 UTC (permalink / raw)
To: devel; +Cc: Chasel Chiu, Nate DeSimone, Star Zeng
From: Michael Kubacki <michael.kubacki@microsoft.com>
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4048
This package did not have CI enabled so code changes were merged
that fail uncrustify formatting. This change updates those files
to include uncustify formatting.
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
---
IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/FspWrapperApiLib.c | 4 ++++
IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/IA32/DispatchExecute.c | 1 -
IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecRamInitData.c | 8 ++++----
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/FspWrapperApiLib.c b/IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/FspWrapperApiLib.c
index 5b5beb5c6557..2e82a0c1b59a 100644
--- a/IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/FspWrapperApiLib.c
+++ b/IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/FspWrapperApiLib.c
@@ -115,6 +115,7 @@ CallFspNotifyPhase (
} else {
Status = Execute64BitCode ((UINTN)NotifyPhaseApi, (UINTN)NotifyPhaseParams, (UINTN)NULL);
}
+
SetInterruptState (InterruptState);
return Status;
@@ -152,6 +153,7 @@ CallFspMemoryInit (
} else {
Status = Execute64BitCode ((UINTN)FspMemoryInitApi, (UINTN)FspmUpdDataPtr, (UINTN)HobListPtr);
}
+
SetInterruptState (InterruptState);
return Status;
@@ -187,6 +189,7 @@ CallTempRamExit (
} else {
Status = Execute64BitCode ((UINTN)TempRamExitApi, (UINTN)TempRamExitParam, (UINTN)NULL);
}
+
SetInterruptState (InterruptState);
return Status;
@@ -222,6 +225,7 @@ CallFspSiliconInit (
} else {
Status = Execute64BitCode ((UINTN)FspSiliconInitApi, (UINTN)FspsUpdDataPtr, (UINTN)NULL);
}
+
SetInterruptState (InterruptState);
return Status;
diff --git a/IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/IA32/DispatchExecute.c b/IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/IA32/DispatchExecute.c
index a17ca7dcabe8..c8248eb88851 100644
--- a/IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/IA32/DispatchExecute.c
+++ b/IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/IA32/DispatchExecute.c
@@ -69,4 +69,3 @@ Execute64BitCode (
{
return EFI_UNSUPPORTED;
}
-
diff --git a/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecRamInitData.c b/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecRamInitData.c
index d2acb2fd46cd..fb0d9a8683a9 100644
--- a/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecRamInitData.c
+++ b/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecRamInitData.c
@@ -10,10 +10,10 @@
#include <FspEas.h>
typedef struct {
- EFI_PHYSICAL_ADDRESS MicrocodeRegionBase;
- UINT64 MicrocodeRegionSize;
- EFI_PHYSICAL_ADDRESS CodeRegionBase;
- UINT64 CodeRegionSize;
+ EFI_PHYSICAL_ADDRESS MicrocodeRegionBase;
+ UINT64 MicrocodeRegionSize;
+ EFI_PHYSICAL_ADDRESS CodeRegionBase;
+ UINT64 CodeRegionSize;
} FSPT_CORE_UPD;
typedef struct {
--
2.28.0.windows.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH v1 4/7] IntelFsp2WrapperPkg: Fix code formatting errors
2022-09-07 3:19 ` [PATCH v1 4/7] IntelFsp2WrapperPkg: Fix code formatting errors Michael Kubacki
@ 2022-09-07 3:34 ` Chiu, Chasel
0 siblings, 0 replies; 15+ messages in thread
From: Chiu, Chasel @ 2022-09-07 3:34 UTC (permalink / raw)
To: mikuback@linux.microsoft.com, devel@edk2.groups.io
Cc: Desimone, Nathaniel L, Zeng, Star
Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>
Thanks,
Chasel
> -----Original Message-----
> From: mikuback@linux.microsoft.com <mikuback@linux.microsoft.com>
> Sent: Tuesday, September 6, 2022 8:19 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 v1 4/7] IntelFsp2WrapperPkg: Fix code formatting errors
>
> From: Michael Kubacki <michael.kubacki@microsoft.com>
>
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4048
>
> This package did not have CI enabled so code changes were merged that fail
> uncrustify formatting. This change updates those files to include uncustify
> formatting.
>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> Cc: Star Zeng <star.zeng@intel.com>
> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
> ---
> IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/FspWrapperApiLib.c
> | 4 ++++
> IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/IA32/DispatchExecute.c
> | 1 -
>
> IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecRamInit
> Data.c | 8 ++++----
> 3 files changed, 8 insertions(+), 5 deletions(-)
>
> diff --git
> a/IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/FspWrapperApiLib.c
> b/IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/FspWrapperApiLib.c
> index 5b5beb5c6557..2e82a0c1b59a 100644
> --- a/IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/FspWrapperApiLib.c
> +++ b/IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/FspWrapperApiLib.
> +++ c
> @@ -115,6 +115,7 @@ CallFspNotifyPhase (
> } else {
> Status = Execute64BitCode ((UINTN)NotifyPhaseApi,
> (UINTN)NotifyPhaseParams, (UINTN)NULL);
> }
> +
> SetInterruptState (InterruptState);
>
> return Status;
> @@ -152,6 +153,7 @@ CallFspMemoryInit (
> } else {
> Status = Execute64BitCode ((UINTN)FspMemoryInitApi,
> (UINTN)FspmUpdDataPtr, (UINTN)HobListPtr);
> }
> +
> SetInterruptState (InterruptState);
>
> return Status;
> @@ -187,6 +189,7 @@ CallTempRamExit (
> } else {
> Status = Execute64BitCode ((UINTN)TempRamExitApi,
> (UINTN)TempRamExitParam, (UINTN)NULL);
> }
> +
> SetInterruptState (InterruptState);
>
> return Status;
> @@ -222,6 +225,7 @@ CallFspSiliconInit (
> } else {
> Status = Execute64BitCode ((UINTN)FspSiliconInitApi,
> (UINTN)FspsUpdDataPtr, (UINTN)NULL);
> }
> +
> SetInterruptState (InterruptState);
>
> return Status;
> diff --git
> a/IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/IA32/DispatchExecute.c
> b/IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/IA32/DispatchExecute.c
> index a17ca7dcabe8..c8248eb88851 100644
> ---
> a/IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/IA32/DispatchExecute.c
> +++ b/IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/IA32/DispatchExec
> +++ ute.c
> @@ -69,4 +69,3 @@ Execute64BitCode (
> {
> return EFI_UNSUPPORTED;
> }
> -
> diff --git
> a/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecRamI
> nitData.c
> b/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecRamI
> nitData.c
> index d2acb2fd46cd..fb0d9a8683a9 100644
> ---
> a/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecRamI
> nitData.c
> +++ b/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecR
> +++ amInitData.c
> @@ -10,10 +10,10 @@
> #include <FspEas.h>
>
> typedef struct {
> - EFI_PHYSICAL_ADDRESS MicrocodeRegionBase;
> - UINT64 MicrocodeRegionSize;
> - EFI_PHYSICAL_ADDRESS CodeRegionBase;
> - UINT64 CodeRegionSize;
> + EFI_PHYSICAL_ADDRESS MicrocodeRegionBase;
> + UINT64 MicrocodeRegionSize;
> + EFI_PHYSICAL_ADDRESS CodeRegionBase;
> + UINT64 CodeRegionSize;
> } FSPT_CORE_UPD;
>
> typedef struct {
> --
> 2.28.0.windows.1
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v1 5/7] IntelFsp2WrapperPkg.dec: Remove duplicate LibraryClasses entry
2022-09-07 3:19 [PATCH v1 0/7] Enable CI in Intel FSP Packages Michael Kubacki
` (3 preceding siblings ...)
2022-09-07 3:19 ` [PATCH v1 4/7] IntelFsp2WrapperPkg: Fix code formatting errors Michael Kubacki
@ 2022-09-07 3:19 ` Michael Kubacki
2022-09-07 3:49 ` [edk2-devel] " Chiu, Chasel
2022-09-07 3:19 ` [PATCH v1 6/7] IntelFsp2WrapperPkg: Add CI YAML file Michael Kubacki
2022-09-07 3:19 ` [PATCH v1 7/7] .azurepipelines: Add IntelFsp2Pkg and IntelFsp2WrapperPkg to CI Michael Kubacki
6 siblings, 1 reply; 15+ messages in thread
From: Michael Kubacki @ 2022-09-07 3:19 UTC (permalink / raw)
To: devel; +Cc: Chasel Chiu, Nate DeSimone, Star Zeng
From: Michael Kubacki <michael.kubacki@microsoft.com>
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4048
The last [LibraryClasses] entry for FspWrapperPlatformMultiPhaseLib
points to the same entry as FspWrapperMultiPhaseProcessLib.
FspWrapperPlatformMultiPhaseHandler() is the only function
implemented in FspWrapperPlatformMultiPhaseLibNull.c and it is only
called (not implemented) in PeiFspWrapperMultiPhaseProcessLib.c,
so I'd assume:
- Producing library: FspWrapperPlatformMultiPhaseLib
- Consuming library: FspWrapperMultiPhaseProcessLib
But, the API descriptions do not provide any descriptive information:
FspWrapperPlatformMultiPhaseHandler():
```
/**
FSP Wrapper Platform MultiPhase Handler
@param[in] FspHobListPtr - Pointer to FSP HobList (valid
after FSP-M completed)
@param[in] ComponentIndex - FSP Component which executing
MultiPhase initialization.
@param[in] PhaseIndex - Indicates current execution phase
of FSP MultiPhase initialization.
@retval EFI_STATUS Always return EFI_SUCCESS
**/
```
In any case, this removes the redundant header file entry so the
Library Class Check CI test can pass on the package.
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
---
IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec | 4 ----
1 file changed, 4 deletions(-)
diff --git a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec
index 95ada0f7a151..c3bbc5c45517 100644
--- a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec
+++ b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec
@@ -32,10 +32,6 @@ [LibraryClasses]
## @libraryclass Provide MultiPhase handling related functions.
FspWrapperMultiPhaseProcessLib|Include/Library/FspWrapperMultiPhaseProcessLib.h
- ## @libraryclass Provide MultiPhase platform actions related functions.
- FspWrapperPlatformMultiPhaseLib|Include/Library/FspWrapperMultiPhaseProcessLib.h
-
-
[Guids]
#
# GUID defined in package
--
2.28.0.windows.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [edk2-devel] [PATCH v1 5/7] IntelFsp2WrapperPkg.dec: Remove duplicate LibraryClasses entry
2022-09-07 3:19 ` [PATCH v1 5/7] IntelFsp2WrapperPkg.dec: Remove duplicate LibraryClasses entry Michael Kubacki
@ 2022-09-07 3:49 ` Chiu, Chasel
2022-09-07 4:34 ` Michael Kubacki
0 siblings, 1 reply; 15+ messages in thread
From: Chiu, Chasel @ 2022-09-07 3:49 UTC (permalink / raw)
To: devel@edk2.groups.io, mikuback@linux.microsoft.com
Cc: Desimone, Nathaniel L, Zeng, Star
Hi Michael,
In this case we intended to provide a single-small function in separate library for platform customization so platforms do not have to override the whole main library instance, and I think it is not valuable to create another H file to hold this single small library function. Is it possible to support such scenario in CI?
Thanks,
Chasel
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Michael
> Kubacki
> Sent: Tuesday, September 6, 2022 8:19 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: [edk2-devel] [PATCH v1 5/7] IntelFsp2WrapperPkg.dec: Remove
> duplicate LibraryClasses entry
>
> From: Michael Kubacki <michael.kubacki@microsoft.com>
>
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4048
>
> The last [LibraryClasses] entry for FspWrapperPlatformMultiPhaseLib points to
> the same entry as FspWrapperMultiPhaseProcessLib.
>
> FspWrapperPlatformMultiPhaseHandler() is the only function implemented in
> FspWrapperPlatformMultiPhaseLibNull.c and it is only called (not implemented)
> in PeiFspWrapperMultiPhaseProcessLib.c,
> so I'd assume:
>
> - Producing library: FspWrapperPlatformMultiPhaseLib
> - Consuming library: FspWrapperMultiPhaseProcessLib
>
> But, the API descriptions do not provide any descriptive information:
>
> FspWrapperPlatformMultiPhaseHandler():
>
> ```
> /**
> FSP Wrapper Platform MultiPhase Handler
>
> @param[in] FspHobListPtr - Pointer to FSP HobList (valid
> after FSP-M completed)
> @param[in] ComponentIndex - FSP Component which executing
> MultiPhase initialization.
> @param[in] PhaseIndex - Indicates current execution phase
> of FSP MultiPhase initialization.
>
> @retval EFI_STATUS Always return EFI_SUCCESS
>
> **/
> ```
>
> In any case, this removes the redundant header file entry so the Library Class
> Check CI test can pass on the package.
>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> Cc: Star Zeng <star.zeng@intel.com>
> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
> ---
> IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec
> b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec
> index 95ada0f7a151..c3bbc5c45517 100644
> --- a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec
> +++ b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec
> @@ -32,10 +32,6 @@ [LibraryClasses]
> ## @libraryclass Provide MultiPhase handling related functions.
>
> FspWrapperMultiPhaseProcessLib|Include/Library/FspWrapperMultiPhaseProce
> ssLib.h
>
> - ## @libraryclass Provide MultiPhase platform actions related functions.
> -
> FspWrapperPlatformMultiPhaseLib|Include/Library/FspWrapperMultiPhaseProc
> essLib.h
> -
> -
> [Guids]
> #
> # GUID defined in package
> --
> 2.28.0.windows.1
>
>
>
> -=-=-=-=-=-=
> Groups.io Links: You receive all messages sent to this group.
> View/Reply Online (#93319): https://edk2.groups.io/g/devel/message/93319
> Mute This Topic: https://groups.io/mt/93518040/1777047
> Group Owner: devel+owner@edk2.groups.io
> Unsubscribe: https://edk2.groups.io/g/devel/unsub [chasel.chiu@intel.com]
> -=-=-=-=-=-=
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [edk2-devel] [PATCH v1 5/7] IntelFsp2WrapperPkg.dec: Remove duplicate LibraryClasses entry
2022-09-07 3:49 ` [edk2-devel] " Chiu, Chasel
@ 2022-09-07 4:34 ` Michael Kubacki
2022-09-07 4:47 ` Chiu, Chasel
0 siblings, 1 reply; 15+ messages in thread
From: Michael Kubacki @ 2022-09-07 4:34 UTC (permalink / raw)
To: Chiu, Chasel, devel@edk2.groups.io; +Cc: Desimone, Nathaniel L, Zeng, Star
If that's your intention, yes the CI can allow that. I've pushed a v2
candidate branch of this series here with your review tags provided so far.
https://github.com/makubacki/edk2/tree/add_missing_ci_yaml_intel_fsp_pkgs_v2
This patch (v1 5/7) is removed from that branch and the change to
explicitly allow this is in the following commit on that branch:
https://github.com/makubacki/edk2/commit/b11dd1a4f59a62b90ed401b6b7cad889dd1e013f#diff-ba7b110a0ec2f7f8fabc973b327ddb98a7d65b6a00b544a609a56593e6b87be3R80-R86
If that looks good, let me know and I can send the v2 series on the list
after leaving v1 open for a bit longer to collect other feedback and
reviews.
Thanks,
Michael
On 9/6/2022 11:49 PM, Chiu, Chasel wrote:
>
> Hi Michael,
>
> In this case we intended to provide a single-small function in separate library for platform customization so platforms do not have to override the whole main library instance, and I think it is not valuable to create another H file to hold this single small library function. Is it possible to support such scenario in CI?
>
> Thanks,
> Chasel
>
>
>> -----Original Message-----
>> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Michael
>> Kubacki
>> Sent: Tuesday, September 6, 2022 8:19 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: [edk2-devel] [PATCH v1 5/7] IntelFsp2WrapperPkg.dec: Remove
>> duplicate LibraryClasses entry
>>
>> From: Michael Kubacki <michael.kubacki@microsoft.com>
>>
>> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4048
>>
>> The last [LibraryClasses] entry for FspWrapperPlatformMultiPhaseLib points to
>> the same entry as FspWrapperMultiPhaseProcessLib.
>>
>> FspWrapperPlatformMultiPhaseHandler() is the only function implemented in
>> FspWrapperPlatformMultiPhaseLibNull.c and it is only called (not implemented)
>> in PeiFspWrapperMultiPhaseProcessLib.c,
>> so I'd assume:
>>
>> - Producing library: FspWrapperPlatformMultiPhaseLib
>> - Consuming library: FspWrapperMultiPhaseProcessLib
>>
>> But, the API descriptions do not provide any descriptive information:
>>
>> FspWrapperPlatformMultiPhaseHandler():
>>
>> ```
>> /**
>> FSP Wrapper Platform MultiPhase Handler
>>
>> @param[in] FspHobListPtr - Pointer to FSP HobList (valid
>> after FSP-M completed)
>> @param[in] ComponentIndex - FSP Component which executing
>> MultiPhase initialization.
>> @param[in] PhaseIndex - Indicates current execution phase
>> of FSP MultiPhase initialization.
>>
>> @retval EFI_STATUS Always return EFI_SUCCESS
>>
>> **/
>> ```
>>
>> In any case, this removes the redundant header file entry so the Library Class
>> Check CI test can pass on the package.
>>
>> Cc: Chasel Chiu <chasel.chiu@intel.com>
>> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
>> Cc: Star Zeng <star.zeng@intel.com>
>> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
>> ---
>> IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec | 4 ----
>> 1 file changed, 4 deletions(-)
>>
>> diff --git a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec
>> b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec
>> index 95ada0f7a151..c3bbc5c45517 100644
>> --- a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec
>> +++ b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec
>> @@ -32,10 +32,6 @@ [LibraryClasses]
>> ## @libraryclass Provide MultiPhase handling related functions.
>>
>> FspWrapperMultiPhaseProcessLib|Include/Library/FspWrapperMultiPhaseProce
>> ssLib.h
>>
>> - ## @libraryclass Provide MultiPhase platform actions related functions.
>> -
>> FspWrapperPlatformMultiPhaseLib|Include/Library/FspWrapperMultiPhaseProc
>> essLib.h
>> -
>> -
>> [Guids]
>> #
>> # GUID defined in package
>> --
>> 2.28.0.windows.1
>>
>>
>>
>> -=-=-=-=-=-=
>> Groups.io Links: You receive all messages sent to this group.
>> View/Reply Online (#93319): https://edk2.groups.io/g/devel/message/93319
>> Mute This Topic: https://groups.io/mt/93518040/1777047
>> Group Owner: devel+owner@edk2.groups.io
>> Unsubscribe: https://edk2.groups.io/g/devel/unsub [chasel.chiu@intel.com]
>> -=-=-=-=-=-=
>>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [edk2-devel] [PATCH v1 5/7] IntelFsp2WrapperPkg.dec: Remove duplicate LibraryClasses entry
2022-09-07 4:34 ` Michael Kubacki
@ 2022-09-07 4:47 ` Chiu, Chasel
0 siblings, 0 replies; 15+ messages in thread
From: Chiu, Chasel @ 2022-09-07 4:47 UTC (permalink / raw)
To: Michael Kubacki, devel@edk2.groups.io; +Cc: Desimone, Nathaniel L, Zeng, Star
Looks good to me! Thanks Michael!
> -----Original Message-----
> From: Michael Kubacki <mikuback@linux.microsoft.com>
> Sent: Tuesday, September 6, 2022 9:35 PM
> To: Chiu, Chasel <chasel.chiu@intel.com>; devel@edk2.groups.io
> Cc: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Zeng, Star
> <star.zeng@intel.com>
> Subject: Re: [edk2-devel] [PATCH v1 5/7] IntelFsp2WrapperPkg.dec: Remove
> duplicate LibraryClasses entry
>
> If that's your intention, yes the CI can allow that. I've pushed a v2 candidate
> branch of this series here with your review tags provided so far.
>
> https://github.com/makubacki/edk2/tree/add_missing_ci_yaml_intel_fsp_pkgs_
> v2
>
> This patch (v1 5/7) is removed from that branch and the change to explicitly
> allow this is in the following commit on that branch:
>
> https://github.com/makubacki/edk2/commit/b11dd1a4f59a62b90ed401b6b7ca
> d889dd1e013f#diff-
> ba7b110a0ec2f7f8fabc973b327ddb98a7d65b6a00b544a609a56593e6b87be3R8
> 0-R86
>
> If that looks good, let me know and I can send the v2 series on the list after
> leaving v1 open for a bit longer to collect other feedback and reviews.
>
> Thanks,
> Michael
>
> On 9/6/2022 11:49 PM, Chiu, Chasel wrote:
> >
> > Hi Michael,
> >
> > In this case we intended to provide a single-small function in separate library
> for platform customization so platforms do not have to override the whole main
> library instance, and I think it is not valuable to create another H file to hold this
> single small library function. Is it possible to support such scenario in CI?
> >
> > Thanks,
> > Chasel
> >
> >
> >> -----Original Message-----
> >> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of
> >> Michael Kubacki
> >> Sent: Tuesday, September 6, 2022 8:19 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: [edk2-devel] [PATCH v1 5/7] IntelFsp2WrapperPkg.dec: Remove
> >> duplicate LibraryClasses entry
> >>
> >> From: Michael Kubacki <michael.kubacki@microsoft.com>
> >>
> >> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4048
> >>
> >> The last [LibraryClasses] entry for FspWrapperPlatformMultiPhaseLib
> >> points to the same entry as FspWrapperMultiPhaseProcessLib.
> >>
> >> FspWrapperPlatformMultiPhaseHandler() is the only function
> >> implemented in FspWrapperPlatformMultiPhaseLibNull.c and it is only
> >> called (not implemented) in PeiFspWrapperMultiPhaseProcessLib.c,
> >> so I'd assume:
> >>
> >> - Producing library: FspWrapperPlatformMultiPhaseLib
> >> - Consuming library: FspWrapperMultiPhaseProcessLib
> >>
> >> But, the API descriptions do not provide any descriptive information:
> >>
> >> FspWrapperPlatformMultiPhaseHandler():
> >>
> >> ```
> >> /**
> >> FSP Wrapper Platform MultiPhase Handler
> >>
> >> @param[in] FspHobListPtr - Pointer to FSP HobList (valid
> >> after FSP-M completed)
> >> @param[in] ComponentIndex - FSP Component which executing
> >> MultiPhase initialization.
> >> @param[in] PhaseIndex - Indicates current execution phase
> >> of FSP MultiPhase initialization.
> >>
> >> @retval EFI_STATUS Always return EFI_SUCCESS
> >>
> >> **/
> >> ```
> >>
> >> In any case, this removes the redundant header file entry so the
> >> Library Class Check CI test can pass on the package.
> >>
> >> Cc: Chasel Chiu <chasel.chiu@intel.com>
> >> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> >> Cc: Star Zeng <star.zeng@intel.com>
> >> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
> >> ---
> >> IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec | 4 ----
> >> 1 file changed, 4 deletions(-)
> >>
> >> diff --git a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec
> >> b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec
> >> index 95ada0f7a151..c3bbc5c45517 100644
> >> --- a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec
> >> +++ b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec
> >> @@ -32,10 +32,6 @@ [LibraryClasses]
> >> ## @libraryclass Provide MultiPhase handling related functions.
> >>
> >> FspWrapperMultiPhaseProcessLib|Include/Library/FspWrapperMultiPhasePr
> >> FspWrapperMultiPhaseProcessLib|oce
> >> ssLib.h
> >>
> >> - ## @libraryclass Provide MultiPhase platform actions related functions.
> >> -
> >> FspWrapperPlatformMultiPhaseLib|Include/Library/FspWrapperMultiPhaseP
> >> FspWrapperPlatformMultiPhaseLib|roc
> >> essLib.h
> >> -
> >> -
> >> [Guids]
> >> #
> >> # GUID defined in package
> >> --
> >> 2.28.0.windows.1
> >>
> >>
> >>
> >> -=-=-=-=-=-=
> >> Groups.io Links: You receive all messages sent to this group.
> >> View/Reply Online (#93319):
> >> https://edk2.groups.io/g/devel/message/93319
> >> Mute This Topic: https://groups.io/mt/93518040/1777047
> >> Group Owner: devel+owner@edk2.groups.io
> >> Unsubscribe: https://edk2.groups.io/g/devel/unsub
> >> [chasel.chiu@intel.com] -=-=-=-=-=-=
> >>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v1 6/7] IntelFsp2WrapperPkg: Add CI YAML file
2022-09-07 3:19 [PATCH v1 0/7] Enable CI in Intel FSP Packages Michael Kubacki
` (4 preceding siblings ...)
2022-09-07 3:19 ` [PATCH v1 5/7] IntelFsp2WrapperPkg.dec: Remove duplicate LibraryClasses entry Michael Kubacki
@ 2022-09-07 3:19 ` Michael Kubacki
2022-09-07 3:19 ` [PATCH v1 7/7] .azurepipelines: Add IntelFsp2Pkg and IntelFsp2WrapperPkg to CI Michael Kubacki
6 siblings, 0 replies; 15+ messages in thread
From: Michael Kubacki @ 2022-09-07 3:19 UTC (permalink / raw)
To: devel; +Cc: Chasel Chiu, Nate DeSimone, Star Zeng
From: Michael Kubacki <michael.kubacki@microsoft.com>
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4048
Adds IntelFsp2WrapperPkg to the list of supported build packages
for edk2 CI and defines an initial set of CI configuration options.
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
---
.pytool/CISettings.py | 1 +
IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.ci.yaml | 92 ++++++++++++++++++++
2 files changed, 93 insertions(+)
diff --git a/.pytool/CISettings.py b/.pytool/CISettings.py
index 0205c26a58f8..d9a260784e59 100644
--- a/.pytool/CISettings.py
+++ b/.pytool/CISettings.py
@@ -55,6 +55,7 @@ class Settings(CiBuildSettingsManager, UpdateSettingsManager, SetupSettingsManag
"DynamicTablesPkg",
"EmulatorPkg",
"IntelFsp2Pkg",
+ "IntelFsp2WrapperPkg",
"MdePkg",
"MdeModulePkg",
"NetworkPkg",
diff --git a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.ci.yaml b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.ci.yaml
new file mode 100644
index 000000000000..2ffd9e8e9fcb
--- /dev/null
+++ b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.ci.yaml
@@ -0,0 +1,92 @@
+## @file
+# Core CI configuration for IntelFsp2WrapperPkg
+#
+# Copyright (c) Microsoft Corporation
+#
+# SPDX-License-Identifier: BSD-2-Clause-Patent
+##
+{
+ ## options defined .pytool/Plugin/LicenseCheck
+ "LicenseCheck": {
+ "IgnoreFiles": []
+ },
+
+ "EccCheck": {
+ ## Exception sample looks like below:
+ ## "ExceptionList": [
+ ## "<ErrorID>", "<KeyWord>"
+ ## ]
+ "ExceptionList": [
+ ],
+ ## Both file path and directory path are accepted.
+ "IgnoreFiles": []
+ },
+
+ ## options defined .pytool/Plugin/CompilerPlugin
+ "CompilerPlugin": {
+ "DscPath": "IntelFsp2WrapperPkg.dsc"
+ },
+
+ ## options defined .pytool/Plugin/HostUnitTestCompilerPlugin
+ "HostUnitTestCompilerPlugin": {
+ "DscPath": "" # Don't support this test
+ },
+
+ ## options defined .pytool/Plugin/CharEncodingCheck
+ "CharEncodingCheck": {
+ "IgnoreFiles": []
+ },
+
+ ## options defined .pytool/Plugin/DependencyCheck
+ "DependencyCheck": {
+ "AcceptableDependencies": [
+ "IntelFsp2Pkg/IntelFsp2Pkg.dec",
+ "IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec",
+ "MdeModulePkg/MdeModulePkg.dec",
+ "MdePkg/MdePkg.dec",
+ "SecurityPkg/SecurityPkg.dec",
+ "UefiCpuPkg/UefiCpuPkg.dec"
+ ],
+ # For host based unit tests
+ "AcceptableDependencies-HOST_APPLICATION":[
+ "UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec"
+ ],
+ # For UEFI shell based apps
+ "AcceptableDependencies-UEFI_APPLICATION":[],
+ "IgnoreInf": []
+ },
+
+ ## options defined .pytool/Plugin/DscCompleteCheck
+ "DscCompleteCheck": {
+ "IgnoreInf": [""],
+ "DscPath": "IntelFsp2WrapperPkg.dsc"
+ },
+
+ ## options defined .pytool/Plugin/HostUnitTestDscCompleteCheck
+ "HostUnitTestDscCompleteCheck": {
+ "IgnoreInf": [""],
+ "DscPath": "" # Don't support this test
+ },
+
+ ## options defined .pytool/Plugin/GuidCheck
+ "GuidCheck": {
+ "IgnoreGuidName": [],
+ "IgnoreGuidValue": [],
+ "IgnoreFoldersAndFiles": [],
+ "IgnoreDuplicates": [],
+ },
+
+ ## options defined .pytool/Plugin/LibraryClassCheck
+ "LibraryClassCheck": {
+ "IgnoreHeaderFile": []
+ },
+
+ ## options defined .pytool/Plugin/SpellCheck
+ "SpellCheck": {
+ "AuditOnly": True, # Fails right now with over 270 errors
+ "IgnoreFiles": [], # use gitignore syntax to ignore errors in matching files
+ "ExtendWords": [], # words to extend to the dictionary for this package
+ "IgnoreStandardPaths": [], # Standard Plugin defined paths that should be ignore
+ "AdditionalIncludePaths": [] # Additional paths to spell check (wildcards supported)
+ }
+}
--
2.28.0.windows.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v1 7/7] .azurepipelines: Add IntelFsp2Pkg and IntelFsp2WrapperPkg to CI
2022-09-07 3:19 [PATCH v1 0/7] Enable CI in Intel FSP Packages Michael Kubacki
` (5 preceding siblings ...)
2022-09-07 3:19 ` [PATCH v1 6/7] IntelFsp2WrapperPkg: Add CI YAML file Michael Kubacki
@ 2022-09-07 3:19 ` Michael Kubacki
2022-09-09 1:35 ` [edk2-devel] " Michael D Kinney
6 siblings, 1 reply; 15+ messages in thread
From: Michael Kubacki @ 2022-09-07 3:19 UTC (permalink / raw)
To: devel
Cc: Bret Barkelew, Chasel Chiu, Liming Gao, Michael D Kinney,
Nate DeSimone, Sean Brogan, Star Zeng
From: Michael Kubacki <michael.kubacki@microsoft.com>
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4048
Adds these packages to a new edk2 matrix job so they can be validated
in edk2 CI.
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Star Zeng <star.zeng@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
---
.azurepipelines/templates/pr-gate-build-job.yml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.azurepipelines/templates/pr-gate-build-job.yml b/.azurepipelines/templates/pr-gate-build-job.yml
index 0e4ad019bf03..759d7e9b4005 100644
--- a/.azurepipelines/templates/pr-gate-build-job.yml
+++ b/.azurepipelines/templates/pr-gate-build-job.yml
@@ -45,6 +45,9 @@ jobs:
TARGET_CRYPTO:
Build.Pkgs: 'CryptoPkg'
Build.Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
+ TARGET_FSP:
+ Build.Pkgs: 'IntelFsp2Pkg,IntelFsp2WrapperPkg'
+ Build.Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
TARGET_SECURITY:
Build.Pkgs: 'SecurityPkg'
Build.Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
--
2.28.0.windows.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [edk2-devel] [PATCH v1 7/7] .azurepipelines: Add IntelFsp2Pkg and IntelFsp2WrapperPkg to CI
2022-09-07 3:19 ` [PATCH v1 7/7] .azurepipelines: Add IntelFsp2Pkg and IntelFsp2WrapperPkg to CI Michael Kubacki
@ 2022-09-09 1:35 ` Michael D Kinney
0 siblings, 0 replies; 15+ messages in thread
From: Michael D Kinney @ 2022-09-09 1:35 UTC (permalink / raw)
To: devel@edk2.groups.io, mikuback@linux.microsoft.com,
Kinney, Michael D
Cc: Barkelew, Bret, Chiu, Chasel, Gao, Liming, Desimone, Nathaniel L,
Sean Brogan, Zeng, Star
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Michael Kubacki
> Sent: Tuesday, September 6, 2022 8:19 PM
> To: devel@edk2.groups.io
> Cc: Barkelew, Bret <bret.barkelew@microsoft.com>; Chiu, Chasel <chasel.chiu@intel.com>; Gao, Liming
> <gaoliming@byosoft.com.cn>; Kinney, Michael D <michael.d.kinney@intel.com>; Desimone, Nathaniel L
> <nathaniel.l.desimone@intel.com>; Sean Brogan <sean.brogan@microsoft.com>; Zeng, Star <star.zeng@intel.com>
> Subject: [edk2-devel] [PATCH v1 7/7] .azurepipelines: Add IntelFsp2Pkg and IntelFsp2WrapperPkg to CI
>
> From: Michael Kubacki <michael.kubacki@microsoft.com>
>
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4048
>
> Adds these packages to a new edk2 matrix job so they can be validated
> in edk2 CI.
>
> Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> Cc: Sean Brogan <sean.brogan@microsoft.com>
> Cc: Star Zeng <star.zeng@intel.com>
> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
> ---
> .azurepipelines/templates/pr-gate-build-job.yml | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/.azurepipelines/templates/pr-gate-build-job.yml b/.azurepipelines/templates/pr-gate-build-job.yml
> index 0e4ad019bf03..759d7e9b4005 100644
> --- a/.azurepipelines/templates/pr-gate-build-job.yml
> +++ b/.azurepipelines/templates/pr-gate-build-job.yml
> @@ -45,6 +45,9 @@ jobs:
> TARGET_CRYPTO:
> Build.Pkgs: 'CryptoPkg'
> Build.Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
> + TARGET_FSP:
> + Build.Pkgs: 'IntelFsp2Pkg,IntelFsp2WrapperPkg'
> + Build.Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
> TARGET_SECURITY:
> Build.Pkgs: 'SecurityPkg'
> Build.Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
> --
> 2.28.0.windows.1
>
>
>
> -=-=-=-=-=-=
> Groups.io Links: You receive all messages sent to this group.
> View/Reply Online (#93321): https://edk2.groups.io/g/devel/message/93321
> Mute This Topic: https://groups.io/mt/93518045/1643496
> Group Owner: devel+owner@edk2.groups.io
> Unsubscribe: https://edk2.groups.io/g/devel/unsub [michael.d.kinney@intel.com]
> -=-=-=-=-=-=
>
^ permalink raw reply [flat|nested] 15+ messages in thread