[PATCH v2] UefiCpuPkg: SecCoreNative without ResetVector

[PATCH v2] UefiCpuPkg: SecCoreNative without ResetVector

[Ashraf Ali S]

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3492

Currently SecCore.inf having the resetvector code under IA32. if the
user wants to use both SecCore and UefiCpuPkg ResetVector it's not
possible, since SecCore and ResetVector(VTF0.INF/ResetVector.inf)
are sharing the same GUID which is BFV. to overcome this issue we can
create the Duplicate version of the SecCore.inf as SecCoreNative.inf
which contains pure SecCore Native functionality without resetvector.
SecCoreNative.inf should have the Unique GUID so that it can be used
along with UefiCpuPkg ResetVector in there implementation.

Cc: Ray Ni <ray.ni@intel.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
Cc: Debkumar De <debkumar.de@intel.com>
Cc: Harry Han <harry.han@intel.com>
Cc: Catharine West <catharine.west@intel.com>
Cc: Digant H Solanki <digant.h.solanki@intel.com>
Cc: Sangeetha V <sangeetha.v@intel.com>

Signed-off-by: Ashraf Ali S <ashraf.ali.s@intel.com>
---
 UefiCpuPkg/SecCore/SecCoreNative.inf | 80 ++++++++++++++++++++++++++++
 UefiCpuPkg/UefiCpuPkg.dsc            |  1 +
 2 files changed, 81 insertions(+)
 create mode 100644 UefiCpuPkg/SecCore/SecCoreNative.inf

diff --git a/UefiCpuPkg/SecCore/SecCoreNative.inf b/UefiCpuPkg/SecCore/SecCoreNative.inf
new file mode 100644
index 0000000000..b528c59879
--- /dev/null
+++ b/UefiCpuPkg/SecCore/SecCoreNative.inf
@@ -0,0 +1,80 @@
+## @file
+#  SecCoreNative module that implements the SEC phase.
+#
+# This is the first module taking control after the reset vector.
+# The entry point function is _ModuleEntryPoint in PlatformSecLib.
+# The entry point function starts in 32bit protected mode or 64bit
+# mode depending on how resetvector is implemented, enables
+# temporary memory and calls into SecStartup().
+#
+#  Copyright (c) 2021, Intel Corporation. All rights reserved.<BR>
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
+#
+##
+
+[Defines]
+  INF_VERSION                    = 0x00010005
+  BASE_NAME                      = SecCoreNative
+  MODULE_UNI_FILE                = SecCore.uni
+  FILE_GUID                      = 43CA74CA-7D29-49A0-B3B9-20F84015B27D
+  MODULE_TYPE                    = SEC
+  VERSION_STRING                 = 1.0
+
+
+#
+# The following information is for reference only and not required by the build tools.
+#
+#  VALID_ARCHITECTURES           = IA32 X64 EBC
+#
+
+[Sources]
+  SecMain.c
+  SecMain.h
+  FindPeiCore.c
+  SecBist.c
+
+[Packages]
+  MdePkg/MdePkg.dec
+  MdeModulePkg/MdeModulePkg.dec
+  UefiCpuPkg/UefiCpuPkg.dec
+
+[LibraryClasses]
+  BaseMemoryLib
+  DebugLib
+  PlatformSecLib
+  PcdLib
+  DebugAgentLib
+  UefiCpuLib
+  PeCoffGetEntryPointLib
+  PeCoffExtraActionLib
+  CpuExceptionHandlerLib
+  ReportStatusCodeLib
+  PeiServicesLib
+  PeiServicesTablePointerLib
+  HobLib
+
+[Ppis]
+  ## SOMETIMES_CONSUMES
+  ## PRODUCES
+  gEfiSecPlatformInformationPpiGuid
+  ## SOMETIMES_CONSUMES
+  ## SOMETIMES_PRODUCES
+  gEfiSecPlatformInformation2PpiGuid
+  gEfiTemporaryRamDonePpiGuid                          ## PRODUCES
+  ## NOTIFY
+  ## SOMETIMES_CONSUMES
+  gPeiSecPerformancePpiGuid
+  gEfiPeiCoreFvLocationPpiGuid
+  ## CONSUMES
+  gRepublishSecPpiPpiGuid
+
+[Guids]
+  ## SOMETIMES_PRODUCES   ## HOB
+  gEfiFirmwarePerformanceGuid
+
+[Pcd]
+  gUefiCpuPkgTokenSpaceGuid.PcdPeiTemporaryRamStackSize  ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdMigrateTemporaryRamFirmwareVolumes  ## CONSUMES
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  SecCoreExtra.uni
diff --git a/UefiCpuPkg/UefiCpuPkg.dsc b/UefiCpuPkg/UefiCpuPkg.dsc
index 699c91626b..870b452840 100644
--- a/UefiCpuPkg/UefiCpuPkg.dsc
+++ b/UefiCpuPkg/UefiCpuPkg.dsc
@@ -161,6 +161,7 @@
   UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.inf
   UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf
   UefiCpuPkg/SecCore/SecCore.inf
