From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <bounce+27952+117963+7686176+12367111@groups.io>
Received: from mail05.groups.io (mail05.groups.io [45.79.224.7])
	by spool.mail.gandi.net (Postfix) with ESMTPS id 3953F7803CF
	for <rebecca@openfw.io>; Thu, 18 Apr 2024 07:57:49 +0000 (UTC)
DKIM-Signature: a=rsa-sha256; bh=BpBviLSKkZjdyiX/0e7UqKfHZwPHrA+L2TJ85r9JPXo=;
 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=1713427068; v=1;
 b=NJRE1LG8atk644pDNDyVQ66NXt5L+HZwPeVRmMveLRDBoxWL6mHfaJgReifsEtvowlbPCgIM
 zCJfDtxoWRbwF9gMWEdveETcBAmG5F11bWFCjpNboAM4EQy20LpIMtoMte+OUj4LlByaS5doR5b
 DRdozEuOj3zyZwjJ61pPMhyZLwQqyXkOHWGs9hhT5uHU8uxEHY/z8612bZ0/gSykK5ys0tiiTBk
 yISRJRN67eUY3mnxq7/K9Muv/RlzERU85BtvklKnXy+G9DBzeP6JPJnP+FzoaEr+EOZ3O7CbzHv
 JM4aSG5EbTXfXMemrYKkmgLJkBbQhB4SqOfyD0O7cqhgw==
X-Received: by 127.0.0.2 with SMTP id i7VfYY7687511xbhC7GhdAHV; Thu, 18 Apr 2024 00:57:48 -0700
X-Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10])
 by mx.groups.io with SMTP id smtpd.web11.7622.1713427067900731697
 for <devel@edk2.groups.io>;
 Thu, 18 Apr 2024 00:57:47 -0700
X-CSE-ConnectionGUID: MhCrX10hSrWIEBs9rbxJSw==
X-CSE-MsgGUID: 3GSQpCf+Q+e7TPCTa8J/qQ==
X-IronPort-AV: E=McAfee;i="6600,9927,11047"; a="20349108"
X-IronPort-AV: E=Sophos;i="6.07,211,1708416000"; 
   d="scan'208,217";a="20349108"
X-Received: from fmviesa009.fm.intel.com ([10.60.135.149])
  by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Apr 2024 00:57:47 -0700
X-CSE-ConnectionGUID: QGAAk6dpSmq6WdTxx4nAJg==
X-CSE-MsgGUID: 7/7xvVBKRWmthgN6gLk33Q==
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="6.07,211,1708416000"; 
   d="scan'208,217";a="22985030"
X-Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81])
  by fmviesa009.fm.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 18 Apr 2024 00:57:47 -0700
X-Received: from fmsmsx603.amr.corp.intel.com (10.18.126.83) 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; Thu, 18 Apr 2024 00:57:47 -0700
X-Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by
 fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server
 (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id
 15.1.2507.35 via Frontend Transport; Thu, 18 Apr 2024 00:57:47 -0700
X-Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.101)
 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; Thu, 18 Apr 2024 00:57:46 -0700
