From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web11.5166.1633988808439056409 for ; Mon, 11 Oct 2021 14:46:53 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=Bv5vcJFU; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: nathaniel.l.desimone@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10134"; a="207780979" X-IronPort-AV: E=Sophos;i="5.85,365,1624345200"; d="scan'208";a="207780979" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Oct 2021 14:46:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,365,1624345200"; d="scan'208";a="480045101" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by orsmga007.jf.intel.com with ESMTP; 11 Oct 2021 14:46:52 -0700 Received: from fmsmsx612.amr.corp.intel.com (10.18.126.92) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12; Mon, 11 Oct 2021 14:46:52 -0700 Received: from fmsmsx606.amr.corp.intel.com (10.18.126.86) by fmsmsx612.amr.corp.intel.com (10.18.126.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12; Mon, 11 Oct 2021 14:46:52 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx606.amr.corp.intel.com (10.18.126.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12 via Frontend Transport; Mon, 11 Oct 2021 14:46:52 -0700 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.168) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2242.12; Mon, 11 Oct 2021 14:46:51 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m9nBs7qC6K1AOJgkHgmgHaNT4mYGJx0pn0yOchPAYHISwt+jQL4O33l/dbGTI/QngGqLonizj2P8ZId53gDXvO6wKiwpVVK/QFZQYK9uCPLCBEsfYDfC9uhqp1iUyZ+Q2QHeSR5DjNnS2ZfUXPlq6CsllPQ9MEULr90GXkaIhQxIJN5bTEhadnYGuFqZVvYCAlk2TVQjeX0Y5WvWcQTaoOjuxIs2EBl6eR0DbIBnSTsezf8JS5GdOrYc8WYn7WhqTPVUSySx7t19GBsUOpeNgXwe/eP6E16qOGn0Oa+xJp4gpzst8/tG4LN3bHENLk7araSGpZemXMXFJPouy3nxqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=pcVwdGU9BE0BBm1sU32PAOzNDgusiJheEkluf9+kT+8=; b=VyWpaovlaT34TUa/eN/naEHr9dyH527TXx+Ybd5TEIX3tHevqofglAnUcJYpfeDxOefaSlj8GvsVKh4pVrBnWdpGxzZxJOQYYNJJHzE+Xv0fFhT4NSw0aVndepQtcMYxoXgCTyCxKgizWJyQTamRg5BEvxdZlgBiOgnV+mtuzsB0Fkg9Xqzbu6j7mA7ndMwqR1ZTOXUJ9iCToXcKhkrWFHDZqjZC7EEhqoRnKNgj4JLyht4U6NZ9ZS3P7kv2ZO1eV8FNdGyo4iUrU8ReU5jk7S31tkXCUX2MyPIDYMn1gjsCf/ZEXE7NDL1DXv/lz82SiHJmGM4dD8EBPV7kx4vUoA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pcVwdGU9BE0BBm1sU32PAOzNDgusiJheEkluf9+kT+8=; b=Bv5vcJFUc+mbvTjrlJHtG/qrShh6iOjyozYeue67+aCa1KPxig6M76EfQMXq3IzY9A8oynQAwyloLUtixfj1vscKDoHrOj8AsLSnTFhPezlnXOZTL/ulRRPlOiVX8WzzY3jRSjRhjt4AbCsv80boFt57Ji4qMTH73pa/mBWT2bk= Received: from MWHPR1101MB2160.namprd11.prod.outlook.com (2603:10b6:301:5b::12) by CO1PR11MB5057.namprd11.prod.outlook.com (2603:10b6:303:6c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.20; Mon, 11 Oct 2021 21:46:51 +0000 Received: from MWHPR1101MB2160.namprd11.prod.outlook.com ([fe80::f07d:7a97:3b68:92ed]) by MWHPR1101MB2160.namprd11.prod.outlook.com ([fe80::f07d:7a97:3b68:92ed%11]) with mapi id 15.20.4587.026; Mon, 11 Oct 2021 21:46:51 +0000 From: "Nate DeSimone" To: "Chiu, Chasel" , "devel@edk2.groups.io" CC: "Chaganty, Rangasai V" , "Luo, Heng" Subject: Re: [edk2-platforms: PATCH v3 6/9] TigerlakeOpenBoardPkg: Use same variable name for FspNvsHob. Thread-Topic: [edk2-platforms: PATCH v3 6/9] TigerlakeOpenBoardPkg: Use same variable name for FspNvsHob. Thread-Index: AQHXvA/Zy5ymETYZKUyhAY70HjTNgqvOWqDg Date: Mon, 11 Oct 2021 21:46:51 +0000 Message-ID: References: <20211008064317.1371-1-chasel.chiu@intel.com> <20211008064317.1371-7-chasel.chiu@intel.com> In-Reply-To: <20211008064317.1371-7-chasel.chiu@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-reaction: no-action dlp-version: 11.6.200.16 dlp-product: dlpe-windows authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: b345d5e4-c29d-468c-29d4-08d98d00a257 x-ms-traffictypediagnostic: CO1PR11MB5057: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2733; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: xYqFXwMaP3e1kKXjNflqXTCVc+eineGIUby5Y7jo74tJwX3xlGZRpg1+R2vba/E3GS7f/pXA5qFONvARutSIkzet7/bp/LqOtvx5ZR6WZQ7VfUy/5kU2/I+UDIWY3xUXFPcJcjF1P1ncrRr+pqu9HoaGKNGQinfIbB36XaA5G0KZf8DebAuW+fCsoh+utQNWrrvZB1J1iueDIRtZM2tEosFr0hEpBeNvEF6GH6w2Opw4scGG5tPUnfTLoO6VG1zCIaUlMzY/13VAJ+WqeRwOXOfOV0n+1ZcjI0caoApK8XR5EjPe0D188sN1cV5kVgiKZJlecBTnYqHptlSE35KhQumCV/GZUpYgLMeudUgdBADqnMdsWPZW1pUn4hK16r5TZZgZD62fqFKQeTy3uPIlBlE2QgBaoKopxZor8sAtRs294upHpluqobkwBV9XAOM+MJ69Gvr+vXmfOWE/XoPce3Hp5AdCtos2GxmHnnF4Vgo68i97PQmKSw7Qla0IvdbB+umukbzTW1StqVv5TdWDfzmCXBuw//LDxU8+MikG8zHwbfNTFqjQeI85CVqGm6Q+8MFvHaRiiQq1UP24qD3tSkKg/4pdLi5vXQnd7KYYZ5tUJVT6mDadZHyi2pQCTrK339z9r7SJnL4KIJBS9YK12aeI2JR0D69y7vpwQQG2c5CO2VvNeARhoOot5nZGjt8LhggvpWUxe/0NaKfTVFv1CtlPx7fNjnHwKQZfynlz6W7nTIwoEEHuJtYmv1yfRDt+UwxhpmrIOHXv7p7RmTwX3q/J/bEXYCx8pBcDxH1jlX4= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1101MB2160.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(86362001)(64756008)(38070700005)(33656002)(83380400001)(186003)(8936002)(66556008)(4326008)(2906002)(66476007)(107886003)(122000001)(26005)(66946007)(52536014)(7696005)(5660300002)(316002)(8676002)(9686003)(76116006)(71200400001)(6506007)(55016002)(966005)(38100700002)(508600001)(54906003)(53546011)(66446008)(110136005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?b1duut5p5vURgVgZF2PACDq3L9nuN1mGVpIBu8eJrgeeemUuuwzVC2JPnTSN?= =?us-ascii?Q?XBmOW6F+QsHKVZvVu7zJiA1XvcUHRSIEsq8R53sH/JRe6lrMO0n06+l8nCyJ?= =?us-ascii?Q?B8m4bTuaLx9s2Go9xE+bXYgXQFhjnvxVxb717K1KTgwXSc9n9fxFiUhAK7oW?= =?us-ascii?Q?Wz+/DmEppJ4zlNMWpfrSrwrW468HCHkLYfPyOSuJfdCemQ+wpCUIiErfPreO?= =?us-ascii?Q?r+7Wh2q9GaE2w8kBxeCrQN4rpkR1ohI+s1Fvo+ECgHVSpiAcQPjTqERXPI8n?= =?us-ascii?Q?qpcDD1MAUHT4MeT7Uhdq9DhwQ+joySudg9sPB/Bci57di+Roou8YqdCOx1D9?= =?us-ascii?Q?OaSitxDbrLO2+E2Z8jLx02uRzLlJRTVVY0vInZC5Rp9S8cVNGgslroibpHh/?= =?us-ascii?Q?+HAG6TPyD0Ir0mxOIhGIWluxUedVeO4Lp7mk3PQNRLEP1B2citCw/CWTDoKZ?= =?us-ascii?Q?hqoPQcsamTpvalv+J3lyQKvUwuVAANboOXIR11SgG6wcf35/i2DkeD+raqmC?= =?us-ascii?Q?V/DdS2Hk9Ej5rA+iAGH6bOrcGGwwYnU7ILm8vahhwvMKqYXKiQcqBpLu9Bmz?= =?us-ascii?Q?9FNjTeF2/X8qDe2eMMP1r8nQLRN/0Mv2LtQdOq/ZSgT+CI6j6OXzRov/q/Yr?= =?us-ascii?Q?FUriLtfw+LfvkY1RmxKWFDJIi24FWL0vVrHaQH6Tnpo3Z1KDZmcg29pwrJcr?= =?us-ascii?Q?4uOs4xUbKuwpwRqzZYuXPRru3xDRUBAIE0m5pUZo9biqjcUUfRecYf4vtKLH?= =?us-ascii?Q?olr6WoeKx68elIM/KIdaGdXC01J9ZuVzriXbm+yj94Wy4bIsAxTNi2dyazm7?= =?us-ascii?Q?imOI9Q/FfzUnCPw2VLB2jf8sDK1pZjD3CFTvkhghsZPlJ3Wwz2CfUdoYikcZ?= =?us-ascii?Q?Ehi/TO7vINL6GQVHWIuSNMcQVxtUnwqukXDfFTJ/Uw974EQIcFxVysshMRZd?= =?us-ascii?Q?baj9OeKF6sxGtq43Rx/6QloGL3OPe7kQqh7Bvn29Ww0azXQmPe+bwvawOnVp?= =?us-ascii?Q?OI4rU4WSc56RKw7aRpPAbQti8+FuJFcXQ2BuBowCo1TkNLiC9cuUlwXSzMar?= =?us-ascii?Q?aww69W5TdEGL4gRShZpLDWdt+pB7Q/ZgEchNU6hBE6zp3bSMKsPMYBvkhv7Y?= =?us-ascii?Q?QjJ2EZIh0yguV6p/8Zk1JbfOkQR9T2lbBCHkMXbj9B2uY5YUn0Ws1HeuvDQy?= =?us-ascii?Q?vsrF/xWLSgxpwDa7+r3a/vThFDYavinllH+ldzXHB9Xq7huUDrmLOZoF4v3G?= =?us-ascii?Q?daEe3EcDlFGKTfHpLu2Q9AiieUFzBegsAsc2xqdxf8RizdWnpYBi8pBHlAri?= =?us-ascii?Q?mSUZmnxC/qmr7/Lai/eN65p+?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2160.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b345d5e4-c29d-468c-29d4-08d98d00a257 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Oct 2021 21:46:51.1903 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: aOGCHc3AstA41+6crk1DVQ9V0LOldsvtO8z2aZXQYFqWsP8faLzSsUzyP0PNjLngVkPmM0ghcNYAIZvnjit4u55Xuj7ZyFZ5Es9h6sza9OE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB5057 Return-Path: nathaniel.l.desimone@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Nate DeSimone > -----Original Message----- > From: Chiu, Chasel > Sent: Thursday, October 7, 2021 11:43 PM > To: devel@edk2.groups.io > Cc: Chiu, Chasel ; Chaganty, Rangasai V > ; Desimone, Nathaniel L > ; Luo, Heng > Subject: [edk2-platforms: PATCH v3 6/9] TigerlakeOpenBoardPkg: Use same > variable name for FspNvsHob. >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3678 >=20 > To simplify the implementation the variable Name/GUID has been changed > to "FspNvsBuffer" and gFspNvsBufferVariableGuid regardless it stores the > data from FSP_NON_VOLATILE_STORAGE_HOB2 or > FSP_NON_VOLATILE_STORAGE_HOB. >=20 > Cc: Sai Chaganty > Cc: Nate DeSimone > Cc: Heng Luo > Signed-off-by: Chasel Chiu > --- >=20 > Platform/Intel/TigerlakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInit > Lib/PeiFspPolicyInitLib.c | 21 ++++++++++++++++++--- >=20 > Platform/Intel/TigerlakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInit > Lib/PeiFspPolicyInitLib.inf | 1 + > Platform/Intel/TigerlakeOpenBoardPkg/TigerlakeURvp/OpenBoardPkg.dsc > | 3 +++ > 3 files changed, 22 insertions(+), 3 deletions(-) >=20 > diff --git > a/Platform/Intel/TigerlakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyI > nitLib/PeiFspPolicyInitLib.c > b/Platform/Intel/TigerlakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyI > nitLib/PeiFspPolicyInitLib.c > index fc523e93d1..938b74e5d8 100644 > --- > a/Platform/Intel/TigerlakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyI > nitLib/PeiFspPolicyInitLib.c > +++ > b/Platform/Intel/TigerlakeOpenBoardPkg/FspWrapper/Library/PeiFspPoli > +++ cyInitLib/PeiFspPolicyInitLib.c > @@ -9,7 +9,9 @@ > #include #include > #include > +#include #include > +#include VOID > EFIAPI@@ -70,9 +72,11 @@ SiliconPolicyDonePreMem( > ) { EFI_STATUS Status;+ UINTN = FspNvsBufferSize;+ > VOID *FspNvsBufferPtr; #if > FixedPcdGet8(PcdFspModeSelection) =3D=3D 0- FSPM_ARCH_CONFIG_PPI > *FspmArchConfigPpi;- EFI_PEI_PPI_DESCRIPTOR > *FspmArchConfigPpiDesc;+ FSPM_ARCH_CONFIG_PPI > *FspmArchConfigPpi;+ EFI_PEI_PPI_DESCRIPTOR > *FspmArchConfigPpiDesc; FspmArchConfigPpi =3D > (FSPM_ARCH_CONFIG_PPI *) AllocateZeroPool (sizeof > (FSPM_ARCH_CONFIG_PPI)); if (FspmArchConfigPpi =3D=3D NULL) {@@ -80,7 > +84,6 @@ SiliconPolicyDonePreMem( > return EFI_OUT_OF_RESOURCES; } FspmArchConfigPpi->Revision = =3D > 1;- FspmArchConfigPpi->NvsBufferPtr =3D NULL; FspmArchConfigPpi= - > >BootLoaderTolumSize =3D 0; FspmArchConfigPpiDesc =3D > (EFI_PEI_PPI_DESCRIPTOR *) AllocateZeroPool (sizeof > (EFI_PEI_PPI_DESCRIPTOR));@@ -98,6 +101,18 @@ > SiliconPolicyDonePreMem( > ASSERT_EFI_ERROR (Status); #endif + //+ // Initialize S3 Data variab= le > (S3DataPtr). It may be used for warm and fast boot paths.+ //+ > FspNvsBufferPtr =3D NULL;+ FspNvsBufferSize =3D 0;+ Status =3D > PeiGetLargeVariable (L"FspNvsBuffer", &gFspNvsBufferVariableGuid, > &FspNvsBufferPtr, &FspNvsBufferSize);+ if (Status =3D=3D EFI_SUCCESS) {+ > DEBUG ((DEBUG_INFO, "Get L\"FspNvsBuffer\" gFspNvsBufferVariableGuid > - %r\n", Status));+ DEBUG ((DEBUG_INFO, "FspNvsBuffer Size - 0x%x\n", > FspNvsBufferSize));+ UPDATE_POLICY (((FSPM_UPD *) FspmUpd)- > >FspmArchUpd.NvsBufferPtr, FspmArchConfigPpi->NvsBufferPtr, > FspNvsBufferPtr);+ }+ // // Install Policy Ready PPI // While inst= alled, RC > assumes the Policy is ready and finalized. So pleasediff --git > a/Platform/Intel/TigerlakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyI > nitLib/PeiFspPolicyInitLib.inf > b/Platform/Intel/TigerlakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyI > nitLib/PeiFspPolicyInitLib.inf > index 708fbac08f..0236ae45ae 100644 > --- > a/Platform/Intel/TigerlakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyI > nitLib/PeiFspPolicyInitLib.inf > +++ > b/Platform/Intel/TigerlakeOpenBoardPkg/FspWrapper/Library/PeiFspPoli > +++ cyInitLib/PeiFspPolicyInitLib.inf > @@ -181,3 +181,4 @@ > gTianoLogoGuid ## CONSUMES gCnviConfigGuid > ## CONSUMES gHdAudioPreMemConfigGuid ## CONSUMES+ > gFspNvsBufferVariableGuid ## CONSUMESdiff --git > a/Platform/Intel/TigerlakeOpenBoardPkg/TigerlakeURvp/OpenBoardPkg.dsc > b/Platform/Intel/TigerlakeOpenBoardPkg/TigerlakeURvp/OpenBoardPkg.dsc > index 1adf634034..451492f984 100644 > --- > a/Platform/Intel/TigerlakeOpenBoardPkg/TigerlakeURvp/OpenBoardPkg.dsc > +++ > b/Platform/Intel/TigerlakeOpenBoardPkg/TigerlakeURvp/OpenBoardPkg.ds > +++ c > @@ -142,6 +142,9 @@ >=20 > GpioCheckConflictLib|$(PLATFORM_SI_PACKAGE)/IpBlock/Gpio/Library/Bas > eGpioCheckConflictLibNull/BaseGpioCheckConflictLibNull.inf !endif > +[LibraryClasses.Common.SEC]+ > VariableReadLib|MinPlatformPkg/Library/BaseVariableReadLibNull/BaseVari > ableReadLibNull.inf+ [LibraryClasses.IA32.SEC] > TestPointCheckLib|$(PLATFORM_PACKAGE)/Test/Library/TestPointCheckLib > /SecTestPointCheckLib.inf > TestPointCheckLib|$(PLATFORM_PACKAGE)/Test/Library/TestPointCheckLib > Null/TestPointCheckLibNull.inf-- > 2.28.0.windows.1