[edk2-platforms][PATCH v1 1/1] SpiFvbServiceStandaloneMm: Add changes for rewrite varstore header

[edk2-platforms][PATCH v1 1/1] SpiFvbServiceStandaloneMm: Add changes for rewrite varstore header

[Michael Kubacki]

From: Michael Kubacki <michael.kubacki@microsoft.com>

Updates the Standalone MM module to have the necessary INF changes
to build with the following two recent commits made to rewrite the
the variable store header in the MM SPI FVB service.

  - e95c798
  - 88d44c5

Cc: Ashraf Ali S <ashraf.ali.s@intel.com>
Cc: Isaac Oram <isaac.w.oram@intel.com>
Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
---
 Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceStandaloneMm.inf | 4 ++++
 Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dec                                       | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceStandaloneMm.inf b/Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceStandaloneMm.inf
index 152cf0036fdb..717b6fc00cc6 100644
--- a/Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceStandaloneMm.inf
+++ b/Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceStandaloneMm.inf
@@ -44,6 +44,8 @@ [Packages]
 [Pcd]
   gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvBase         ## CONSUMES
   gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize         ## CONSUMES
+  gIntelSiliconPkgTokenSpaceGuid.PcdFlashVariableStoreType       ## SOMETIMES_CONSUMES
+  gIntelSiliconPkgTokenSpaceGuid.PcdFlashNvStorageAdditionalSize ## CONSUMES
 
 [Sources]
   FvbInfo.c
@@ -60,6 +62,8 @@ [Protocols]
 [Guids]
   gEfiFirmwareFileSystem2Guid                   ## CONSUMES
   gEfiSystemNvDataFvGuid                        ## CONSUMES
+  gEfiVariableGuid                              ## SOMETIMES_CONSUMES
+  gEfiAuthenticatedVariableGuid                 ## SOMETIMES_CONSUMES
 
 [Depex]
   TRUE
diff --git a/Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dec b/Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dec
index d73a51ca5235..cad22acda496 100644
--- a/Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dec
+++ b/Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dec
@@ -188,7 +188,8 @@ [PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx]
 
   ## Define Flash Variable Store type.<BR><BR>
   #  When Flash Variable Store corruption happened, the SpiFvbService will recreate Variable Store
-  #  with valid header information provided by this PCD value.<BR>
+  #  with valid header information provided by this PCD value.
+  #  Note: This PCD must be FixedAtBuild when using Standalone MM.
   #  0: Variable Store is gEfiVariableGuid type.<BR>
   #  1: Variable Store is gEfiAuthenticatedVariableGuid type.<BR>
   #  Other value: reserved for future use.<BR>
@@ -199,6 +200,7 @@ [PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx]
   #  Platform may implement a Regular variable region and an additional region, which will require this PCD
   #  to tell SpiFvbService to include both regions.
   #  Note: This PCD is for compatible with legacy usages that should be deprecated.
+  #  Note: This PCD must be FixedAtBuild when using Standalone MM.
   #  The new usage model should define separate regions without implicit connections to UEFI Variable or FTW regions.<BR>
   #  Example legacy usage is to set this PCD equal to platform PcdFlashFvNvStorageEventLogSize.
   #  0: No additional NVS region.<BR>
-- 
2.28.0.windows.1

Re: [edk2-platforms][PATCH v1 1/1] SpiFvbServiceStandaloneMm: Add changes for rewrite varstore header

[Isaac Oram]

Reviewed-by: Isaac Oram <isaac.w.oram@intel.com>

-----Original Message-----
From: mikuback@linux.microsoft.com <mikuback@linux.microsoft.com> 
Sent: Thursday, February 9, 2023 4:52 PM
To: devel@edk2.groups.io
Cc: S, Ashraf Ali <ashraf.ali.s@intel.com>; Oram, Isaac W <isaac.w.oram@intel.com>; Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>; Ni, Ray <ray.ni@intel.com>; Chiu, Chasel <chasel.chiu@intel.com>
Subject: [edk2-platforms][PATCH v1 1/1] SpiFvbServiceStandaloneMm: Add changes for rewrite varstore header

