From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 3D57DAC068A for ; Thu, 21 Dec 2023 00:13:16 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=QUdxJA2fT6WhEHHT7b+iAK8TeUt1QCiPWPBRhFbvM1E=; c=relaxed/simple; d=groups.io; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:From:To:CC:Subject:Thread-Topic:Thread-Index:Date:Message-ID:References:In-Reply-To:Accept-Language:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20140610; t=1703117594; v=1; b=nUStwQBPKbAgmm7e8Ik1JUUmv8n7iEF94mD5wSz9i49qgpxO71AdVcqGQUO7Q9i8jp3kYkiq hQ86apXt59yweqk/1WceTh4zw7HtTQWPuEJjmIohHXWJWVYeIfffjvh76JrOCuLHWTW7/gRfnAQ lKOEM51+99nmYBsxYajRTeLc= X-Received: by 127.0.0.2 with SMTP id 2LyuYY7687511xC4rt9GjvCj; Wed, 20 Dec 2023 16:13:14 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by mx.groups.io with SMTP id smtpd.web10.38017.1703117593857961766 for ; Wed, 20 Dec 2023 16:13:14 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10930"; a="9362649" X-IronPort-AV: E=Sophos;i="6.04,292,1695711600"; d="scan'208";a="9362649" X-Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Dec 2023 16:12:38 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.04,292,1695711600"; d="scan'208";a="18141950" X-Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by orviesa002.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 20 Dec 2023 16:12:38 -0800 X-Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) 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.2507.35; Wed, 20 Dec 2023 16:12:37 -0800 X-Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35 via Frontend Transport; Wed, 20 Dec 2023 16:12:37 -0800 X-Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.41) 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.2507.35; Wed, 20 Dec 2023 16:12:36 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A1rWH5CoZXU58/8693X7+BoOoMAcOLmepAoUE0r72f+f60Bv5gCZfEa/sNNkYSLYFJKzd/DsccZ2Jn+i+eOJZtKGhTJ1esZ3HDJCsdAUTB7ZDecYAx1zhA37AO1fF+yoF75a2ZH0AxTkpqJ/GesmiZxblZUZaQA/l1QK4vrdgltO1lYj5cNmYcyCkk2acPNmO8y/wZuOMPysOpDXwOimNiPyfNhzQSlobD/pu+EOS3bf0vpfVmH3wtMrAr0f6TXpj1+VAgZW+haOZXY4l1xou0gcnSmShWroNXyBKSt+8mE89v6nYs4/VRLG5i93JBnMHefbMBwbGITzaPUKUpub6A== 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=C+0ZniZSlD9hBBeLeAngfnVmkLbby/gmiSCf+UdjkqA=; b=LQQ0TEZh3sO7UtBz2vNdIrOP5+GISTkwhw3WInBGRSRrIZfnxHWd5+QmVJZg1dBcK8ee7iATXOrnQjgNaAiiU6qjqQzw6+z79jRd2w+e+JQrYdCYr+zgrruIyIj01iB2IyVMeXBqR4Fo4nalXcLMIaYbPtU3/sMD7E3NoXGz0N5Q+1WlVUmgNR5AF1BoagoZKUEPYoZT8xdHwUYBrEWUelvSSWtUmEFS1jISAyg2PxRaPTEYweQo661sqhxMhu4x6R2Ok1xVE32MgeU5VAYCElLMe3lc99LqB8ns5jrHLxE/zZyDk4t54ekF83wvMkXkCgYQl2YwHpKE0UInATGf0A== 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 X-Received: from MW4PR11MB5821.namprd11.prod.outlook.com (2603:10b6:303:184::5) by PH0PR11MB4853.namprd11.prod.outlook.com (2603:10b6:510:40::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7113.18; Thu, 21 Dec 2023 00:12:33 +0000 X-Received: from MW4PR11MB5821.namprd11.prod.outlook.com ([fe80::ced7:2db7:4cae:ab0]) by MW4PR11MB5821.namprd11.prod.outlook.com ([fe80::ced7:2db7:4cae:ab0%7]) with mapi id 15.20.7091.034; Thu, 21 Dec 2023 00:12:33 +0000 From: "Nate DeSimone" To: "Kuo, Ted" , "devel@edk2.groups.io" CC: "Chaganty, Rangasai V" , "Chiu, Chasel" , "Dong, Eric" , "S, Ashraf Ali" , "Duggapu, Chinni B" , "Gao, Liming" Subject: Re: [edk2-devel][edk2-platforms][PATCH v1] MinPlatformPkg: Support SecFspWrapperPlatformSecLib in X64 Thread-Topic: [edk2-devel][edk2-platforms][PATCH v1] MinPlatformPkg: Support SecFspWrapperPlatformSecLib in X64 Thread-Index: AQHaMWcyOqOabAvSl0+X6UsIbWXDzrCyzC4g Date: Thu, 21 Dec 2023 00:12:33 +0000 Message-ID: References: <4b738d12c89b75385473339b2da9b3ee76425d44.1702871727.git.ted.kuo@intel.com> In-Reply-To: <4b738d12c89b75385473339b2da9b3ee76425d44.1702871727.git.ted.kuo@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: MW4PR11MB5821:EE_|PH0PR11MB4853:EE_ x-ms-office365-filtering-correlation-id: ed23b231-0182-4558-b5f5-08dc01b987c7 x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: 4lRldNOiCJ1F8SdEr3cDBczeknlhAjUE3Uh2XKQt4+Ue8W7CNrwCb8BeuV/8ZsmgX1roCfKXa6Fg9dE89dsYoxEvvVnj/XVyy/siX0f6jo5v/n1KvwDi24nSj0rs/S6hXPb2fPrhRxrHlP3EDJQao1EESm4loSHarfTnByBFF9Tex5IBKXmxPQw/VRO+mhl6gRmW2kUCk5upzMP5OC9XviNhadWkk6kLunhSQZRK5GoSnf/clePMB5aH3MAqYHXgUeaxynZzLWxCI5BeC9WFBNXXGV5an04fTwib4FGv6G1wZHfJ3U+Y04JDVVGl6kxDKss1lstwrdtXKkqIrzWsy/aad5zOeSHujWsZTibCkH1O3W+0TVvJH75q25a2WU4j0Hnk57B1WlTot+MZOP3+cQ1NzwqTeEU5pZdz/kFPqUMoOWSaysf0a6HVnAxuiW+NuLeMaYCouVSMf89gzpIRBxIp3Y7BjZMBexILUEKePD6ueJq2VPomDSW3NOmZDsb0N/s6LAThM2QHLGiFSfNFo8mmZa+UlVPx4Gfs6wOEZfCnmJWWDiTqRS8NPClRO8HO/gadZP3znJKbOC2m/DiqTsLUeAbnUGTS8iZStO8c3mPoJld0pyy+Yz9A6EsjQio7L1Do5Sib5uTgDLAYvPTAoIqVsm9VFlar9UDYUiwCt8Nrsx4YP0qstrTRC2DdYvJCeqlrmM4OxAU/mEgcAEviYA== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?xoD9WStanWQMGsHLswJDOk5JSgc1uxesZX3FouH3FsdEuB/SZ6E+7OK/w5OP?= =?us-ascii?Q?QJwchwUx4cyrWu8pwhDqcyLBFf9qSLo57dT1PcB+7MLW//DHlrpNt1bhe8C+?= =?us-ascii?Q?e6ffQ/r5u8wyy01DkP1fco+Y6eYM7UVHIyNVBlQGdb0cnjDIcn54/lfbOwln?= =?us-ascii?Q?870Mw2HCDDwI5sCluNTcX/rRb65hywHjxWM2SeFcoUBqX/11DFsFfSk6IeT3?= =?us-ascii?Q?W8bFYgnj4SZwg+cdLFYpCtoA8UsGu9++XEeuvRu2rlOH5RtWzqpCZnx0LmGi?= =?us-ascii?Q?3kbYqjfdsJWMat2Kfkhmy9Zbw0cqTXE/Pa2uCIPtk6gdZpGzSDNfkPggFP8Q?= =?us-ascii?Q?6qcLJoFf5k+BKYywRRsRFLRkis6tAOOC0GIv6PBmSWNXItfU/5MEJUkihXUo?= =?us-ascii?Q?4G2XiehM/laawIO1XFg6m75D0ibOFW52GvxU1nyY5q3m7wRlfuAyh8mT3unO?= =?us-ascii?Q?1LnTC0Ylr9OrvAgruI3S4XqPrWutql5GhmMbVOvguhrNO3MkJXWWJZnodEdV?= =?us-ascii?Q?CFuTnBi1gccOVoP+bakisffQGyJlql9sAhUso/icftPORe8IFlHpR583Z+py?= =?us-ascii?Q?y1txddqNqPCda+Y7ZVmsRrbeGVHB8vdqBEnRY0oA3NTT4p5U5g+nwI+uZJ3L?= =?us-ascii?Q?RUcMeIihf9lo2gJ9FeiO0aQ5SQkVQzT9hZxGJPo5jPM6wgvEkZ77h7WfrnWm?= =?us-ascii?Q?tZkY9/E7MHj2QXIH2HbKon7c6DlN8feZrLhXqnkoe2TCDIaqr+/LTORqMDL5?= =?us-ascii?Q?fgkxVSA2IEjUnQt2opmLgCqoSzxt+rncnJaY2blN6u1jt/YrSO2C4z0yOTGR?= =?us-ascii?Q?vcCB3zXSVQddSeGrwwptStOnKv0mBBIChdyNFJHXrvnPFb/sBUNJMJF0HZgC?= =?us-ascii?Q?EM2AzVZf0AjMp8+moVd2oi3ON1HheyPuhXq8BTmr4lUl2jDqRN3AO6UefgX+?= =?us-ascii?Q?I9jF7ttayLTa5UOpNtKoD7SN/EMIVu3IoFbdGk94BBHawGe2IWRA3NUbxmd+?= =?us-ascii?Q?GrHP5vKIsynIShoRy3C+GzBWAAgre0ai00Zxg/ksNMiJELfcjROucNsEqRCe?= =?us-ascii?Q?/1rKxZGcCoGBHZp7hSOvLi+DfthNtitNYyJ+cflbDH9Q8kSpgU5kDqobA7qW?= =?us-ascii?Q?jTTpZfqZARLxtyge/lN2P7eqi3SFFaSdPGKwlIyoXtS+GkpLJ1zkJj/QFVZK?= =?us-ascii?Q?tvXUiFgeyKsZdbmv0RD0vjnDe0b2fvAENSI7f1xWXaX1imT7x6JQFjXFyIb0?= =?us-ascii?Q?4UlY1odkfeKJBN/OFzr/pJMBe3/wSM2LEQtRjya+RpqL6auns7C0MtTf96A3?= =?us-ascii?Q?thrthcy/taMhyQ5hB3e9B9PvfE+3VU7PE2eOlDzsRnMhNcQ03sTOO9Y3OBT9?= =?us-ascii?Q?UoehCVmcQ4a0saNjGEmPvCXpSbHdI4c+PUdnTi60xWa8DkvButNxyGHfyPoL?= =?us-ascii?Q?QXAU0arfdLeQKwdKbuszk2jWwf5WvGEpDvfqd7X5/lJiLWVvpf8csy1DGPIi?= =?us-ascii?Q?hjI1QsUb1TwqIFYOufbJT3rg0UEuxdcjEf5caZs/1vvALP4j+uDetcWCm6WZ?= =?us-ascii?Q?mM1IFcXydUijwrq0U6gOhv64O0ZKnIT3YIN+RvsnSkavbwgF1+hgxXuS3bsB?= =?us-ascii?Q?ng=3D=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MW4PR11MB5821.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ed23b231-0182-4558-b5f5-08dc01b987c7 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Dec 2023 00:12:33.7866 (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: 7qMLHLaGGVXG3OZrn98Tn8ftbQYr2IY+LoSso3mTJkUKWIC0LxYxiH+NjJsyBTjGCzIyMnYvRFp0k/MguuX+ojWrcNTMdfX5uDtRLxyo5eo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB4853 X-OriginatorOrg: intel.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,nathaniel.l.desimone@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: KZeFsQYNdEXpkudPPo2lQ6stx7686176AA= Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=nUStwQBP; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io Hi Ted, Looking at this code, the X64 version will only work if PcdFspWrapperResetV= ectorInFsp =3D=3D TRUE. Moreover, the IA32 version will only work if PcdFsp= WrapperResetVectorInFsp =3D=3D FALSE. So... what is the point of having a P= CD if the PCD must always be set to one value or the other? Please choose o= ne of these options: Option 1: Make the PCD work correctly for all the 4 cases: - IA32 + Bootloader Reset Vector - IA32 + FSP Reset Vector - X64 + Bootloader Reset Vector - X64 + FSP Reset Vector Option 2: Make a separate instance of PlatformSecLib for the case of FSP-O = providing the reset vector. Additional feedback is below inline. Thanks, Nate > -----Original Message----- > From: Kuo, Ted > Sent: Sunday, December 17, 2023 8:03 PM > To: devel@edk2.groups.io > Cc: Chaganty, Rangasai V ; Chiu, Chasel > ; Desimone, Nathaniel L > ; Dong, Eric ; S, > Ashraf Ali ; Duggapu, Chinni B > ; Gao, Liming > Subject: [edk2-devel][edk2-platforms][PATCH v1] MinPlatformPkg: Support > SecFspWrapperPlatformSecLib in X64 >=20 > https://bugzilla.tianocore.org/show_bug.cgi?id=3D4623 > 1.Added PeiCoreEntry.nasm, SecEntry.nasm and Stack.nasm for X64. > 2.Made changes in common file to support both IA32 and X64. > 3.Added the PCDs below for FSP-T UPD revsions and X64 feature. > - PcdFspWrapperResetVectorInFsp > - PcdFspWrapperBfvforResetVectorInFsp > - PcdFsptUpdHeaderRevision > - PcdFsptArchUpdHeaderRevision >=20 > Cc: Sai Chaganty > Cc: Chasel Chiu > Cc: Nate DeSimone > Cc: Eric Dong > Cc: Ashraf Ali S > Cc: Chinni B Duggapu > Cc: Liming Gao > Signed-off-by: Ted Kuo > --- > .../SecFspWrapperPlatformSecLib/FsptCoreUpd.h | 25 +- > .../Ia32/SecEntry.nasm | 4 +- > .../SecFspWrapperPlatformSecLib.inf | 12 +- > .../SecGetPerformance.c | 11 +- > .../SecPlatformInformation.c | 8 +- > .../SecRamInitData.c | 56 ++++- > .../X64/PeiCoreEntry.nasm | 224 ++++++++++++++++++ > .../X64/SecEntry.nasm | 214 +++++++++++++++++ > .../X64/Stack.nasm | 72 ++++++ > .../Ia32 =3D> Include}/Fsp.h | 4 +- > .../Intel/MinPlatformPkg/MinPlatformPkg.dec | 21 ++ > 11 files changed, 629 insertions(+), 22 deletions(-) > create mode 100644 Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecF= spWrapperPlatformSecLib/X64/PeiCoreEntry.nasm > create mode 100644 Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecF= spWrapperPlatformSecLib/X64/SecEntry.nasm > create mode 100644 Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecF= spWrapperPlatformSecLib/X64/Stack.nasm > rename Platform/Intel/MinPlatformPkg/{FspWrapper/Library/SecFspWrapperPl= atformSecLib/Ia32 =3D> Include}/Fsp.h (86%) >=20 > diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapp= erPlatformSecLib/FsptCoreUpd.h b/Platform/Intel/MinPlatformPkg/FspWrapper/L= ibrary/SecFspWrapperPlatformSecLib/FsptCoreUpd.h > index 7c0f605b92..7c4ddc09a8 100644 > --- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatf= ormSecLib/FsptCoreUpd.h > +++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatf= ormSecLib/FsptCoreUpd.h > @@ -1,6 +1,6 @@ > /** @file > =20 > -Copyright (c) 2017, Intel Corporation. All rights reserved.
> +Copyright (c) 2017 - 2023, Intel Corporation. All rights reserved.
> SPDX-License-Identifier: BSD-2-Clause-Patent > =20 > **/ > @@ -10,6 +10,28 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > =20 > #pragma pack(1) > =20 > +#if defined (MDE_CPU_X64) > +/** Fsp T Core UPD > +**/ > +typedef struct { > + > +/** Offset 0x0040 > +**/ > + EFI_PHYSICAL_ADDRESS MicrocodeRegionBase; > + > +/** Offset 0x0048 > +**/ > + UINT64 MicrocodeRegionSize; > + > +/** Offset 0x0050 > +**/ > + EFI_PHYSICAL_ADDRESS CodeRegionBase; > + > +/** Offset 0x0058 > +**/ > + UINT64 CodeRegionSize; > +} FSPT_CORE_UPD; > +#else > /** Fsp T Core UPD > **/ > typedef struct { > @@ -34,6 +56,7 @@ typedef struct { > **/ > UINT8 Reserved[16]; > } FSPT_CORE_UPD; > +#endif > =20 > #pragma pack() > =20 > diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapp= erPlatformSecLib/Ia32/SecEntry.nasm b/Platform/Intel/MinPlatformPkg/FspWrap= per/Library/SecFspWrapperPlatformSecLib/Ia32/SecEntry.nasm > index 7f6d771e41..de44066a20 100644 > --- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatf= ormSecLib/Ia32/SecEntry.nasm > +++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatf= ormSecLib/Ia32/SecEntry.nasm > @@ -1,6 +1,6 @@ > ;-----------------------------------------------------------------------= ------- > ; > -; Copyright (c) 2019, Intel Corporation. All rights reserved.
> +; Copyright (c) 2019 - 2023, Intel Corporation. All rights reserved.
> ; SPDX-License-Identifier: BSD-2-Clause-Patent > ; Module Name: > ; > @@ -13,7 +13,7 @@ > ; > ;-----------------------------------------------------------------------= ------- > =20 > -#include "Fsp.h" > +#include > =20 > SECTION .text > =20 > diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapp= erPlatformSecLib/SecFspWrapperPlatformSecLib.inf b/Platform/Intel/MinPlatfo= rmPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecFspWrapperPlatformS= ecLib.inf > index 2e0d67eae4..99a04cc264 100644 > --- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatf= ormSecLib/SecFspWrapperPlatformSecLib.inf > +++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatf= ormSecLib/SecFspWrapperPlatformSecLib.inf > @@ -1,7 +1,7 @@ > ## @file > # Provide FSP wrapper platform sec related function. > # > -# Copyright (c) 2017 - 2021, Intel Corporation. All rights reserved. > +# Copyright (c) 2017 - 2023, Intel Corporation. All rights reserved. > # > # SPDX-License-Identifier: BSD-2-Clause-Patent > # > @@ -47,7 +47,11 @@ > Ia32/SecEntry.nasm > Ia32/PeiCoreEntry.nasm > Ia32/Stack.nasm > - Ia32/Fsp.h > + > +[Sources.X64] > + X64/SecEntry.nasm > + X64/PeiCoreEntry.nasm > + X64/Stack.nasm > =20 > ########################################################################= ######## > # > @@ -96,3 +100,7 @@ > gIntelFsp2WrapperTokenSpaceGuid.PcdFspmBaseAddress ##= CONSUMES > gIntelFsp2WrapperTokenSpaceGuid.PcdFspModeSelection ##= CONSUMES > gMinPlatformPkgTokenSpaceGuid.PcdFspDispatchModeUseFspPeiMain ##= CONSUMES > + gMinPlatformPkgTokenSpaceGuid.PcdFspWrapperResetVectorInFsp ##= CONSUMES > + gMinPlatformPkgTokenSpaceGuid.PcdFspWrapperBfvforResetVectorInFsp ##= CONSUMES > + gMinPlatformPkgTokenSpaceGuid.PcdFsptUpdHeaderRevision ##= CONSUMES > + gMinPlatformPkgTokenSpaceGuid.PcdFsptArchUpdHeaderRevision ##= CONSUMES > diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapp= erPlatformSecLib/SecGetPerformance.c b/Platform/Intel/MinPlatformPkg/FspWra= pper/Library/SecFspWrapperPlatformSecLib/SecGetPerformance.c > index ac2deeabec..471e9e86a2 100644 > --- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatf= ormSecLib/SecGetPerformance.c > +++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatf= ormSecLib/SecGetPerformance.c > @@ -1,7 +1,7 @@ > /** @file > Sample to provide SecGetPerformance function. > =20 > -Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.
> +Copyright (c) 2017 - 2023, Intel Corporation. All rights reserved.
> SPDX-License-Identifier: BSD-2-Clause-Patent > =20 > **/ > @@ -58,6 +58,7 @@ SecGetPerformance ( > if (EFI_ERROR (Status)) { > return EFI_NOT_FOUND; > } > + > // > // |--------------| <- TopOfTemporaryRam - BL > // | List Ptr | > @@ -77,12 +78,12 @@ SecGetPerformance ( > // | TSC[31:00] | > // |--------------| > // > - TopOfTemporaryRam =3D (UINTN) TopOfTemporaryRamPpi - sizeof (UINT32); > - TopOfTemporaryRam -=3D sizeof (UINT32) * 2; > - Count =3D *(UINT32 *)(TopOfTemporaryRam - sizeof (UINT32))= ; > + TopOfTemporaryRam =3D (UINT32)(UINTN)TopOfTemporaryRamPpi - sizeof(UIN= TN); Why the cast from UINTN to UINT32? This will truncate the value and cause t= he code to break if we map the reset vector to > 4 GB. > + TopOfTemporaryRam -=3D sizeof(UINTN) * 2; > + Count =3D *(UINT32 *) (UINTN) (TopOfTemporaryRam - sizeof = (UINT32)); > Size =3D Count * sizeof (UINT32); > =20 > - Ticker =3D *(UINT64 *) (TopOfTemporaryRam - sizeof (UINT32) - Size - s= izeof (UINT32) * 2); > + Ticker =3D *(UINT64 *) (UINTN) (TopOfTemporaryRam - sizeof (UINT32) - = Size - sizeof (UINT32) * 2); Any reason for using sizeof (UINT32) * 2 instead of sizeof(UINT64)? To me i= t seems somewhat obvious that a TSC value would be 64-bit size even though = EDX:EAX are used to return it. Ticker =3D *(UINT64 *) (UINTN) (TopOfTemporaryRam - sizeof (UINT32) - Size = - sizeof (UINT64)); > Performance->ResetEnd =3D GetTimeInNanoSecond (Ticker); > =20 > return EFI_SUCCESS; > diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapp= erPlatformSecLib/SecPlatformInformation.c b/Platform/Intel/MinPlatformPkg/F= spWrapper/Library/SecFspWrapperPlatformSecLib/SecPlatformInformation.c > index 24d55ed838..68b3fa14c0 100644 > --- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatf= ormSecLib/SecPlatformInformation.c > +++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatf= ormSecLib/SecPlatformInformation.c > @@ -1,7 +1,7 @@ > /** @file > Provide SecPlatformInformation function. > =20 > -Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.
> +Copyright (c) 2017 - 2023, Intel Corporation. All rights reserved.
> SPDX-License-Identifier: BSD-2-Clause-Patent > =20 > **/ > @@ -59,9 +59,9 @@ SecPlatformInformation ( > // This routine copies the BIST information to the buffer pointed by > // PlatformInformationRecord for output. > // > - TopOfTemporaryRam =3D (UINTN) TopOfTemporaryRamPpi - sizeof (UINT32); > - TopOfTemporaryRam -=3D sizeof (UINT32) * 2; > - Count =3D *((UINT32 *)(TopOfTemporaryRam - sizeof (UINT32)= )); > + TopOfTemporaryRam =3D (UINT32)(UINTN)TopOfTemporaryRamPpi - sizeof (UI= NTN); Why the cast from UINTN to UINT32? This will truncate the value and cause t= he code to break if we map the reset vector to > 4 GB. > + TopOfTemporaryRam -=3D sizeof(UINTN) * 2; > + Count =3D *((UINT32 *)(UINTN) (TopOfTemporaryRam - sizeof = (UINT32))); > Size =3D Count * sizeof (IA32_HANDOFF_STATUS); > =20 > if ((*StructureSize) < (UINT64) Size) { > diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapp= erPlatformSecLib/SecRamInitData.c b/Platform/Intel/MinPlatformPkg/FspWrappe= r/Library/SecFspWrapperPlatformSecLib/SecRamInitData.c > index 355d1e6509..928049f13b 100644 > --- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatf= ormSecLib/SecRamInitData.c > +++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatf= ormSecLib/SecRamInitData.c > @@ -1,7 +1,7 @@ > /** @file > Provide TempRamInitParams data. > =20 > -Copyright (c) 2017 - 2021, Intel Corporation. All rights reserved.
> +Copyright (c) 2017 - 2023, Intel Corporation. All rights reserved.
> SPDX-License-Identifier: BSD-2-Clause-Patent > =20 > **/ > @@ -12,17 +12,59 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > =20 > typedef struct { > FSP_UPD_HEADER FspUpdHeader; > +#if FixedPcdGet8 (PcdFsptArchUpdHeaderRevision) =3D=3D 1 > + FSPT_ARCH_UPD FsptArchUpd; > +#elif FixedPcdGet8 (PcdFsptArchUpdHeaderRevision) =3D=3D 2 > + FSPT_ARCH2_UPD FsptArchUpd; > +#endif > FSPT_CORE_UPD FsptCoreUpd; > -} FSPT_UPD_CORE_DATA; > + UINT16 UpdTerminator; > +} FSPT_UPD_DATA; > =20 > -GLOBAL_REMOVE_IF_UNREFERENCED CONST FSPT_UPD_CORE_DATA FsptUpdDataPtr = =3D { > +GLOBAL_REMOVE_IF_UNREFERENCED CONST FSPT_UPD_DATA FsptUpdDataPtr =3D { Please add comments to all the FsptUpdDataPtr initial values below so it is= clear which field is being initialized to which value. > { > 0x4450555F54505346, > - 0x00, > + FixedPcdGet8 (PcdFsptUpdHeaderRevision), > { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x00, 0x00 > } > }, > +#if FixedPcdGet8 (PcdFsptArchUpdHeaderRevision) =3D=3D 1 > + { > + 0x01, > + { > + 0x00, 0x00, 0x00 > + }, > + 0x00000020, > + 0, > + { > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 > + } > + }, > +#elif FixedPcdGet8 (PcdFsptArchUpdHeaderRevision) =3D=3D 2 > + { > + 0x02, > + { > + 0x00, 0x00, 0x00 > + }, > + 0x00000020, > + 0, > + { > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 > + } > + }, > +#endif > +#if defined (MDE_CPU_X64) > + { > + FixedPcdGet32 (PcdFlashFvMicrocodeBase) + FixedPcdGet32 (PcdMicrocod= eOffsetInFv), > + FixedPcdGet32 (PcdFlashFvMicrocodeSize) - FixedPcdGet32 (PcdMicrocod= eOffsetInFv), > + 0, // Set CodeRegionBase as 0, so that caching will be 4GB-= (CodeRegionSize > LLCSize ? LLCSize : CodeRegionSize) will be used. > + FixedPcdGet32 (PcdFlashCodeCacheSize) > + }, > +#else > { > FixedPcdGet32 (PcdFlashFvMicrocodeBase) + FixedPcdGet32 (PcdMicrocod= eOffsetInFv), > FixedPcdGet32 (PcdFlashFvMicrocodeSize) - FixedPcdGet32 (PcdMicrocod= eOffsetInFv), > @@ -31,6 +73,8 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST FSPT_UPD_CORE_DATA = FsptUpdDataPtr =3D { > { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 > } > - } > + }, > +#endif > + 0x55AA > }; > =20 > diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapp= erPlatformSecLib/X64/PeiCoreEntry.nasm b/Platform/Intel/MinPlatformPkg/FspW= rapper/Library/SecFspWrapperPlatformSecLib/X64/PeiCoreEntry.nasm > new file mode 100644 > index 0000000000..c69c3b1116 > --- /dev/null > +++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatf= ormSecLib/X64/PeiCoreEntry.nasm > @@ -0,0 +1,224 @@ > +;-----------------------------------------------------------------------= ------- > +; > +; Copyright (c) 2023, Intel Corporation. All rights reserved.
> +; SPDX-License-Identifier: BSD-2-Clause-Patent > +; > +; Module Name: > +; > +; PeiCoreEntry.nasm > +; > +; Abstract: > +; > +; Find and call SecStartup > +; > +;-----------------------------------------------------------------------= ------- > + > +SECTION .text > + > +extern ASM_PFX(SecStartup) > +extern ASM_PFX(PlatformInit) > +extern ASM_PFX(PcdGet32 (PcdFspWrapperBfvforResetVectorInFsp)) > + > +;-----------------------------------------------------------------------= ------ > +; Macro: PUSHA_64 > +; > +; Description: Saves all registers on stack > +; > +; Input: None > +; > +; Output: None > +;-----------------------------------------------------------------------= ------ > +%macro PUSHA_64 0 > + push r8 > + push r9 > + push r10 > + push r11 > + push r12 > + push r13 > + push r14 > + push r15 > + push rax > + push rcx > + push rdx > + push rbx > + push rsp > + push rbp > + push rsi > + push rdi > +%endmacro > + > +;-----------------------------------------------------------------------= ------ > +; Macro: POPA_64 > +; > +; Description: Restores all registers from stack > +; > +; Input: None > +; > +; Output: None > +;-----------------------------------------------------------------------= ------ > +%macro POPA_64 0 > + pop rdi > + pop rsi > + pop rbp > + pop rsp > + pop rbx > + pop rdx > + pop rcx > + pop rax > + pop r15 > + pop r14 > + pop r13 > + pop r12 > + pop r11 > + pop r10 > + pop r9 > + pop r8 > +%endmacro > + > +; > +; args 1:XMM, 2:REG, 3:IDX > +; > +%macro LXMMN 3 > + pextrq %2, %1, (%3 & 3) > + %endmacro Why are some do some of these macro definitions have %endmacro at the same = indent as %macro and some of them have it indented? Please do it the same w= ay for all the macro definitions in the file. > + > +; > +; args 1:YMM, 2:XMM, 3:IDX (0 - lower 128bits, 1 - upper 128bits) > +; > +%macro LYMMN 3 > + vextractf128 %2, %1, %3 > + %endmacro > + > +%macro LOAD_TS 1 > + LYMMN ymm6, xmm5, 1 > + LXMMN xmm5, %1, 1 > + %endmacro > + > +global ASM_PFX(CallPeiCoreEntryPoint) > +ASM_PFX(CallPeiCoreEntryPoint): > + ; > + ; Per X64 calling convention, make sure RSP is 16-byte aligned. > + ; > + mov rax, rsp > + and rax, 0fh > + sub rsp, rax > + > + ; > + ; Platform init > + ; > + PUSHA_64 > + sub rsp, 20h > + call ASM_PFX(PlatformInit) > + add rsp, 20h > + POPA_64 > + > + ; > + ; Set stack top pointer > + ; > + mov rsp, r8 > + > + ; > + ; Push the hob list pointer > + ; > + push rcx > + > + ; > + ; RBP holds start of BFV passed from Vtf0. Save it to r10. > + ; > + mov r10, rbp > + > + ; > + ; Save the value > + ; RDX: start of range > + ; r8: end of range > + ; > + mov rbp, rsp > + push rdx > + push r8 > + mov r14, rdx > + mov r15, r8 > + > + ; > + ; Push processor count to stack first, then BIST status (AP then BSP) > + ; > + mov eax, 1 > + cpuid > + shr ebx, 16 > + and ebx, 0000000FFh > + cmp bl, 1 > + jae PushProcessorCount > + > + ; > + ; Some processors report 0 logical processors. Effectively 0 =3D 1. > + ; So we fix up the processor count > + ; > + inc ebx > + > +PushProcessorCount: > + sub rsp, 4 > + mov rdi, rsp > + mov DWORD [rdi], ebx > + > + ; > + ; We need to implement a long-term solution for BIST capture. For now= , we just copy BSP BIST > + ; for all processor threads > + ; > + xor ecx, ecx > + mov cl, bl > +PushBist: > + sub rsp, 4 > + mov rdi, rsp > + movd eax, mm0 > + mov DWORD [rdi], eax > + loop PushBist > + > + ; Save Time-Stamp Counter > + LOAD_TS rax > + push rax > + > + ; > + ; Per X64 calling convention, make sure RSP is 16-byte aligned. > + ; > + mov rax, rsp > + and rax, 0fh > + sub rsp, rax > + > + ; > + ; Pass entry point of the PEI core > + ; > + mov rdi, 0FFFFFFE0h > + mov edi, DWORD [rdi] > + mov r9, rdi > + > + ; > + ; Pass BFV into the PEI Core > + ; > +#if FixedPcdGet8(PcdFspWrapperResetVectorInFsp) =3D=3D 1 > + ; > + ; Reset Vector and initial sec core (to initialize Temp Ram) is part o= f FSP O > + ; Default UefiCpuPkg Reset Vector locates FSP O as BFV > + ; However the Actual Sec Core that launches PEI is part of another Fv. > + ; We need to Pass that Fv as BFV to PEI Core > + ; > + xor rcx, rcx > + mov r8, ASM_PFX (PcdGet32 (PcdFspWrapperBfvforResetVectorInFsp)) > + mov ecx, DWORD[r8] This should be UINT64 since it is possible with 64-bit for the reset vector= to be > 4 GB. > + mov r8, rcx > +#else > + mov r8, r10 > +#endif > + > + ; > + ; Pass stack size into the PEI Core > + ; > + mov rcx, r15 ; Start of TempRam > + mov rdx, r14 ; End of TempRam > + > + sub rcx, rdx ; Size of TempRam > + > + ; > + ; Pass Control into the PEI Core > + ; > + sub rsp, 20h > + call ASM_PFX(SecStartup) > + > diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapp= erPlatformSecLib/X64/SecEntry.nasm b/Platform/Intel/MinPlatformPkg/FspWrapp= er/Library/SecFspWrapperPlatformSecLib/X64/SecEntry.nasm > new file mode 100644 > index 0000000000..c4a95fbe10 > --- /dev/null > +++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatf= ormSecLib/X64/SecEntry.nasm > @@ -0,0 +1,214 @@ > +;-----------------------------------------------------------------------= ------- > +; > +; Copyright (c) 2023, Intel Corporation. All rights reserved.
> +; SPDX-License-Identifier: BSD-2-Clause-Patent > +; Module Name: > +; > +; SecEntry.nasm > +; > +; Abstract: > +; > +; This is the code that passes control to PEI core. > +; > +;-----------------------------------------------------------------------= ------- > + > +#include > + > +IA32_CR4_OSFXSR equ 200h > +IA32_CR4_OSXMMEXCPT equ 400h > +IA32_CR0_MP equ 2h > + > +IA32_CPUID_SSE2 equ 02000000h > +IA32_CPUID_SSE2_B equ 26 > + > +SECTION .text > + > +extern ASM_PFX(CallPeiCoreEntryPoint) > +extern ASM_PFX(FsptUpdDataPtr) > +extern ASM_PFX(BoardBeforeTempRamInit) > +; Pcds > +extern ASM_PFX(PcdGet32 (PcdFspTemporaryRamSize)) > +extern ASM_PFX(PcdGet32 (PcdFsptBaseAddress)) > + > +;-----------------------------------------------------------------------= ----- > +; > +; Procedure: _ModuleEntryPoint > +; > +; Input: None > +; > +; Output: None > +; > +; Destroys: Assume all registers > +; > +; Description: > +; > +; Call TempRamInit API from FSP binary. After TempRamInit done, pass > +; control to PEI core. > +; > +; Return: None > +; > +; MMX Usage: > +; MM0 =3D BIST State > +; > +;-----------------------------------------------------------------------= ----- > + > +BITS 64 > +align 16 > +global ASM_PFX(_ModuleEntryPoint) > +ASM_PFX(_ModuleEntryPoint): > +#if FixedPcdGet8(PcdFspWrapperResetVectorInFsp) =3D=3D 1 > + ; > + ; When Fsp holds reset vector, TempRamInitApi would be called by FSP i= tself > + ; and this will be the first call to FspWrapper. So, Skip calling Temp= RamInitApi > + ; and proceed further to launch PeiCore Entry. > + ; > + jmp CallSecFspInit > +#endif > + > + fninit ; clear any pending Floating poi= nt exceptions > + ; > + ; Store the BIST value in mm0 > + ; > + movd mm0, eax > + cli > + > + ; > + ; Check INIT# is asserted by port 0xCF9 > + ; > + mov dx, 0CF9h > + in al, dx > + cmp al, 04h > + jz IssueWarmReset > + > + ; Trigger warm reset if PCIEBAR register is not in reset/default value= state > + ; > + mov eax, 80000060h ; PCIEX_BAR_REG B0:D0:F0:R60 > + mov dx, 0CF8h > + out dx, eax > + mov dx, 0CFCh > + in eax, dx > + cmp eax, 0 > + jz NotWarmStart > + > +IssueWarmReset: > + ; > + ; @note Issue warm reset, since if CPU only reset is issued not all MS= Rs are restored to their defaults > + ; > + mov dx, 0CF9h > + mov al, 06h > + out dx, al > + jmp $ > + > +NotWarmStart: > + ; Find FSP info header > + mov rax, ASM_PFX(PcdGet32 (PcdFsptBaseAddress)) > + mov edi, [eax] > + > + mov eax, dword [edi + FVH_SIGINATURE_OFFSET] > + cmp eax, FVH_SIGINATURE_VALID_VALUE > + jnz FspHeaderNotFound > + > + xor eax, eax > + mov ax, word [edi + FVH_EXTHEADER_OFFSET_OFFSET] > + cmp ax, 0 > + jnz FspFvExtHeaderExist > + > + xor eax, eax > + mov ax, word [edi + FVH_HEADER_LENGTH_OFFSET] ; Bypass Fv Head= er > + add edi, eax > + jmp FspCheckFfsHeader > + > +FspFvExtHeaderExist: > + add edi, eax > + mov eax, dword [edi + FVH_EXTHEADER_SIZE_OFFSET] ; Bypass Ext Fv = Header > + add edi, eax > + > + ; Round up to 8 byte alignment > + mov eax, edi > + and al, 07h > + jz FspCheckFfsHeader > + > + and edi, 0FFFFFFF8h > + add edi, 08h > + > +FspCheckFfsHeader: > + ; Check the ffs guid > + mov eax, dword [edi] > + cmp eax, FSP_HEADER_GUID_DWORD1 > + jnz FspHeaderNotFound > + > + mov eax, dword [edi + 4] > + cmp eax, FSP_HEADER_GUID_DWORD2 > + jnz FspHeaderNotFound > + > + mov eax, dword [edi + 8] > + cmp eax, FSP_HEADER_GUID_DWORD3 > + jnz FspHeaderNotFound > + > + mov eax, dword [edi + 0Ch] > + cmp eax, FSP_HEADER_GUID_DWORD4 > + jnz FspHeaderNotFound > + > + add edi, FFS_HEADER_SIZE_VALUE ; Bypass the ffs header > + > + ; Check the section type as raw section > + mov al, byte [edi + SECTION_HEADER_TYPE_OFFSET] > + cmp al, 019h > + jnz FspHeaderNotFound > + > + add edi, RAW_SECTION_HEADER_SIZE_VALUE ; Bypass the section header > + jmp FspHeaderFound > + > +FspHeaderNotFound: > + jmp $ > + > +FspHeaderFound: > + ; Get the fsp TempRamInit Api address > + mov eax, dword [edi + FSP_HEADER_IMAGEBASE_OFFSET] > + add eax, dword [edi + FSP_HEADER_TEMPRAMINIT_OFFSET] > + > + ; Setup the hardcode stack > + mov rsp, TempRamInitStack ; move return address to rsp > + mov rcx, ASM_PFX(FsptUpdDataPtr) ; TempRamInitParams > + > + ; Call the fsp TempRamInit Api > + jmp rax > + > +TempRamInitDone: > + mov rbx, 0800000000000000Eh > + cmp rax, rbx ; Check if EFI_NOT_FOUND returned. Err= or code for Microcode Update not found. > + je CallSecFspInit ; If microcode not found, don't hang, = but continue. > + > + test rax, rax ; Check if EFI_SUCCESS returned. > + jnz FspApiFailed > + > + ; RDX: start of range > + ; R8: end of range > +CallSecFspInit: > +#if FixedPcdGet8(PcdFspModeSelection) =3D=3D 1 > + push rax > + mov rax, ASM_PFX(PcdGet32 (PcdFspTemporaryRamSize)) > + sub edx, dword [rax] ; TemporaryRam for FSP > + pop rax > +#endif > + > + mov r8, rdx > + mov rdx, rcx > + xor ecx, ecx ; zero - no Hob List Yet > + mov rsp, r8 > + > + ; > + ; Per X64 calling convention, make sure RSP is 16-byte aligned. > + ; > + mov rax, rsp > + and rax, 0fh > + sub rsp, rax > + > + call ASM_PFX(CallPeiCoreEntryPoint) > + > +FspApiFailed: > + jmp $ > + > +align 10h > +TempRamInitStack: > + DQ TempRamInitDone > diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapp= erPlatformSecLib/X64/Stack.nasm b/Platform/Intel/MinPlatformPkg/FspWrapper/= Library/SecFspWrapperPlatformSecLib/X64/Stack.nasm > new file mode 100644 > index 0000000000..d7ae97c5da > --- /dev/null > +++ b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatf= ormSecLib/X64/Stack.nasm > @@ -0,0 +1,72 @@ > +;-----------------------------------------------------------------------= ------- > +; > +; Copyright (c) 2023, Intel Corporation. All rights reserved.
> +; SPDX-License-Identifier: BSD-2-Clause-Patent > +; Abstract: > +; > +; Switch the stack from temporary memory to permanent memory. > +; > +;-----------------------------------------------------------------------= ------- > + > + SECTION .text > + > +;-----------------------------------------------------------------------= ------- > +; VOID > +; EFIAPI > +; SecSwitchStack ( > +; UINT32 TemporaryMemoryBase, > +; UINT32 PermanentMemoryBase > +; ); > +;-----------------------------------------------------------------------= ------- > +global ASM_PFX(SecSwitchStack) > +ASM_PFX(SecSwitchStack): > + ; > + ; Save four register: rax, rbx, rcx, rdx > + ; > + push rax > + push rbx > + push rcx > + push rdx > + > + ; > + ; !!CAUTION!! this function address's is pushed into stack after > + ; migration of whole temporary memory, so need save it to permanent > + ; memory at first! > + ; > + > + mov rbx, rcx ; Save the first parameter > + mov rcx, rdx ; Save the second parameter > + > + ; > + ; Save this function's return address into permanent memory at first= . > + ; Then, Fixup the esp point to permanent memory > + ; > + mov rax, rsp > + sub rax, rbx > + add rax, rcx > + mov rdx, qword [rsp] ; copy pushed register's value to per= manent memory > + mov qword [rax], rdx > + mov rdx, qword [rsp + 8] > + mov qword [rax + 8], rdx > + mov rdx, qword [rsp + 16] > + mov qword [rax + 16], rdx > + mov rdx, qword [rsp + 24] > + mov qword [rax + 24], rdx > + mov rdx, qword [rsp + 32] ; Update this function's return addre= ss into permanent memory > + mov qword [rax + 32], rdx > + mov rsp, rax ; From now, rsp is pointed to permane= nt memory > + > + ; > + ; Fixup the rbp point to permanent memory > + ; > + mov rax, rbp > + sub rax, rbx > + add rax, rcx > + mov rbp, rax ; From now, rbp is pointed to permane= nt memory > + > + pop rdx > + pop rcx > + pop rbx > + pop rax > + ret > + > diff --git a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapp= erPlatformSecLib/Ia32/Fsp.h b/Platform/Intel/MinPlatformPkg/Include/Fsp.h > similarity index 86% > rename from Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrappe= rPlatformSecLib/Ia32/Fsp.h > rename to Platform/Intel/MinPlatformPkg/Include/Fsp.h > index 9f6cdcf476..1b86912583 100644 > --- a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatf= ormSecLib/Ia32/Fsp.h > +++ b/Platform/Intel/MinPlatformPkg/Include/Fsp.h > @@ -36,7 +36,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > // > // Fsp Header > // > -#define FSP_HEADER_IMAGEBASE_OFFSET 0x1C > -#define FSP_HEADER_TEMPRAMINIT_OFFSET 0x30 > +#define FSP_HEADER_IMAGEBASE_OFFSET 0x1C > +#define FSP_HEADER_TEMPRAMINIT_OFFSET 0x30 > =20 > #endif > diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec b/Platform/= Intel/MinPlatformPkg/MinPlatformPkg.dec > index a14c6b2db5..8256e62510 100644 > --- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec > +++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec > @@ -393,6 +393,27 @@ > # > gMinPlatformPkgTokenSpaceGuid.PcdFspDispatchModeUseFspPeiMain|TRUE|BOO= LEAN|0xF00000A8 > =20 > + ## Reset Vector in FSP > + # FALSE: Reset Vector is in FSP Wrapper > + # TRUE: Reset Vector is in FSP > + # > + gMinPlatformPkgTokenSpaceGuid.PcdFspWrapperResetVectorInFsp|FALSE|BOOL= EAN|0xF00000A9 > + > + ## BFV Location for Reset Vector in FSP > + # The default of BFV Location for Reset Vector in FSP is 0xFFFF0000. > + # > + gMinPlatformPkgTokenSpaceGuid.PcdFspWrapperBfvforResetVectorInFsp|0xFF= FF0000|UINT32|0xF00000AA This should be UINT64 since it is possible with 64-bit for the reset vector= to be > 4 GB. > + > + ## FSP-T UPD Header Revision > + # The default of FSP-T UPD Header Revision is 0. > + # > + gMinPlatformPkgTokenSpaceGuid.PcdFsptUpdHeaderRevision|0x0|UINT8|0xF00= 000AC > + > + ## FSP-T ARCH UPD Header Revision > + # The default of FSP-T ARCH UPD Header Revision is 0. > + # > + gMinPlatformPkgTokenSpaceGuid.PcdFsptArchUpdHeaderRevision|0x0|UINT8|0= xF00000AD > + > [PcdsFeatureFlag] > =20 > gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit |FALSE|BOOLEAN= |0xF00000A1 > --=20 > 2.40.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#112777): https://edk2.groups.io/g/devel/message/112777 Mute This Topic: https://groups.io/mt/103237142/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-