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 D77C6740032 for ; Mon, 29 Jan 2024 23:39:13 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=g0vr7bAG1dG1KxVhbKHtqEre0BQ5YwaHXq+YcaSvlbE=; 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=1706571552; v=1; b=DVnAY10/Ig6VEVOq7xqurk6WVWdj6qceCeN3AssUDAbZc6WciI5qcZknSd0yur2ZGD6QHBhs JZIaci26wZiJkYaOzL0cJ9cbjIoUxPrLSp44KxeA/mju42VQuTkjjSODMQ77hil3NU5feAaDs99 vOPorLwCYFAKdSONmxi0WukY= X-Received: by 127.0.0.2 with SMTP id b8gKYY7687511xxfGtsCRxlm; Mon, 29 Jan 2024 15:39:12 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web11.6271.1706571551902731951 for ; Mon, 29 Jan 2024 15:39:11 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10968"; a="400258547" X-IronPort-AV: E=Sophos;i="6.05,227,1701158400"; d="scan'208";a="400258547" X-Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jan 2024 15:39:10 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10968"; a="737571023" X-IronPort-AV: E=Sophos;i="6.05,227,1701158400"; d="scan'208";a="737571023" X-Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by orsmga003.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 29 Jan 2024 15:39:10 -0800 X-Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) 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.2507.35; Mon, 29 Jan 2024 15:39:09 -0800 X-Received: from fmsmsx601.amr.corp.intel.com (10.18.126.81) 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.2507.35; Mon, 29 Jan 2024 15:39:09 -0800 X-Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) 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 via Frontend Transport; Mon, 29 Jan 2024 15:39:09 -0800 X-Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.100) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Mon, 29 Jan 2024 15:39:08 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cXlQbGBXztcjjlgj9Z/DNcv/xkaDxSdgBb2rt9NTmJDl7pEzqSu5OeXR3pzHoFfvugVwG4b4VJ8ifnsqad9tBttf2d1Z+8Ot/R33IylshkgzNjjV+dR+9gToov3ga23JjQzNadq982Y8hHDW0m+IyfPGjjslT+QnSWKSCxjq6ZfG483L9lV6dKQo0dk7p9aMDX1phjh3EclduVBdlQYuI/rQT3a+a59yUZz28tMlf4SY88PG8ys+W6mWRi3qcDQiwtXE6qrInVuklqoZsGEoftx5Nk5VUy2DQb8Q9QKEqdkYUVQqPb2NWH1ETC2WF5KBdMpp2/GjIsRCXt9DvWNGfw== 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=vhk7IGhxPpASqEjxobNAg4XjWcFN6cpIECrqctIBFBs=; b=h7IAb/5IzEvWJ5F/m1KRmbPOkYvcfmxfUpjZ2+71NkDEG9VVgvyF5DOA4HxrRc8qpMBd9vQ9By0vtnFevo80X/SXfgGyqgOK7wr3snC/EHeAXKnoZyzfOyC1wjkQU6rSdU8QOHY8EUtEsMduKMR/QtgRGDbiRlPsNt/1GAqSGJKHYFbSVWh7ym5P0JojK9hQQ8ZHCNVNg4DXyodwPEbRNADy5FDgmh8U6VltwkGoSnbaqu6t/yVLbqVxuLLmEOdG5MajzjS8Cw2JbOrGiWkrrUa+GyLYrfGVxB/SvUnYGBLz4ZhjngrmlB7OwalX+xz70JuFpAap9wLXKuZRYh7qTA== 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 DM8PR11MB5575.namprd11.prod.outlook.com (2603:10b6:8:38::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.34; Mon, 29 Jan 2024 23:39:05 +0000 X-Received: from MW4PR11MB5821.namprd11.prod.outlook.com ([fe80::7d4f:b2b0:e284:aeff]) by MW4PR11MB5821.namprd11.prod.outlook.com ([fe80::7d4f:b2b0:e284:aeff%5]) with mapi id 15.20.7228.029; Mon, 29 Jan 2024 23:39:05 +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 v4] MinPlatformPkg: Support SecFspWrapperPlatformSecLib in X64 Thread-Topic: [edk2-devel][edk2-platforms][PATCH v4] MinPlatformPkg: Support SecFspWrapperPlatformSecLib in X64 Thread-Index: AQHaPV/OsqVhdAl62km5851QmpB3RrDxnRow Date: Mon, 29 Jan 2024 23:39:04 +0000 Message-ID: References: <588d6f17d0a4ac8ea2353d027829c1993da3dd0a.1704183832.git.ted.kuo@intel.com> In-Reply-To: <588d6f17d0a4ac8ea2353d027829c1993da3dd0a.1704183832.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_|DM8PR11MB5575:EE_ x-ms-office365-filtering-correlation-id: 8223bc56-842b-469b-de18-08dc21237aef x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: dkG+D/q3O0zuv1dnfmTT17XiVjIu8Pij4yX7bN3R2mg7nddSviPWktga1thxCZsajbrP4JVBpBRHldcQlEXTRu6wNl//vjor/XLXWPAo7VMP0MbVrhO6+3EGiv3hVruwEBRDohw79slIc3wbfQzxQHED0wV6UtiZ570m697jJUSOdx9hbtmrtS/CFi+LadP8ej/KPfxjTUM2LgMgjELTcBIeKD5DmUGmUC8a5622criOqPDk9SdAJRpyW5XeDC0rufm5JEqkXwZ9NxVA/OoUkzOQSso6t4I5xXtwH7uO1Y+cn52yq0VVZPzAWBDWq22oXUTwFLHVCp0cTMDsPvJQLXuR8LMllWm7YxrNbQCPYMLO3SEsFP+lXBbZFbH/0mKDEpk9NQA7ayLLGC42+VhJaSuu0L3VsTWs6Y+MWxBtPKleB6i52PIJHWh80ar1jvBj9FpAPSY6CMyS/vSD8SuTx5d9SQdb3DDcMF00Dc6OtYlS0sjFd1cVj3gTpAAhiPl7bv4NLNN2JU4DX5w+F3SGJ4wyhCFAzlj+PPEqDcX0TPuNPxn54JVsFmDTnd+fbq/IB2hj0ZZ3oi1Z0hEc87eKES8GLUNFz5sVC5aY6fhJg/+9cxZf01tPd2dXZDD1f9cwYWGgO6snPaL/eREZx5ODCIKX752A+hkbgiJx0Oze8IjjGRsHo4QEkGcg98i7X405QsfkVVG0inakDgFfl5Inxw== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?sQVCIyZgt/o38sIuNHXGaBDhwriD9bIe/utGY6KFwbweHC1iPOzwEWhd4UUH?= =?us-ascii?Q?Y4j5JLaykTGKTOCH63ur08EnpCE5SVcCW2qEzsHB5KqaFf7ARvHgI1F8xlFg?= =?us-ascii?Q?6tiHkz/z2gGa8MEpl5kOnIu7RWMreURIBNn+n73YjcjOK7k27X25I8vy25I8?= =?us-ascii?Q?WtTH+VtbKdvr4v9bqpSd92Ex20WE92UW7iNX63EHdgWKOGAokNks2I0OITtZ?= =?us-ascii?Q?+4hjvHwYhAY3DGxNyXprBtrXuCZKRcKhUNluO4MezRE51D6Lxq3bEedp6SlU?= =?us-ascii?Q?GIanxAI11LQyl/YTFkD2dr/OBRko4hy6d1jfqZADxCvc+pMdVNEhxaeATJzD?= =?us-ascii?Q?Tl2iSn1sFxl1dSmcpz5ZZoVCg4St7Omkgp6UYHTrW6C6yzfeRjFWuJ6WRPuk?= =?us-ascii?Q?EvNN7s4LIaI6m246Tkysmpbau4rCFFs3xMlttovgyTh/dzC0PyQF/0Dgm/h4?= =?us-ascii?Q?tXg54oGkBbljXFkZolw0H/qlbIJUiqXH2rYv68jFbTHaRt+l7qf1TSzLETf4?= =?us-ascii?Q?b/mDQbP1IvPoa59kwPc9FcgiEbSi6lRVQWZvxGVBUeL4b1nZFz/hodpJiR26?= =?us-ascii?Q?vOkfuqdMthu0Z0/5yjD8+xTpNEeK2HvCsPhvT2+x4SIkx4GYlP1yyifYMGLg?= =?us-ascii?Q?O1zLHk1OBFTrP0/QfG1QNCmb2oRPXwYy5PZLxUvPb1E5dI+Ua2QbOg7UXTMP?= =?us-ascii?Q?QtokadbRaZCqM6HIMHKxvlsr/x8q+YHBZwAlqjNUrhwqMk6r25aaglvr1kK5?= =?us-ascii?Q?dO9SB5S+6+5XiN1aVOfIlNp1ER/aa3N/kbw5yQfXXNBcqX4t48xKFbuMGypD?= =?us-ascii?Q?pNg/zyOgdiIsOvhUV4p2XowvGzLaYIGnOqlOsIqO0kQLpKJoluz2N62IZMTd?= =?us-ascii?Q?TQ+INKQkiBwuc16xEMVFdIypiRclmpjDbVZwiISrfI8q7ryn7HzC+q7TWNj4?= =?us-ascii?Q?IGhGgAu3bnX1QUVGyjlwdmlBhtuugklPODfB9OSCZjUFAORPndOXe8dWBxmN?= =?us-ascii?Q?kaxgIBiwIss1iQfMLdLbR9+Jp5BqCfLJm9/tix2GS2t7HMklCl32AMt32oTm?= =?us-ascii?Q?u/jBKdKMvv5vXvVhrU5/4sefhMv75xnzK+80V9HIuge2XhIv/0P1sCyL1vA2?= =?us-ascii?Q?PaD0bzEUk8hOfR8T0JInV+I8wv8Z5FYUFaqtNMjZ32ptkZCmm+2VtSkDa42Z?= =?us-ascii?Q?nz0bh0fiftr9/PvnXj1zGYDrQy3J1O7kdZ3AENb3PJ3WtGX55OuBCoxZn9GE?= =?us-ascii?Q?dJk5FjNIF7kIaulxQosIDE/R+LEm1XpifXSudxlHMcHt/6rl4QdmlGj10KvF?= =?us-ascii?Q?ImQQyqqrxeaagyrERukN4KA+5lZ2D4vjCyUEa62iOONT+B68ssYwrBIsFbgR?= =?us-ascii?Q?GLLEVb6zanDtHHA1RnMHf7aDkBexvSYWmgvgpEnQ4aPK0FK3sbuwW88EJyb0?= =?us-ascii?Q?7vg9319ih7x1UsXcfKFXzpGMy4o5Rt9cfOGO7oAyjEsxas2X1hWqOeSlJC9k?= =?us-ascii?Q?XfN6Qp2M7nbPH8PXp45XJVpx67wv4DDO4ctPE4R5DlZmVHDpo3Mp6SZ/bNpJ?= =?us-ascii?Q?SwVDX96GEhTyHd7zbWjrOISCOLr2hnkPoTv7UL7EKbHgzEIt2+wlghmt4cQV?= =?us-ascii?Q?WQ=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: 8223bc56-842b-469b-de18-08dc21237aef X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Jan 2024 23:39:04.9729 (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: ILMCl7QsOzKoDAxSwNwn+6FQql3ylnx2442xnogL11tVf2NuzbES03zrj19QVy9f83FqHxRiLbBx9Ln4ccSSoqHYX9+kwPUKz7zZv70iGDc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM8PR11MB5575 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: GtxEMvXohmWh4s1rqeM3s24nx7686176AA= 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="DVnAY10/"; 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; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}") Hi Ted, The scenario where we have a 64-bit FSP that does not support reset vector = in FSP-O is likely to happen in a future Intel platform. As such, please im= plement this feature in a manner that does not require all assembly code in= the X64 folder to use FSP-O. Thanks, Nate > -----Original Message----- > From: Kuo, Ted > Sent: Tuesday, January 2, 2024 1:41 AM > 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 v4] 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 files to support both IA32 and X64. > 3.Added the PCDs below for FSP-T UPD revisions and reset vector in FSP. > - PcdFspWrapperBfvforResetVectorInFsp > - PcdFsptUpdHeaderRevision > - PcdFsptArchUpdRevision >=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 | 9 +- > ...pWrapperPlatformSecLibResetVectorInFsp.inf | 101 +++++++++ > .../SecGetPerformance.c | 11 +- > .../SecPlatformInformation.c | 8 +- > .../SecRamInitData.c | 73 +++++-- > .../X64/PeiCoreEntry.nasm | 202 ++++++++++++++++++ > .../X64/SecEntry.nasm | 71 ++++++ > .../X64/Stack.nasm | 72 +++++++ > .../Ia32 =3D> Include}/Fsp.h | 6 +- > .../Intel/MinPlatformPkg/MinPlatformPkg.dec | 17 +- > 12 files changed, 565 insertions(+), 34 deletions(-) create mode 100644 > Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatform > SecLib/SecFspWrapperPlatformSecLibResetVectorInFsp.inf > create mode 100644 > Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatform > SecLib/X64/PeiCoreEntry.nasm > create mode 100644 > Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatform > SecLib/X64/SecEntry.nasm > create mode 100644 > Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatform > SecLib/X64/Stack.nasm > rename > Platform/Intel/MinPlatformPkg/{FspWrapper/Library/SecFspWrapperPlatfor > mSecLib/Ia32 =3D> Include}/Fsp.h (79%) >=20 > diff --git > a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor > mSecLib/FsptCoreUpd.h > b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo > rmSecLib/FsptCoreUpd.h > index 7c0f605b92..24c18f25b8 100644 > --- > a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor > mSecLib/FsptCoreUpd.h > +++ > b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlat > +++ formSecLib/FsptCoreUpd.h > @@ -1,6 +1,6 @@ > /** @file -Copyright (c) 2017, Intel Corporation. All rights > reserved.
+Copyright (c) 2017 - 2024, Intel Corporation. All rights > reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent **/@@ -10,6 > +10,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > #pragma pack(1) +#if FixedPcdGet8 (PcdFsptArchUpdRevision) <=3D 1 /** F= sp T > Core UPD **/ typedef struct {@@ -34,6 +35,28 @@ typedef struct { > **/ UINT8 Reserved[16]; } FSPT_CORE_UPD;+#else+/= ** 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;+#endif #pra= gma > pack() diff --git > a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor > mSecLib/Ia32/SecEntry.nasm > b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo > rmSecLib/Ia32/SecEntry.nasm > index 7f6d771e41..0b3f343991 100644 > --- > a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor > mSecLib/Ia32/SecEntry.nasm > +++ > b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlat > +++ formSecLib/Ia32/SecEntry.nasm > @@ -1,6 +1,6 @@ > ;-----------------------------------------------------------------------= ------- ;-; > Copyright (c) 2019, Intel Corporation. All rights reserved.
+; Copyrig= ht (c) > 2019 - 2024, Intel Corporation. All rights reserved.
; SPDX-License- > Identifier: BSD-2-Clause-Patent ; Module Name: ;@@ -13,7 +13,7 @@ ; ;---= --- > ------------------------------------------------------------------------ = -#include > "Fsp.h"+#include SECTION .text diff --git > a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor > mSecLib/SecFspWrapperPlatformSecLib.inf > b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo > rmSecLib/SecFspWrapperPlatformSecLib.inf > index 2e0d67eae4..6806e000ce 100644 > --- > a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor > mSecLib/SecFspWrapperPlatformSecLib.inf > +++ > b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlat > +++ formSecLib/SecFspWrapperPlatformSecLib.inf > @@ -1,7 +1,7 @@ > ## @file-# Provide FSP wrapper platform sec related function.+# Provid= e FSP > wrapper platform sec related function for IA32. #-# Copyright (c) 2017 - > 2021, Intel Corporation. All rights reserved.
+# Copyright (c) 2017 -= 2024, > Intel Corporation. All rights reserved.
# # SPDX-License-Identifier: = BSD-2- > Clause-Patent #@@ -25,7 +25,7 @@ > # # The following information is for reference only and not required by = the > build tools. #-# VALID_ARCHITECTURES =3D IA32 X64+# > VALID_ARCHITECTURES =3D IA32 # > ################################################################### > #############@@ -47,7 +47,6 @@ > Ia32/SecEntry.nasm Ia32/PeiCoreEntry.nasm Ia32/Stack.nasm- > Ia32/Fsp.h > ################################################################### > ############# #@@ -96,3 +95,5 @@ > gIntelFsp2WrapperTokenSpaceGuid.PcdFspmBaseAddress ## > CONSUMES gIntelFsp2WrapperTokenSpaceGuid.PcdFspModeSelection > ## CONSUMES > gMinPlatformPkgTokenSpaceGuid.PcdFspDispatchModeUseFspPeiMain ## > CONSUMES+ gMinPlatformPkgTokenSpaceGuid.PcdFsptUpdHeaderRevision > ## CONSUMES+ gMinPlatformPkgTokenSpaceGuid.PcdFsptArchUpdRevision > ## CONSUMESdiff --git > a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor > mSecLib/SecFspWrapperPlatformSecLibResetVectorInFsp.inf > b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo > rmSecLib/SecFspWrapperPlatformSecLibResetVectorInFsp.inf > new file mode 100644 > index 0000000000..ea062cfad1 > --- /dev/null > +++ > b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlat > +++ formSecLib/SecFspWrapperPlatformSecLibResetVectorInFsp.inf > @@ -0,0 +1,101 @@ > +## @file+# Provide FSP wrapper platform sec related function for X64.+#= +# > Copyright (c) 2024, Intel Corporation. All rights reserved.
+#+# SPDX- > License-Identifier: BSD-2-Clause- > Patent+#+#+##++#################################################### > ############################+#+# Defines Section - statements that will b= e > processed to create a > Makefile.+#+######################################################## > ########################+[Defines]+ INF_VERSION =3D > 0x00010005+ BASE_NAME =3D SecFspWrapperPlatformSecL= ib+ > FILE_GUID =3D 94D8AA5C-5BAE-421F-B2C7-DD1A93BB4D3D+ > MODULE_TYPE =3D SEC+ VERSION_STRING = =3D 1.0+ > LIBRARY_CLASS =3D PlatformSecLib+++#+# The following inf= ormation is > for reference only and not required by the build tools.+# This library is= only > supported in X64 when reset vector is in FSP.+#+# VALID_ARCHITECTURES > =3D > X64+#++########################################################### > #####################+#+# Sources Section - list of files that are requir= ed for > the build to > succeed.+#+######################################################## > ########################++[Sources]+ FspWrapperPlatformSecLib.c+ > SecRamInitData.c+ SecPlatformInformation.c+ SecGetPerformance.c+ > SecTempRamDone.c+ PlatformInit.c+ FsptCoreUpd.h++[Sources.X64]+ > X64/SecEntry.nasm+ X64/PeiCoreEntry.nasm+ > X64/Stack.nasm++################################################## > ##############################+#+# Package Dependency Section - list of > Package files that are required for+# this > module.+#+######################################################### > #######################++[Packages]+ MdePkg/MdePkg.dec+ > MdeModulePkg/MdeModulePkg.dec+ UefiCpuPkg/UefiCpuPkg.dec+ > IntelFsp2Pkg/IntelFsp2Pkg.dec+ > IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec+ > MinPlatformPkg/MinPlatformPkg.dec++[LibraryClasses]+ LocalApicLib+ > SerialPortLib+ FspWrapperPlatformLib+ FspWrapperApiLib+ SecBoardInitLi= b+ > TestPointCheckLib+ PeiServicesTablePointerLib++[Ppis]+ > gEfiSecPlatformInformationPpiGuid ## CONSUMES+ > gPeiSecPerformancePpiGuid ## CONSUMES+ > gTopOfTemporaryRamPpiGuid ## PRODUCES+ > gEfiPeiFirmwareVolumeInfoPpiGuid ## PRODUCES+ > gFspTempRamExitPpiGuid ## CONSUMES+ > gPlatformInitTempRamExitPpiGuid ## CONSUMES++[Pcd]+ > gUefiCpuPkgTokenSpaceGuid.PcdPeiTemporaryRamStackSize ## > CONSUMES+ gIntelFsp2WrapperTokenSpaceGuid.PcdFsptBaseAddress > ## CONSUMES+ gIntelFsp2PkgTokenSpaceGuid.PcdFspTemporaryRamSize > ## CONSUMES+ > gMinPlatformPkgTokenSpaceGuid.PcdSecSerialPortDebugEnable ## > CONSUMES++[FixedPcd]+ > gMinPlatformPkgTokenSpaceGuid.PcdFlashFvMicrocodeBase ## > CONSUMES+ gMinPlatformPkgTokenSpaceGuid.PcdFlashFvMicrocodeSize > ## CONSUMES+ gMinPlatformPkgTokenSpaceGuid.PcdMicrocodeOffsetInFv > ## CONSUMES+ > gIntelFsp2WrapperTokenSpaceGuid.PcdFlashCodeCacheAddress ## > CONSUMES+ gIntelFsp2WrapperTokenSpaceGuid.PcdFlashCodeCacheSize > ## CONSUMES+ gIntelFsp2WrapperTokenSpaceGuid.PcdFspmBaseAddress > ## CONSUMES+ gIntelFsp2WrapperTokenSpaceGuid.PcdFspModeSelection > ## CONSUMES+ > gMinPlatformPkgTokenSpaceGuid.PcdFspDispatchModeUseFspPeiMain ## > CONSUMES+ > gMinPlatformPkgTokenSpaceGuid.PcdFspWrapperBfvforResetVectorInFsp ## > CONSUMES+ gMinPlatformPkgTokenSpaceGuid.PcdFsptUpdHeaderRevision > ## CONSUMES+ gMinPlatformPkgTokenSpaceGuid.PcdFsptArchUpdRevision > ## CONSUMESdiff --git > a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor > mSecLib/SecGetPerformance.c > b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo > rmSecLib/SecGetPerformance.c > index ac2deeabec..1699bd9710 100644 > --- > a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor > mSecLib/SecGetPerformance.c > +++ > b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlat > +++ formSecLib/SecGetPerformance.c > @@ -1,7 +1,7 @@ > /** @file Sample to provide SecGetPerformance function. -Copyright (c) > 2017 - 2019, Intel Corporation. All rights reserved.
+Copyright (c) 20= 17 - > 2024, Intel Corporation. All rights reserved.
SPDX-License-Identifier= : BSD- > 2-Clause-Patent **/@@ -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 - siz= eof > (UINT32));+ TopOfTemporaryRam =3D (UINTN) TopOfTemporaryRamPpi - sizeof > (UINTN);+ TopOfTemporaryRam -=3D sizeof(UINTN) * 2;+ Count = =3D > *(UINT32 *) (UINTN) (TopOfTemporaryRam - sizeof (UINT32)); Size = =3D > Count * sizeof (UINT32); - Ticker =3D *(UINT64 *) (TopOfTemporaryRam - s= izeof > (UINT32) - Size - sizeof (UINT32) * 2);+ Ticker =3D *(UINT64 *) (UINTN) > (TopOfTemporaryRam - sizeof (UINT32) - Size - sizeof (UINT64)); > Performance->ResetEnd =3D GetTimeInNanoSecond (Ticker); return > EFI_SUCCESS;diff --git > a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor > mSecLib/SecPlatformInformation.c > b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo > rmSecLib/SecPlatformInformation.c > index 24d55ed838..4cbde95c2d 100644 > --- > a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor > mSecLib/SecPlatformInformation.c > +++ > b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlat > +++ formSecLib/SecPlatformInformation.c > @@ -1,7 +1,7 @@ > /** @file Provide SecPlatformInformation function. -Copyright (c) 2017= - > 2019, Intel Corporation. All rights reserved.
+Copyright (c) 2017 - 20= 24, > Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-= 2- > Clause-Patent **/@@ -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 - si= zeof > (UINT32)));+ TopOfTemporaryRam =3D (UINTN) TopOfTemporaryRamPpi - > sizeof (UINTN);+ TopOfTemporaryRam -=3D sizeof (UINTN) * 2;+ Count = =3D > *((UINT32 *)(UINTN) (TopOfTemporaryRam - sizeof (UINT32))); Size = =3D > Count * sizeof (IA32_HANDOFF_STATUS); if ((*StructureSize) < (UINT64) > Size) {diff --git > a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor > mSecLib/SecRamInitData.c > b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo > rmSecLib/SecRamInitData.c > index 355d1e6509..49d5302a7b 100644 > --- > a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor > mSecLib/SecRamInitData.c > +++ > b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlat > +++ formSecLib/SecRamInitData.c > @@ -1,7 +1,7 @@ > /** @file Provide TempRamInitParams data. -Copyright (c) 2017 - 2021, > Intel Corporation. All rights reserved.
+Copyright (c) 2017 - 2024, In= tel > Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clau= se- > Patent **/@@ -12,25 +12,70 @@ SPDX-License-Identifier: BSD-2-Clause- > Patent > typedef struct { FSP_UPD_HEADER FspUpdHeader;+#if FixedPcdGet8 > (PcdFsptArchUpdRevision) =3D=3D 1+ FSPT_ARCH_UPD FsptArchUpd;+#elif > FixedPcdGet8 (PcdFsptArchUpdRevision) =3D=3D 2+ FSPT_ARCH2_UPD > FsptArchUpd;+#endif FSPT_CORE_UPD FsptCoreUpd;-} > FSPT_UPD_CORE_DATA;+ UINT16 UpdTerminator;+} FSPT_UPD_DATA; - > GLOBAL_REMOVE_IF_UNREFERENCED CONST FSPT_UPD_CORE_DATA > FsptUpdDataPtr =3D {+GLOBAL_REMOVE_IF_UNREFERENCED CONST > FSPT_UPD_DATA FsptUpdDataPtr =3D { {- 0x4450555F54505346,- 0x00,-= { > 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,- 0x00, 0= x00, > 0x00, 0x00, 0x00, 0x00, 0x00+ 0x4450555F54505346, > // FSP-T UPD Header Signature - FSPT_UPD+ FixedPcdGet8 > (PcdFsptUpdHeaderRevision), // FSP-T UPD Header Revi= sion+ { > // Reserved[23]+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0= 0, > 0x00,+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,+ > 0x00, 0x00, 0x00 } },+#if FixedPcdGet8 (PcdFsptArchUpdRevision) =3D= =3D 1 {- > FixedPcdGet32 (PcdFlashFvMicrocodeBase) + FixedPcdGet32 > (PcdMicrocodeOffsetInFv),- FixedPcdGet32 (PcdFlashFvMicrocodeSize) - > FixedPcdGet32 (PcdMicrocodeOffsetInFv),- 0, // Set CodeRegion= Base as > 0, so that caching will be 4GB-(CodeRegionSize > LLCSize ? LLCSize : > CodeRegionSize) will be used.- FixedPcdGet32 (PcdFlashCodeCacheSize),-= { > 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,+ 0x01, > // FSP-T ARCH UPD Revision+ { = // > Reserved[3]+ 0x00, 0x00, 0x00+ },+ 0x00000020, > // Length of FSP-T ARCH UPD+ 0, = // > FspDebugHandler+ { = // Reserved1[20]+ > 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,+ 0x00, 0= x00, > 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00+ }+ },+#elif FixedPcdG= et8 > (PcdFsptArchUpdRevision) =3D=3D 2+ {+ 0x02, = // > FSP-T ARCH2 UPD Revision+ { = // Reserved[3]+ > 0x00, 0x00, 0x00+ },+ 0x00000020, = // Length of > FSP-T ARCH2 UPD+ 0, = // FspDebugHandler+ { > // Reserved1[16]+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x= 00, > 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }- }+ },+#endif+#if > FixedPcdGet8 (PcdFsptArchUpdRevision) <=3D 1+ {+ FixedPcdGet32 > (PcdFlashFvMicrocodeBase) + FixedPcdGet32 (PcdMicrocodeOffsetInFv), // > MicrocodeRegionBase+ FixedPcdGet32 (PcdFlashFvMicrocodeSize) - > FixedPcdGet32 (PcdMicrocodeOffsetInFv), // MicrocodeRegionSize+ 0, // = Set > CodeRegionBase as 0, so that caching will be 4GB-(CodeRegionSize > LLCSiz= e ? > LLCSize : CodeRegionSize) will be used.+ FixedPcdGet32 > (PcdFlashCodeCacheSize), // Co= deRegionSize+ { > // Reserved[16]+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0= 0, > 0x00,+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00+ }+ },+#else+ {+ > FixedPcdGet32 (PcdFlashFvMicrocodeBase) + FixedPcdGet32 > (PcdMicrocodeOffsetInFv), // MicrocodeRegionBase+ FixedPcdGet32 > (PcdFlashFvMicrocodeSize) - FixedPcdGet32 (PcdMicrocodeOffsetInFv), // > MicrocodeRegionSize+ 0, // Set CodeRegionBase as 0, so that caching wi= ll be > 4GB-(CodeRegionSize > LLCSize ? LLCSize : CodeRegionSize) will be used.+ > FixedPcdGet32 (PcdFlashCodeCacheSize) = // > CodeRegionSize+ },+#endif+ 0x55AA };-diff --git > a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor > mSecLib/X64/PeiCoreEntry.nasm > b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo > rmSecLib/X64/PeiCoreEntry.nasm > new file mode 100644 > index 0000000000..af3affcf7f > --- /dev/null > +++ > b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlat > +++ formSecLib/X64/PeiCoreEntry.nasm > @@ -0,0 +1,202 @@ > +;-----------------------------------------------------------------------= -------+;+; > Copyright (c) 2024, Intel Corporation. All rights reserved.
+; SPDX-Li= cense- > 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(PcdGet64 (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+ pus= h rax+ > push rcx+ push rdx+ push rbx+ push rsp+ push rbp+ pus= h rsi+ push > rdi+%endmacro++;---------------------------------------------------------= -------------- > ------+; Macro: POPA_64+;+; Description: Restores all registers= from > stack+;+; Input: None+;+; Output: None+;------------------= ----------------- > ------------------------------------------+%macro POPA_64 0+ pop rd= i+ pop > rsi+ pop rbp+ pop rsp+ pop rbx+ pop rdx+ pop rcx+ po= p rax+ pop > r15+ pop r14+ pop r13+ pop r12+ pop r11+ pop r10+ po= p r9+ pop > r8+%endmacro++global > ASM_PFX(CallPeiCoreEntryPoint)+ASM_PFX(CallPeiCoreEntryPoint):+ ;+ ; Pe= r > X64 calling convention, make sure RSP is 16-byte aligned.+ ;+ mov r= ax, 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 pointe= r+ ;+ 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 DW= ORD > [rdi], ebx++ ;+ ; We need to implement a long-term solution for BIST ca= pture. > 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 ea= x, mm0+ > mov DWORD [rdi], eax+ loop PushBist++ ;+ ; FSP saves the timest= amp of > the beginning of firmware execution in mm5.+ ; Get the timestamp from mm= 5 > and then push to stack.+ ;+ movq rax, mm5+ 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+ ;+ ; Reset Vector and initial SEC core (to initialize Temp Ra= m) is part > of FSP-O.+ ; Default UefiCpuPkg Reset Vector locates FSP-O as BFV. Howev= er > the actual+ ; SEC core that launches PEI is part of another FV. We need = to pass > that FV+ ; as BFV to PEI core.+ ;+ mov r8, ASM_PFX (PcdGet64 > (PcdFspWrapperBfvforResetVectorInFsp))+ mov rcx, QWORD[r8]+ mov > r8, rcx++ ;+ ; Pass stack size into the PEI Core+ ;+ mov rcx, r1= 5 ; 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/SecFspWrapperPlatfor > mSecLib/X64/SecEntry.nasm > b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo > rmSecLib/X64/SecEntry.nasm > new file mode 100644 > index 0000000000..de8ba83d52 > --- /dev/null > +++ > b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlat > +++ formSecLib/X64/SecEntry.nasm > @@ -0,0 +1,71 @@ > +;-----------------------------------------------------------------------= -------+;+; > Copyright (c) 2024, Intel Corporation. All rights reserved.
+; SPDX-Li= cense- > Identifier: BSD-2-Clause-Patent+; Module Name:+;+; SecEntry.nasm+;+; > Abstract:+;+; This is the code that passes control to PEI core.+;+;-----= ------------ > -------------------------------------------------------------++#include > ++SECTION .text++extern ASM_PFX(CallPeiCoreEntryPoint)+extern > ASM_PFX(FsptUpdDataPtr)+; Pcds+extern ASM_PFX(PcdGet32 > (PcdFspTemporaryRamSize))++;---------------------------------------------= ---------- > ---------------------+;+; Procedure: _ModuleEntryPoint+;+; Input: = None+;+; > Output: None+;+; Destroys: Assume all registers+;+; Description= :+;+; > 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):+ push rax+ > mov rax, ASM_PFX(FsptUpdDataPtr) ; This is dummy code to include > TempRamInitParams in SecCore for FSP-O.+#if > FixedPcdGet8(PcdFspModeSelection) =3D=3D 1+ mov rax, ASM_PFX(PcdGet3= 2 > (PcdFspTemporaryRamSize))+ sub edx, dword [rax] ; Tempo= raryRam > for FSP+#endif+ pop rax++ mov r8, rdx+ mov rdx, rcx+ xor= ecx, ecx > ; zero - no Hob List Yet+ mov rsp, r8++ ;+ ; Per X64 calling conve= ntion, make > sure RSP is 16-byte aligned.+ ;+ mov rax, rsp+ and rax, 0fh+ = sub rsp, > rax++ call ASM_PFX(CallPeiCoreEntryPoint)++ jmp $diff --git > a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor > mSecLib/X64/Stack.nasm > b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo > rmSecLib/X64/Stack.nasm > new file mode 100644 > index 0000000000..21010bf4ef > --- /dev/null > +++ > b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlat > +++ formSecLib/X64/Stack.nasm > @@ -0,0 +1,72 @@ > +;-----------------------------------------------------------------------= -------+;+; > Copyright (c) 2024, Intel Corporation. All rights reserved.
+; SPDX-Li= cense- > Identifier: BSD-2-Clause-Patent+; Abstract:+;+; Switch the stack from > temporary memory to permanent memory.+;+;--------------------------------= ----- > -----------------------------------------++ SECTION .text++;----------= ----------------- > ---------------------------------------------------+; VOID+; EFIAPI+; Sec= SwitchStack > (+; 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 fir= st parameter+ > mov rcx, rdx ; Save the second parameter++ ;+ ; S= ave this > function's return address into permanent memory at first.+ ; Then, Fix= up the > esp point to permanent memory+ ;+ mov rax, rsp+ sub rax, rbx= + add > rax, rcx+ mov rdx, qword [rsp] ; copy pushed register's valu= e to > permanent memory+ mov qword [rax], rdx+ mov rdx, qword [rsp + 8= ]+ > mov qword [rax + 8], rdx+ mov rdx, qword [rsp + 16]+ mov qwor= d [rax + > 16], rdx+ mov rdx, qword [rsp + 24]+ mov qword [rax + 24], rdx+= mov > rdx, qword [rsp + 32] ; Update this function's return address into per= manent > memory+ mov qword [rax + 32], rdx+ mov rsp, rax = ; From now, > rsp is pointed to permanent memory++ ;+ ; Fixup the rbp point to > permanent memory+ ;+ mov rax, rbp+ sub rax, rbx+ add ra= x, rcx+ > mov rbp, rax ; From now, rbp is pointed to permanent me= mory++ > pop rdx+ pop rcx+ pop rbx+ pop rax+ ret+diff --git > a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor > mSecLib/Ia32/Fsp.h b/Platform/Intel/MinPlatformPkg/Include/Fsp.h > similarity index 79% > rename from > Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatform > SecLib/Ia32/Fsp.h > rename to Platform/Intel/MinPlatformPkg/Include/Fsp.h > index 9f6cdcf476..319e1e3372 100644 > --- > a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfor > mSecLib/Ia32/Fsp.h > +++ b/Platform/Intel/MinPlatformPkg/Include/Fsp.h > @@ -1,7 +1,7 @@ > /** @file Fsp related definitions -Copyright (c) 2017, Intel Corporati= on. All > rights reserved.
+Copyright (c) 2017 - 2024, Intel Corporation. All ri= ghts > reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent **/@@ -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 #endifdiff --git > a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec > b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec > index a14c6b2db5..12f86585ad 100644 > --- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec > +++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec > @@ -6,7 +6,7 @@ > # INF files to generate AutoGen.c and AutoGen.h files # for the build > infrastructure. #-# Copyright (c) 2017 - 2021, Intel Corporation. All rig= hts > reserved.
+# Copyright (c) 2017 - 2024, Intel Corporation. All rights > reserved.
# Copyright (C) 2023 Advanced Micro Devices, Inc. All right= s > reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent@@ -393,6 > +393,21 @@ > # > gMinPlatformPkgTokenSpaceGuid.PcdFspDispatchModeUseFspPeiMain|TRUE > |BOOLEAN|0xF00000A8 + ## BFV Location for Reset Vector in FSP+ # The > default of BFV Location for Reset Vector in FSP is 0x00000000FFFF0000.+ = #+ > gMinPlatformPkgTokenSpaceGuid.PcdFspWrapperBfvforResetVectorInFsp|0x > 00000000FFFF0000|UINT64|0xF00000A9++ ## FSP-T UPD Header > Revision+ # The default of FSP-T UPD Header Revision is 0.+ #+ > gMinPlatformPkgTokenSpaceGuid.PcdFsptUpdHeaderRevision|0x0|UINT8|0x > F00000AA++ ## FSP-T ARCH UPD Revision+ # The default of FSP-T ARCH UPD > Revision is 0.+ #+ > gMinPlatformPkgTokenSpaceGuid.PcdFsptArchUpdRevision|0x0|UINT8|0xF0 > 0000AC+ [PcdsFeatureFlag] > gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit > |FALSE|BOOLEAN|0xF00000A1-- > 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 (#114750): https://edk2.groups.io/g/devel/message/114750 Mute This Topic: https://groups.io/mt/103478590/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-