From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail05.groups.io (mail05.groups.io [45.79.224.7]) by spool.mail.gandi.net (Postfix) with ESMTPS id D948B740035 for ; Tue, 30 Apr 2024 05:58:13 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=Qy4ofhLfedeRxkNq4pq3CaDtPAgleptBWlue7SvHNjg=; c=relaxed/simple; d=groups.io; h=From:To:CC:Subject:Thread-Topic:Thread-Index:Date:Message-ID:References:In-Reply-To:Accept-Language:msip_labels:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Resent-Date:Resent-From:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type; s=20240206; t=1714456692; v=1; b=KpV5qyT0qxcVzn41ETcFcvDeRPQCGra87U89yXCveSR7I3KhUKPKxopbr8jlFI5ECxUGWI+U bSUoZwB5wUEFSf4Md5OQaSla4A3oPg7HX4IEjIbRf+HzlryZUpOPLmPZQE5uK+s70puC9kZAm+0 Q531gc10breSQCfyzeIYZmhrxV0vq3moiXHsC9yJNyWVyZaqve+nIsRDvfs28QY5mjN3WLsaWWv WEPp6UsDsDAmiDvkm1/ne8Iu6mPoFUpZ16sKBLFKGsOyUJDeUkH6qGTBTluJTKeNTI1rGRdvFdE rwUlbxGGeyllkyRCtdmiia15SSNPDBEyFRqqCRzNjeMmw== X-Received: by 127.0.0.2 with SMTP id vJ5sYY7687511x2jVsG0t9kl; Mon, 29 Apr 2024 22:58:12 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) by mx.groups.io with SMTP id smtpd.web10.8876.1714456690734218962 for ; Mon, 29 Apr 2024 22:58:10 -0700 X-CSE-ConnectionGUID: OIES7vwTSJGO816KfG6l+g== X-CSE-MsgGUID: bCkozqTAQxeGaH79x03Kuw== X-IronPort-AV: E=McAfee;i="6600,9927,11059"; a="10021262" X-IronPort-AV: E=Sophos;i="6.07,241,1708416000"; d="scan'208,217";a="10021262" X-Received: from orviesa006.jf.intel.com ([10.64.159.146]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Apr 2024 22:58:06 -0700 X-CSE-ConnectionGUID: 3Nvt7DvXRoOlDKMU7TUl9w== X-CSE-MsgGUID: G1J6LKMMTkqScYflttgmfg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,241,1708416000"; d="scan'208,217";a="26753465" X-Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by orviesa006.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 29 Apr 2024 22:58:04 -0700 X-Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Mon, 29 Apr 2024 22:58:04 -0700 X-Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35 via Frontend Transport; Mon, 29 Apr 2024 22:58:04 -0700 X-Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.41) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Mon, 29 Apr 2024 22:58:04 -0700 X-Received: from MN6PR11MB8244.namprd11.prod.outlook.com (2603:10b6:208:470::14) by SN7PR11MB7706.namprd11.prod.outlook.com (2603:10b6:806:32c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7519.34; Tue, 30 Apr 2024 05:58:01 +0000 X-Received: from MN6PR11MB8244.namprd11.prod.outlook.com ([fe80::8774:81a7:c5b7:5c2c]) by MN6PR11MB8244.namprd11.prod.outlook.com ([fe80::8774:81a7:c5b7:5c2c%7]) with mapi id 15.20.7519.031; Tue, 30 Apr 2024 05:58:01 +0000 From: "Ni, Ray" To: "Wu, Jiaxin" , "devel@edk2.groups.io" CC: "Zeng, Star" , Gerd Hoffmann , "Kumar, Rahul R" Subject: Re: [edk2-devel] [PATCH v4 02/14] UefiCpuPkg/SmmRelocationLib: Add SmmRelocationLib library instance Thread-Topic: [PATCH v4 02/14] UefiCpuPkg/SmmRelocationLib: Add SmmRelocationLib library instance Thread-Index: AQHal9O/yCD0S8KfLECvs4neTDEMLrGAVtSk Date: Tue, 30 Apr 2024 05:58:01 +0000 Message-ID: References: <20240426121720.54308-1-jiaxin.wu@intel.com> <20240426121720.54308-3-jiaxin.wu@intel.com> In-Reply-To: <20240426121720.54308-3-jiaxin.wu@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: MN6PR11MB8244:EE_|SN7PR11MB7706:EE_ x-ms-office365-filtering-correlation-id: bc46b7f3-b7c0-4ea2-6c05-08dc68da7e7b x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: =?us-ascii?Q?3mF6TE1WERz5XPRFqxSUUl3nhQ7jMAArMzr0f7M73REeJAcOr5BgYMq4j8FA?= =?us-ascii?Q?Q5uYw0OnWoO91D1/+kWm3dPmSbmN0whx6zbFyoirgisYaKlPlREWVG0LYCce?= =?us-ascii?Q?AqRG1dYhLGV+LHeBeoU+ydO/RJRlM8ppF1t7PaYz3RTH7LUSi+yE/izPhO66?= =?us-ascii?Q?U3x9mNtt1s/lRsN1p1YY5h1pmcslsNLAmw3+1zae9kBD7D4Bf1XrFwK8h+kY?= =?us-ascii?Q?nN2I5rSHGZaii9LYBdsHbBsSPznRR/kYNOEuy8S42ajvhQvvOd7PCu87/fpq?= =?us-ascii?Q?qxjLp9zGyP9OfjrUHfPz0dAy9WZ9UYMcOELgm2B0AOLiTA+5Sg+nX16+6Di7?= =?us-ascii?Q?J6mLcqbLOoU2WamHFlLOXw5ttJF5tlvFmKvPtXVrGq9P5qSgu5r7c8KQSPRJ?= =?us-ascii?Q?jWZZZOnuMAi2PNCp1+U5y2jYlOnYQgNGV/yFlhGV1Oy5baQPVGYRPY4wdmf2?= =?us-ascii?Q?RvwYGWKrjHyyIA86PkL649T8lsQotMPDZVaHSuY4oJ38OYksBwv+EdsXTd9n?= =?us-ascii?Q?qthMZz5IsGhK2UW9wi0pcFqDQAFcEs+lO1+gWgf6zmWp7qoT6gCLbeXJTuVb?= =?us-ascii?Q?j1SKTMMCgQVlD/xkNj/FbSBKRa/vdEQc1fIYNPtr8IRvb6Ka4y50HDp3eXeq?= =?us-ascii?Q?TnH+mBJ62htez6OiXukKx/OhT8pktSHFO2U8aXyyvxcWn5VNkQNUo1qjihHa?= =?us-ascii?Q?Oej8E2gD5OVna+BgnNn1yjxsK7hFbpbqlpY9OftEjgF56IknSRNRv85CzR4c?= =?us-ascii?Q?A02v6ekeFD1C4PR5NE+yoLCNLGtMIncPWCxTqah93pqKX/Rn7vda7q3zHJTs?= =?us-ascii?Q?AA7QfPVBWAHXRotpWdIivWE8XYAHEmTgxMNhVtX9AgVeOA4FB9Te9saM1w4X?= =?us-ascii?Q?w24j9eX0raqfg6dbr3ZWdR1NxQHrSSbjAHHwJ82TFaivM3d+k8dk7mVjeoac?= =?us-ascii?Q?WnI2ubK8/O6tr3ohi/mtfvIs20M4UtGkj+YQ9stphjgD7TwNQBS2h9ZrGrZb?= =?us-ascii?Q?1xzzAMpKYB8ZwsCqZH1KAcjm73Cvyas2gi7j4YXSFKKYThvY4JkAJSZGQ51Y?= =?us-ascii?Q?zHBgu4T0NFcKlhSpUfr4D8DUWDdU6k4pJ+F74fg4b1XcZKJBettKzD3UOojo?= =?us-ascii?Q?XfPvqWxDqIaRSCgc9agaGmZ6EGWga9l1FD75/gqywFnUrk6UYItfM0+fWO9M?= =?us-ascii?Q?eXhnjhsKOrnU+rmLssqHXQo2u9Ped05PBntlneSiYL3E5rzk12JbLMkWo4P/?= =?us-ascii?Q?usrKEfryZfl1aTGBZa1g0cWGzgh0xYpHI47Z/4KOF7MqZW77uQe9RjWvix/n?= =?us-ascii?Q?nLRvDQj0XkddMqoIM2mN11ZP08TCRbR3PRiwZz8Y+gSq2g=3D=3D?= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?1L9TmQjWmVhP7PiJv6zGzzVKTH8QcfE/KLQZ/FBe1AIQrevPqd0Yy2UGWPT0?= =?us-ascii?Q?FcBgmfRF07WlT/j2Y9mWagip6rn9sQv8U50jmALwudiEW/Pjc2dvyNwOVnIS?= =?us-ascii?Q?R0tq6u9TKgodzrFvV1Fbrikq7P5IFkaYT0p8cNFgXp/Exhk7Jh22/H9s8qpl?= =?us-ascii?Q?qrRW/xMbHblh0Z2neIXbuyv5PtnMMDzNczvcHKC3uld+WEdQldGXuA9H+3RD?= =?us-ascii?Q?mYuwL7LolnVfia3hxjw+GQXT7tHZkkT4A7j6UGLgaqg0XxmrBGwkOaWl7N4V?= =?us-ascii?Q?xYuad2YGBzs1GHhpePt/2kdgR/0+8gXy/3wEQT5PPcYavKW695V/gGs5tQZI?= =?us-ascii?Q?SsU6L7m3+pBD2pM2S6LFDLhRfBUyhf8O5v5/OJW9RMMYtBmAKUUUdbPBahvP?= =?us-ascii?Q?dvmkPXEJSUd8470lgHVTSjuPBUgCXcYs1Ozj2ecCaqaWkviV9PPaPr6uaB3b?= =?us-ascii?Q?cIHPI89X/RuIkAdvesL7H8BH/Zpc0CHvFnb+GGKhPXFrAyivBHhRbTpTxd9r?= =?us-ascii?Q?iAUjEaih4uDpLpP8PABuPd74Bu6Rjna3A0ThyA0E6KDfKmj/lOLuBBuVKcyy?= =?us-ascii?Q?IDqhAnWIoG4mrc8j0g12/X8wMA3e8Vx61y4iZdSd+rPL4PWzJmjhFiVBtrs4?= =?us-ascii?Q?I+zU4ix5RpopfxKnU0aLxus0NgSi4LeWhN2hIESCWm3trDns3RW63P0MroBR?= =?us-ascii?Q?pRujMSgPQT5PqQB7lMck1gavHonGDSz1kErQyskpDOblku3iD/PJa47xNigp?= =?us-ascii?Q?Qkvo6sy0UHalR356LEI8BidZ5Be9OAuV2zekYpIlsmZraIu/56HlcXk29lSi?= =?us-ascii?Q?j7slzyZ+7Uqg2G1ehuD6yC5rt99xhpe/WVyU1LcSS3sjIWX8kM0bD7I8APKO?= =?us-ascii?Q?6D03QDT1BIeQ1Vyr5l07rH3aymOUXcRWcbNvDF8l2qGH8vNf7I4ndJO1BNkP?= =?us-ascii?Q?CJmAROeRhpH3XN3yet/fDFNzsD5iFltWfGr5ZakgS/b1YgsJVA1zf6Llip1B?= =?us-ascii?Q?wwIgM2/1+qByg0GPiOFYcJZK5rbT87/MzocW+gGH+pReNy4bg37aIeAEljjU?= =?us-ascii?Q?R36wg7mhz60s+mAlanOWCisQ0ELgNctwwdf+CNMEpbVG+qXONnH9mMAHjW9y?= =?us-ascii?Q?2sUTH8UhrkqHLKg6JoEgT/hqBAKcY6zGqG2aTDqn4dVbpK93w15paBLl6za+?= =?us-ascii?Q?HU+uLPOyHwXHQLUcekSeLQDta27wi0ER0sjlHJm0dHO9T3DIKa6GwwNAjzj4?= =?us-ascii?Q?WC64YRogk6biIAw1slgsR2UyIesVDhDtuR3UlTedw7U14MfURneWqkzDNbzq?= =?us-ascii?Q?6Vkg1zvjMmgeDBq2blBtZPWch/vVMKR2hy17tFQQNBK86Mguee4TMbhYMtHf?= =?us-ascii?Q?MBv4X9HXwaE0RoP+lvIIokf15Hj6OT9e+EY/vAFgTqpVQyLf3N732xb3rdGS?= =?us-ascii?Q?rdD+7d29CEe+e8eXtUmodCGvsHWiT/yudlItAfVNKUXKAPYoClweeVP0hkWv?= =?us-ascii?Q?KfIDiuOsozuBFshrsy9CoJWyUr4QJBa8I3HP1DAU2k9HPXdgvQEau8SyjxpC?= =?us-ascii?Q?849m6jjDqV+5t8HtD0E=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN6PR11MB8244.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bc46b7f3-b7c0-4ea2-6c05-08dc68da7e7b X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Apr 2024 05:58:01.3354 (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: Fd6yd4Cp+bGC7/YvEEqK6dh1nQOyBB2VePCdIwTsWh75nfWeHFMxyc5Rwx3hr5v+FpK7xeUVmzYIi7VzPxtI4Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR11MB7706 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 Resent-Date: Mon, 29 Apr 2024 22:58:10 -0700 Resent-From: ray.ni@intel.com Reply-To: devel@edk2.groups.io,ray.ni@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: 3JQ336965sIoyoO4HgDWCuCEx7686176AA= Content-Language: en-US Content-Type: multipart/alternative; boundary="_000_MN6PR11MB8244CD8579A9E0CE5DADB5278C1A2MN6PR11MB8244namp_" X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b=KpV5qyT0; 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 45.79.224.7 as permitted sender) smtp.mailfrom=bounce@groups.io --_000_MN6PR11MB8244CD8579A9E0CE5DADB5278C1A2MN6PR11MB8244namp_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable I've given Reviewed-by for the v3 version. What extra changes did you make so that you need me to review it again? Thanks, Ray ________________________________ From: Wu, Jiaxin Sent: Friday, April 26, 2024 20:17 To: devel@edk2.groups.io Cc: Ni, Ray ; Zeng, Star ; Gerd Hoff= mann ; Kumar, Rahul R Subject: [PATCH v4 02/14] UefiCpuPkg/SmmRelocationLib: Add SmmRelocationLib= library instance This patch just separates the smbase relocation logic from PiSmmCpuDxeSmm driver, and moves to the SmmRelocationInit interface. It maintains the original implementation of most functions and leaves the definitions of global variables intact. Further refinements to the code are planned for subsequent patches. Platform shall consume the interface for the smbase relocation if need SMM support. Note: Before using SmmRelocationLib, the PiSmmCpuDxeSmm driver allocates the SMRAM to be used for SMI handler and Save state area of each processor from Smst->AllocatePages(). With SmmRelocationLib, the SMRAM allocation for SMI handlers and Save state areas is moved to early PEI phase (Smst->AllocatePages() service is not available). So, the allocation is done by splitting the SMRAM out of the SMRAM regions reported from gEfiSmmSMramMemoryGuid. So, Platform must produce the gEfiSmmSMramMemoryGuid HOB for SmmRelocationLib usage. Cc: Ray Ni Cc: Zeng Star Cc: Gerd Hoffmann Cc: Rahul Kumar Signed-off-by: Jiaxin Wu --- .../SmmRelocationLib}/Ia32/Semaphore.c | 10 +- .../SmmRelocationLib}/Ia32/SmmInit.nasm | 67 ++- .../SmmRelocationLib/InternalSmmRelocationLib.h | 132 +++++ .../Library/SmmRelocationLib/SmmRelocationLib.c | 600 +++++++++++++++++= ++++ .../Library/SmmRelocationLib/SmmRelocationLib.inf | 61 +++ .../SmmRelocationLib/SmramSaveStateConfig.c | 139 +++++ .../SmmRelocationLib}/X64/Semaphore.c | 10 +- .../SmmRelocationLib}/X64/SmmInit.nasm | 69 ++- UefiCpuPkg/UefiCpuPkg.dsc | 1 + 9 files changed, 1066 insertions(+), 23 deletions(-) copy UefiCpuPkg/{PiSmmCpuDxeSmm =3D> Library/SmmRelocationLib}/Ia32/Semaph= ore.c (79%) copy UefiCpuPkg/{PiSmmCpuDxeSmm =3D> Library/SmmRelocationLib}/Ia32/SmmIni= t.nasm (53%) create mode 100644 UefiCpuPkg/Library/SmmRelocationLib/InternalSmmRelocati= onLib.h create mode 100644 UefiCpuPkg/Library/SmmRelocationLib/SmmRelocationLib.c create mode 100644 UefiCpuPkg/Library/SmmRelocationLib/SmmRelocationLib.in= f create mode 100644 UefiCpuPkg/Library/SmmRelocationLib/SmramSaveStateConfi= g.c copy UefiCpuPkg/{PiSmmCpuDxeSmm =3D> Library/SmmRelocationLib}/X64/Semapho= re.c (84%) copy UefiCpuPkg/{PiSmmCpuDxeSmm =3D> Library/SmmRelocationLib}/X64/SmmInit= .nasm (64%) diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/Semaphore.c b/UefiCpuPkg/Librar= y/SmmRelocationLib/Ia32/Semaphore.c similarity index 79% copy from UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/Semaphore.c copy to UefiCpuPkg/Library/SmmRelocationLib/Ia32/Semaphore.c index a9fcc89dda..ba329d6ba2 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/Semaphore.c +++ b/UefiCpuPkg/Library/SmmRelocationLib/Ia32/Semaphore.c @@ -1,15 +1,15 @@ /** @file -Semaphore mechanism to indicate to the BSP that an AP has exited SMM -after SMBASE relocation. + Semaphore mechanism to indicate to the BSP that an AP has exited SMM + after SMBASE relocation. -Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.
-SPDX-License-Identifier: BSD-2-Clause-Patent + Copyright (c) 2024, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#include "PiSmmCpuDxeSmm.h" +#include "InternalSmmRelocationLib.h" UINTN mSmmRelocationOriginalAddress; volatile BOOLEAN *mRebasedFlag; /** diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmInit.nasm b/UefiCpuPkg/Libra= ry/SmmRelocationLib/Ia32/SmmInit.nasm similarity index 53% copy from UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmInit.nasm copy to UefiCpuPkg/Library/SmmRelocationLib/Ia32/SmmInit.nasm index b5e77a1a5b..3d845e9e16 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmInit.nasm +++ b/UefiCpuPkg/Library/SmmRelocationLib/Ia32/SmmInit.nasm @@ -1,7 +1,7 @@ ;-------------------------------------------------------------------------= ----- ; -; Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.
+; Copyright (c) 2024, Intel Corporation. All rights reserved.
; SPDX-License-Identifier: BSD-2-Clause-Patent ; ; Module Name: ; ; SmmInit.nasm @@ -27,15 +27,70 @@ global ASM_PFX(gcSmmInitSize) global ASM_PFX(gcSmmInitTemplate) %define PROTECT_MODE_CS 0x8 %define PROTECT_MODE_DS 0x20 - SECTION .text + SECTION .data -ASM_PFX(gcSmiInitGdtr): +NullSeg: DQ 0 ; reserved by architecture +CodeSeg32: + DW -1 ; LimitLow + DW 0 ; BaseLow + DB 0 ; BaseMid + DB 0x9b + DB 0xcf ; LimitHigh + DB 0 ; BaseHigh +ProtModeCodeSeg32: + DW -1 ; LimitLow + DW 0 ; BaseLow + DB 0 ; BaseMid + DB 0x9b + DB 0xcf ; LimitHigh + DB 0 ; BaseHigh +ProtModeSsSeg32: + DW -1 ; LimitLow + DW 0 ; BaseLow + DB 0 ; BaseMid + DB 0x93 + DB 0xcf ; LimitHigh + DB 0 ; BaseHigh +DataSeg32: + DW -1 ; LimitLow + DW 0 ; BaseLow + DB 0 ; BaseMid + DB 0x93 + DB 0xcf ; LimitHigh + DB 0 ; BaseHigh +CodeSeg16: + DW -1 DW 0 - DQ 0 + DB 0 + DB 0x9b + DB 0x8f + DB 0 +DataSeg16: + DW -1 + DW 0 + DB 0 + DB 0x93 + DB 0x8f + DB 0 +CodeSeg64: + DW -1 ; LimitLow + DW 0 ; BaseLow + DB 0 ; BaseMid + DB 0x9b + DB 0xaf ; LimitHigh + DB 0 ; BaseHigh +GDT_SIZE equ $ - NullSeg + +ASM_PFX(gcSmiInitGdtr): + DW GDT_SIZE - 1 + DD NullSeg + + + SECTION .text global ASM_PFX(SmmStartup) BITS 16 ASM_PFX(SmmStartup): @@ -89,8 +144,8 @@ ASM_PFX(SmmRelocationSemaphoreComplete): mov eax, [ASM_PFX(mRebasedFlag)] mov byte [eax], 1 pop eax jmp [ASM_PFX(mSmmRelocationOriginalAddress)] -global ASM_PFX(PiSmmCpuSmmInitFixupAddress) -ASM_PFX(PiSmmCpuSmmInitFixupAddress): +global ASM_PFX(SmmInitFixupAddress) +ASM_PFX(SmmInitFixupAddress): ret diff --git a/UefiCpuPkg/Library/SmmRelocationLib/InternalSmmRelocationLib.h= b/UefiCpuPkg/Library/SmmRelocationLib/InternalSmmRelocationLib.h new file mode 100644 index 0000000000..a9d3f271a9 --- /dev/null +++ b/UefiCpuPkg/Library/SmmRelocationLib/InternalSmmRelocationLib.h @@ -0,0 +1,132 @@ +/** @file + SMM Relocation Lib for each processor. + + This Lib produces the SMM_BASE_HOB in HOB database which tells + the PiSmmCpuDxeSmm driver (runs at a later phase) about the new + SMBASE for each processor. PiSmmCpuDxeSmm driver installs the + SMI handler at the SMM_BASE_HOB.SmBase[Index]+0x8000 for processor + Index. + + Copyright (c) 2024, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#ifndef INTERNAL_SMM_RELOCATION_LIB_H_ +#define INTERNAL_SMM_RELOCATION_LIB_H_ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +extern IA32_DESCRIPTOR gcSmiInitGdtr; +extern CONST UINT16 gcSmmInitSize; +extern CONST UINT8 gcSmmInitTemplate[]; + +X86_ASSEMBLY_PATCH_LABEL gPatchSmmCr0; +X86_ASSEMBLY_PATCH_LABEL gPatchSmmCr3; +X86_ASSEMBLY_PATCH_LABEL gPatchSmmCr4; +X86_ASSEMBLY_PATCH_LABEL gPatchSmmInitStack; + +// +// The size 0x20 must be bigger than +// the size of template code of SmmInit. Currently, +// the size of SmmInit requires the 0x16 Bytes buffer +// at least. +// +#define BACK_BUF_SIZE 0x20 + +#define CR4_CET_ENABLE BIT23 + +// +// EFER register LMA bit +// +#define LMA BIT10 + +/** + This function configures the SmBase on the currently executing CPU. + + @param[in] SmBase The SmBase on the currently executing = CPU. + +**/ +VOID +EFIAPI +ConfigureSmBase ( + IN UINT64 SmBase + ); + +/** + Semaphore operation for all processor relocate SMMBase. +**/ +VOID +EFIAPI +SmmRelocationSemaphoreComplete ( + VOID + ); + +/** + Hook the code executed immediately after an RSM instruction on the curre= ntly + executing CPU. The mode of code executed immediately after RSM must be + detected, and the appropriate hook must be selected. Always clear the a= uto + HALT restart flag if it is set. + + @param[in] CpuIndex The processor index for the curr= ently + executing CPU. + @param[in,out] CpuState Pointer to SMRAM Save State Map = for the + currently executing CPU. + @param[in] NewInstructionPointer32 Instruction pointer to use if re= suming to + 32-bit mode from 64-bit SMM. + @param[in] NewInstructionPointer Instruction pointer to use if re= suming to + same mode as SMM. + + @retval The value of the original instruction pointer before it was hook= ed. + +**/ +UINT64 +EFIAPI +HookReturnFromSmm ( + IN UINTN CpuIndex, + IN OUT SMRAM_SAVE_STATE_MAP *CpuState, + IN UINT64 NewInstructionPointer32, + IN UINT64 NewInstructionPointer + ); + +/** + Hook return address of SMM Save State so that semaphore code + can be executed immediately after AP exits SMM to indicate to + the BSP that an AP has exited SMM after SMBASE relocation. + + @param[in] CpuIndex The processor index. + @param[in] RebasedFlag A pointer to a flag that is set to TRUE + immediately after AP exits SMM. + +**/ +VOID +SemaphoreHook ( + IN UINTN CpuIndex, + IN volatile BOOLEAN *RebasedFlag + ); + +/** + This function fixes up the address of the global variable or function + referred in SmmInit assembly files to be the absolute address. +**/ +VOID +EFIAPI +SmmInitFixupAddress ( + ); + +#endif diff --git a/UefiCpuPkg/Library/SmmRelocationLib/SmmRelocationLib.c b/UefiC= puPkg/Library/SmmRelocationLib/SmmRelocationLib.c new file mode 100644 index 0000000000..13e62b662d --- /dev/null +++ b/UefiCpuPkg/Library/SmmRelocationLib/SmmRelocationLib.c @@ -0,0 +1,600 @@ +/** @file + SMM Relocation Lib for each processor. + + This Lib produces the SMM_BASE_HOB in HOB database which tells + the PiSmmCpuDxeSmm driver (runs at a later phase) about the new + SMBASE for each processor. PiSmmCpuDxeSmm driver installs the + SMI handler at the SMM_BASE_HOB.SmBase[Index]+0x8000 for processor + Index. + + Copyright (c) 2024, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ +#include "InternalSmmRelocationLib.h" + +UINTN mMaxNumberOfCpus =3D 1; +UINTN mNumberOfCpus =3D 1; + +// +// Record all Processors Info +// +EFI_PROCESSOR_INFORMATION *mProcessorInfo =3D NULL; + +// +// IDT used during SMM Init +// +IA32_DESCRIPTOR gcSmiIdtr; + +// +// Smbase for all CPUs +// +UINT64 *mSmBase =3D NULL; + +// +// SmBase Rebased flag for all CPUs +// +volatile BOOLEAN *mRebased; + +/** + This function will create SmBase for all CPUs. + + @param[in] SmBase Pointer to SmBase for all CPUs. + + @retval EFI_SUCCESS Create SmBase for all CPUs successfully. + @retval Others Failed to create SmBase for all CPUs. + +**/ +EFI_STATUS +CreateSmmBaseHob ( + IN UINT64 *SmBase + ) +{ + UINTN Index; + SMM_BASE_HOB_DATA *SmmBaseHobData; + UINT32 CpuCount; + UINT32 NumberOfProcessorsInHob; + UINT32 MaxCapOfProcessorsInHob; + UINT32 HobCount; + + SmmBaseHobData =3D NULL; + CpuCount =3D 0; + NumberOfProcessorsInHob =3D 0; + MaxCapOfProcessorsInHob =3D 0; + HobCount =3D 0; + + // + // Count the HOB instance maximum capacity of CPU (MaxCapOfProcessorsInH= ob) since the max HobLength is 0xFFF8. + // + MaxCapOfProcessorsInHob =3D (0xFFF8 - sizeof (EFI_HOB_GUID_TYPE) - sizeo= f (SMM_BASE_HOB_DATA)) / sizeof (UINT64) + 1; + DEBUG ((DEBUG_INFO, "CreateSmmBaseHob - MaxCapOfProcessorsInHob: %d\n", = MaxCapOfProcessorsInHob)); + + // + // Create Guided SMM Base HOB Instances. + // + while (CpuCount !=3D mMaxNumberOfCpus) { + NumberOfProcessorsInHob =3D MIN ((UINT32)mMaxNumberOfCpus - CpuCount, = MaxCapOfProcessorsInHob); + + SmmBaseHobData =3D BuildGuidHob ( + &gSmmBaseHobGuid, + sizeof (SMM_BASE_HOB_DATA) + sizeof (UINT64) * Numb= erOfProcessorsInHob + ); + if (SmmBaseHobData =3D=3D NULL) { + return EFI_OUT_OF_RESOURCES; + } + + SmmBaseHobData->ProcessorIndex =3D CpuCount; + SmmBaseHobData->NumberOfProcessors =3D NumberOfProcessorsInHob; + + DEBUG ((DEBUG_INFO, "CreateSmmBaseHob - SmmBaseHobData[%d]->ProcessorI= ndex: %d\n", HobCount, SmmBaseHobData->ProcessorIndex)); + DEBUG ((DEBUG_INFO, "CreateSmmBaseHob - SmmBaseHobData[%d]->NumberOfPr= ocessors: %d\n", HobCount, SmmBaseHobData->NumberOfProcessors)); + for (Index =3D 0; Index < SmmBaseHobData->NumberOfProcessors; Index++)= { + // + // Calculate the new SMBASE address + // + SmmBaseHobData->SmBase[Index] =3D SmBase[Index + CpuCount]; + DEBUG ((DEBUG_INFO, "CreateSmmBaseHob - SmmBaseHobData[%d]->SmBase[%= d]: 0x%08x\n", HobCount, Index, SmmBaseHobData->SmBase[Index])); + } + + CpuCount +=3D NumberOfProcessorsInHob; + HobCount++; + SmmBaseHobData =3D NULL; + } + + return EFI_SUCCESS; +} + +/** + C function for SMI handler. To change all processor's SMMBase Register. + +**/ +VOID +EFIAPI +SmmInitHandler ( + VOID + ) +{ + UINT32 ApicId; + UINTN Index; + + // + // Update SMM IDT entries' code segment and load IDT + // + AsmWriteIdtr (&gcSmiIdtr); + ApicId =3D GetApicId (); + + for (Index =3D 0; Index < mNumberOfCpus; Index++) { + if (ApicId =3D=3D (UINT32)mProcessorInfo[Index].ProcessorId) { + // + // Configure SmBase. + // + ConfigureSmBase (mSmBase[Index]); + + // + // Hook return after RSM to set SMM re-based flag + // SMM re-based flag can't be set before RSM, because SMM save state= context might be override + // by next AP flow before it take effect. + // + SemaphoreHook (Index, &mRebased[Index]); + return; + } + } + + ASSERT (FALSE); +} + +/** + Relocate SmmBases for each processor. + Execute on first boot and all S3 resumes + +**/ +VOID +SmmRelocateBases ( + VOID + ) +{ + UINT8 BakBuf[BACK_BUF_SIZE]; + SMRAM_SAVE_STATE_MAP BakBuf2; + SMRAM_SAVE_STATE_MAP *CpuStatePtr; + UINT8 *U8Ptr; + UINTN Index; + UINTN BspIndex; + UINT32 BspApicId; + + // + // Make sure the reserved size is large enough for procedure SmmInitTemp= late. + // + ASSERT (sizeof (BakBuf) >=3D gcSmmInitSize); + + // + // Patch ASM code template with current CR0, CR3, and CR4 values + // + PatchInstructionX86 (gPatchSmmCr0, AsmReadCr0 (), 4); + PatchInstructionX86 (gPatchSmmCr3, AsmReadCr3 (), 4); + PatchInstructionX86 (gPatchSmmCr4, AsmReadCr4 () & (~CR4_CET_ENABLE), 4)= ; + + U8Ptr =3D (UINT8 *)(UINTN)(SMM_DEFAULT_SMBASE + SMM_HANDLER_OFFSET= ); + CpuStatePtr =3D (SMRAM_SAVE_STATE_MAP *)(UINTN)(SMM_DEFAULT_SMBASE + SMR= AM_SAVE_STATE_MAP_OFFSET); + + // + // Backup original contents at address 0x38000 + // + CopyMem (BakBuf, U8Ptr, sizeof (BakBuf)); + CopyMem (&BakBuf2, CpuStatePtr, sizeof (BakBuf2)); + + // + // Load image for relocation + // + CopyMem (U8Ptr, gcSmmInitTemplate, gcSmmInitSize); + + // + // Retrieve the local APIC ID of current processor + // + BspApicId =3D GetApicId (); + + // + // Relocate SM bases for all APs + // This is APs' 1st SMI - rebase will be done here, and APs' default SMI= handler will be overridden by gcSmmInitTemplate + // + BspIndex =3D (UINTN)-1; + for (Index =3D 0; Index < mNumberOfCpus; Index++) { + mRebased[Index] =3D FALSE; + if (BspApicId !=3D (UINT32)mProcessorInfo[Index].ProcessorId) { + SendSmiIpi ((UINT32)mProcessorInfo[Index].ProcessorId); + // + // Wait for this AP to finish its 1st SMI + // + while (!mRebased[Index]) { + } + } else { + // + // BSP will be Relocated later + // + BspIndex =3D Index; + } + } + + // + // Relocate BSP's SMM base + // + ASSERT (BspIndex !=3D (UINTN)-1); + SendSmiIpi (BspApicId); + + // + // Wait for the BSP to finish its 1st SMI + // + while (!mRebased[BspIndex]) { + } + + // + // Restore contents at address 0x38000 + // + CopyMem (CpuStatePtr, &BakBuf2, sizeof (BakBuf2)); + CopyMem (U8Ptr, BakBuf, sizeof (BakBuf)); +} + +/** + Initialize IDT to setup exception handlers in SMM. + +**/ +VOID +InitSmmIdt ( + VOID + ) +{ + EFI_STATUS Status; + BOOLEAN InterruptState; + IA32_DESCRIPTOR PeiIdtr; + CONST EFI_PEI_SERVICES **PeiServices; + + // + // There are 32 (not 255) entries in it since only processor + // generated exceptions will be handled. + // + gcSmiIdtr.Limit =3D (sizeof (IA32_IDT_GATE_DESCRIPTOR) * 32) - 1; + + // + // Allocate for IDT. + // sizeof (UINTN) is for the PEI Services Table pointer. + // + gcSmiIdtr.Base =3D (UINTN)AllocateZeroPool (gcSmiIdtr.Limit + 1 + sizeof= (UINTN)); + ASSERT (gcSmiIdtr.Base !=3D 0); + gcSmiIdtr.Base +=3D sizeof (UINTN); + + // + // Disable Interrupt, save InterruptState and save PEI IDT table + // + InterruptState =3D SaveAndDisableInterrupts (); + AsmReadIdtr (&PeiIdtr); + + // + // Save the PEI Services Table pointer + // The PEI Services Table pointer will be stored in the sizeof (UINTN) b= ytes + // immediately preceding the IDT in memory. + // + PeiServices =3D (CONST EFI_PEI_SERVICE= S **)(*(UINTN *)(PeiIdtr.Base - sizeof (UINTN))); + (*(UINTN *)(gcSmiIdtr.Base - sizeof (UINTN))) =3D (UINTN)PeiServices; + + // + // Load SMM temporary IDT table + // + AsmWriteIdtr (&gcSmiIdtr); + + // + // Setup SMM default exception handlers, SMM IDT table + // will be updated and saved in gcSmiIdtr + // + Status =3D InitializeCpuExceptionHandlers (NULL); + ASSERT_EFI_ERROR (Status); + + // + // Restore PEI IDT table and CPU InterruptState + // + AsmWriteIdtr ((IA32_DESCRIPTOR *)&PeiIdtr); + SetInterruptState (InterruptState); +} + +/** + This routine will split SmramReserve HOB to reserve SmmRelocationSize fo= r Smm relocated memory. + + @param[in] SmmRelocationSize SmmRelocationSize for all processor= s. + @param[in,out] SmmRelocationStart Return the start address of Smm rel= ocated memory in SMRAM. + + @retval EFI_SUCCESS The gEfiSmmSmramMemoryGuid is split succes= sfully. + @retval EFI_DEVICE_ERROR Failed to build new HOB for gEfiSmmSmramMe= moryGuid. + @retval EFI_NOT_FOUND The gEfiSmmSmramMemoryGuid is not found. + +**/ +EFI_STATUS +SplitSmramHobForSmmRelocation ( + IN UINT64 SmmRelocationSize, + IN OUT EFI_PHYSICAL_ADDRESS *SmmRelocationStart + ) +{ + EFI_HOB_GUID_TYPE *GuidHob; + EFI_SMRAM_HOB_DESCRIPTOR_BLOCK *Block; + EFI_SMRAM_HOB_DESCRIPTOR_BLOCK *NewBlock; + UINTN NewBlockSize; + + ASSERT (SmmRelocationStart !=3D NULL); + + // + // Retrieve the GUID HOB data that contains the set of SMRAM descriptors + // + GuidHob =3D GetFirstGuidHob (&gEfiSmmSmramMemoryGuid); + if (GuidHob =3D=3D NULL) { + return EFI_NOT_FOUND; + } + + Block =3D (EFI_SMRAM_HOB_DESCRIPTOR_BLOCK *)GET_GUID_HOB_DATA (GuidHob); + + // + // Allocate one extra EFI_SMRAM_DESCRIPTOR to describe smram carved out = for all SMBASE + // + NewBlockSize =3D sizeof (EFI_SMRAM_HOB_DESCRIPTOR_BLOCK) + (Block->Numbe= rOfSmmReservedRegions * sizeof (EFI_SMRAM_DESCRIPTOR)); + + NewBlock =3D (EFI_SMRAM_HOB_DESCRIPTOR_BLOCK *)BuildGuidHob ( + &gEfiSmmSmramMemoryGuid, + NewBlockSize + ); + ASSERT (NewBlock !=3D NULL); + if (NewBlock =3D=3D NULL) { + return EFI_DEVICE_ERROR; + } + + // + // Copy old EFI_SMRAM_HOB_DESCRIPTOR_BLOCK to new allocated region + // + CopyMem ((VOID *)NewBlock, Block, NewBlockSize - sizeof (EFI_SMRAM_DESCR= IPTOR)); + + // + // Increase the number of SMRAM descriptors by 1 to make room for the AL= LOCATED descriptor of size EFI_PAGE_SIZE + // + NewBlock->NumberOfSmmReservedRegions =3D (UINT32)(Block->NumberOfSmmRese= rvedRegions + 1); + + ASSERT (Block->NumberOfSmmReservedRegions >=3D 1); + // + // Copy last entry to the end - we assume TSEG is last entry. + // + CopyMem (&NewBlock->Descriptor[Block->NumberOfSmmReservedRegions], &NewB= lock->Descriptor[Block->NumberOfSmmReservedRegions - 1], sizeof (EFI_SMRAM_= DESCRIPTOR)); + + // + // Update the entry in the array with a size of SmmRelocationSize and pu= t into the ALLOCATED state + // + NewBlock->Descriptor[Block->NumberOfSmmReservedRegions - 1].PhysicalSize= =3D SmmRelocationSize; + NewBlock->Descriptor[Block->NumberOfSmmReservedRegions - 1].RegionState = |=3D EFI_ALLOCATED; + + // + // Return the start address of Smm relocated memory in SMRAM. + // + *SmmRelocationStart =3D NewBlock->Descriptor[Block->NumberOfSmmReservedR= egions - 1].CpuStart; + + // + // Reduce the size of the last SMRAM descriptor by SmmRelocationSize + // + NewBlock->Descriptor[Block->NumberOfSmmReservedRegions].PhysicalStart += =3D SmmRelocationSize; + NewBlock->Descriptor[Block->NumberOfSmmReservedRegions].CpuStart += =3D SmmRelocationSize; + NewBlock->Descriptor[Block->NumberOfSmmReservedRegions].PhysicalSize -= =3D SmmRelocationSize; + + // + // Last step, we can scrub old one + // + ZeroMem (&GuidHob->Name, sizeof (GuidHob->Name)); + + return EFI_SUCCESS; +} + +/** + This function will initialize SmBase for all CPUs. + + @param[in,out] SmBase Pointer to SmBase for all CPUs. + + @retval EFI_SUCCESS Initialize SmBase for all CPUs successfull= y. + @retval Others Failed to initialize SmBase for all CPUs. + +**/ +EFI_STATUS +InitSmBaseForAllCpus ( + IN OUT UINT64 **SmBase + ) +{ + EFI_STATUS Status; + UINTN TileSize; + UINT64 SmmRelocationSize; + EFI_PHYSICAL_ADDRESS SmmRelocationStart; + UINTN Index; + + SmmRelocationStart =3D 0; + + ASSERT (SmBase !=3D NULL); + + // + // Calculate SmmRelocationSize for all of the tiles. + // + // The CPU save state and code for the SMI entry point are tiled within = an SMRAM + // allocated buffer. The minimum size of this buffer for a uniprocessor = system + // is 32 KB, because the entry point is SMBASE + 32KB, and CPU save stat= e area + // just below SMBASE + 64KB. If more than one CPU is present in the plat= form, + // then the SMI entry point and the CPU save state areas can be tiles to= minimize + // the total amount SMRAM required for all the CPUs. The tile size can b= e computed + // by adding the CPU save state size, any extra CPU specific context, an= d + // the size of code that must be placed at the SMI entry point to transf= er + // control to a C function in the native SMM execution mode. This size i= s + // rounded up to the nearest power of 2 to give the tile size for a each= CPU. + // The total amount of memory required is the maximum number of CPUs tha= t + // platform supports times the tile size. + // + TileSize =3D SIZE_8KB; + SmmRelocationSize =3D EFI_PAGES_TO_SIZE (EFI_SIZE_TO_PAGES (SIZE_32KB + = TileSize * (mMaxNumberOfCpus - 1))); + + // + // Split SmramReserve HOB to reserve SmmRelocationSize for Smm relocated= memory + // + Status =3D SplitSmramHobForSmmRelocation ( + SmmRelocationSize, + &SmmRelocationStart + ); + if (EFI_ERROR (Status)) { + return Status; + } + + ASSERT (SmmRelocationStart !=3D 0); + DEBUG ((DEBUG_INFO, "InitSmBaseForAllCpus - SmmRelocationSize: 0x%08x\n"= , SmmRelocationSize)); + DEBUG ((DEBUG_INFO, "InitSmBaseForAllCpus - SmmRelocationStart: 0x%08x\n= ", SmmRelocationStart)); + + // + // Init SmBase + // + *SmBase =3D (UINT64 *)AllocatePages (EFI_SIZE_TO_PAGES (sizeof (UINT64) = * mMaxNumberOfCpus)); + if (*SmBase =3D=3D NULL) { + return EFI_OUT_OF_RESOURCES; + } + + for (Index =3D 0; Index < mMaxNumberOfCpus; Index++) { + // + // Return each SmBase in SmBase + // + (*SmBase)[Index] =3D (UINTN)(SmmRelocationStart)+ Index * TileSize - S= MM_HANDLER_OFFSET; + DEBUG ((DEBUG_INFO, "InitSmBaseForAllCpus - SmBase For CPU[%d]: 0x%08x= \n", Index, (*SmBase)[Index])); + } + + return EFI_SUCCESS; +} + +/** + CPU SmmBase Relocation Init. + + This function is to relocate CPU SmmBase. + + @param[in] MpServices2 Pointer to this instance of the MpServices= . + + @retval EFI_SUCCESS CPU SmmBase Relocated successfully. + @retval Others CPU SmmBase Relocation failed. + +**/ +EFI_STATUS +EFIAPI +SmmRelocationInit ( + IN EDKII_PEI_MP_SERVICES2_PPI *MpServices2 + ) +{ + EFI_STATUS Status; + UINTN NumberOfEnabledCpus; + UINTN SmmStackSize; + UINT8 *SmmStacks; + UINTN Index; + + SmmStacks =3D NULL; + + DEBUG ((DEBUG_INFO, "SmmRelocationInit Start \n")); + if (MpServices2 =3D=3D NULL) { + return EFI_INVALID_PARAMETER; + } + + // + // Get the number of processors + // + Status =3D MpServices2->GetNumberOfProcessors ( + MpServices2, + &mNumberOfCpus, + &NumberOfEnabledCpus + ); + if (EFI_ERROR (Status)) { + goto ON_EXIT; + } + + if (FeaturePcdGet (PcdCpuHotPlugSupport)) { + mMaxNumberOfCpus =3D PcdGet32 (PcdCpuMaxLogicalProcessorNumber); + } else { + mMaxNumberOfCpus =3D mNumberOfCpus; + } + + ASSERT (mNumberOfCpus <=3D mMaxNumberOfCpus); + + // + // Retrieve the Processor Info for all CPUs + // + mProcessorInfo =3D (EFI_PROCESSOR_INFORMATION *)AllocatePool (sizeof (EF= I_PROCESSOR_INFORMATION) * mMaxNumberOfCpus); + if (mProcessorInfo =3D=3D NULL) { + Status =3D EFI_OUT_OF_RESOURCES; + goto ON_EXIT; + } + + for (Index =3D 0; Index < mMaxNumberOfCpus; Index++) { + if (Index < mNumberOfCpus) { + Status =3D MpServices2->GetProcessorInfo (MpServices2, Index | CPU_V= 2_EXTENDED_TOPOLOGY, &mProcessorInfo[Index]); + if (EFI_ERROR (Status)) { + goto ON_EXIT; + } + } + } + + // + // Initialize the SmBase for all CPUs + // + Status =3D InitSmBaseForAllCpus (&mSmBase); + if (EFI_ERROR (Status)) { + goto ON_EXIT; + } + + // + // Fix up the address of the global variable or function referred in + // SmmInit assembly files to be the absolute address + // + SmmInitFixupAddress (); + + // + // Patch SMI stack for SMM base relocation + // Note: No need allocate stack for all CPUs since the relocation + // occurs serially for each CPU + // + SmmStackSize =3D EFI_PAGE_SIZE; + SmmStacks =3D (UINT8 *)AllocatePages (EFI_SIZE_TO_PAGES (SmmStackSize= )); + if (SmmStacks =3D=3D NULL) { + Status =3D EFI_OUT_OF_RESOURCES; + goto ON_EXIT; + } + + DEBUG ((DEBUG_INFO, "SmmRelocationInit - SmmStackSize: 0x%08x\n", SmmSta= ckSize)); + DEBUG ((DEBUG_INFO, "SmmRelocationInit - SmmStacks: 0x%08x\n", SmmStacks= )); + + PatchInstructionX86 ( + gPatchSmmInitStack, + (UINTN)(SmmStacks + SmmStackSize - sizeof (UINTN)), + sizeof (UINTN) + ); + + // + // Initialize the SMM IDT for SMM base relocation + // + InitSmmIdt (); + + // + // Relocate SmmBases for each processor. + // Allocate mRebased as the flag to indicate the relocation is done for = each CPU. + // + mRebased =3D (BOOLEAN *)AllocateZeroPool (sizeof (BOOLEAN) * mMaxNumberO= fCpus); + if (mRebased =3D=3D NULL) { + Status =3D EFI_OUT_OF_RESOURCES; + goto ON_EXIT; + } + + SmmRelocateBases (); + + // + // Create the SmBase HOB for all CPUs + // + Status =3D CreateSmmBaseHob (mSmBase); + +ON_EXIT: + if (SmmStacks !=3D NULL) { + FreePages (SmmStacks, EFI_SIZE_TO_PAGES (SmmStackSize)); + } + + if (mSmBase !=3D NULL) { + FreePages (mSmBase, EFI_SIZE_TO_PAGES (sizeof (UINT64) * mMaxNumberOfC= pus)); + } + + DEBUG ((DEBUG_INFO, "SmmRelocationInit Done\n")); + return Status; +} diff --git a/UefiCpuPkg/Library/SmmRelocationLib/SmmRelocationLib.inf b/Uef= iCpuPkg/Library/SmmRelocationLib/SmmRelocationLib.inf new file mode 100644 index 0000000000..45fdaf35bc --- /dev/null +++ b/UefiCpuPkg/Library/SmmRelocationLib/SmmRelocationLib.inf @@ -0,0 +1,61 @@ +## @file +# SMM Relocation Lib for each processor. +# +# This Lib produces the SMM_BASE_HOB in HOB database which tells +# the PiSmmCpuDxeSmm driver (runs at a later phase) about the new +# SMBASE for each processor. PiSmmCpuDxeSmm driver installs the +# SMI handler at the SMM_BASE_HOB.SmBase[Index]+0x8000 for processor +# Index. +# +# Copyright (c) 2024, Intel Corporation. All rights reserved.
+# SPDX-License-Identifier: BSD-2-Clause-Patent +# +## + +[Defines] + INF_VERSION =3D 0x00010005 + BASE_NAME =3D SmmRelocationLib + FILE_GUID =3D 853E97B3-790C-4EA3-945C-8F622FC47FE8 + MODULE_TYPE =3D PEIM + VERSION_STRING =3D 1.0 + LIBRARY_CLASS =3D SmmRelocationLib + +[Sources] + InternalSmmRelocationLib.h + SmramSaveStateConfig.c + SmmRelocationLib.c + +[Sources.Ia32] + Ia32/Semaphore.c + Ia32/SmmInit.nasm + +[Sources.X64] + X64/Semaphore.c + X64/SmmInit.nasm + +[Packages] + MdePkg/MdePkg.dec + MdeModulePkg/MdeModulePkg.dec + UefiCpuPkg/UefiCpuPkg.dec + +[LibraryClasses] + BaseLib + BaseMemoryLib + CpuExceptionHandlerLib + CpuLib + DebugLib + HobLib + LocalApicLib + MemoryAllocationLib + PcdLib + PeiServicesLib + +[Guids] + gSmmBaseHobGuid ## HOB ALWAYS_PRODUCED + gEfiSmmSmramMemoryGuid ## CONSUMES + +[Pcd] + gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber + +[FeaturePcd] + gUefiCpuPkgTokenSpaceGuid.PcdCpuHotPlugSupport ##= CONSUMES diff --git a/UefiCpuPkg/Library/SmmRelocationLib/SmramSaveStateConfig.c b/U= efiCpuPkg/Library/SmmRelocationLib/SmramSaveStateConfig.c new file mode 100644 index 0000000000..d3a0bb9b89 --- /dev/null +++ b/UefiCpuPkg/Library/SmmRelocationLib/SmramSaveStateConfig.c @@ -0,0 +1,139 @@ +/** @file + Config SMRAM Save State for SmmBases Relocation. + + Copyright (c) 2024, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ +#include "InternalSmmRelocationLib.h" +#include + +/** + Get the mode of the CPU at the time an SMI occurs + + @retval EFI_MM_SAVE_STATE_REGISTER_LMA_32BIT 32 bit. + @retval EFI_MM_SAVE_STATE_REGISTER_LMA_64BIT 64 bit. + +**/ +UINT8 +GetMmSaveStateRegisterLma ( + VOID + ) +{ + CPUID_VERSION_INFO_EAX RegEax; + CPUID_EXTENDED_CPU_SIG_EDX RegEdx; + UINTN FamilyId; + UINTN ModelId; + UINT32 Eax; + UINT8 SmmSaveStateRegisterLma; + + // + // Determine the mode of the CPU at the time an SMI occurs + // Intel(R) 64 and IA-32 Architectures Software Developer's Manual + // Volume 3C, Section 34.4.1.1 + // + RegEax.Uint32 =3D GetCpuFamilyModel (); + FamilyId =3D RegEax.Bits.FamilyId; + ModelId =3D RegEax.Bits.Model; + if ((FamilyId =3D=3D 0x06) || (FamilyId =3D=3D 0x0f)) { + ModelId =3D ModelId | RegEax.Bits.ExtendedModelId << 4; + } + + RegEdx.Uint32 =3D 0; + AsmCpuid (CPUID_EXTENDED_FUNCTION, &Eax, NULL, NULL, NULL); + if (Eax >=3D CPUID_EXTENDED_CPU_SIG) { + AsmCpuid (CPUID_EXTENDED_CPU_SIG, NULL, NULL, NULL, &(RegEdx.Uint32)); + } + + SmmSaveStateRegisterLma =3D (UINT8)EFI_MM_SAVE_STATE_REGISTER_LMA_32BIT; + if (RegEdx.Bits.LM) { + SmmSaveStateRegisterLma =3D (UINT8)EFI_MM_SAVE_STATE_REGISTER_LMA_64BI= T; + } + + if (FamilyId =3D=3D 0x06) { + if ((ModelId =3D=3D 0x17) || (ModelId =3D=3D 0x0f) || (ModelId =3D=3D = 0x1c)) { + SmmSaveStateRegisterLma =3D (UINT8)EFI_MM_SAVE_STATE_REGISTER_LMA_64= BIT; + } + } + + return SmmSaveStateRegisterLma; +} + +/** + This function configures the SmBase on the currently executing CPU. + + @param[in] SmBase The SmBase on the currently executing = CPU. + +**/ +VOID +EFIAPI +ConfigureSmBase ( + IN UINT64 SmBase + ) +{ + SMRAM_SAVE_STATE_MAP *CpuState; + + CpuState =3D (SMRAM_SAVE_STATE_MAP *)(UINTN)(SMM_DEFAULT_SMBASE + SMRAM_= SAVE_STATE_MAP_OFFSET); + + CpuState->x86.SMBASE =3D (UINT32)SmBase; +} + +/** + Hook the code executed immediately after an RSM instruction on the curre= ntly + executing CPU. The mode of code executed immediately after RSM must be + detected, and the appropriate hook must be selected. Always clear the a= uto + HALT restart flag if it is set. + + @param[in] CpuIndex The processor index for the curr= ently + executing CPU. + @param[in,out] CpuState Pointer to SMRAM Save State Map = for the + currently executing CPU. + @param[in] NewInstructionPointer32 Instruction pointer to use if re= suming to + 32-bit mode from 64-bit SMM. + @param[in] NewInstructionPointer Instruction pointer to use if re= suming to + same mode as SMM. + + @retval The value of the original instruction pointer before it was hook= ed. + +**/ +UINT64 +EFIAPI +HookReturnFromSmm ( + IN UINTN CpuIndex, + IN OUT SMRAM_SAVE_STATE_MAP *CpuState, + IN UINT64 NewInstructionPointer32, + IN UINT64 NewInstructionPointer + ) +{ + UINT64 OriginalInstructionPointer; + + if (GetMmSaveStateRegisterLma () =3D=3D EFI_MM_SAVE_STATE_REGISTER_LMA_3= 2BIT) { + OriginalInstructionPointer =3D (UINT64)CpuState->x86._EIP; + CpuState->x86._EIP =3D (UINT32)NewInstructionPointer; + + // + // Clear the auto HALT restart flag so the RSM instruction returns + // program control to the instruction following the HLT instruction. + // + if ((CpuState->x86.AutoHALTRestart & BIT0) !=3D 0) { + CpuState->x86.AutoHALTRestart &=3D ~BIT0; + } + } else { + OriginalInstructionPointer =3D CpuState->x64._RIP; + if ((CpuState->x64.IA32_EFER & LMA) =3D=3D 0) { + CpuState->x64._RIP =3D (UINT32)NewInstructionPointer32; + } else { + CpuState->x64._RIP =3D (UINT32)NewInstructionPointer; + } + + // + // Clear the auto HALT restart flag so the RSM instruction returns + // program control to the instruction following the HLT instruction. + // + if ((CpuState->x64.AutoHALTRestart & BIT0) !=3D 0) { + CpuState->x64.AutoHALTRestart &=3D ~BIT0; + } + } + + return OriginalInstructionPointer; +} diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/Semaphore.c b/UefiCpuPkg/Library= /SmmRelocationLib/X64/Semaphore.c similarity index 84% copy from UefiCpuPkg/PiSmmCpuDxeSmm/X64/Semaphore.c copy to UefiCpuPkg/Library/SmmRelocationLib/X64/Semaphore.c index dafbc3390e..53f3084363 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/Semaphore.c +++ b/UefiCpuPkg/Library/SmmRelocationLib/X64/Semaphore.c @@ -1,15 +1,15 @@ /** @file -Semaphore mechanism to indicate to the BSP that an AP has exited SMM -after SMBASE relocation. + Semaphore mechanism to indicate to the BSP that an AP has exited SMM + after SMBASE relocation. -Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.
-SPDX-License-Identifier: BSD-2-Clause-Patent + Copyright (c) 2024, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#include "PiSmmCpuDxeSmm.h" +#include "InternalSmmRelocationLib.h" X86_ASSEMBLY_PATCH_LABEL gPatchSmmRelocationOriginalAddressPtr32; X86_ASSEMBLY_PATCH_LABEL gPatchRebasedFlagAddr32; UINTN mSmmRelocationOriginalAddress; diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmInit.nasm b/UefiCpuPkg/Librar= y/SmmRelocationLib/X64/SmmInit.nasm similarity index 64% copy from UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmInit.nasm copy to UefiCpuPkg/Library/SmmRelocationLib/X64/SmmInit.nasm index 9cf3a6dcf9..c790ad7ad8 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmInit.nasm +++ b/UefiCpuPkg/Library/SmmRelocationLib/X64/SmmInit.nasm @@ -1,7 +1,7 @@ ;-------------------------------------------------------------------------= ----- ; -; Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.
+; Copyright (c) 2024, Intel Corporation. All rights reserved.
; SPDX-License-Identifier: BSD-2-Clause-Patent ; ; Module Name: ; ; SmmInit.nasm @@ -28,16 +28,71 @@ global ASM_PFX(gcSmmInitTemplate) global ASM_PFX(gPatchRebasedFlagAddr32) global ASM_PFX(gPatchSmmRelocationOriginalAddressPtr32) %define LONG_MODE_CS 0x38 - DEFAULT REL - SECTION .text + SECTION .data + +NullSeg: DQ 0 ; reserved by architecture +CodeSeg32: + DW -1 ; LimitLow + DW 0 ; BaseLow + DB 0 ; BaseMid + DB 0x9b + DB 0xcf ; LimitHigh + DB 0 ; BaseHigh +ProtModeCodeSeg32: + DW -1 ; LimitLow + DW 0 ; BaseLow + DB 0 ; BaseMid + DB 0x9b + DB 0xcf ; LimitHigh + DB 0 ; BaseHigh +ProtModeSsSeg32: + DW -1 ; LimitLow + DW 0 ; BaseLow + DB 0 ; BaseMid + DB 0x93 + DB 0xcf ; LimitHigh + DB 0 ; BaseHigh +DataSeg32: + DW -1 ; LimitLow + DW 0 ; BaseLow + DB 0 ; BaseMid + DB 0x93 + DB 0xcf ; LimitHigh + DB 0 ; BaseHigh +CodeSeg16: + DW -1 + DW 0 + DB 0 + DB 0x9b + DB 0x8f + DB 0 +DataSeg16: + DW -1 + DW 0 + DB 0 + DB 0x93 + DB 0x8f + DB 0 +CodeSeg64: + DW -1 ; LimitLow + DW 0 ; BaseLow + DB 0 ; BaseMid + DB 0x9b + DB 0xaf ; LimitHigh + DB 0 ; BaseHigh +GDT_SIZE equ $ - NullSeg ASM_PFX(gcSmiInitGdtr): - DW 0 - DQ 0 + DW GDT_SIZE - 1 + DQ NullSeg + + + DEFAULT REL + SECTION .text global ASM_PFX(SmmStartup) BITS 16 ASM_PFX(SmmStartup): @@ -132,12 +187,12 @@ ASM_PFX(gPatchRebasedFlagAddr32): pop eax jmp dword [dword 0] ; destination will be patch= ed ASM_PFX(gPatchSmmRelocationOriginalAddressPtr32): BITS 64 -global ASM_PFX(PiSmmCpuSmmInitFixupAddress) -ASM_PFX(PiSmmCpuSmmInitFixupAddress): +global ASM_PFX(SmmInitFixupAddress) +ASM_PFX(SmmInitFixupAddress): lea rax, [@LongMode] lea rcx, [@PatchLongModeOffset - 6] mov dword [rcx], eax lea rax, [ASM_PFX(SmmStartup)] diff --git a/UefiCpuPkg/UefiCpuPkg.dsc b/UefiCpuPkg/UefiCpuPkg.dsc index 9426641eb2..8f67587e91 100644 --- a/UefiCpuPkg/UefiCpuPkg.dsc +++ b/UefiCpuPkg/UefiCpuPkg.dsc @@ -199,10 +199,11 @@ UnitTestResultReportLib|UnitTestFrameworkPkg/Library/UnitTestResultR= eportLib/UnitTestResultReportLibConOut.inf } UefiCpuPkg/Library/MmSaveStateLib/AmdMmSaveStateLib.inf UefiCpuPkg/Library/MmSaveStateLib/IntelMmSaveStateLib.inf UefiCpuPkg/Library/SmmCpuFeaturesLib/AmdSmmCpuFeaturesLib.inf + UefiCpuPkg/Library/SmmRelocationLib/SmmRelocationLib.inf [Components.X64] UefiCpuPkg/Library/CpuExceptionHandlerLib/UnitTest/DxeCpuExceptionHandle= rLibUnitTest.inf [Components.RISCV64] -- 2.16.2.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 (#118414): https://edk2.groups.io/g/devel/message/118414 Mute This Topic: https://groups.io/mt/105748913/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- --_000_MN6PR11MB8244CD8579A9E0CE5DADB5278C1A2MN6PR11MB8244namp_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable
I've given Reviewed-by for the v3 version.
What extra changes did you make so that you need me to review it again?

Thanks,
Ray
From: Wu, Jiaxin <jiaxin= .wu@intel.com>
Sent: Friday, April 26, 2024 20:17
To: devel@edk2.groups.io <devel@edk2.groups.io>
Cc: Ni, Ray <ray.ni@intel.com>; Zeng, Star <star.zeng@intel= .com>; Gerd Hoffmann <kraxel@redhat.com>; Kumar, Rahul R <rahul= .r.kumar@intel.com>
Subject: [PATCH v4 02/14] UefiCpuPkg/SmmRelocationLib: Add SmmReloca= tionLib library instance
 
This patch just separates the smbase relocation lo= gic from
PiSmmCpuDxeSmm driver, and moves to the SmmRelocationInit
interface. It maintains the original implementation of most
functions and leaves the definitions of global variables
intact. Further refinements to the code are planned for
subsequent patches.

Platform shall consume the interface for the smbase
relocation if need SMM support.

Note:
Before using SmmRelocationLib, the PiSmmCpuDxeSmm driver
allocates the SMRAM to be used for SMI handler and Save
state area of each processor from Smst->AllocatePages().
With SmmRelocationLib, the SMRAM allocation for SMI
handlers and Save state areas is moved to early PEI
phase (Smst->AllocatePages() service is not available).
So, the allocation is done by splitting the SMRAM out of
the SMRAM regions reported from gEfiSmmSMramMemoryGuid.

So, Platform must produce the gEfiSmmSMramMemoryGuid HOB
for SmmRelocationLib usage.

Cc: Ray Ni <ray.ni@intel.com>
Cc: Zeng Star <star.zeng@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
Signed-off-by: Jiaxin Wu <jiaxin.wu@intel.com>
---
 .../SmmRelocationLib}/Ia32/Semaphore.c     &= nbsp;       |  10 +-
 .../SmmRelocationLib}/Ia32/SmmInit.nasm     =        |  67 ++-
 .../SmmRelocationLib/InternalSmmRelocationLib.h    | 1= 32 +++++
 .../Library/SmmRelocationLib/SmmRelocationLib.c    | 6= 00 +++++++++++++++++++++
 .../Library/SmmRelocationLib/SmmRelocationLib.inf  |  61 ++= +
 .../SmmRelocationLib/SmramSaveStateConfig.c    &n= bsp;   | 139 +++++
 .../SmmRelocationLib}/X64/Semaphore.c     &n= bsp;        |  10 +-
 .../SmmRelocationLib}/X64/SmmInit.nasm     &= nbsp;       |  69 ++-
 UefiCpuPkg/UefiCpuPkg.dsc       &n= bsp;            = ;      |   1 +
 9 files changed, 1066 insertions(+), 23 deletions(-)
 copy UefiCpuPkg/{PiSmmCpuDxeSmm =3D> Library/SmmRelocationLib}/Ia3= 2/Semaphore.c (79%)
 copy UefiCpuPkg/{PiSmmCpuDxeSmm =3D> Library/SmmRelocationLib}/Ia3= 2/SmmInit.nasm (53%)
 create mode 100644 UefiCpuPkg/Library/SmmRelocationLib/InternalSmmRel= ocationLib.h
 create mode 100644 UefiCpuPkg/Library/SmmRelocationLib/SmmRelocationL= ib.c
 create mode 100644 UefiCpuPkg/Library/SmmRelocationLib/SmmRelocationL= ib.inf
 create mode 100644 UefiCpuPkg/Library/SmmRelocationLib/SmramSaveState= Config.c
 copy UefiCpuPkg/{PiSmmCpuDxeSmm =3D> Library/SmmRelocationLib}/X64= /Semaphore.c (84%)
 copy UefiCpuPkg/{PiSmmCpuDxeSmm =3D> Library/SmmRelocationLib}/X64= /SmmInit.nasm (64%)

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/Semaphore.c b/UefiCpuPkg/Librar= y/SmmRelocationLib/Ia32/Semaphore.c
similarity index 79%
copy from UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/Semaphore.c
copy to UefiCpuPkg/Library/SmmRelocationLib/Ia32/Semaphore.c
index a9fcc89dda..ba329d6ba2 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/Semaphore.c
+++ b/UefiCpuPkg/Library/SmmRelocationLib/Ia32/Semaphore.c
@@ -1,15 +1,15 @@
 /** @file
-Semaphore mechanism to indicate to the BSP that an AP has exited SMM
-after SMBASE relocation.
+  Semaphore mechanism to indicate to the BSP that an AP has exited SM= M
+  after SMBASE relocation.
 
-Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR&g= t;
-SPDX-License-Identifier: BSD-2-Clause-Patent
+  Copyright (c) 2024, Intel Corporation. All rights reserved.<BR&g= t;
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#include "PiSmmCpuDxeSmm.h"
+#include "InternalSmmRelocationLib.h"
 
 UINTN          &nbs= p;  mSmmRelocationOriginalAddress;
 volatile BOOLEAN  *mRebasedFlag;
 
 /**
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmInit.nasm b/UefiCpuPkg/Libra= ry/SmmRelocationLib/Ia32/SmmInit.nasm
similarity index 53%
copy from UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmInit.nasm
copy to UefiCpuPkg/Library/SmmRelocationLib/Ia32/SmmInit.nasm
index b5e77a1a5b..3d845e9e16 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmInit.nasm
+++ b/UefiCpuPkg/Library/SmmRelocationLib/Ia32/SmmInit.nasm
@@ -1,7 +1,7 @@
 ;--------------------------------------------------------------------= ---------- ;
-; Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR= >
+; Copyright (c) 2024, Intel Corporation. All rights reserved.<BR>  ; SPDX-License-Identifier: BSD-2-Clause-Patent
 ;
 ; Module Name:
 ;
 ;   SmmInit.nasm
@@ -27,15 +27,70 @@ global ASM_PFX(gcSmmInitSize)
 global ASM_PFX(gcSmmInitTemplate)
 
 %define PROTECT_MODE_CS 0x8
 %define PROTECT_MODE_DS 0x20
 
-    SECTION .text
+    SECTION .data
 
-ASM_PFX(gcSmiInitGdtr):
+NullSeg: DQ 0          &= nbsp;        ; reserved by architecture<= br> +CodeSeg32:
+            DW = ;     -1        = ;          ; LimitLow
+            DW = ;     0        =            ; BaseLow
+            DB = ;     0        =            ; BaseMid
+            DB = ;     0x9b
+            DB = ;     0xcf       &nb= sp;        ; LimitHigh
+            DB = ;     0        =            ; BaseHigh
+ProtModeCodeSeg32:
+            DW = ;     -1        = ;          ; LimitLow
+            DW = ;     0        =            ; BaseLow
+            DB = ;     0        =            ; BaseMid
+            DB = ;     0x9b
+            DB = ;     0xcf       &nb= sp;        ; LimitHigh
+            DB = ;     0        =            ; BaseHigh
+ProtModeSsSeg32:
+            DW = ;     -1        = ;          ; LimitLow
+            DW = ;     0        =            ; BaseLow
+            DB = ;     0        =            ; BaseMid
+            DB = ;     0x93
+            DB = ;     0xcf       &nb= sp;        ; LimitHigh
+            DB = ;     0        =            ; BaseHigh
+DataSeg32:
+            DW = ;     -1        = ;          ; LimitLow
+            DW = ;     0        =            ; BaseLow
+            DB = ;     0        =            ; BaseMid
+            DB = ;     0x93
+            DB = ;     0xcf       &nb= sp;        ; LimitHigh
+            DB = ;     0        =            ; BaseHigh
+CodeSeg16:
+            DW = ;     -1
             DW=       0
-            DQ = ;     0
+            DB = ;     0
+            DB = ;     0x9b
+            DB = ;     0x8f
+            DB = ;     0
+DataSeg16:
+            DW = ;     -1
+            DW = ;     0
+            DB = ;     0
+            DB = ;     0x93
+            DB = ;     0x8f
+            DB = ;     0
+CodeSeg64:
+            DW = ;     -1        = ;          ; LimitLow
+            DW = ;     0        =            ; BaseLow
+            DB = ;     0        =            ; BaseMid
+            DB = ;     0x9b
+            DB = ;     0xaf       &nb= sp;        ; LimitHigh
+            DB = ;     0        =            ; BaseHigh
+GDT_SIZE equ $ - NullSeg
+
+ASM_PFX(gcSmiInitGdtr):
+    DW      GDT_SIZE - 1
+    DD      NullSeg
+
+
+    SECTION .text
 
 global ASM_PFX(SmmStartup)
 
 BITS 16
 ASM_PFX(SmmStartup):
@@ -89,8 +144,8 @@ ASM_PFX(SmmRelocationSemaphoreComplete):
     mov     eax, [ASM_PFX(mRebased= Flag)]
     mov     byte [eax], 1
     pop     eax
     jmp     [ASM_PFX(mSmmRelocatio= nOriginalAddress)]
 
-global ASM_PFX(PiSmmCpuSmmInitFixupAddress)
-ASM_PFX(PiSmmCpuSmmInitFixupAddress):
+global ASM_PFX(SmmInitFixupAddress)
+ASM_PFX(SmmInitFixupAddress):
     ret
diff --git a/UefiCpuPkg/Library/SmmRelocationLib/InternalSmmRelocationLib.h= b/UefiCpuPkg/Library/SmmRelocationLib/InternalSmmRelocationLib.h
new file mode 100644
index 0000000000..a9d3f271a9
--- /dev/null
+++ b/UefiCpuPkg/Library/SmmRelocationLib/InternalSmmRelocationLib.h
@@ -0,0 +1,132 @@
+/** @file
+  SMM Relocation Lib for each processor.
+
+  This Lib produces the SMM_BASE_HOB in HOB database which tells
+  the PiSmmCpuDxeSmm driver (runs at a later phase) about the new
+  SMBASE for each processor. PiSmmCpuDxeSmm driver installs the
+  SMI handler at the SMM_BASE_HOB.SmBase[Index]+0x8000 for processor<= br> +  Index.
+
+  Copyright (c) 2024, Intel Corporation. All rights reserved.<BR&g= t;
+  SPDX-License-Identifier: BSD-2-Clause-Patent
+
+**/
+
+#ifndef INTERNAL_SMM_RELOCATION_LIB_H_
+#define INTERNAL_SMM_RELOCATION_LIB_H_
+
+#include <Library/BaseLib.h>
+#include <Library/BaseMemoryLib.h>
+#include <Library/CpuExceptionHandlerLib.h>
+#include <Library/DebugLib.h>
+#include <Library/HobLib.h>
+#include <Library/LocalApicLib.h>
+#include <Library/MemoryAllocationLib.h>
+#include <Library/PcdLib.h>
+#include <Library/PeimEntryPoint.h>
+#include <Library/PeiServicesLib.h>
+#include <Library/SmmRelocationLib.h>
+#include <Guid/SmramMemoryReserve.h>
+#include <Guid/SmmBaseHob.h>
+#include <Register/Intel/Cpuid.h>
+#include <Register/Intel/SmramSaveStateMap.h>
+#include <Protocol/MmCpu.h>
+
+extern IA32_DESCRIPTOR  gcSmiInitGdtr;
+extern CONST UINT16     gcSmmInitSize;
+extern CONST UINT8      gcSmmInitTemplate[];
+
+X86_ASSEMBLY_PATCH_LABEL  gPatchSmmCr0;
+X86_ASSEMBLY_PATCH_LABEL  gPatchSmmCr3;
+X86_ASSEMBLY_PATCH_LABEL  gPatchSmmCr4;
+X86_ASSEMBLY_PATCH_LABEL  gPatchSmmInitStack;
+
+//
+// The size 0x20 must be bigger than
+// the size of template code of SmmInit. Currently,
+// the size of SmmInit requires the 0x16 Bytes buffer
+// at least.
+//
+#define BACK_BUF_SIZE  0x20
+
+#define CR4_CET_ENABLE  BIT23
+
+//
+// EFER register LMA bit
+//
+#define LMA  BIT10
+
+/**
+  This function configures the SmBase on the currently executing CPU.=
+
+  @param[in]     SmBase    &n= bsp;        The SmBase on the currently = executing CPU.
+
+**/
+VOID
+EFIAPI
+ConfigureSmBase (
+  IN UINT64  SmBase
+  );
+
+/**
+  Semaphore operation for all processor relocate SMMBase.
+**/
+VOID
+EFIAPI
+SmmRelocationSemaphoreComplete (
+  VOID
+  );
+
+/**
+  Hook the code executed immediately after an RSM instruction on the = currently
+  executing CPU.  The mode of code executed immediately after RS= M must be
+  detected, and the appropriate hook must be selected.  Always c= lear the auto
+  HALT restart flag if it is set.
+
+  @param[in]     CpuIndex    =              Th= e processor index for the currently
+            &n= bsp;            = ;            &n= bsp;    executing CPU.
+  @param[in,out] CpuState       &n= bsp;         Pointer to SMRAM Save = State Map for the
+            &n= bsp;            = ;            &n= bsp;    currently executing CPU.
+  @param[in]     NewInstructionPointer32  In= struction pointer to use if resuming to
+            &n= bsp;            = ;            &n= bsp;    32-bit mode from 64-bit SMM.
+  @param[in]     NewInstructionPointer  = ;  Instruction pointer to use if resuming to
+            &n= bsp;            = ;            &n= bsp;    same mode as SMM.
+
+  @retval The value of the original instruction pointer before it was= hooked.
+
+**/
+UINT64
+EFIAPI
+HookReturnFromSmm (
+  IN     UINTN      = ;           CpuIndex,
+  IN OUT SMRAM_SAVE_STATE_MAP  *CpuState,
+  IN     UINT64     &nbs= p;          NewInstructionPoin= ter32,
+  IN     UINT64     &nbs= p;          NewInstructionPoin= ter
+  );
+
+/**
+  Hook return address of SMM Save State so that semaphore code
+  can be executed immediately after AP exits SMM to indicate to
+  the BSP that an AP has exited SMM after SMBASE relocation.
+
+  @param[in] CpuIndex     The processor index. +  @param[in] RebasedFlag  A pointer to a flag that is set to TRU= E
+            &n= bsp;            = ; immediately after AP exits SMM.
+
+**/
+VOID
+SemaphoreHook (
+  IN UINTN          = ;   CpuIndex,
+  IN volatile BOOLEAN  *RebasedFlag
+  );
+
+/**
+  This function fixes up the address of the global variable or functi= on
+  referred in SmmInit assembly files to be the absolute address.
+**/
+VOID
+EFIAPI
+SmmInitFixupAddress (
+  );
+
+#endif
diff --git a/UefiCpuPkg/Library/SmmRelocationLib/SmmRelocationLib.c b/UefiC= puPkg/Library/SmmRelocationLib/SmmRelocationLib.c
new file mode 100644
index 0000000000..13e62b662d
--- /dev/null
+++ b/UefiCpuPkg/Library/SmmRelocationLib/SmmRelocationLib.c
@@ -0,0 +1,600 @@
+/** @file
+  SMM Relocation Lib for each processor.
+
+  This Lib produces the SMM_BASE_HOB in HOB database which tells
+  the PiSmmCpuDxeSmm driver (runs at a later phase) about the new
+  SMBASE for each processor. PiSmmCpuDxeSmm driver installs the
+  SMI handler at the SMM_BASE_HOB.SmBase[Index]+0x8000 for processor<= br> +  Index.
+
+  Copyright (c) 2024, Intel Corporation. All rights reserved.<BR&g= t;
+  SPDX-License-Identifier: BSD-2-Clause-Patent
+
+**/
+#include "InternalSmmRelocationLib.h"
+
+UINTN  mMaxNumberOfCpus =3D 1;
+UINTN  mNumberOfCpus    =3D 1;
+
+//
+// Record all Processors Info
+//
+EFI_PROCESSOR_INFORMATION  *mProcessorInfo =3D NULL;
+
+//
+// IDT used during SMM Init
+//
+IA32_DESCRIPTOR  gcSmiIdtr;
+
+//
+// Smbase for all CPUs
+//
+UINT64  *mSmBase =3D NULL;
+
+//
+// SmBase Rebased flag for all CPUs
+//
+volatile BOOLEAN  *mRebased;
+
+/**
+  This function will create SmBase for all CPUs.
+
+  @param[in] SmBase    Pointer to SmBase for all CPUs.=
+
+  @retval EFI_SUCCESS        =    Create SmBase for all CPUs successfully.
+  @retval Others         = ;       Failed to create SmBase for all CPUs.=
+
+**/
+EFI_STATUS
+CreateSmmBaseHob (
+  IN UINT64  *SmBase
+  )
+{
+  UINTN          &n= bsp;   Index;
+  SMM_BASE_HOB_DATA  *SmmBaseHobData;
+  UINT32          &= nbsp;  CpuCount;
+  UINT32          &= nbsp;  NumberOfProcessorsInHob;
+  UINT32          &= nbsp;  MaxCapOfProcessorsInHob;
+  UINT32          &= nbsp;  HobCount;
+
+  SmmBaseHobData         = ; =3D NULL;
+  CpuCount          = ;      =3D 0;
+  NumberOfProcessorsInHob =3D 0;
+  MaxCapOfProcessorsInHob =3D 0;
+  HobCount          = ;      =3D 0;
+
+  //
+  // Count the HOB instance maximum capacity of CPU (MaxCapOfProcesso= rsInHob) since the max HobLength is 0xFFF8.
+  //
+  MaxCapOfProcessorsInHob =3D (0xFFF8 - sizeof (EFI_HOB_GUID_TYPE) - = sizeof (SMM_BASE_HOB_DATA)) / sizeof (UINT64) + 1;
+  DEBUG ((DEBUG_INFO, "CreateSmmBaseHob - MaxCapOfProcessorsInHo= b: %d\n", MaxCapOfProcessorsInHob));
+
+  //
+  // Create Guided SMM Base HOB Instances.
+  //
+  while (CpuCount !=3D mMaxNumberOfCpus) {
+    NumberOfProcessorsInHob =3D MIN ((UINT32)mMaxNumberOfCp= us - CpuCount, MaxCapOfProcessorsInHob);
+
+    SmmBaseHobData =3D BuildGuidHob (
+            &n= bsp;          &gSmmBaseHob= Guid,
+            &n= bsp;          sizeof (SMM_BASE= _HOB_DATA) + sizeof (UINT64) * NumberOfProcessorsInHob
+            &n= bsp;          );
+    if (SmmBaseHobData =3D=3D NULL) {
+      return EFI_OUT_OF_RESOURCES;
+    }
+
+    SmmBaseHobData->ProcessorIndex   &nbs= p; =3D CpuCount;
+    SmmBaseHobData->NumberOfProcessors =3D NumberOfProce= ssorsInHob;
+
+    DEBUG ((DEBUG_INFO, "CreateSmmBaseHob - SmmBaseHob= Data[%d]->ProcessorIndex: %d\n", HobCount, SmmBaseHobData->Proce= ssorIndex));
+    DEBUG ((DEBUG_INFO, "CreateSmmBaseHob - SmmBaseHob= Data[%d]->NumberOfProcessors: %d\n", HobCount, SmmBaseHobData->N= umberOfProcessors));
+    for (Index =3D 0; Index < SmmBaseHobData->NumberO= fProcessors; Index++) {
+      //
+      // Calculate the new SMBASE address
+      //
+      SmmBaseHobData->SmBase[Index] =3D SmBase= [Index + CpuCount];
+      DEBUG ((DEBUG_INFO, "CreateSmmBaseHob = - SmmBaseHobData[%d]->SmBase[%d]: 0x%08x\n", HobCount, Index, SmmBa= seHobData->SmBase[Index]));
+    }
+
+    CpuCount +=3D NumberOfProcessorsInHob;
+    HobCount++;
+    SmmBaseHobData =3D NULL;
+  }
+
+  return EFI_SUCCESS;
+}
+
+/**
+  C function for SMI handler. To change all processor's SMMBase Regis= ter.
+
+**/
+VOID
+EFIAPI
+SmmInitHandler (
+  VOID
+  )
+{
+  UINT32  ApicId;
+  UINTN   Index;
+
+  //
+  // Update SMM IDT entries' code segment and load IDT
+  //
+  AsmWriteIdtr (&gcSmiIdtr);
+  ApicId =3D GetApicId ();
+
+  for (Index =3D 0; Index < mNumberOfCpus; Index++) {
+    if (ApicId =3D=3D (UINT32)mProcessorInfo[Index].Process= orId) {
+      //
+      // Configure SmBase.
+      //
+      ConfigureSmBase (mSmBase[Index]);
+
+      //
+      // Hook return after RSM to set SMM re-base= d flag
+      // SMM re-based flag can't be set before RS= M, because SMM save state context might be override
+      // by next AP flow before it take effect. +      //
+      SemaphoreHook (Index, &mRebased[Index])= ;
+      return;
+    }
+  }
+
+  ASSERT (FALSE);
+}
+
+/**
+  Relocate SmmBases for each processor.
+  Execute on first boot and all S3 resumes
+
+**/
+VOID
+SmmRelocateBases (
+  VOID
+  )
+{
+  UINT8          &n= bsp;      BakBuf[BACK_BUF_SIZE];
+  SMRAM_SAVE_STATE_MAP  BakBuf2;
+  SMRAM_SAVE_STATE_MAP  *CpuStatePtr;
+  UINT8          &n= bsp;      *U8Ptr;
+  UINTN          &n= bsp;      Index;
+  UINTN          &n= bsp;      BspIndex;
+  UINT32          &= nbsp;     BspApicId;
+
+  //
+  // Make sure the reserved size is large enough for procedure SmmIni= tTemplate.
+  //
+  ASSERT (sizeof (BakBuf) >=3D gcSmmInitSize);
+
+  //
+  // Patch ASM code template with current CR0, CR3, and CR4 values +  //
+  PatchInstructionX86 (gPatchSmmCr0, AsmReadCr0 (), 4);
+  PatchInstructionX86 (gPatchSmmCr3, AsmReadCr3 (), 4);
+  PatchInstructionX86 (gPatchSmmCr4, AsmReadCr4 () & (~CR4_CET_EN= ABLE), 4);
+
+  U8Ptr       =3D (UINT8 *)(UINTN)(SMM_= DEFAULT_SMBASE + SMM_HANDLER_OFFSET);
+  CpuStatePtr =3D (SMRAM_SAVE_STATE_MAP *)(UINTN)(SMM_DEFAULT_SMBASE = + SMRAM_SAVE_STATE_MAP_OFFSET);
+
+  //
+  // Backup original contents at address 0x38000
+  //
+  CopyMem (BakBuf, U8Ptr, sizeof (BakBuf));
+  CopyMem (&BakBuf2, CpuStatePtr, sizeof (BakBuf2));
+
+  //
+  // Load image for relocation
+  //
+  CopyMem (U8Ptr, gcSmmInitTemplate, gcSmmInitSize);
+
+  //
+  // Retrieve the local APIC ID of current processor
+  //
+  BspApicId =3D GetApicId ();
+
+  //
+  // Relocate SM bases for all APs
+  // This is APs' 1st SMI - rebase will be done here, and APs' defaul= t SMI handler will be overridden by gcSmmInitTemplate
+  //
+  BspIndex =3D (UINTN)-1;
+  for (Index =3D 0; Index < mNumberOfCpus; Index++) {
+    mRebased[Index] =3D FALSE;
+    if (BspApicId !=3D (UINT32)mProcessorInfo[Index].Proces= sorId) {
+      SendSmiIpi ((UINT32)mProcessorInfo[Index].P= rocessorId);
+      //
+      // Wait for this AP to finish its 1st SMI +      //
+      while (!mRebased[Index]) {
+      }
+    } else {
+      //
+      // BSP will be Relocated later
+      //
+      BspIndex =3D Index;
+    }
+  }
+
+  //
+  // Relocate BSP's SMM base
+  //
+  ASSERT (BspIndex !=3D (UINTN)-1);
+  SendSmiIpi (BspApicId);
+
+  //
+  // Wait for the BSP to finish its 1st SMI
+  //
+  while (!mRebased[BspIndex]) {
+  }
+
+  //
+  // Restore contents at address 0x38000
+  //
+  CopyMem (CpuStatePtr, &BakBuf2, sizeof (BakBuf2));
+  CopyMem (U8Ptr, BakBuf, sizeof (BakBuf));
+}
+
+/**
+  Initialize IDT to setup exception handlers in SMM.
+
+**/
+VOID
+InitSmmIdt (
+  VOID
+  )
+{
+  EFI_STATUS         &nb= sp;    Status;
+  BOOLEAN          =        InterruptState;
+  IA32_DESCRIPTOR         Pei= Idtr;
+  CONST EFI_PEI_SERVICES  **PeiServices;
+
+  //
+  // There are 32 (not 255) entries in it since only processor
+  // generated exceptions will be handled.
+  //
+  gcSmiIdtr.Limit =3D (sizeof (IA32_IDT_GATE_DESCRIPTOR) * 32) - 1; +
+  //
+  // Allocate for IDT.
+  // sizeof (UINTN) is for the PEI Services Table pointer.
+  //
+  gcSmiIdtr.Base =3D (UINTN)AllocateZeroPool (gcSmiIdtr.Limit + 1 + s= izeof (UINTN));
+  ASSERT (gcSmiIdtr.Base !=3D 0);
+  gcSmiIdtr.Base +=3D sizeof (UINTN);
+
+  //
+  // Disable Interrupt, save InterruptState and save PEI IDT table +  //
+  InterruptState =3D SaveAndDisableInterrupts ();
+  AsmReadIdtr (&PeiIdtr);
+
+  //
+  // Save the PEI Services Table pointer
+  // The PEI Services Table pointer will be stored in the sizeof (UIN= TN) bytes
+  // immediately preceding the IDT in memory.
+  //
+  PeiServices         &n= bsp;            = ;             = =3D (CONST EFI_PEI_SERVICES **)(*(UINTN *)(PeiIdtr.Base - sizeof (UINTN)));=
+  (*(UINTN *)(gcSmiIdtr.Base - sizeof (UINTN))) =3D (UINTN)PeiService= s;
+
+  //
+  // Load SMM temporary IDT table
+  //
+  AsmWriteIdtr (&gcSmiIdtr);
+
+  //
+  // Setup SMM default exception handlers, SMM IDT table
+  // will be updated and saved in gcSmiIdtr
+  //
+  Status =3D InitializeCpuExceptionHandlers (NULL);
+  ASSERT_EFI_ERROR (Status);
+
+  //
+  // Restore PEI IDT table and CPU InterruptState
+  //
+  AsmWriteIdtr ((IA32_DESCRIPTOR *)&PeiIdtr);
+  SetInterruptState (InterruptState);
+}
+
+/**
+  This routine will split SmramReserve HOB to reserve SmmRelocationSi= ze for Smm relocated memory.
+
+  @param[in]       SmmRelocationSize&nb= sp;  SmmRelocationSize for all processors.
+  @param[in,out]   SmmRelocationStart  Return the star= t address of Smm relocated memory in SMRAM.
+
+  @retval EFI_SUCCESS        =    The gEfiSmmSmramMemoryGuid is split successfully.
+  @retval EFI_DEVICE_ERROR      Failed to bu= ild new HOB for gEfiSmmSmramMemoryGuid.
+  @retval EFI_NOT_FOUND       &nbs= p; The gEfiSmmSmramMemoryGuid is not found.
+
+**/
+EFI_STATUS
+SplitSmramHobForSmmRelocation (
+  IN     UINT64     &nbs= p;          SmmRelocationSize,=
+  IN OUT EFI_PHYSICAL_ADDRESS  *SmmRelocationStart
+  )
+{
+  EFI_HOB_GUID_TYPE        &n= bsp;      *GuidHob;
+  EFI_SMRAM_HOB_DESCRIPTOR_BLOCK  *Block;
+  EFI_SMRAM_HOB_DESCRIPTOR_BLOCK  *NewBlock;
+  UINTN          &n= bsp;            = ;    NewBlockSize;
+
+  ASSERT (SmmRelocationStart !=3D NULL);
+
+  //
+  // Retrieve the GUID HOB data that contains the set of SMRAM descri= ptors
+  //
+  GuidHob =3D GetFirstGuidHob (&gEfiSmmSmramMemoryGuid);
+  if (GuidHob =3D=3D NULL) {
+    return EFI_NOT_FOUND;
+  }
+
+  Block =3D (EFI_SMRAM_HOB_DESCRIPTOR_BLOCK *)GET_GUID_HOB_DATA (Guid= Hob);
+
+  //
+  // Allocate one extra EFI_SMRAM_DESCRIPTOR to describe smram carved= out for all SMBASE
+  //
+  NewBlockSize =3D sizeof (EFI_SMRAM_HOB_DESCRIPTOR_BLOCK) + (Block-&= gt;NumberOfSmmReservedRegions * sizeof (EFI_SMRAM_DESCRIPTOR));
+
+  NewBlock =3D (EFI_SMRAM_HOB_DESCRIPTOR_BLOCK *)BuildGuidHob (
+            &n= bsp;            = ;            &n= bsp;           &gEfiS= mmSmramMemoryGuid,
+            &n= bsp;            = ;            &n= bsp;           NewBlockSi= ze
+            &n= bsp;            = ;            &n= bsp;           );
+  ASSERT (NewBlock !=3D NULL);
+  if (NewBlock =3D=3D NULL) {
+    return EFI_DEVICE_ERROR;
+  }
+
+  //
+  // Copy old EFI_SMRAM_HOB_DESCRIPTOR_BLOCK to new allocated region<= br> +  //
+  CopyMem ((VOID *)NewBlock, Block, NewBlockSize - sizeof (EFI_SMRAM_= DESCRIPTOR));
+
+  //
+  // Increase the number of SMRAM descriptors by 1 to make room for t= he ALLOCATED descriptor of size EFI_PAGE_SIZE
+  //
+  NewBlock->NumberOfSmmReservedRegions =3D (UINT32)(Block->Numb= erOfSmmReservedRegions + 1);
+
+  ASSERT (Block->NumberOfSmmReservedRegions >=3D 1);
+  //
+  // Copy last entry to the end - we assume TSEG is last entry.
+  //
+  CopyMem (&NewBlock->Descriptor[Block->NumberOfSmmReserved= Regions], &NewBlock->Descriptor[Block->NumberOfSmmReservedRegions= - 1], sizeof (EFI_SMRAM_DESCRIPTOR));
+
+  //
+  // Update the entry in the array with a size of SmmRelocationSize a= nd put into the ALLOCATED state
+  //
+  NewBlock->Descriptor[Block->NumberOfSmmReservedRegions - 1].P= hysicalSize =3D SmmRelocationSize;
+  NewBlock->Descriptor[Block->NumberOfSmmReservedRegions - 1].R= egionState |=3D EFI_ALLOCATED;
+
+  //
+  // Return the start address of Smm relocated memory in SMRAM.
+  //
+  *SmmRelocationStart =3D NewBlock->Descriptor[Block->NumberOfS= mmReservedRegions - 1].CpuStart;
+
+  //
+  // Reduce the size of the last SMRAM descriptor by SmmRelocationSiz= e
+  //
+  NewBlock->Descriptor[Block->NumberOfSmmReservedRegions].Physi= calStart +=3D SmmRelocationSize;
+  NewBlock->Descriptor[Block->NumberOfSmmReservedRegions].CpuSt= art      +=3D SmmRelocationSize;
+  NewBlock->Descriptor[Block->NumberOfSmmReservedRegions].Physi= calSize  -=3D SmmRelocationSize;
+
+  //
+  // Last step, we can scrub old one
+  //
+  ZeroMem (&GuidHob->Name, sizeof (GuidHob->Name));
+
+  return EFI_SUCCESS;
+}
+
+/**
+  This function will initialize SmBase for all CPUs.
+
+  @param[in,out] SmBase    Pointer to SmBase for all C= PUs.
+
+  @retval EFI_SUCCESS        =    Initialize SmBase for all CPUs successfully.
+  @retval Others         = ;       Failed to initialize SmBase for all C= PUs.
+
+**/
+EFI_STATUS
+InitSmBaseForAllCpus (
+  IN OUT UINT64  **SmBase
+  )
+{
+  EFI_STATUS         &nb= sp;  Status;
+  UINTN          &n= bsp;      TileSize;
+  UINT64          &= nbsp;     SmmRelocationSize;
+  EFI_PHYSICAL_ADDRESS  SmmRelocationStart;
+  UINTN          &n= bsp;      Index;
+
+  SmmRelocationStart =3D 0;
+
+  ASSERT (SmBase !=3D NULL);
+
+  //
+  // Calculate SmmRelocationSize for all of the tiles.
+  //
+  // The CPU save state and code for the SMI entry point are tiled wi= thin an SMRAM
+  // allocated buffer. The minimum size of this buffer for a uniproce= ssor system
+  // is 32 KB, because the entry point is SMBASE + 32KB, and CPU save= state area
+  // just below SMBASE + 64KB. If more than one CPU is present in the= platform,
+  // then the SMI entry point and the CPU save state areas can be til= es to minimize
+  // the total amount SMRAM required for all the CPUs. The tile size = can be computed
+  // by adding the CPU save state size, any extra CPU specific contex= t, and
+  // the size of code that must be placed at the SMI entry point to t= ransfer
+  // control to a C function in the native SMM execution mode. This s= ize is
+  // rounded up to the nearest power of 2 to give the tile size for a= each CPU.
+  // The total amount of memory required is the maximum number of CPU= s that
+  // platform supports times the tile size.
+  //
+  TileSize          =3D = SIZE_8KB;
+  SmmRelocationSize =3D EFI_PAGES_TO_SIZE (EFI_SIZE_TO_PAGES (SIZE_32= KB + TileSize * (mMaxNumberOfCpus - 1)));
+
+  //
+  // Split SmramReserve HOB to reserve SmmRelocationSize for Smm relo= cated memory
+  //
+  Status =3D SplitSmramHobForSmmRelocation (
+             S= mmRelocationSize,
+             &= amp;SmmRelocationStart
+             )= ;
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+
+  ASSERT (SmmRelocationStart !=3D 0);
+  DEBUG ((DEBUG_INFO, "InitSmBaseForAllCpus - SmmRelocationSize:= 0x%08x\n", SmmRelocationSize));
+  DEBUG ((DEBUG_INFO, "InitSmBaseForAllCpus - SmmRelocationStart= : 0x%08x\n", SmmRelocationStart));
+
+  //
+  // Init SmBase
+  //
+  *SmBase =3D (UINT64 *)AllocatePages (EFI_SIZE_TO_PAGES (sizeof (UIN= T64) * mMaxNumberOfCpus));
+  if (*SmBase =3D=3D NULL) {
+    return EFI_OUT_OF_RESOURCES;
+  }
+
+  for (Index =3D 0; Index < mMaxNumberOfCpus; Index++) {
+    //
+    // Return each SmBase in SmBase
+    //
+    (*SmBase)[Index] =3D (UINTN)(SmmRelocationStart)+ Index= * TileSize - SMM_HANDLER_OFFSET;
+    DEBUG ((DEBUG_INFO, "InitSmBaseForAllCpus - SmBase= For CPU[%d]: 0x%08x\n", Index, (*SmBase)[Index]));
+  }
+
+  return EFI_SUCCESS;
+}
+
+/**
+  CPU SmmBase Relocation Init.
+
+  This function is to relocate CPU SmmBase.
+
+  @param[in] MpServices2        Po= inter to this instance of the MpServices.
+
+  @retval EFI_SUCCESS        =    CPU SmmBase Relocated successfully.
+  @retval Others         = ;       CPU SmmBase Relocation failed.
+
+**/
+EFI_STATUS
+EFIAPI
+SmmRelocationInit (
+  IN EDKII_PEI_MP_SERVICES2_PPI  *MpServices2
+  )
+{
+  EFI_STATUS  Status;
+  UINTN       NumberOfEnabledCpus;
+  UINTN       SmmStackSize;
+  UINT8       *SmmStacks;
+  UINTN       Index;
+
+  SmmStacks =3D NULL;
+
+  DEBUG ((DEBUG_INFO, "SmmRelocationInit Start \n"));
+  if (MpServices2 =3D=3D NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  //
+  // Get the number of processors
+  //
+  Status =3D MpServices2->GetNumberOfProcessors (
+            &n= bsp;            = ; MpServices2,
+            &n= bsp;            = ; &mNumberOfCpus,
+            &n= bsp;            = ; &NumberOfEnabledCpus
+            &n= bsp;            = ; );
+  if (EFI_ERROR (Status)) {
+    goto ON_EXIT;
+  }
+
+  if (FeaturePcdGet (PcdCpuHotPlugSupport)) {
+    mMaxNumberOfCpus =3D PcdGet32 (PcdCpuMaxLogicalProcesso= rNumber);
+  } else {
+    mMaxNumberOfCpus =3D mNumberOfCpus;
+  }
+
+  ASSERT (mNumberOfCpus <=3D mMaxNumberOfCpus);
+
+  //
+  // Retrieve the Processor Info for all CPUs
+  //
+  mProcessorInfo =3D (EFI_PROCESSOR_INFORMATION *)AllocatePool (sizeo= f (EFI_PROCESSOR_INFORMATION) * mMaxNumberOfCpus);
+  if (mProcessorInfo =3D=3D NULL) {
+    Status =3D EFI_OUT_OF_RESOURCES;
+    goto ON_EXIT;
+  }
+
+  for (Index =3D 0; Index < mMaxNumberOfCpus; Index++) {
+    if (Index < mNumberOfCpus) {
+      Status =3D MpServices2->GetProcessorInfo= (MpServices2, Index | CPU_V2_EXTENDED_TOPOLOGY, &mProcessorInfo[Index]= );
+      if (EFI_ERROR (Status)) {
+        goto ON_EXIT;
+      }
+    }
+  }
+
+  //
+  // Initialize the SmBase for all CPUs
+  //
+  Status =3D InitSmBaseForAllCpus (&mSmBase);
+  if (EFI_ERROR (Status)) {
+    goto ON_EXIT;
+  }
+
+  //
+  // Fix up the address of the global variable or function referred i= n
+  // SmmInit assembly files to be the absolute address
+  //
+  SmmInitFixupAddress ();
+
+  //
+  // Patch SMI stack for SMM base relocation
+  // Note: No need allocate stack for all CPUs since the relocation +  // occurs serially for each CPU
+  //
+  SmmStackSize =3D EFI_PAGE_SIZE;
+  SmmStacks    =3D (UINT8 *)AllocatePages (EFI_SIZE_TO= _PAGES (SmmStackSize));
+  if (SmmStacks =3D=3D NULL) {
+    Status =3D EFI_OUT_OF_RESOURCES;
+    goto ON_EXIT;
+  }
+
+  DEBUG ((DEBUG_INFO, "SmmRelocationInit - SmmStackSize: 0x%08x\= n", SmmStackSize));
+  DEBUG ((DEBUG_INFO, "SmmRelocationInit - SmmStacks: 0x%08x\n&q= uot;, SmmStacks));
+
+  PatchInstructionX86 (
+    gPatchSmmInitStack,
+    (UINTN)(SmmStacks + SmmStackSize - sizeof (UINTN)),
+    sizeof (UINTN)
+    );
+
+  //
+  // Initialize the SMM IDT for SMM base relocation
+  //
+  InitSmmIdt ();
+
+  //
+  // Relocate SmmBases for each processor.
+  // Allocate mRebased as the flag to indicate the relocation is done= for each CPU.
+  //
+  mRebased =3D (BOOLEAN *)AllocateZeroPool (sizeof (BOOLEAN) * mMaxNu= mberOfCpus);
+  if (mRebased =3D=3D NULL) {
+    Status =3D EFI_OUT_OF_RESOURCES;
+    goto ON_EXIT;
+  }
+
+  SmmRelocateBases ();
+
+  //
+  // Create the SmBase HOB for all CPUs
+  //
+  Status =3D CreateSmmBaseHob (mSmBase);
+
+ON_EXIT:
+  if (SmmStacks !=3D NULL) {
+    FreePages (SmmStacks, EFI_SIZE_TO_PAGES (SmmStackSize))= ;
+  }
+
+  if (mSmBase !=3D NULL) {
+    FreePages (mSmBase, EFI_SIZE_TO_PAGES (sizeof (UINT64) = * mMaxNumberOfCpus));
+  }
+
+  DEBUG ((DEBUG_INFO, "SmmRelocationInit Done\n"));
+  return Status;
+}
diff --git a/UefiCpuPkg/Library/SmmRelocationLib/SmmRelocationLib.inf b/Uef= iCpuPkg/Library/SmmRelocationLib/SmmRelocationLib.inf
new file mode 100644
index 0000000000..45fdaf35bc
--- /dev/null
+++ b/UefiCpuPkg/Library/SmmRelocationLib/SmmRelocationLib.inf
@@ -0,0 +1,61 @@
+## @file
+# SMM Relocation Lib for each processor.
+#
+# This Lib produces the SMM_BASE_HOB in HOB database which tells
+# the PiSmmCpuDxeSmm driver (runs at a later phase) about the new
+# SMBASE for each processor. PiSmmCpuDxeSmm driver installs the
+# SMI handler at the SMM_BASE_HOB.SmBase[Index]+0x8000 for processor
+# Index.
+#
+# Copyright (c) 2024, Intel Corporation. All rights reserved.<BR> +# SPDX-License-Identifier: BSD-2-Clause-Patent
+#
+##
+
+[Defines]
+  INF_VERSION         &n= bsp;          =3D 0x00010005 +  BASE_NAME         &nbs= p;            =3D Sm= mRelocationLib
+  FILE_GUID         &nbs= p;            =3D 85= 3E97B3-790C-4EA3-945C-8F622FC47FE8
+  MODULE_TYPE         &n= bsp;          =3D PEIM
+  VERSION_STRING         = ;        =3D 1.0
+  LIBRARY_CLASS         =          =3D SmmRelocationLib
+
+[Sources]
+  InternalSmmRelocationLib.h
+  SmramSaveStateConfig.c
+  SmmRelocationLib.c
+
+[Sources.Ia32]
+  Ia32/Semaphore.c
+  Ia32/SmmInit.nasm
+
+[Sources.X64]
+  X64/Semaphore.c
+  X64/SmmInit.nasm
+
+[Packages]
+  MdePkg/MdePkg.dec
+  MdeModulePkg/MdeModulePkg.dec
+  UefiCpuPkg/UefiCpuPkg.dec
+
+[LibraryClasses]
+  BaseLib
+  BaseMemoryLib
+  CpuExceptionHandlerLib
+  CpuLib
+  DebugLib
+  HobLib
+  LocalApicLib
+  MemoryAllocationLib
+  PcdLib
+  PeiServicesLib
+
+[Guids]
+  gSmmBaseHobGuid        &nbs= p;            &= nbsp;         ## HOB ALWAYS_PRODUCE= D
+  gEfiSmmSmramMemoryGuid       &nb= sp;            =     ## CONSUMES
+
+[Pcd]
+  gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber
+
+[FeaturePcd]
+  gUefiCpuPkgTokenSpaceGuid.PcdCpuHotPlugSupport   &nb= sp;            =         ## CONSUMES
diff --git a/UefiCpuPkg/Library/SmmRelocationLib/SmramSaveStateConfig.c b/U= efiCpuPkg/Library/SmmRelocationLib/SmramSaveStateConfig.c
new file mode 100644
index 0000000000..d3a0bb9b89
--- /dev/null
+++ b/UefiCpuPkg/Library/SmmRelocationLib/SmramSaveStateConfig.c
@@ -0,0 +1,139 @@
+/** @file
+  Config SMRAM Save State for SmmBases Relocation.
+
+  Copyright (c) 2024, Intel Corporation. All rights reserved.<BR&g= t;
+  SPDX-License-Identifier: BSD-2-Clause-Patent
+
+**/
+#include "InternalSmmRelocationLib.h"
+#include <Library/CpuLib.h>
+
+/**
+  Get the mode of the CPU at the time an SMI occurs
+
+  @retval EFI_MM_SAVE_STATE_REGISTER_LMA_32BIT   32 bit. +  @retval EFI_MM_SAVE_STATE_REGISTER_LMA_64BIT   64 bit. +
+**/
+UINT8
+GetMmSaveStateRegisterLma (
+  VOID
+  )
+{
+  CPUID_VERSION_INFO_EAX      RegEax;
+  CPUID_EXTENDED_CPU_SIG_EDX  RegEdx;
+  UINTN          &n= bsp;            Fami= lyId;
+  UINTN          &n= bsp;            Mode= lId;
+  UINT32          &= nbsp;           Eax;
+  UINT8          &n= bsp;            SmmS= aveStateRegisterLma;
+
+  //
+  // Determine the mode of the CPU at the time an SMI occurs
+  //   Intel(R) 64 and IA-32 Architectures Software Develop= er's Manual
+  //   Volume 3C, Section 34.4.1.1
+  //
+  RegEax.Uint32 =3D GetCpuFamilyModel ();
+  FamilyId      =3D RegEax.Bits.FamilyId; +  ModelId       =3D RegEax.Bits.Model;<= br> +  if ((FamilyId =3D=3D 0x06) || (FamilyId =3D=3D 0x0f)) {
+    ModelId =3D ModelId | RegEax.Bits.ExtendedModelId <&= lt; 4;
+  }
+
+  RegEdx.Uint32 =3D 0;
+  AsmCpuid (CPUID_EXTENDED_FUNCTION, &Eax, NULL, NULL, NULL);
+  if (Eax >=3D CPUID_EXTENDED_CPU_SIG) {
+    AsmCpuid (CPUID_EXTENDED_CPU_SIG, NULL, NULL, NULL, &am= p;(RegEdx.Uint32));
+  }
+
+  SmmSaveStateRegisterLma =3D (UINT8)EFI_MM_SAVE_STATE_REGISTER_LMA_3= 2BIT;
+  if (RegEdx.Bits.LM) {
+    SmmSaveStateRegisterLma =3D (UINT8)EFI_MM_SAVE_STATE_RE= GISTER_LMA_64BIT;
+  }
+
+  if (FamilyId =3D=3D 0x06) {
+    if ((ModelId =3D=3D 0x17) || (ModelId =3D=3D 0x0f) || (= ModelId =3D=3D 0x1c)) {
+      SmmSaveStateRegisterLma =3D (UINT8)EFI_MM_S= AVE_STATE_REGISTER_LMA_64BIT;
+    }
+  }
+
+  return SmmSaveStateRegisterLma;
+}
+
+/**
+  This function configures the SmBase on the currently executing CPU.=
+
+  @param[in]     SmBase    &n= bsp;        The SmBase on the currently = executing CPU.
+
+**/
+VOID
+EFIAPI
+ConfigureSmBase (
+  IN UINT64  SmBase
+  )
+{
+  SMRAM_SAVE_STATE_MAP  *CpuState;
+
+  CpuState =3D (SMRAM_SAVE_STATE_MAP *)(UINTN)(SMM_DEFAULT_SMBASE + S= MRAM_SAVE_STATE_MAP_OFFSET);
+
+  CpuState->x86.SMBASE =3D (UINT32)SmBase;
+}
+
+/**
+  Hook the code executed immediately after an RSM instruction on the = currently
+  executing CPU.  The mode of code executed immediately after RS= M must be
+  detected, and the appropriate hook must be selected.  Always c= lear the auto
+  HALT restart flag if it is set.
+
+  @param[in]     CpuIndex    =              Th= e processor index for the currently
+            &n= bsp;            = ;            &n= bsp;    executing CPU.
+  @param[in,out] CpuState       &n= bsp;         Pointer to SMRAM Save = State Map for the
+            &n= bsp;            = ;            &n= bsp;    currently executing CPU.
+  @param[in]     NewInstructionPointer32  In= struction pointer to use if resuming to
+            &n= bsp;            = ;            &n= bsp;    32-bit mode from 64-bit SMM.
+  @param[in]     NewInstructionPointer  = ;  Instruction pointer to use if resuming to
+            &n= bsp;            = ;            &n= bsp;    same mode as SMM.
+
+  @retval The value of the original instruction pointer before it was= hooked.
+
+**/
+UINT64
+EFIAPI
+HookReturnFromSmm (
+  IN     UINTN      = ;           CpuIndex,
+  IN OUT SMRAM_SAVE_STATE_MAP  *CpuState,
+  IN     UINT64     &nbs= p;          NewInstructionPoin= ter32,
+  IN     UINT64     &nbs= p;          NewInstructionPoin= ter
+  )
+{
+  UINT64  OriginalInstructionPointer;
+
+  if (GetMmSaveStateRegisterLma () =3D=3D EFI_MM_SAVE_STATE_REGISTER_= LMA_32BIT) {
+    OriginalInstructionPointer =3D (UINT64)CpuState->x86= ._EIP;
+    CpuState->x86._EIP     &nbs= p;   =3D (UINT32)NewInstructionPointer;
+
+    //
+    // Clear the auto HALT restart flag so the RSM instruct= ion returns
+    // program control to the instruction following the HLT= instruction.
+    //
+    if ((CpuState->x86.AutoHALTRestart & BIT0) !=3D = 0) {
+      CpuState->x86.AutoHALTRestart &=3D ~= BIT0;
+    }
+  } else {
+    OriginalInstructionPointer =3D CpuState->x64._RIP; +    if ((CpuState->x64.IA32_EFER & LMA) =3D=3D 0) {<= br> +      CpuState->x64._RIP =3D (UINT32)NewInstru= ctionPointer32;
+    } else {
+      CpuState->x64._RIP =3D (UINT32)NewInstru= ctionPointer;
+    }
+
+    //
+    // Clear the auto HALT restart flag so the RSM instruct= ion returns
+    // program control to the instruction following the HLT= instruction.
+    //
+    if ((CpuState->x64.AutoHALTRestart & BIT0) !=3D = 0) {
+      CpuState->x64.AutoHALTRestart &=3D ~= BIT0;
+    }
+  }
+
+  return OriginalInstructionPointer;
+}
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/Semaphore.c b/UefiCpuPkg/Library= /SmmRelocationLib/X64/Semaphore.c
similarity index 84%
copy from UefiCpuPkg/PiSmmCpuDxeSmm/X64/Semaphore.c
copy to UefiCpuPkg/Library/SmmRelocationLib/X64/Semaphore.c
index dafbc3390e..53f3084363 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/Semaphore.c
+++ b/UefiCpuPkg/Library/SmmRelocationLib/X64/Semaphore.c
@@ -1,15 +1,15 @@
 /** @file
-Semaphore mechanism to indicate to the BSP that an AP has exited SMM
-after SMBASE relocation.
+  Semaphore mechanism to indicate to the BSP that an AP has exited SM= M
+  after SMBASE relocation.
 
-Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR&g= t;
-SPDX-License-Identifier: BSD-2-Clause-Patent
+  Copyright (c) 2024, Intel Corporation. All rights reserved.<BR&g= t;
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#include "PiSmmCpuDxeSmm.h"
+#include "InternalSmmRelocationLib.h"
 
 X86_ASSEMBLY_PATCH_LABEL  gPatchSmmRelocationOriginalAddressPtr3= 2;
 X86_ASSEMBLY_PATCH_LABEL  gPatchRebasedFlagAddr32;
 
 UINTN          &nbs= p;  mSmmRelocationOriginalAddress;
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmInit.nasm b/UefiCpuPkg/Librar= y/SmmRelocationLib/X64/SmmInit.nasm
similarity index 64%
copy from UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmInit.nasm
copy to UefiCpuPkg/Library/SmmRelocationLib/X64/SmmInit.nasm
index 9cf3a6dcf9..c790ad7ad8 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmInit.nasm
+++ b/UefiCpuPkg/Library/SmmRelocationLib/X64/SmmInit.nasm
@@ -1,7 +1,7 @@
 ;--------------------------------------------------------------------= ---------- ;
-; Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR= >
+; Copyright (c) 2024, Intel Corporation. All rights reserved.<BR>  ; SPDX-License-Identifier: BSD-2-Clause-Patent
 ;
 ; Module Name:
 ;
 ;   SmmInit.nasm
@@ -28,16 +28,71 @@ global ASM_PFX(gcSmmInitTemplate)
 global ASM_PFX(gPatchRebasedFlagAddr32)
 global ASM_PFX(gPatchSmmRelocationOriginalAddressPtr32)
 
 %define LONG_MODE_CS 0x38
 
-    DEFAULT REL
-    SECTION .text
+    SECTION .data
+
+NullSeg: DQ 0          &= nbsp;        ; reserved by architecture<= br> +CodeSeg32:
+            DW = ;     -1        = ;          ; LimitLow
+            DW = ;     0        =            ; BaseLow
+            DB = ;     0        =            ; BaseMid
+            DB = ;     0x9b
+            DB = ;     0xcf       &nb= sp;        ; LimitHigh
+            DB = ;     0        =            ; BaseHigh
+ProtModeCodeSeg32:
+            DW = ;     -1        = ;          ; LimitLow
+            DW = ;     0        =            ; BaseLow
+            DB = ;     0        =            ; BaseMid
+            DB = ;     0x9b
+            DB = ;     0xcf       &nb= sp;        ; LimitHigh
+            DB = ;     0        =            ; BaseHigh
+ProtModeSsSeg32:
+            DW = ;     -1        = ;          ; LimitLow
+            DW = ;     0        =            ; BaseLow
+            DB = ;     0        =            ; BaseMid
+            DB = ;     0x93
+            DB = ;     0xcf       &nb= sp;        ; LimitHigh
+            DB = ;     0        =            ; BaseHigh
+DataSeg32:
+            DW = ;     -1        = ;          ; LimitLow
+            DW = ;     0        =            ; BaseLow
+            DB = ;     0        =            ; BaseMid
+            DB = ;     0x93
+            DB = ;     0xcf       &nb= sp;        ; LimitHigh
+            DB = ;     0        =            ; BaseHigh
+CodeSeg16:
+            DW = ;     -1
+            DW = ;     0
+            DB = ;     0
+            DB = ;     0x9b
+            DB = ;     0x8f
+            DB = ;     0
+DataSeg16:
+            DW = ;     -1
+            DW = ;     0
+            DB = ;     0
+            DB = ;     0x93
+            DB = ;     0x8f
+            DB = ;     0
+CodeSeg64:
+            DW = ;     -1        = ;          ; LimitLow
+            DW = ;     0        =            ; BaseLow
+            DB = ;     0        =            ; BaseMid
+            DB = ;     0x9b
+            DB = ;     0xaf       &nb= sp;        ; LimitHigh
+            DB = ;     0        =            ; BaseHigh
+GDT_SIZE equ $ -   NullSeg
 
 ASM_PFX(gcSmiInitGdtr):
-            DW = ;     0
-            DQ = ;     0
+    DW      GDT_SIZE - 1
+    DQ      NullSeg
+
+
+    DEFAULT REL
+    SECTION .text
 
 global ASM_PFX(SmmStartup)
 
 BITS 16
 ASM_PFX(SmmStartup):
@@ -132,12 +187,12 @@ ASM_PFX(gPatchRebasedFlagAddr32):
     pop     eax
     jmp     dword [dword 0] &= nbsp;           &nbs= p;      ; destination will be patched
 ASM_PFX(gPatchSmmRelocationOriginalAddressPtr32):
 
 BITS 64
-global ASM_PFX(PiSmmCpuSmmInitFixupAddress)
-ASM_PFX(PiSmmCpuSmmInitFixupAddress):
+global ASM_PFX(SmmInitFixupAddress)
+ASM_PFX(SmmInitFixupAddress):
     lea    rax, [@LongMode]
     lea    rcx, [@PatchLongModeOffset -= 6]
     mov    dword [rcx], eax
 
     lea    rax, [ASM_PFX(SmmStartup)] diff --git a/UefiCpuPkg/UefiCpuPkg.dsc b/UefiCpuPkg/UefiCpuPkg.dsc
index 9426641eb2..8f67587e91 100644
--- a/UefiCpuPkg/UefiCpuPkg.dsc
+++ b/UefiCpuPkg/UefiCpuPkg.dsc
@@ -199,10 +199,11 @@
       UnitTestResultReportLib|UnitTestFramew= orkPkg/Library/UnitTestResultReportLib/UnitTestResultReportLibConOut.inf    }
   UefiCpuPkg/Library/MmSaveStateLib/AmdMmSaveStateLib.inf
   UefiCpuPkg/Library/MmSaveStateLib/IntelMmSaveStateLib.inf
   UefiCpuPkg/Library/SmmCpuFeaturesLib/AmdSmmCpuFeaturesLib.inf<= br> +  UefiCpuPkg/Library/SmmRelocationLib/SmmRelocationLib.inf
 
 [Components.X64]
   UefiCpuPkg/Library/CpuExceptionHandlerLib/UnitTest/DxeCpuExcep= tionHandlerLibUnitTest.inf
 
 [Components.RISCV64]
--
2.16.2.windows.1

_._,_._,_
Groups.io Links:

=20 You receive all messages sent to this group. =20 =20

View/Reply Online (#118414) | =20 | Mute= This Topic | New Topic
Your Subscriptio= n | Contact Group Owner | Unsubscribe [rebecca@openfw.io]

_._,_._,_
--_000_MN6PR11MB8244CD8579A9E0CE5DADB5278C1A2MN6PR11MB8244namp_--