From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web10.7828.1634002442169569452 for ; Mon, 11 Oct 2021 18:34:04 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=ED+jBgqB; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: heng.luo@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10134"; a="250404493" X-IronPort-AV: E=Sophos;i="5.85,366,1624345200"; d="scan'208";a="250404493" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Oct 2021 18:33:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,366,1624345200"; d="scan'208";a="591540753" Received: from orsmsx605.amr.corp.intel.com ([10.22.229.18]) by orsmga004.jf.intel.com with ESMTP; 11 Oct 2021 18:33:56 -0700 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX605.amr.corp.intel.com (10.22.229.18) 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 18:33:55 -0700 Received: from orsmsx604.amr.corp.intel.com (10.22.229.17) by ORSMSX610.amr.corp.intel.com (10.22.229.23) 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 18:33:55 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx604.amr.corp.intel.com (10.22.229.17) 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 18:33:55 -0700 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.175) by edgegateway.intel.com (134.134.137.100) 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 18:33:55 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OYzbN8H4jzU3qZbiazCeS0Z7/mHINltm0c+nX+7DpENvQvGsH0aS3fwFeJdkbMhotpxolaPHbLW4O11W1/wFDAK3pdAxO0553UleZsKG4ExhdM5zvGOmZfkSAaRM0BYVK0Wm3Bx7tRhzlAXX0zwurCwNCFcuxGaKHnZIQgijKoc18aLjhsbUd2JuiIorMq5t7DwYwAC6Fe/APNBocqDNMGW7hC+r/QfQmrseVUU8kbuMNuSj/fRUvfS/B/b7wIiBT4TRTDdZwbfFRREngz9lMt+QAp7K+k5bhC+e4L92Oli0GWFcyADjiPjO1/RjhLFsC9xdtG0P3mECavIMqyF5AA== 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=bjJqmFUfLy0hCxNzWWhOrs923Q+U6FMMcLPXvl5pcIQ=; b=fJEbWoqHQBvgC1X9QyLorkoq0D+Tiys+h7kotTHUxWANQY/LRwK1uewlfl9hAB1fuMsCO//i8M5tve3RFa90tLTUMYkAHeKlkBU4jGAMCnswnHKRL36rQ/sLyF7B4gO+XHiiEKM8mOp5X9gDdJDIwriAUriTOeDgSFMGcB5ZNNwzclOIcYHTuW2+AJaTJSBTVuRzcSPilQqrxV1kQMXImNqOfd2COxcW5MoGfuOekWpSO/uJjQWK6vW5+YDCrpFTZxDlEpNWCpXoeodneMOjjn237cA6m6s7ofOTQu6/KaDCiHjqJPlMWWOcAbHPMZrwfw/Og55M5767uLTKIw9FIw== 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=bjJqmFUfLy0hCxNzWWhOrs923Q+U6FMMcLPXvl5pcIQ=; b=ED+jBgqBl93FpBdZ4sWdHAC9BL2MCXiU7xV76juj+DS37pz4xspkLgfcsLSsAK4G6zxL4BfSDUSvx0jZyupkcCpC9zD91e2MTfaOa4PLaLnBlL2+TswGztKeapzavZc6vga3MqrmR4VMNcpLoWxZJQE9sVMRoGdKvG8W8J3jW4w= Received: from SN6PR11MB2752.namprd11.prod.outlook.com (2603:10b6:805:59::31) by SA2PR11MB4811.namprd11.prod.outlook.com (2603:10b6:806:11d::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.19; Tue, 12 Oct 2021 01:33:54 +0000 Received: from SN6PR11MB2752.namprd11.prod.outlook.com ([fe80::5910:735d:a42c:8d5e]) by SN6PR11MB2752.namprd11.prod.outlook.com ([fe80::5910:735d:a42c:8d5e%6]) with mapi id 15.20.4587.026; Tue, 12 Oct 2021 01:33:54 +0000 From: "Heng Luo" To: "Chiu, Chasel" , "devel@edk2.groups.io" CC: "Chaganty, Rangasai V" , "Desimone, Nathaniel L" 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/Z67m5Y6Z6eUynDAGllGH/aqvOmi0g Date: Tue, 12 Oct 2021 01:33:53 +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-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.6.200.16 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: b60546e2-68ed-4e93-7845-08d98d205a35 x-ms-traffictypediagnostic: SA2PR11MB4811: 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: x8uMLjLxIwS1VDjoGNmN1h9qEWJI6dkdmtZ2/ZpozBJv6Ox7rHXPmVz8Ux6FIRZ0arKxBrJQ4bk3Bigd1JhJGDzclgfwhcXW3es+6BSnbbhzL3g0QMjflhzbuSNz8JxNX02xVF2YBHtekaJDjlWOizgWVCf7o3H42m9Sd1ypuWXLy7f+MC1YtX/L9ZHMjRQp14zpyPIVZwGs6jXDeyaaZyCIco6mJGGvC7wv2ZPHbNiZHs/w3u63Wz7R3uANYuKUlm8LcwAsYO7bZxZ4249lx8Usfb3gJ0TMZg/53JKS/yRm1nuaEVbopdCMYj1p6dHvGMIYihxhDNEBF5sgrzJMlf+MmReae982ajKxz/jBmmyvY19HHk+uhFJ9q9CdIBrNbufOjRQ/2XnLx+8CqzMMF338X7sgLCMNjKToc2BakmXDU3nwccdWtjp5RNSVVxQmwWe9haxBUm37iiRR3XsT5qfxNDtcZvgyECWzlyHtvs8A20y6FDBLv9kI/HH4pu66y1UF6UeU6kFEVTFIvYBkh89rBg6tios7gpGOd7lbLDwUOmx6bChNL095BCHvUdZFvWoAK5nBTQ2dx3n/WqFB2BKcWuiNdakxwKO3upRtdEgYJOraYdNiL6LdL9QH2WywqT71WaIePgeA++0cMN7nsTh022VRFHsgYXWAmSByTHuI2C2Lb++iCMWkSr74p54QuEKEkBKxNSac6R3ZmiUiAOSlWrBk5JjWonDKeWRGMsNfVA49iKHyoX7tMfhkbBZJVEksZirid9/ApJGzZhA1xJGgcGHCxsdn9Tog/+IU7Pg= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR11MB2752.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(66946007)(8936002)(66476007)(66556008)(83380400001)(8676002)(76116006)(64756008)(66446008)(71200400001)(2906002)(107886003)(186003)(4326008)(9686003)(316002)(5660300002)(966005)(55016002)(38100700002)(508600001)(54906003)(38070700005)(6506007)(53546011)(33656002)(26005)(122000001)(7696005)(52536014)(86362001)(110136005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?4tgj+TwgFKJKgvCBEXBwy5WEPkIrcfNJrK19Y9WtLi0en13KdQqK2ALgDAjv?= =?us-ascii?Q?kff0rxnHiXWJ9Y8HoN+uQ5eDo11fOtxTweHrkb2WwLQO+zl0tUtzY32xWnMU?= =?us-ascii?Q?YqIE/4A8E+KelFT8pAOXqvkTR1QBcXbalyOMK6Nb0t+zJYtctHPiA6dodKxJ?= =?us-ascii?Q?40uOnkRKGAoVjzE20SSgtu0DCTJFqFG1eZjRGS6F1xu7MNlYed92CBMgz861?= =?us-ascii?Q?phrtM5iQsOSUN9WA5AOoX56il84Cn8FoXVQgaJgd7UNxZOQSkPMqYS95oS9W?= =?us-ascii?Q?+fCEtBaajlhWERDNwds7AidS/LoWZspcW+E+hDXWmCJLkHuo/inqYeNOIwxK?= =?us-ascii?Q?MaR7XCHbGC5Nr5if928pfvl4G6RJwoBzpZqCTHPEQ2Nx5dMdJ+Uu/7FWKiQU?= =?us-ascii?Q?rWaDG/OLLfdKveEGMXsANnj4aW91vQA+MguBzUtbs6Ah9JBgGeintRRAPW/R?= =?us-ascii?Q?V9n4Ye4qko/CiR0dmrl9xrp/1kz4+Zk0WY+FHDqdOixtMvuR5yKJBGk7z2nL?= =?us-ascii?Q?TUDqaY+o0jJqfN9NiAHIlDjSnyTJIiKySUeGn4l7l2BxBE1DO2clGEPFFG7t?= =?us-ascii?Q?LT83n17+nIJOCzDraUbv35SPiK7DR/YkOuHBIy/VFNQWMCvzMtPpErXfcaPv?= =?us-ascii?Q?1VSWVDGAwLIHfOMCRoCvOe4Togr27p2eNGlJ4K/5P2ALd3bWQ7e866LUm2l/?= =?us-ascii?Q?WXNL/XVOZwHNbpOnZg3a8AELlMeUEktaw3gnlo3VqJCLnTKbctSvgeNbQ6uc?= =?us-ascii?Q?a1cI4nl2zSc16pEZF8zRyYUXGdvM0lVTD73bPgukzxioe7FCXLemQmH7Zws8?= =?us-ascii?Q?UNgE8UFspwXf8vwlBWuiBuiPNRiUP4Tj4VViekfBnyrUMkLtqebNDePgnLiv?= =?us-ascii?Q?2S9nnfsYxCPF7ononq5TScIV26Eg3ukdh9l8wf8j5kmKuJIK1PvJea9JyxLt?= =?us-ascii?Q?f9/EwZzjSL5IqbzjXg6e1rcU3hzUy1hQmcSrUz3NToMGMo9BGjS6Czev1qou?= =?us-ascii?Q?bMKQd5VJ5DlJPISteaO+MZiYAkeojmDmYg9wgrC1k7A1I3gWIwhdAWE1j95l?= =?us-ascii?Q?2Eavxq7NrI9RZQVF3RQC7XkPoPCZYp2N37dUvSbnGkdMi8JfYzlrtNeIKbzf?= =?us-ascii?Q?opnEOrKEGg2Pfx0OOYeTj2U3GLplgrPDbvWM76pdWvvZ4yDfrlOS/x9zRDme?= =?us-ascii?Q?NtCnixsHKlscrGdqD1XuMlPUbPcoj5Eiw46AXoJB7BgizgXMPyRjNYyYmguT?= =?us-ascii?Q?f3hkTuv3BrLkGs39+ql2qePMJxCTa61eosxOSREejGvf8myXIeTnxlylKK0w?= =?us-ascii?Q?w6U7VMp5dBKJg3qymuTaxNiY?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB2752.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b60546e2-68ed-4e93-7845-08d98d205a35 X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Oct 2021 01:33:53.9960 (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: mvV6Zrkqqi2nXjsCqNWpQniQUV+RQ++JMaeBg7LFA/2uuYmkSbiQNsWU90KolFQz4AAW4H4uegi9d/ekw7YkZg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR11MB4811 Return-Path: heng.luo@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Heng Luo > -----Original Message----- > From: Chiu, Chasel > Sent: Friday, October 8, 2021 2: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 dat= a > 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/PeiFspPolicyInitL= ib/ > PeiFspPolicyInitLib.c | 21 ++++++++++++++++++--- >=20 > Platform/Intel/TigerlakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitL= ib/ > 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/PeiFspPolicyIni= tLi > b/PeiFspPolicyInitLib.c > b/Platform/Intel/TigerlakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyIni= tLi > b/PeiFspPolicyInitLib.c > index fc523e93d1..938b74e5d8 100644 > --- > a/Platform/Intel/TigerlakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyIni= tLi > b/PeiFspPolicyInitLib.c > +++ b/Platform/Intel/TigerlakeOpenBoardPkg/FspWrapper/Library/PeiFspPoli > +++ cyInitLib/PeiFspPolicyInitLib.c > @@ -9,7 +9,9 @@ > #include #include > #include +#include #inc= lude > +#include VOID EFIAPI@@ > -70,9 +72,11 @@ SiliconPolicyDonePreMem( > ) { EFI_STATUS Status;+ UINTN = FspNvsBufferSize;+ > VOID *FspNvsBufferPtr; #if FixedPcdGet8(PcdFspMod= eSelection) =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.+ //+ FspNvsBu= fferPtr > =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));+ D= EBUG > ((DEBUG_INFO, "FspNvsBuffer Size - 0x%x\n", FspNvsBufferSize));+ > UPDATE_POLICY (((FSPM_UPD *) FspmUpd)->FspmArchUpd.NvsBufferPtr, > FspmArchConfigPpi->NvsBufferPtr, FspNvsBufferPtr);+ }+ // // Install= Policy > Ready PPI // While installed, RC assumes the Policy is ready and finali= zed. So > pleasediff --git > a/Platform/Intel/TigerlakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyIni= tLi > b/PeiFspPolicyInitLib.inf > b/Platform/Intel/TigerlakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyIni= tLi > b/PeiFspPolicyInitLib.inf > index 708fbac08f..0236ae45ae 100644 > --- > a/Platform/Intel/TigerlakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyIni= tLi > b/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/BaseGpi > oCheckConflictLibNull/BaseGpioCheckConflictLibNull.inf !endif > +[LibraryClasses.Common.SEC]+ > VariableReadLib|MinPlatformPkg/Library/BaseVariableReadLibNull/BaseVariab= l > eReadLibNull.inf+ [LibraryClasses.IA32.SEC] > TestPointCheckLib|$(PLATFORM_PACKAGE)/Test/Library/TestPointCheckLib/Sec > TestPointCheckLib.inf > TestPointCheckLib|$(PLATFORM_PACKAGE)/Test/Library/TestPointCheckLibNull > /TestPointCheckLibNull.inf-- > 2.28.0.windows.1