+  UefiCpuPkg/SecCore/SecCoreNative.inf
   UefiCpuPkg/SecMigrationPei/SecMigrationPei.inf
   UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf
   UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf {
-- 
2.30.2.windows.1

Re: [edk2-devel] [PATCH v2] UefiCpuPkg: SecCoreNative without ResetVector

[Marvin Häuser]

This will also help with PE file alignment in FD, as SecCore no longer 
needs to be pinned to the very top. Thank you!

Best regards,
Marvin

On 16/09/2021 16:26, Ashraf Ali S wrote:
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3492
>
> Currently SecCore.inf having the resetvector code under IA32. if the
> user wants to use both SecCore and UefiCpuPkg ResetVector it's not
> possible, since SecCore and ResetVector(VTF0.INF/ResetVector.inf)
> are sharing the same GUID which is BFV. to overcome this issue we can
> create the Duplicate version of the SecCore.inf as SecCoreNative.inf
> which contains pure SecCore Native functionality without resetvector.
> SecCoreNative.inf should have the Unique GUID so that it can be used
> along with UefiCpuPkg ResetVector in there implementation.
>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Rahul Kumar <rahul1.kumar@intel.com>
> Cc: Debkumar De <debkumar.de@intel.com>
> Cc: Harry Han <harry.han@intel.com>
> Cc: Catharine West <catharine.west@intel.com>
> Cc: Digant H Solanki <digant.h.solanki@intel.com>
> Cc: Sangeetha V <sangeetha.v@intel.com>
>
> Signed-off-by: Ashraf Ali S <ashraf.ali.s@intel.com>
> ---
>   UefiCpuPkg/SecCore/SecCoreNative.inf | 80 ++++++++++++++++++++++++++++
>   UefiCpuPkg/UefiCpuPkg.dsc            |  1 +
>   2 files changed, 81 insertions(+)
>   create mode 100644 UefiCpuPkg/SecCore/SecCoreNative.inf
>
> diff --git a/UefiCpuPkg/SecCore/SecCoreNative.inf b/UefiCpuPkg/SecCore/SecCoreNative.inf
> new file mode 100644
> index 0000000000..b528c59879
> --- /dev/null
> +++ b/UefiCpuPkg/SecCore/SecCoreNative.inf
> @@ -0,0 +1,80 @@
> +## @file
> +#  SecCoreNative module that implements the SEC phase.
> +#
> +# This is the first module taking control after the reset vector.
> +# The entry point function is _ModuleEntryPoint in PlatformSecLib.
> +# The entry point function starts in 32bit protected mode or 64bit
> +# mode depending on how resetvector is implemented, enables
> +# temporary memory and calls into SecStartup().
> +#
> +#  Copyright (c) 2021, Intel Corporation. All rights reserved.<BR>
> +#  SPDX-License-Identifier: BSD-2-Clause-Patent
> +#
> +##
> +
> +[Defines]
> +  INF_VERSION                    = 0x00010005
> +  BASE_NAME                      = SecCoreNative
> +  MODULE_UNI_FILE                = SecCore.uni
> +  FILE_GUID                      = 43CA74CA-7D29-49A0-B3B9-20F84015B27D
> +  MODULE_TYPE                    = SEC
> +  VERSION_STRING                 = 1.0
> +
> +
> +#
> +# The following information is for reference only and not required by the build tools.
> +#
> +#  VALID_ARCHITECTURES           = IA32 X64 EBC
> +#
> +
> +[Sources]
> +  SecMain.c
> +  SecMain.h
> +  FindPeiCore.c
> +  SecBist.c
> +
> +[Packages]
> +  MdePkg/MdePkg.dec
> +  MdeModulePkg/MdeModulePkg.dec
> +  UefiCpuPkg/UefiCpuPkg.dec
> +
> +[LibraryClasses]
> +  BaseMemoryLib
> +  DebugLib
> +  PlatformSecLib
> +  PcdLib
> +  DebugAgentLib
> +  UefiCpuLib
> +  PeCoffGetEntryPointLib
> +  PeCoffExtraActionLib
> +  CpuExceptionHandlerLib
> +  ReportStatusCodeLib
> +  PeiServicesLib
> +  PeiServicesTablePointerLib
> +  HobLib
> +
> +[Ppis]
> +  ## SOMETIMES_CONSUMES
> +  ## PRODUCES
> +  gEfiSecPlatformInformationPpiGuid
> +  ## SOMETIMES_CONSUMES
> +  ## SOMETIMES_PRODUCES
> +  gEfiSecPlatformInformation2PpiGuid
> +  gEfiTemporaryRamDonePpiGuid                          ## PRODUCES
> +  ## NOTIFY
> +  ## SOMETIMES_CONSUMES
> +  gPeiSecPerformancePpiGuid
> +  gEfiPeiCoreFvLocationPpiGuid
> +  ## CONSUMES
> +  gRepublishSecPpiPpiGuid
> +
> +[Guids]
> +  ## SOMETIMES_PRODUCES   ## HOB
> +  gEfiFirmwarePerformanceGuid
> +
> +[Pcd]
> +  gUefiCpuPkgTokenSpaceGuid.PcdPeiTemporaryRamStackSize  ## CONSUMES
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdMigrateTemporaryRamFirmwareVolumes  ## CONSUMES
> +
> +[UserExtensions.TianoCore."ExtraFiles"]
> +  SecCoreExtra.uni
> diff --git a/UefiCpuPkg/UefiCpuPkg.dsc b/UefiCpuPkg/UefiCpuPkg.dsc
> index 699c91626b..870b452840 100644
> --- a/UefiCpuPkg/UefiCpuPkg.dsc
> +++ b/UefiCpuPkg/UefiCpuPkg.dsc
> @@ -161,6 +161,7 @@
>     UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.inf
>     UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf
>     UefiCpuPkg/SecCore/SecCore.inf
> +  UefiCpuPkg/SecCore/SecCoreNative.inf
>     UefiCpuPkg/SecMigrationPei/SecMigrationPei.inf
>     UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf
>     UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf {

Re: [PATCH v2] UefiCpuPkg: SecCoreNative without ResetVector

[Ni, Ray]

Reviewed-by: Ray Ni <ray.ni@intel.com>

> -----Original Message-----
> From: S, Ashraf Ali <ashraf.ali.s@intel.com>
> Sent: Thursday, September 16, 2021 10:27 PM
> To: devel@edk2.groups.io
> Cc: S, Ashraf Ali <ashraf.ali.s@intel.com>; Ni, Ray <ray.ni@intel.com>; Kumar, Rahul1 <rahul1.kumar@intel.com>; De,
> Debkumar <debkumar.de@intel.com>; Han, Harry <harry.han@intel.com>; West, Catharine <catharine.west@intel.com>;
> Solanki, Digant H <digant.h.solanki@intel.com>; V, Sangeetha <sangeetha.v@intel.com>
> Subject: [PATCH v2] UefiCpuPkg: SecCoreNative without ResetVector
> 
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3492
> 
> Currently SecCore.inf having the resetvector code under IA32. if the
> user wants to use both SecCore and UefiCpuPkg ResetVector it's not
> possible, since SecCore and ResetVector(VTF0.INF/ResetVector.inf)
> are sharing the same GUID which is BFV. to overcome this issue we can
> create the Duplicate version of the SecCore.inf as SecCoreNative.inf
> which contains pure SecCore Native functionality without resetvector.
> SecCoreNative.inf should have the Unique GUID so that it can be used
> along with UefiCpuPkg ResetVector in there implementation.
> 
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Rahul Kumar <rahul1.kumar@intel.com>
> Cc: Debkumar De <debkumar.de@intel.com>
> Cc: Harry Han <harry.han@intel.com>
> Cc: Catharine West <catharine.west@intel.com>
> Cc: Digant H Solanki <digant.h.solanki@intel.com>
> Cc: Sangeetha V <sangeetha.v@intel.com>
> 
> Signed-off-by: Ashraf Ali S <ashraf.ali.s@intel.com>
> ---
>  UefiCpuPkg/SecCore/SecCoreNative.inf | 80 ++++++++++++++++++++++++++++
>  UefiCpuPkg/UefiCpuPkg.dsc            |  1 +
>  2 files changed, 81 insertions(+)
>  create mode 100644 UefiCpuPkg/SecCore/SecCoreNative.inf
> 
> diff --git a/UefiCpuPkg/SecCore/SecCoreNative.inf b/UefiCpuPkg/SecCore/SecCoreNative.inf
> new file mode 100644
> index 0000000000..b528c59879
> --- /dev/null
> +++ b/UefiCpuPkg/SecCore/SecCoreNative.inf
> @@ -0,0 +1,80 @@
> +## @file
> +#  SecCoreNative module that implements the SEC phase.
> +#
> +# This is the first module taking control after the reset vector.
> +# The entry point function is _ModuleEntryPoint in PlatformSecLib.
> +# The entry point function starts in 32bit protected mode or 64bit
> +# mode depending on how resetvector is implemented, enables
> +# temporary memory and calls into SecStartup().
> +#
> +#  Copyright (c) 2021, Intel Corporation. All rights reserved.<BR>
> +#  SPDX-License-Identifier: BSD-2-Clause-Patent
> +#
> +##
> +
> +[Defines]
> +  INF_VERSION                    = 0x00010005
> +  BASE_NAME                      = SecCoreNative
> +  MODULE_UNI_FILE                = SecCore.uni
> +  FILE_GUID                      = 43CA74CA-7D29-49A0-B3B9-20F84015B27D
> +  MODULE_TYPE                    = SEC
> +  VERSION_STRING                 = 1.0
> +
> +
> +#
> +# The following information is for reference only and not required by the build tools.
> +#
> +#  VALID_ARCHITECTURES           = IA32 X64 EBC
> +#
> +
> +[Sources]
> +  SecMain.c
> +  SecMain.h
> +  FindPeiCore.c
> +  SecBist.c
> +
> +[Packages]
> +  MdePkg/MdePkg.dec
> +  MdeModulePkg/MdeModulePkg.dec
> +  UefiCpuPkg/UefiCpuPkg.dec
> +
> +[LibraryClasses]
> +  BaseMemoryLib
> +  DebugLib
> +  PlatformSecLib
> +  PcdLib
> +  DebugAgentLib
> +  UefiCpuLib
> +  PeCoffGetEntryPointLib
> +  PeCoffExtraActionLib
> +  CpuExceptionHandlerLib
> +  ReportStatusCodeLib
> +  PeiServicesLib
> +  PeiServicesTablePointerLib
> +  HobLib
> +
> +[Ppis]
> +  ## SOMETIMES_CONSUMES
> +  ## PRODUCES
> +  gEfiSecPlatformInformationPpiGuid
> +  ## SOMETIMES_CONSUMES
> +  ## SOMETIMES_PRODUCES
> +  gEfiSecPlatformInformation2PpiGuid
> +  gEfiTemporaryRamDonePpiGuid                          ## PRODUCES
> +  ## NOTIFY
> +  ## SOMETIMES_CONSUMES
> +  gPeiSecPerformancePpiGuid
> +  gEfiPeiCoreFvLocationPpiGuid
> +  ## CONSUMES
> +  gRepublishSecPpiPpiGuid
> +
> +[Guids]
> +  ## SOMETIMES_PRODUCES   ## HOB
> +  gEfiFirmwarePerformanceGuid
> +
> +[Pcd]
> +  gUefiCpuPkgTokenSpaceGuid.PcdPeiTemporaryRamStackSize  ## CONSUMES
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdMigrateTemporaryRamFirmwareVolumes  ## CONSUMES
> +
> +[UserExtensions.TianoCore."ExtraFiles"]
> +  SecCoreExtra.uni
> diff --git a/UefiCpuPkg/UefiCpuPkg.dsc b/UefiCpuPkg/UefiCpuPkg.dsc
> index 699c91626b..870b452840 100644
> --- a/UefiCpuPkg/UefiCpuPkg.dsc
> +++ b/UefiCpuPkg/UefiCpuPkg.dsc
> @@ -161,6 +161,7 @@
>    UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.inf
>    UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf
>    UefiCpuPkg/SecCore/SecCore.inf
> +  UefiCpuPkg/SecCore/SecCoreNative.inf
>    UefiCpuPkg/SecMigrationPei/SecMigrationPei.inf
>    UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf
>    UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf {
> --
> 2.30.2.windows.1