From: Michael Kubacki <michael.kubacki@microsoft.com>

Updates the Standalone MM module to have the necessary INF changes to build with the following two recent commits made to rewrite the the variable store header in the MM SPI FVB service.

  - e95c798
  - 88d44c5

Cc: Ashraf Ali S <ashraf.ali.s@intel.com>
Cc: Isaac Oram <isaac.w.oram@intel.com>
Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
---
 Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceStandaloneMm.inf | 4 ++++
 Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dec                                       | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceStandaloneMm.inf b/Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceStandaloneMm.inf
index 152cf0036fdb..717b6fc00cc6 100644
--- a/Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceStandaloneMm.inf
+++ b/Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbSe
+++ rviceStandaloneMm.inf
@@ -44,6 +44,8 @@ [Packages]
 [Pcd]
   gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvBase         ## CONSUMES
   gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize         ## CONSUMES
+  gIntelSiliconPkgTokenSpaceGuid.PcdFlashVariableStoreType       ## SOMETIMES_CONSUMES
+  gIntelSiliconPkgTokenSpaceGuid.PcdFlashNvStorageAdditionalSize ## 
+ CONSUMES
 
 [Sources]
   FvbInfo.c
@@ -60,6 +62,8 @@ [Protocols]
 [Guids]
   gEfiFirmwareFileSystem2Guid                   ## CONSUMES
   gEfiSystemNvDataFvGuid                        ## CONSUMES
+  gEfiVariableGuid                              ## SOMETIMES_CONSUMES
+  gEfiAuthenticatedVariableGuid                 ## SOMETIMES_CONSUMES
 
 [Depex]
   TRUE
diff --git a/Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dec b/Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dec
index d73a51ca5235..cad22acda496 100644
--- a/Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dec
+++ b/Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dec
@@ -188,7 +188,8 @@ [PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx]
 
   ## Define Flash Variable Store type.<BR><BR>
   #  When Flash Variable Store corruption happened, the SpiFvbService will recreate Variable Store
-  #  with valid header information provided by this PCD value.<BR>
+  #  with valid header information provided by this PCD value.
+  #  Note: This PCD must be FixedAtBuild when using Standalone MM.
   #  0: Variable Store is gEfiVariableGuid type.<BR>
   #  1: Variable Store is gEfiAuthenticatedVariableGuid type.<BR>
   #  Other value: reserved for future use.<BR> @@ -199,6 +200,7 @@ [PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx]
   #  Platform may implement a Regular variable region and an additional region, which will require this PCD
   #  to tell SpiFvbService to include both regions.
   #  Note: This PCD is for compatible with legacy usages that should be deprecated.
+  #  Note: This PCD must be FixedAtBuild when using Standalone MM.
   #  The new usage model should define separate regions without implicit connections to UEFI Variable or FTW regions.<BR>
   #  Example legacy usage is to set this PCD equal to platform PcdFlashFvNvStorageEventLogSize.
   #  0: No additional NVS region.<BR>
--
2.28.0.windows.1

Re: [edk2-platforms][PATCH v1 1/1] SpiFvbServiceStandaloneMm: Add changes for rewrite varstore header

[Chiu, Chasel]

Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>

Thanks,
Chasel


