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.web12.2217.1639712872984329136 for ; Thu, 16 Dec 2021 19:47:53 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=MCbJneGC; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: chasel.chiu@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1639712873; x=1671248873; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=67NtuFvCFglp4YsenTc7BV8UoCGEW1YajDOv+HUNqT4=; b=MCbJneGC0Mw4LblbvQ7/uNpYP0PaGgh1BMvgEjIwLk700ZQNR+5RalU1 plA7dhYaG6ae4hoBXKt8RyxWx40Ooh8TXazDgyInpy8zxgVXGEYGaQI/h iqTONKYUH4zGf9u6QdCiLu32XJw1VrDxjYC8pOHpdhhs1/c2gjX5ryXTU W7X2+hJbmrrQ26YgO6VTPPgMOY2UGi1XgAShRrm7eu39mpLIMOzpGWDCz NKBqWoaLHl8MlcI2W0ko8+2Lltw+5lLvTJVD46M51/bef8B1DSzoTwh8k XUwml1KNVhcMbmSoILrTuoZJVdb86j4nIqQkxCo8qOFwPh6csDtQ4uE9h g==; X-IronPort-AV: E=McAfee;i="6200,9189,10200"; a="220352410" X-IronPort-AV: E=Sophos;i="5.88,213,1635231600"; d="scan'208";a="220352410" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Dec 2021 19:47:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,213,1635231600"; d="scan'208";a="662720043" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by fmsmga001.fm.intel.com with ESMTP; 16 Dec 2021 19:47:52 -0800 Received: from fmsmsx608.amr.corp.intel.com (10.18.126.88) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Thu, 16 Dec 2021 19:47:51 -0800 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx608.amr.corp.intel.com (10.18.126.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Thu, 16 Dec 2021 19:47:51 -0800 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx611.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20 via Frontend Transport; Thu, 16 Dec 2021 19:47:51 -0800 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (104.47.57.168) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.20; Thu, 16 Dec 2021 19:47:50 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BwtAY1eqqV5Mi/1n68kEl39jtPtrr5sSrhOIpWthvQXkqPrCWpSa+uDEOqD45JC83OLqkRBDwxxGfc90rlQ+LINhgp3bzoLuXd+9jm0KF9bx9/OQEHYiyKb7+v8wRjMnKwO6jyjwL55g0ixSg0qHc7BzZhgIdpHu6hle6z+s/uOSY2dWvZim93yYjn4xBILLVliYOEUxSF7bF6PACSBSH4Z+HQWc0CK7oJMwaGRmAuuEUKQCRGP4/UTD/XohLDqmpnuu3SqhHC8mhRELOfQR2mtQEHIwgCStuzKmuop9OwS8yy4/L8b1TXdTOjlvmLfgJXXKkG6CxkRqiLdO55vDTg== 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=VALTHE6F4XwOgUB9WjrFB8fy3fK2kTLpogbLxe+rr1M=; b=A7LajI36NXCdY8zHv4dDW9YIULZVrCKFjFzOgxA2ZXb80RmipE5Un/o1/Vyeg1S4Msk1E9DrgF4uflpGWOxLbALLXKln+ypvuyy5L6c/Zf7GWqGN6EDGD0BTkW+ayg13HkUNy3rloP2e78CFU89TdiR6FPohP17rqiZH6L96PRK2CFQ0MY/y3wBzMC7Twln8hN9MHnnz9RFI/Zi6tJykRZ+R5vRQeSp5U7kaPQRMzjFv8fk/gx3TVCH6JJVZ2rKIwYrlDyHj+2LnjhHhRzfnnF9c6pu9V9ujRmMy1DpvKy07Lg/76tJgJVdZHWJjFZbf5HvtsJhKKp2bJP1VceLnfQ== 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 Received: from BN9PR11MB5483.namprd11.prod.outlook.com (2603:10b6:408:104::10) by BN6PR11MB0019.namprd11.prod.outlook.com (2603:10b6:405:69::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4801.14; Fri, 17 Dec 2021 03:47:49 +0000 Received: from BN9PR11MB5483.namprd11.prod.outlook.com ([fe80::30af:cda7:8cd4:f9f9]) by BN9PR11MB5483.namprd11.prod.outlook.com ([fe80::30af:cda7:8cd4:f9f9%9]) with mapi id 15.20.4778.018; Fri, 17 Dec 2021 03:47:49 +0000 From: "Chiu, Chasel" To: "S, Ashraf Ali" , "devel@edk2.groups.io" CC: "Desimone, Nathaniel L" , "Zeng, Star" , "Kuo, Ted" , "Duggapu, Chinni B" , "Chaganty, Rangasai V" , "Solanki, Digant H" , "V, Sangeetha" , "Ni, Ray" Subject: Re: [PATCH v8] IntelFsp2WrapperPkg : FSPM/S UPD data address based on Build Type Thread-Topic: [PATCH v8] IntelFsp2WrapperPkg : FSPM/S UPD data address based on Build Type Thread-Index: AQHX8lRzM2XzMUEop02HiCM2dO8rnaw2DKbA Date: Fri, 17 Dec 2021 03:47:49 +0000 Message-ID: References: <7886ad065bf2cb1b513300da04db32a698d4b590.1639642126.git.ashraf.ali.s@intel.com> In-Reply-To: <7886ad065bf2cb1b513300da04db32a698d4b590.1639642126.git.ashraf.ali.s@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: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 2ee63d33-445c-4509-66ab-08d9c10ffee6 x-ms-traffictypediagnostic: BN6PR11MB0019:EE_ x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:644; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: kw0T7luQjdbyOWkBit5GCkYui5EZhVNpoW1DEwN3c6jiCPuwitHXS/TLBTOcE7BhKgpLoj4YSPrNE7epPvZRpVf3XeVmtMFWQXJ8cfNdyGAnzx92gY8hxQZl5sfqcEadTfyqB+5sivEqDzYflhKb2Nsjc64dPAnocZFqrmFBUjN/99Egl+DBJEEhqmwoy5L0CiJdP5TSrw9NgfEmwYCIJjJ1/hyUQomW7xfAy1Qw4aIRcDq++SV9UAHvhh08Y4kHeSZ5X2WJm8N6f4Wat1bJl6BGm+fiDxrMKOjX2Dh5oCPed7fzzw8tr1Gsm+omVBXHhH9GY7nlVU0EVddtcsviGNbAWC0OszwJG6IQNhKC72gi7FbETUKfbStUNTVNZpPkk3oUznawmG8w8BBvgnmp5jYXJyMajUkWP3vnrYaejmT5EaJrh8n3ldlOCgZ/APF+axVZyvZ8BhUwIs1o5W4A9yg9v0N+7X1sAmcTuZDrzL3BUE6eh7AThCiwBan4tddscuPcb8Sa+XjDbVPX9zNHW4vT2adWHCYkfbQoPlMOpY6kO72TbEToSaPA3GMpuaGIMFjRApkTEIXs0+Qt2ooxHsJcLqrSmkKt/aMTsNxlkUURpDGFpVZ9hgSEj9Vlx84FVtGtUrlvRFbFkKZEf83UE0H676Qfk4zMJ48iwF/RUJ6KhIzVtHfFZE8j0K9BhJn/athz27TkZz/6jbetLA7Raa1OmJOsPuouPtbR/wK46hsXycVXIwW4m8ZVFxaExHLyQ22ItXezAv7j011mlKFZUjaJ3fS3L3x/nXcvG48jAFs= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BN9PR11MB5483.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(26005)(110136005)(71200400001)(316002)(186003)(38100700002)(54906003)(38070700005)(33656002)(122000001)(66946007)(52536014)(8676002)(7696005)(107886003)(66476007)(64756008)(66556008)(66446008)(8936002)(9686003)(19627235002)(76116006)(83380400001)(2906002)(53546011)(55016003)(508600001)(6506007)(4326008)(82960400001)(5660300002)(86362001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?Wo/vGAYhq7Gg6hDa69xoZVk6q6akqZhGMRbD/eRjYldlI8zI6x7h9EBCDUp/?= =?us-ascii?Q?j9rjUtY6s9KvSabhuz9zXvNjCODlkkBZdYFS3XietyerQYEHhilwCJa0tIqR?= =?us-ascii?Q?cKOM0UKDVYNAUvJOj7zt4BvnKauqz5QezvOcBNUmDt6AH+EeZSPwlqlKwWq5?= =?us-ascii?Q?Dbt69qHRyXhUbzr9tjnyVyCK1KfAKDzbJnCDnHKxV/1jMHXWYElYV6ojqOcx?= =?us-ascii?Q?wW8fnmQm1klD8zIGFQCFNVx9TAj/Rjz18bQGu5uCwpFs9KXy58Uy7LhGm0Si?= =?us-ascii?Q?P+3HYycWSaXNntfdZjcjuU0AK7Z1bK8lfBINQUUQGaOsqjqJU2Jpr0FdM9pq?= =?us-ascii?Q?gNGwaUMdTqPiYd8hNzj06a7YeQB4vWbQEOMCExIufBAp3TjfBht/Is7a2uKh?= =?us-ascii?Q?0k5H6CKVGRuO0kTIJ2/jP1SUye5ee3w5jyD3BcVzS5eM5bDNgrN5G8+a3SxM?= =?us-ascii?Q?0ETkhz+pTUDig6EKGZerfgkWxM9TItsletJwmWm2ZZS8TwlM3qiU9IpB/ouk?= =?us-ascii?Q?+ssyEHCqJzp7e8FS5heUC+8biBr5VkRoRUL3nJboJt8zBssn44KXHuve9wNv?= =?us-ascii?Q?u/7zfhaPUf4F+IEQ7do82Fm+zer7dJ0FRMcOLjiLLwu+rbe/LLqXPJrxPm9+?= =?us-ascii?Q?0l9T6BYK/SL8DuH2sIvovom+CE0Typ4mSZDLtwtKnIYCNFr3EcyCMryuG3Le?= =?us-ascii?Q?6wYARwi9Jp2Zk6DdCwATKEjospNjpqrtPM3gH9qfHa3kL/xQY5Z7mUoVUHh4?= =?us-ascii?Q?XZK3ImV7d8qvJ+iPJNFC4MYtG5FXwoROoI8ogfyUHusHcLCNQU0Il/Lj55/p?= =?us-ascii?Q?+oPGUcwym95uoBtIZGS6jqFRhhGmRmcoLwg49razw/zzjYm4TkPm7/YCbTMA?= =?us-ascii?Q?wX5FQUCAS0kWVWYrGjNioW2m79imoyGEwEqS+lFU5C/sifma/YYWBC7byHJD?= =?us-ascii?Q?G2+mLRiQJh5zbNnijZQ/37BmUsA/LmMJtxfEXE554D4zA3KhX03BOe5SKLrI?= =?us-ascii?Q?LoWdI52pwomTSC+wRh1s3bQPF1qqcWsII3QG58eX119aEnwat/HKrTt0z6Ew?= =?us-ascii?Q?Uaw+qSspR2Fdd9NC6hIErZAJVI25FXDv3TC+LccJMvMsjePwNJjSBX3epiQM?= =?us-ascii?Q?mvIp7y0OBkFE7Au/2CRpk33ZEpJjFr/KquqEkKMVe4IJTCTO7HOnzbMZSCVN?= =?us-ascii?Q?csexB0zz/31pLa9SFfJrvbLONdRYSqXKtMaEONeMoPVMR77IJHv67ZIF2BnP?= =?us-ascii?Q?Bow/5wf/4hDpYWS56W0JCc7Fp7siivek8R1wEAfJtPAWfzWpfPumMKU/SHk1?= =?us-ascii?Q?lYIt+A7i8e9ZKhrSq8TVLEs6ERjmyN6yCNdei6O6HQfA7rFzaqcEsz2xF9gR?= =?us-ascii?Q?c+g0dEPa4xqxHwK7UmkKbkTWpsE1CivWEHp5LwcWHDZOdfF2YJsrSyq8avro?= =?us-ascii?Q?2UnnDbZ+fe7YY7DJVjrH6rNtyKJMoXC3BCOxMsB/2DpWF58YXIIk65zbTl/J?= =?us-ascii?Q?GWqy+xJx9Hf3ud2Pc9uPWvA1UeE2Mc31/beZcXCjC7Amknat4tQ4Qn70gs/W?= =?us-ascii?Q?op8IFx3FLqhaIAzyNGgqCwUvigCp4zI0cPUpIbImdF+lVGqmmshH969E4CNT?= =?us-ascii?Q?kIKTCiVeQWn25xqEDRk9eEE=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN9PR11MB5483.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2ee63d33-445c-4509-66ab-08d9c10ffee6 X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Dec 2021 03:47:49.2936 (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: 9HJ8leQhxpR2yvV6eOREiPOtd183wFX6kCr4yXVpgBuYev4JDTUOjm0jWkOkzwQAgSqjKQgHjQkcbXaKsHcUdw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB0019 Return-Path: chasel.chiu@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Thanks Ashraf! Reviewed-by: Chasel Chiu > -----Original Message----- > From: S, Ashraf Ali > Sent: Thursday, December 16, 2021 4:10 PM > To: devel@edk2.groups.io > Cc: S, Ashraf Ali ; Chiu, Chasel ; > Desimone, Nathaniel L ; Zeng, Star > ; Kuo, Ted ; Duggapu, Chinni B > ; Chaganty, Rangasai V > ; Solanki, Digant H > ; V, Sangeetha ; Ni, R= ay > > Subject: [PATCH v8] IntelFsp2WrapperPkg : FSPM/S UPD data address based o= n > Build Type >=20 > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D3642 > when the module is not building in IA32 mode which will lead to building = error. > when a module built-in X64 function pointer will be the size of 64bit wid= th which > cannot be fit in 32bit address which will lead to error. to overcome this= issue > introducing the 2 new PCD's for the 64bit modules can consume it. based o= n the > which pcd platform set, use that. >=20 > Cc: Chasel Chiu > Cc: Nate DeSimone > Cc: Star Zeng > Cc: Kuo Ted > Cc: Duggapu Chinni B > Cc: Rangasai V Chaganty > Cc: Digant H Solanki > Cc: Sangeetha V > Cc: Ray Ni > Signed-off-by: Ashraf Ali S > --- > .../FspmWrapperPeim/FspmWrapperPeim.c | 25 ++++++++++++++++--- > .../FspmWrapperPeim/FspmWrapperPeim.inf | 3 ++- > .../FspsWrapperPeim/FspsWrapperPeim.c | 25 ++++++++++++++++--- > .../FspsWrapperPeim/FspsWrapperPeim.inf | 3 ++- > IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec | 2 ++ > 5 files changed, 50 insertions(+), 8 deletions(-) >=20 > diff --git a/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c > b/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c > index 287e7f9159..49fbb27eca 100644 > --- a/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c > +++ b/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c > @@ -3,7 +3,7 @@ > register TemporaryRamDonePpi to call TempRamExit API, and register > MemoryDiscoveredPpi > notify to call FspSiliconInit API. >=20 > - Copyright (c) 2014 - 2020, Intel Corporation. All rights reserved.
> + Copyright (c) 2014 - 2021, Intel Corporation. All rights > + reserved.
> SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > **/ > @@ -38,6 +38,25 @@ >=20 > extern EFI_GUID gFspHobGuid; >=20 > +/** > + Get the FSP M UPD Data address > + > + @return FSP-M UPD Data Address > +**/ > + > +UINTN > +EFIAPI > +GetFspmUpdDataAddress ( > + VOID > + ) > +{ > + if (PcdGet64 (PcdFspmUpdDataAddress64) !=3D 0) { > + return (UINTN) PcdGet64 (PcdFspmUpdDataAddress64); > + } else { > + return (UINTN) PcdGet32 (PcdFspmUpdDataAddress); > + } > +} > + > /** > Call FspMemoryInit API. >=20 > @@ -67,7 +86,7 @@ PeiFspMemoryInit ( > return EFI_DEVICE_ERROR; > } >=20 > - if ((PcdGet32 (PcdFspmUpdDataAddress) =3D=3D 0) && (FspmHeaderPtr- > >CfgRegionSize !=3D 0) && (FspmHeaderPtr->CfgRegionOffset !=3D 0)) { > + if ((GetFspmUpdDataAddress () =3D=3D 0) && (FspmHeaderPtr->CfgRegionSi= ze > + !=3D 0) && (FspmHeaderPtr->CfgRegionOffset !=3D 0)) { > // > // Copy default FSP-M UPD data from Flash > // > @@ -79,7 +98,7 @@ PeiFspMemoryInit ( > // > // External UPD is ready, get the buffer from PCD pointer. > // > - FspmUpdDataPtr =3D (FSPM_UPD_COMMON *)PcdGet32 > (PcdFspmUpdDataAddress); > + FspmUpdDataPtr =3D (FSPM_UPD_COMMON *) GetFspmUpdDataAddress(); > ASSERT (FspmUpdDataPtr !=3D NULL); > } >=20 > diff --git a/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf > b/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf > index 00166e56a0..5d0e021401 100644 > --- a/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf > +++ b/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf > @@ -6,7 +6,7 @@ > # register TemporaryRamDonePpi to call TempRamExit API, and register > MemoryDiscoveredPpi # notify to call FspSiliconInit API. > # > -# Copyright (c) 2014 - 2020, Intel Corporation. All rights reserved. > +# Copyright (c) 2014 - 2021, Intel Corporation. All rights > +reserved.
> # > # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -60,6 +60,7 @@ > gIntelFsp2WrapperTokenSpaceGuid.PcdFspModeSelection ## CONSUMES > gIntelFsp2WrapperTokenSpaceGuid.PcdFsptBaseAddress ## CONSUMES > gIntelFsp2WrapperTokenSpaceGuid.PcdFspMeasurementConfig ## > CONSUMES > + gIntelFsp2WrapperTokenSpaceGuid.PcdFspmUpdDataAddress64 ## > CONSUMES >=20 > [Sources] > FspmWrapperPeim.c > diff --git a/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.c > b/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.c > index f7459a90b5..ddee9cd029 100644 > --- a/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.c > +++ b/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.c > @@ -3,7 +3,7 @@ > register TemporaryRamDonePpi to call TempRamExit API, and register > MemoryDiscoveredPpi > notify to call FspSiliconInit API. >=20 > - Copyright (c) 2014 - 2020, Intel Corporation. All rights reserved.
> + Copyright (c) 2014 - 2021, Intel Corporation. All rights > + reserved.
> SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > **/ > @@ -181,6 +181,25 @@ FspSiliconInitDoneGetFspHobList ( > } > } >=20 > +/** > + Get the FSP S UPD Data address > + > + @return FSP-S UPD Data Address > +**/ > + > +UINTN > +EFIAPI > +GetFspsUpdDataAddress ( > + VOID > + ) > +{ > + if (PcdGet64 (PcdFspsUpdDataAddress64) !=3D 0) { > + return (UINTN) PcdGet64 (PcdFspsUpdDataAddress64); > + } else { > + return (UINTN) PcdGet32 (PcdFspsUpdDataAddress); > + } > +} > + > /** > This function is for FSP dispatch mode to perform post FSP-S process. >=20 > @@ -283,7 +302,7 @@ PeiMemoryDiscoveredNotify ( > return EFI_DEVICE_ERROR; > } >=20 > - if ((PcdGet32 (PcdFspsUpdDataAddress) =3D=3D 0) && (FspsHeaderPtr- > >CfgRegionSize !=3D 0) && (FspsHeaderPtr->CfgRegionOffset !=3D 0)) { > + if ((GetFspsUpdDataAddress () =3D=3D 0) && (FspsHeaderPtr->CfgRegionSi= ze > + !=3D 0) && (FspsHeaderPtr->CfgRegionOffset !=3D 0)) { > // > // Copy default FSP-S UPD data from Flash > // > @@ -292,7 +311,7 @@ PeiMemoryDiscoveredNotify ( > SourceData =3D (UINTN *)((UINTN)FspsHeaderPtr->ImageBase + > (UINTN)FspsHeaderPtr->CfgRegionOffset); > CopyMem (FspsUpdDataPtr, SourceData, (UINTN)FspsHeaderPtr- > >CfgRegionSize); > } else { > - FspsUpdDataPtr =3D (FSPS_UPD_COMMON *)PcdGet32 > (PcdFspsUpdDataAddress); > + FspsUpdDataPtr =3D (FSPS_UPD_COMMON *) GetFspsUpdDataAddress(); > ASSERT (FspsUpdDataPtr !=3D NULL); > } >=20 > diff --git a/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf > b/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf > index aeeca58d6d..da0049a654 100644 > --- a/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf > +++ b/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf > @@ -6,7 +6,7 @@ > # register TemporaryRamDonePpi to call TempRamExit API, and register > MemoryDiscoveredPpi # notify to call FspSiliconInit API. > # > -# Copyright (c) 2014 - 2020, Intel Corporation. All rights reserved. > +# Copyright (c) 2014 - 2021, Intel Corporation. All rights > +reserved.
> # > # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -68,6 +68,7 @@ > gIntelFsp2WrapperTokenSpaceGuid.PcdFspsUpdDataAddress ## CONSUMES > gIntelFsp2WrapperTokenSpaceGuid.PcdFspModeSelection ## CONSUMES > gIntelFsp2WrapperTokenSpaceGuid.PcdFspMeasurementConfig ## > CONSUMES > + gIntelFsp2WrapperTokenSpaceGuid.PcdFspsUpdDataAddress64 ## > CONSUMES >=20 > [Guids] > gFspHobGuid ## CONSUMES ## HOB > diff --git a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec > b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec > index b8dac1b574..a5a8b8a19e 100644 > --- a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec > +++ b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec > @@ -121,3 +121,5 @@ > # >=20 > gIntelFsp2WrapperTokenSpaceGuid.PcdFspmUpdDataAddress|0x00000000|UIN > T32|0x50000000 >=20 > gIntelFsp2WrapperTokenSpaceGuid.PcdFspsUpdDataAddress|0x00000000|UINT > 32|0x50000001 > + > + > gIntelFsp2WrapperTokenSpaceGuid.PcdFspmUpdDataAddress64|0x00000000|U > IN > + T64|0x50000002 > + > + > gIntelFsp2WrapperTokenSpaceGuid.PcdFspsUpdDataAddress64|0x00000000|UI > N > + T64|0x50000003 > -- > 2.30.2.windows.1