From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mx.groups.io with SMTP id smtpd.web10.1658.1675990313455633567 for ; Thu, 09 Feb 2023 16:51:53 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@linux.microsoft.com header.s=default header.b=WDLvTJ8U; spf=pass (domain: linux.microsoft.com, ip: 13.77.154.182, mailfrom: mikuback@linux.microsoft.com) Received: from localhost.localdomain (unknown [47.201.8.94]) by linux.microsoft.com (Postfix) with ESMTPSA id 2141520C8AF7; Thu, 9 Feb 2023 16:51:52 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 2141520C8AF7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1675990312; bh=TroIQHgpNXLrVJrw6weuSxtKFU9iPpNp7V6mWV2B3CY=; h=From:To:Cc:Subject:Date:From; b=WDLvTJ8U1LJV75qjtypoo50on9EmfeFgNyE4LxopgFNJO2IngBgr80eCF5WyehJbD PhBVd+QZWzQtegztEr9ca0OpzrUwfkP2dC9xlLTXOtf4A+0tssUnWgLHbLgLVqZYS8 cmWF0YqjBaE0T9Ax+npz/EPmGtGkhjB8S+QV4k2M= From: "Michael Kubacki" To: devel@edk2.groups.io Cc: Ashraf Ali S , Isaac Oram , Rangasai V Chaganty , Ray Ni , Chasel Chiu Subject: [edk2-platforms][PATCH v1 1/1] SpiFvbServiceStandaloneMm: Add changes for rewrite varstore header Date: Thu, 9 Feb 2023 19:51:30 -0500 Message-Id: <20230210005130.1021-1-mikuback@linux.microsoft.com> X-Mailer: git-send-email 2.28.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Kubacki 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 Cc: Isaac Oram Cc: Rangasai V Chaganty Cc: Ray Ni Cc: Chasel Chiu Signed-off-by: Michael Kubacki --- Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceS= tandaloneMm.inf | 4 ++++ Silicon/Intel/IntelSiliconPkg/IntelSiliconPkg.dec = | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/Sp= iFvbServiceStandaloneMm.inf b/Silicon/Intel/IntelSiliconPkg/Feature/Flash= /SpiFvbService/SpiFvbServiceStandaloneMm.inf index 152cf0036fdb..717b6fc00cc6 100644 --- a/Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbSer= viceStandaloneMm.inf +++ b/Silicon/Intel/IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbSer= viceStandaloneMm.inf @@ -44,6 +44,8 @@ [Packages] [Pcd] gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvBase ## CONS= UMES gIntelSiliconPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize ## CONS= UMES + gIntelSiliconPkgTokenSpaceGuid.PcdFlashVariableStoreType ## SOME= TIMES_CONSUMES + gIntelSiliconPkgTokenSpaceGuid.PcdFlashNvStorageAdditionalSize ## CONS= UMES =20 [Sources] FvbInfo.c @@ -60,6 +62,8 @@ [Protocols] [Guids] gEfiFirmwareFileSystem2Guid ## CONSUMES gEfiSystemNvDataFvGuid ## CONSUMES + gEfiVariableGuid ## SOMETIMES_CONSUMES + gEfiAuthenticatedVariableGuid ## SOMETIMES_CONSUMES =20 [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] =20 ## Define Flash Variable Store type.

# When Flash Variable Store corruption happened, the SpiFvbService wi= ll recreate Variable Store - # with valid header information provided by this PCD value.
+ # 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.
# 1: Variable Store is gEfiAuthenticatedVariableGuid type.
# Other value: reserved for future use.
@@ -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.
# Example legacy usage is to set this PCD equal to platform PcdFlashF= vNvStorageEventLogSize. # 0: No additional NVS region.
--=20 2.28.0.windows.1