> -----Original Message-----
> From: mikuback@linux.microsoft.com <mikuback@linux.microsoft.com>
> Sent: Thursday, February 9, 2023 4:52 PM
> To: devel@edk2.groups.io
> Cc: S, Ashraf Ali <ashraf.ali.s@intel.com>; Oram, Isaac W
> <isaac.w.oram@intel.com>; Chaganty, Rangasai V
> <rangasai.v.chaganty@intel.com>; Ni, Ray <ray.ni@intel.com>; Chiu, Chasel
> <chasel.chiu@intel.com>
> Subject: [edk2-platforms][PATCH v1 1/1] SpiFvbServiceStandaloneMm: Add
> changes for rewrite varstore header
> 
> From: Michael Kubacki <michael.kubacki@microsoft.com>
> 
> Updates the Standalone MM module to have the necessary INF changes to build
> with the following two recent commits made to rewrite the the variable store
> header in the MM SPI FVB service.
> 
>   - e95c798
>   - 88d44c5
> 
> Cc: Ashraf Ali S <ashraf.ali.s@intel.com>
> Cc: Isaac Oram <isaac.w.oram@intel.com>
> Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
> ---
> 
> Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceStandalo
> neMm.inf | 4 ++++
>  Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dec                                       | 4 +++-
>  2 files changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git
> a/Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceStandal
> oneMm.inf
> b/Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceStandal
> oneMm.inf
> index 152cf0036fdb..717b6fc00cc6 100644
> ---
> a/Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceStandal
> oneMm.inf
> +++ b/Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbSe
> +++ rviceStandaloneMm.inf
> @@ -44,6 +44,8 @@ [Packages]
>  [Pcd]
>    gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvBase         ##
> CONSUMES
>    gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize         ## CONSUMES
> +  gIntelSiliconPkgTokenSpaceGuid.PcdFlashVariableStoreType       ##
> SOMETIMES_CONSUMES
> +  gIntelSiliconPkgTokenSpaceGuid.PcdFlashNvStorageAdditionalSize ##
> + CONSUMES
> 
>  [Sources]
>    FvbInfo.c
> @@ -60,6 +62,8 @@ [Protocols]
>  [Guids]
>    gEfiFirmwareFileSystem2Guid                   ## CONSUMES
>    gEfiSystemNvDataFvGuid                        ## CONSUMES
> +  gEfiVariableGuid                              ## SOMETIMES_CONSUMES
> +  gEfiAuthenticatedVariableGuid                 ## SOMETIMES_CONSUMES
> 
>  [Depex]
>    TRUE
> diff --git a/Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dec
> b/Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dec
> index d73a51ca5235..cad22acda496 100644
> --- a/Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dec
> +++ b/Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dec
> @@ -188,7 +188,8 @@ [PcdsFixedAtBuild, PcdsPatchableInModule,
> PcdsDynamic, PcdsDynamicEx]
> 
>    ## Define Flash Variable Store type.<BR><BR>
>    #  When Flash Variable Store corruption happened, the SpiFvbService will
> recreate Variable Store
> -  #  with valid header information provided by this PCD value.<BR>
> +  #  with valid header information provided by this PCD value.
> +  #  Note: This PCD must be FixedAtBuild when using Standalone MM.
>    #  0: Variable Store is gEfiVariableGuid type.<BR>
>    #  1: Variable Store is gEfiAuthenticatedVariableGuid type.<BR>
>    #  Other value: reserved for future use.<BR> @@ -199,6 +200,7 @@
> [PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx]
>    #  Platform may implement a Regular variable region and an additional region,
> which will require this PCD
>    #  to tell SpiFvbService to include both regions.
>    #  Note: This PCD is for compatible with legacy usages that should be
> deprecated.
> +  #  Note: This PCD must be FixedAtBuild when using Standalone MM.
>    #  The new usage model should define separate regions without implicit
> connections to UEFI Variable or FTW regions.<BR>
>    #  Example legacy usage is to set this PCD equal to platform
> PcdFlashFvNvStorageEventLogSize.
>    #  0: No additional NVS region.<BR>
> --
> 2.28.0.windows.1

Re: [edk2-platforms][PATCH v1 1/1] SpiFvbServiceStandaloneMm: Add changes for rewrite varstore header

[Chiu, Chasel]

Thanks Michael!

Patch has been merged:
https://github.com/tianocore/edk2-platforms/commit/e2353ad640d55dafb7315eae2a93b318809ccbe3