X-Received: from MN0PR11MB6158.namprd11.prod.outlook.com (2603:10b6:208:3ca::18)
 by IA1PR11MB6076.namprd11.prod.outlook.com (2603:10b6:208:3d4::11) with
 Microsoft SMTP Server (version=TLS1_2,
 cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.26; Thu, 18 Apr
 2024 07:57:44 +0000
X-Received: from MN0PR11MB6158.namprd11.prod.outlook.com
 ([fe80::b0c8:dcaf:59ea:9e99]) by MN0PR11MB6158.namprd11.prod.outlook.com
 ([fe80::b0c8:dcaf:59ea:9e99%6]) with mapi id 15.20.7472.037; Thu, 18 Apr 2024
 07:57:44 +0000
From: "Wu, Jiaxin" <jiaxin.wu@intel.com>
To: "Ni, Ray" <ray.ni@intel.com>, "devel@edk2.groups.io"
	<devel@edk2.groups.io>
CC: "Zeng, Star" <star.zeng@intel.com>, Gerd Hoffmann <kraxel@redhat.com>,
	"Kumar, Rahul R" <rahul.r.kumar@intel.com>
Subject: Re: [edk2-devel] [PATCH v3 05/13] UefiCpuPkg/SmmRelocationLib: Remove unnecessary global variable
Thread-Topic: [PATCH v3 05/13] UefiCpuPkg/SmmRelocationLib: Remove unnecessary
 global variable
Thread-Index: AQHakV2InbWMfBDP/0iTmQflUWaSqrFtpnFbgAAC1IA=
Date: Thu, 18 Apr 2024 07:57:44 +0000
Message-ID: <MN0PR11MB61581D539997F43F5217724BFE0E2@MN0PR11MB6158.namprd11.prod.outlook.com>
References: <20240418065556.5696-1-jiaxin.wu@intel.com>
 <20240418065556.5696-6-jiaxin.wu@intel.com>
 <MN6PR11MB8244D06ADD52B4D33DA0DB7A8C0E2@MN6PR11MB8244.namprd11.prod.outlook.com>
In-Reply-To: <MN6PR11MB8244D06ADD52B4D33DA0DB7A8C0E2@MN6PR11MB8244.namprd11.prod.outlook.com>
Accept-Language: zh-CN, en-US
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
msip_labels: 
x-ms-publictraffictype: Email
x-ms-traffictypediagnostic: MN0PR11MB6158:EE_|IA1PR11MB6076:EE_
x-ms-office365-filtering-correlation-id: 72ad0433-25ad-48c6-8040-08dc5f7d3b2a
x-ms-exchange-senderadcheck: 1
x-ms-exchange-antispam-relay: 0
x-microsoft-antispam-message-info: yyU4QyCtY6QTZU/4HxXyb6rdJiI3kkv3r1y5wFK1w+YXpD0j47iekkzNCmoPzvoEbRUUaq4Sg6Fc8RptUZOpi7qsOMK1aa0nHaTG6RIMg2Uh061BUZigBhJmjGTYjWBfWLNFmEbxtX/FOUK4I3K3YO37+jB8uR1K4DcNIty0Lll0AMGXnO4deG2S8Hm/2mbRtx/gLBk7AynYrH7gsG3vkH6et4Xp+GKDXYorFR6Ya0GWF+DRUcRQ2uqWeDBD2ir79v6DNArtzaHuUPpYtlZ3tgPzzHLVUBd/FxYe0XIVJ7k6mgAuYDrM5zE6KfSGX2ALyq8jwDCDNnBbBMfzMiJuZxvjb4CFSDY1PosZoSyqmOyBa4VCk8idYV9c9BhKSX5DBmk7uNuiUgqxjL6oWTvIawD1awzrAAeb5yzWh4dvXI29ifBDcCoyFehUcv/9SbhMhGjMN1JgGvOsrQxVNZXEcuQsPY3SKptCrdapvdSyea/75RwGbQrGPtDoG/pxLfmGkIL7B4tVMwYOa1YWjy1DKRVEn6z+G8fzVJL1r10E4rTJ6WoydbzJW6HdTZtpZPkYkIEs8YcpGPElaMGK9lCqqNIKCte+3XDuVMzDPd/BpeelgAMMeMTJtQHkni4+bWIJu0jp8tBggCFMpDsvKoVU2Bl7cnUgTcGjXhy8oJzWw626ioomQCCMinKrTv6CaQ4b9A6BCnZI6lAObQ4yNBBAq799tTavKpsg228AbJM1r6I=
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?XGgAAQvLYNGMzez9Q9ACQ0NPprSoQRzfAemFQCLhq7oiPOL9Oe06dxF3XHLD?=
 =?us-ascii?Q?GN9GCBe8qRfJbjqLVHrtF4DjJDzolnGYXcUmPodCQWCX6eqb8s6+UZ7OJxYE?=
 =?us-ascii?Q?tknECDTb8OV1KgM2U/VSnhNPZQAn8HFMbjxNx6W2V7c7vWu48lbF7tb8VBoA?=
 =?us-ascii?Q?d4D6g1OKgfbQ0u1g9qr65tYAXL/M2HRse6IZYz7gHbZhKrxCpsJj050gpZa1?=
 =?us-ascii?Q?hB4MnR43i3+TFgPgcPTiMukrrCPsNAoB++33tFB3vs6PjdyOQC5egbrf1lGr?=
 =?us-ascii?Q?QwsB0LlI1mQg9vYnm6GqUhY+apu3Np+Pa7A2n2XpttsiuQlCgZDRhCadzsxz?=
 =?us-ascii?Q?2Nf+3euVm9dxG10d3X6QSA4XOH4WGWH5JuQwYaXDD9Km7Lk9UcVyTk3JoKPb?=
 =?us-ascii?Q?nNSdIVl3/2hVWeGG67kTMTVlVspnT3Sy7W3ZLAEYT791lwlb69OzCdIdbnbI?=
 =?us-ascii?Q?5iTWsAZXen2Xpk8SRZ9IM9MVCjsLFcGuUvSRfJsDaPCzK0Z6Oy1YqYX7nR9j?=
 =?us-ascii?Q?6fvhOqD6Mm2rDHhc2vKd4ZRSyBaColxBCdvOaV7Hb6olt1JPihtxIiZhCkQ+?=
 =?us-ascii?Q?JMFQs+nfYuHWc9hc2wwpSzhN99RF+EaMU4t+pjVMbTw0toss6vGtoKrl9U1h?=
 =?us-ascii?Q?IxCaeKcc+bJ0feEL6ombll49dl4I6iU5jJQvBF8wdDRGLcdmB63wh8de8hP/?=
 =?us-ascii?Q?bbF5KpZ8ZAeiR0oK08DsLp6zCKYD8XhZqpcjz8G+ZLpcLnnvRZ/56OEbeauu?=
 =?us-ascii?Q?J0KMsVj9ztii3nMt7bZuqTiZQtdua6R2QvJpUV9noufOtDi8fUJgxwX+5cZi?=
 =?us-ascii?Q?z5gJLxcdC2MtpzNiNvSuvi9ezu/xUdgr9fh89lx74FfgfC62pQDq5eCW1ab2?=
 =?us-ascii?Q?xL4njUa+i+8SgFjmr8wc+3OHsKfMr9ZTwUZSgVtgXyletcbPJDrFXMCQYy47?=
 =?us-ascii?Q?Yr2N3msjGy96Nh2cpAgvsS7tyRctUu3NfnLdOIKW9KFLIK46x+t4eJokZpx1?=
 =?us-ascii?Q?M0AvGRRafP3bGvSwgMVh/C7db6MUUvLHaeAC3YwSEqKgiadv2vOhTXZfqeW6?=
 =?us-ascii?Q?bmBn8l/N1dRMmHFy2wNXOlGm2lGnJMC2eoY6a2aLbusgdVKNHINQ1ggbxPEv?=
 =?us-ascii?Q?Um4WGyXRMwQmkkYC6hupr9LxLg36aidslh8mWcsPr5bpeu2kxeTkT/1fA9by?=
 =?us-ascii?Q?H/X49tad7IryrTIRXU0ZohLoEZ9ZQ2c2e3w3j8h+D3O90QvDB8eijZD419aa?=
 =?us-ascii?Q?rwfrySIj9DKXB/+qYvJMC+FXc/Ukr5ODlSDJPRSXFDPgRZaofRFGZIhWVn2R?=
 =?us-ascii?Q?YxeLAYl9RpQZewhsaUPZhwIFFlkDacdK8MyXhWzcCMkuVaz7woGZgZ5hztDF?=
 =?us-ascii?Q?V1BrWAAito4quU5T/dJw21fXIxVne1MAkNnnPNmWwnjsL187z8H1ZPNTBYbq?=
 =?us-ascii?Q?SzQ30byG0WPZ9g7hXrsb1AYAbJTyXgf5AaU7S6XORv7o2TuxgPhDEFmdu/hZ?=
 =?us-ascii?Q?o3wDKqkNWongO5pmcf4+ZNiYfsx+qsx7eNtiKGJB6tcJRZuZRdKiOxM8nc2L?=
 =?us-ascii?Q?0Ibyl1jZ2USH0TnbVuapjXZy+PUIHSBwKKbiUlHU?=
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: MN0PR11MB6158.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 72ad0433-25ad-48c6-8040-08dc5f7d3b2a
X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Apr 2024 07:57:44.7777
 (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: 90fBzDlJIaPMVl7mHJvLCtr5tJP4y0v/CxY4KSwurOyhP9tlx0XJb5ievhVI+A58pA/HBdsqoaTMH3avDK0/mA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR11MB6076
X-OriginatorOrg: intel.com
Precedence: Bulk
List-Subscribe: <mailto:devel+subscribe@edk2.groups.io>
List-Help: <mailto:devel+help@edk2.groups.io>
Sender: devel@edk2.groups.io
List-Id: <devel.edk2.groups.io>
Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io
Resent-Date: Thu, 18 Apr 2024 00:57:48 -0700
Resent-From: jiaxin.wu@intel.com
Reply-To: devel@edk2.groups.io,jiaxin.wu@intel.com
List-Unsubscribe-Post: List-Unsubscribe=One-Click
List-Unsubscribe: <https://edk2.groups.io/g/devel/leave/12367111/7686176/1913456212/plugh>
X-Gm-Message-State: jAAtWUxLz62M4i3hZGtOANiux7686176AA=
Content-Language: en-US
Content-Type: multipart/alternative;
	boundary="_000_MN0PR11MB61581D539997F43F5217724BFE0E2MN0PR11MB6158namp_"
X-GND-Status: LEGIT
Authentication-Results: spool.mail.gandi.net;
	dkim=pass header.d=groups.io header.s=20240206 header.b=NJRE1LG8;
	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_MN0PR11MB61581D539997F43F5217724BFE0E2MN0PR11MB6158namp_
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable

Sure, I will you split the removal of CpuIndex parameter in a new patch.

Thanks,
Jiaxin

From: Ni, Ray <ray.ni@intel.com>
Sent: Thursday, April 18, 2024 3:48 PM
To: Wu, Jiaxin <jiaxin.wu@intel.com>; devel@edk2.groups.io
Cc: Zeng, Star <star.zeng@intel.com>; Gerd Hoffmann <kraxel@redhat.com>; Ku=
mar, Rahul R <rahul.r.kumar@intel.com>
Subject: Re: [PATCH v3 05/13] UefiCpuPkg/SmmRelocationLib: Remove unnecessa=
ry global variable

 UINT64
 EFIAPI
 HookReturnFromSmm (
-  IN     UINTN                 CpuIndex,
   IN OUT SMRAM_SAVE_STATE_MAP  *CpuState,
   IN     UINT64                NewInstructionPointer32,
   IN     UINT64                NewInstructionPointer
   )
 {
diff --git a/UefiCpuPkg/Library/SmmRelocationLib/X64/Semaphore.c b/UefiCpuP=
kg/Library/SmmRelocationLib/X64/Semaphore.c
index 53f3084363..cd6778e3fc 100644
--- a/UefiCpuPkg/Library/SmmRelocationLib/X64/Semaphore.c
+++ b/UefiCpuPkg/Library/SmmRelocationLib/X64/Semaphore.c
@@ -26,18 +26,16 @@ SmmRelocationSemaphoreComplete32 (
 /**
   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
   )
 {
   SMRAM_SAVE_STATE_MAP  *CpuState;
   UINTN                 TempValue;
@@ -49,11 +47,10 @@ SemaphoreHook (
     4
     );

   CpuState                      =3D (SMRAM_SAVE_STATE_MAP *)(UINTN)(SMM_DE=
FAULT_SMBASE + SMRAM_SAVE_STATE_MAP_OFFSET);
   mSmmRelocationOriginalAddress =3D HookReturnFromSmm (
-                                    CpuIndex,
                                     CpuState,
                                     (UINT64)(UINTN)&SmmRelocationSemaphore=
Complete32,
                                     (UINT64)(UINTN)&SmmRelocationSemaphore=
Complete
                                     );


[Ray] Can you split the removal of CpuIndex parameter in a new patch? Other=
s look good to me.

--
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 (#117963): https://edk2.groups.io/g/devel/message/117963
Mute This Topic: https://groups.io/mt/105593573/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_MN0PR11MB61581D539997F43F5217724BFE0E2MN0PR11MB6158namp_
Content-Type: text/html; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable

<html xmlns:v=3D"urn:schemas-microsoft-com:vml" xmlns:o=3D"urn:schemas-micr=
osoft-com:office:office" xmlns:w=3D"urn:schemas-microsoft-com:office:word" =
xmlns:m=3D"http://schemas.microsoft.com/office/2004/12/omml" xmlns=3D"http:=
//www.w3.org/TR/REC-html40">
<head>
<meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3Dus-ascii"=
>
<meta name=3D"Generator" content=3D"Microsoft Word 15 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
	{font-family:"Cambria Math";
	panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
	{font-family:DengXian;
	panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
	{font-family:Calibri;
	panose-1:2 15 5 2 2 2 4 3 2 4;}
@font-face
	{font-family:DengXian;
	panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
	{font-family:Aptos;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
	{margin:0in;
	font-size:11.0pt;
	font-family:"Calibri",sans-serif;}
span.EmailStyle19
	{mso-style-type:personal-reply;
	font-family:"Calibri",sans-serif;
	color:windowtext;}
.MsoChpDefault
	{mso-style-type:export-only;
	font-size:10.0pt;
	mso-ligatures:none;}
@page WordSection1
	{size:8.5in 11.0in;
	margin:1.0in 1.25in 1.0in 1.25in;}
div.WordSection1
	{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext=3D"edit" spidmax=3D"1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext=3D"edit">
<o:idmap v:ext=3D"edit" data=3D"1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang=3D"EN-US" link=3D"#0563C1" vlink=3D"#954F72" style=3D"word-wrap:=
break-word">
<div class=3D"WordSection1">
<p class=3D"MsoNormal">Sure, I will <span style=3D"font-family:&quot;Aptos&=
quot;,sans-serif;color:black">
you split the removal of CpuIndex parameter in a new patch.<o:p></o:p></spa=
n></p>
<p class=3D"MsoNormal"><span style=3D"font-family:&quot;Aptos&quot;,sans-se=
rif;color:black"><o:p>&nbsp;</o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"font-family:&quot;Aptos&quot;,sans-se=
rif;color:black">Thanks,<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"font-family:&quot;Aptos&quot;,sans-se=
rif;color:black">Jiaxin</span><o:p></o:p></p>
<p class=3D"MsoNormal"><o:p>&nbsp;</o:p></p>
<div style=3D"border:none;border-left:solid blue 1.5pt;padding:0in 0in 0in =
4.0pt">
<div>
<div style=3D"border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0in =
0in 0in">
<p class=3D"MsoNormal"><b>From:</b> Ni, Ray &lt;ray.ni@intel.com&gt; <br>
<b>Sent:</b> Thursday, April 18, 2024 3:48 PM<br>
<b>To:</b> Wu, Jiaxin &lt;jiaxin.wu@intel.com&gt;; devel@edk2.groups.io<br>
<b>Cc:</b> Zeng, Star &lt;star.zeng@intel.com&gt;; Gerd Hoffmann &lt;kraxel=
@redhat.com&gt;; Kumar, Rahul R &lt;rahul.r.kumar@intel.com&gt;<br>
<b>Subject:</b> Re: [PATCH v3 05/13] UefiCpuPkg/SmmRelocationLib: Remove un=
necessary global variable<o:p></o:p></p>
</div>
</div>
<p class=3D"MsoNormal"><o:p>&nbsp;</o:p></p>
<div>
<p class=3D"MsoNormal"><span style=3D"font-family:&quot;Aptos&quot;,sans-se=
rif;color:black">&nbsp;UINT64<br>
&nbsp;EFIAPI<br>
&nbsp;HookReturnFromSmm (<br>
-&nbsp; IN&nbsp;&nbsp;&nbsp;&nbsp; UINTN&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp=
;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; CpuIndex,<br>
&nbsp;&nbsp; IN OUT SMRAM_SAVE_STATE_MAP&nbsp; *CpuState,<br>
&nbsp;&nbsp; IN&nbsp;&nbsp;&nbsp;&nbsp; UINT64&nbsp;&nbsp;&nbsp;&nbsp;&nbsp=
;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; NewInstructio=
nPointer32,<br>
&nbsp;&nbsp; IN&nbsp;&nbsp;&nbsp;&nbsp; UINT64&nbsp;&nbsp;&nbsp;&nbsp;&nbsp=
;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; NewInstructio=
nPointer<br>
&nbsp;&nbsp; )<br>
&nbsp;{<br>
diff --git a/UefiCpuPkg/Library/SmmRelocationLib/X64/Semaphore.c b/UefiCpuP=
kg/Library/SmmRelocationLib/X64/Semaphore.c<br>
index 53f3084363..cd6778e3fc 100644<br>
--- a/UefiCpuPkg/Library/SmmRelocationLib/X64/Semaphore.c<br>
+++ b/UefiCpuPkg/Library/SmmRelocationLib/X64/Semaphore.c<br>
@@ -26,18 +26,16 @@ SmmRelocationSemaphoreComplete32 (<br>
&nbsp;/**<br>
&nbsp;&nbsp; Hook return address of SMM Save State so that semaphore code<b=
r>
&nbsp;&nbsp; can be executed immediately after AP exits SMM to indicate to<=
br>
&nbsp;&nbsp; the BSP that an AP has exited SMM after SMBASE relocation.<br>
&nbsp;<br>
-&nbsp; @param[in] CpuIndex&nbsp;&nbsp;&nbsp;&nbsp; The processor index.<br=
>
&nbsp;&nbsp; @param[in] RebasedFlag&nbsp; A pointer to a flag that is set t=
o TRUE<br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb=
sp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;=
&nbsp; immediately after AP exits SMM.<br>
&nbsp;<br>
&nbsp;**/<br>
&nbsp;VOID<br>
&nbsp;SemaphoreHook (<br>
-&nbsp; IN UINTN&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp=
;&nbsp;&nbsp; CpuIndex,<br>
&nbsp;&nbsp; IN volatile BOOLEAN&nbsp; *RebasedFlag<br>
&nbsp;&nbsp; )<br>
&nbsp;{<br>
&nbsp;&nbsp; SMRAM_SAVE_STATE_MAP&nbsp; *CpuState;<br>
&nbsp;&nbsp; UINTN&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb=
sp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; TempValue;<br>
@@ -49,11 +47,10 @@ SemaphoreHook (<br>
&nbsp;&nbsp;&nbsp;&nbsp; 4<br>
&nbsp;&nbsp;&nbsp;&nbsp; );<br>
&nbsp;<br>
&nbsp;&nbsp; CpuState&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;=
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; =
=3D (SMRAM_SAVE_STATE_MAP *)(UINTN)(SMM_DEFAULT_SMBASE + SMRAM_SAVE_STATE_M=
AP_OFFSET);<br>
&nbsp;&nbsp; mSmmRelocationOriginalAddress =3D HookReturnFromSmm (<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&n=
bsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp=
;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; CpuIndex,<br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb=
sp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;=
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; CpuState=
,<br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb=
sp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;=
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; (UINT64)=
(UINTN)&amp;SmmRelocationSemaphoreComplete32,<br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb=
sp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;=
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; (UINT64)=
(UINTN)&amp;SmmRelocationSemaphoreComplete<br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb=
sp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;=
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; );<br>
&nbsp;<o:p></o:p></span></p>
</div>
<div>
<p class=3D"MsoNormal"><span style=3D"font-family:&quot;Aptos&quot;,sans-se=
rif;color:black"><o:p>&nbsp;</o:p></span></p>
</div>
<div>
<p class=3D"MsoNormal"><span style=3D"font-family:&quot;Aptos&quot;,sans-se=
rif;color:black">[Ray] Can you split the removal of CpuIndex parameter in a=
 new patch? Others look good to me.<o:p></o:p></span></p>
</div>
<div>
<p class=3D"MsoNormal" style=3D"margin-bottom:12.0pt"><span style=3D"font-f=
amily:&quot;Aptos&quot;,sans-serif;color:black"><br>
--<br>
2.16.2.windows.1<o:p></o:p></span></p>
</div>
</div>
</div>
</body>
</html>


<div width=3D"1" style=3D"color:white;clear:both">_._,_._,_</div>
<hr>


Groups.io Links:<p>


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


<p>
<a target=3D"_blank" href=3D"https://edk2.groups.io/g/devel/message/117963"=
>View/Reply Online (#117963)</a> |


 =20

|

  <a target=3D"_blank" href=3D"https://groups.io/mt/105593573/7686176">Mute=
 This Topic</a>


| <a href=3D"https://edk2.groups.io/g/devel/post">New Topic</a>

<br>




<a href=3D"https://edk2.groups.io/g/devel/editsub/7686176">Your Subscriptio=
n</a> |
<a href=3D"mailto:devel+owner@edk2.groups.io">Contact Group Owner</a> |

<a href=3D"https://edk2.groups.io/g/devel/unsub">Unsubscribe</a>

 [rebecca@openfw.io]<br>
<div width=3D"1" style=3D"color:white;clear:both">_._,_._,_</div>


--_000_MN0PR11MB61581D539997F43F5217724BFE0E2MN0PR11MB6158namp_--