> -----Original Message-----
> From: mikuback@linux.microsoft.com <mikuback@linux.microsoft.com>
> Sent: Thursday, February 9, 2023 4:52 PM
> To: devel@edk2.groups.io
> Cc: S, Ashraf Ali <ashraf.ali.s@intel.com>; Oram, Isaac W
> <isaac.w.oram@intel.com>; Chaganty, Rangasai V
> <rangasai.v.chaganty@intel.com>; Ni, Ray <ray.ni@intel.com>; Chiu, Chasel
> <chasel.chiu@intel.com>
> Subject: [edk2-platforms][PATCH v1 1/1] SpiFvbServiceStandaloneMm: Add
> changes for rewrite varstore header
> 
> From: Michael Kubacki <michael.kubacki@microsoft.com>
> 
> Updates the Standalone MM module to have the necessary INF changes to build
> with the following two recent commits made to rewrite the the variable store
> header in the MM SPI FVB service.
> 
>   - e95c798
>   - 88d44c5
> 
> Cc: Ashraf Ali S <ashraf.ali.s@intel.com>
> Cc: Isaac Oram <isaac.w.oram@intel.com>
> Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
> ---
> 
> Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceStandalo
> neMm.inf | 4 ++++
>  Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dec                                       | 4 +++-
>  2 files changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git
> a/Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceStandal
> oneMm.inf
> b/Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceStandal
> oneMm.inf
> index 152cf0036fdb..717b6fc00cc6 100644
> ---
> a/Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceStandal
> oneMm.inf
> +++ b/Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbSe
> +++ rviceStandaloneMm.inf
> @@ -44,6 +44,8 @@ [Packages]
>  [Pcd]
>    gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvBase         ##
> CONSUMES
>    gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize         ## CONSUMES
> +  gIntelSiliconPkgTokenSpaceGuid.PcdFlashVariableStoreType       ##
> SOMETIMES_CONSUMES
> +  gIntelSiliconPkgTokenSpaceGuid.PcdFlashNvStorageAdditionalSize ##
> + CONSUMES
> 
>  [Sources]
>    FvbInfo.c
> @@ -60,6 +62,8 @@ [Protocols]
>  [Guids]
>    gEfiFirmwareFileSystem2Guid                   ## CONSUMES
>    gEfiSystemNvDataFvGuid                        ## CONSUMES
> +  gEfiVariableGuid                              ## SOMETIMES_CONSUMES
> +  gEfiAuthenticatedVariableGuid                 ## SOMETIMES_CONSUMES
> 
>  [Depex]
>    TRUE
> diff --git a/Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dec
> b/Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dec
> index d73a51ca5235..cad22acda496 100644
> --- a/Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dec
> +++ b/Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dec
> @@ -188,7 +188,8 @@ [PcdsFixedAtBuild, PcdsPatchableInModule,
> PcdsDynamic, PcdsDynamicEx]
> 
>    ## Define Flash Variable Store type.<BR><BR>
>    #  When Flash Variable Store corruption happened, the SpiFvbService will
> recreate Variable Store
> -  #  with valid header information provided by this PCD value.<BR>
> +  #  with valid header information provided by this PCD value.
> +  #  Note: This PCD must be FixedAtBuild when using Standalone MM.
>    #  0: Variable Store is gEfiVariableGuid type.<BR>
>    #  1: Variable Store is gEfiAuthenticatedVariableGuid type.<BR>
>    #  Other value: reserved for future use.<BR> @@ -199,6 +200,7 @@
> [PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx]
>    #  Platform may implement a Regular variable region and an additional region,
> which will require this PCD
>    #  to tell SpiFvbService to include both regions.
>    #  Note: This PCD is for compatible with legacy usages that should be
> deprecated.
> +  #  Note: This PCD must be FixedAtBuild when using Standalone MM.
>    #  The new usage model should define separate regions without implicit
> connections to UEFI Variable or FTW regions.<BR>
>    #  Example legacy usage is to set this PCD equal to platform
> PcdFlashFvNvStorageEventLogSize.
>    #  0: No additional NVS region.<BR>
> --
> 2.28.0.windows.1