From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (NAM02-SN1-obe.outbound.protection.outlook.com [40.107.96.88]) by mx.groups.io with SMTP id smtpd.web10.2219.1689147754954289913 for ; Wed, 12 Jul 2023 00:42:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@amd.com header.s=selector1 header.b=Fvn2tec/; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: amd.com, ip: 40.107.96.88, mailfrom: abner.chang@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dy3bTWSags6YYte8vi0aO9E/aGSCwsUvZbTslI/Q81dVotF36WdTgFwRGFNefWU+UAzg/LPnyryvNQFYmUEmaxwgIBPkBKRVE2r7Jj77JI1N8HjTdQOAfDGIbNhDwutK8jpic4DM6NvwTOOPD0ttA49IF/nRdxUxG3BTZp0BiUaS0ca7qlepT9dck07H7498w/TeRQb9lbNzQaP2LP9rOD/T8KrmTuVWCpi2vZe9o6umUUMk5ajErSh46l5nQOkahTl9aAQi3vXa2TPpEW0/bNdrew2d7tKRUsaoD0E1y/8ZDkzgijzf713UnhX//FkbhoZJ00GxadeUvI/oaynMoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=HtMBAouCu5wE3qrhOzZy+d5TmYy3VRVj0vNaLFGiOA4=; b=LII6UChaPjYXZUMCsFIOTCu252Mlno7DF6UW4QTCj73OEC4UcNHJ8lOQMmbrrwmEMPAW7eMed38utdjGN493EylKa7yOy4WlJoSrRFDFHPbyK3EYfgjLhWJ3CAjWJfnIezi/fw1nCObPuD1G2+64UeN35a9F7MNUrdmL2yxHGdmnpZOWNbLJcng7/v49ptNFID1NP4ASNZcw3FxAwRP5ccJMWW8Q4uwllOtioPaUDRPRWdPlZ/+ugoZWYOfSg1uQHw2jQ0yn+EEzTJ6zhjBvTHEAuJXkwkLwjNo5ZKdO/D9p6PWcHaVlPL5YMDaNi1p7xXZyb1lLzEOiEIeXshR8rg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HtMBAouCu5wE3qrhOzZy+d5TmYy3VRVj0vNaLFGiOA4=; b=Fvn2tec/0hCCXd6WTL6BUsg/SoKTvXjqO0HDNBXCMgjM/ctZp7n92PYZZFBbTqXOwh6OLtabck8KnxwUyBN6KhRtxXFGy43/B5yT3XugQeQrsn9+ehtMHM6VzFvqcI3wEjiRQQhT2bDIjmZt9lKRdEvndt9Bn2vzDWd9Njrp2eA= Received: from MN2PR12MB3966.namprd12.prod.outlook.com (2603:10b6:208:165::18) by IA0PR12MB8837.namprd12.prod.outlook.com (2603:10b6:208:491::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6565.26; Wed, 12 Jul 2023 07:42:32 +0000 Received: from MN2PR12MB3966.namprd12.prod.outlook.com ([fe80::edb0:bed8:c650:5040]) by MN2PR12MB3966.namprd12.prod.outlook.com ([fe80::edb0:bed8:c650:5040%6]) with mapi id 15.20.6565.028; Wed, 12 Jul 2023 07:42:31 +0000 From: "Chang, Abner" To: "Attar, AbdulLateef (Abdul Lateef)" , "devel@edk2.groups.io" CC: "Attar, AbdulLateef (Abdul Lateef)" , Eric Dong , Ray Ni , Rahul Kumar , Gerd Hoffmann Subject: Re: [PATCH v1 1/1] UefiCpuPkg: Uses gMmst in MmSaveStateLib Thread-Topic: [PATCH v1 1/1] UefiCpuPkg: Uses gMmst in MmSaveStateLib Thread-Index: AQHZtImG8W3JQ3yDVUGHEDcwkhoh2K+1v5fw Date: Wed, 12 Jul 2023 07:42:31 +0000 Message-ID: References: <9f4ee69f63e53cf8e001d8e0ea516da131494b23.1689142923.git.abdattar@amd.com> In-Reply-To: <9f4ee69f63e53cf8e001d8e0ea516da131494b23.1689142923.git.abdattar@amd.com> Accept-Language: en-US, zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_4342314e-0df4-4b58-84bf-38bed6170a0f_ActionId=8de38fa4-01a5-41f2-a743-21c4641a3c85;MSIP_Label_4342314e-0df4-4b58-84bf-38bed6170a0f_ContentBits=0;MSIP_Label_4342314e-0df4-4b58-84bf-38bed6170a0f_Enabled=true;MSIP_Label_4342314e-0df4-4b58-84bf-38bed6170a0f_Method=Standard;MSIP_Label_4342314e-0df4-4b58-84bf-38bed6170a0f_Name=General;MSIP_Label_4342314e-0df4-4b58-84bf-38bed6170a0f_SetDate=2023-07-12T07:41:56Z;MSIP_Label_4342314e-0df4-4b58-84bf-38bed6170a0f_SiteId=3dd8961f-e488-4e60-8e11-a82d994e183d; authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=amd.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: MN2PR12MB3966:EE_|IA0PR12MB8837:EE_ x-ms-office365-filtering-correlation-id: be445a8a-5b59-4e86-0724-08db82ab8cbc x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: ZZZAuZHPfV8sVFsRDV6s5mtZ4es9OL60m2Z+KHurihnS3PykbDiXX1jWC05FP+jkvvDaHFWSk3ef6zQ6MdEs+NNjHnyX8ObOJe/50Ysuig7exe5FfGR1r1YW62Q1OaJ/ewtKNcB+1EjUuB0Xgv3M5osfymXWrb7A87iHSDv/wcsLa1B1k+vivyEhKXknFu/xljtOg0iRp4PpYcZ12DQkf88VnIa/hyv7DMXFBlOjeK1Ctz/NwMEPva868Oe0PX2kqEG9FVpMMuKIxw+1pEWhaeuHzvT3tfEUylm3lUlaypKm4pq5SCm9BYov/bvThtk/8AKMSzQT5/OUf8Pm3btV8ejKNQH+sux9efzISh0bWY7MY/XmvZMoY9uJdDZ23t98zz/MKG4uNNw6kfTKq7C9fBvDh+Rj91DS4y1IpgNPfgZhIwmWoDMu3GiMCtJAwAInqm6Satqb9seVASDcTyo3LH81gM7JzAGaLsseCmI2psR+YDWOt3fWr01ed2dazZxAnj0HC10WDZA9vZWPqIMDIioaLNyEeSkXy6jJsBy0jg0RVSLoJjgjBdAqQwjiLyVjWXRtLmOXRHOYdwOnhAK4ESqvUGdqjkLzfj3mMEjW8Sw= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MN2PR12MB3966.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(6029001)(4636009)(346002)(366004)(376002)(136003)(396003)(39860400002)(451199021)(41300700001)(52536014)(5660300002)(54906003)(110136005)(71200400001)(55016003)(2906002)(316002)(8936002)(8676002)(7696005)(966005)(66446008)(4326008)(66476007)(66556008)(66946007)(64756008)(76116006)(9686003)(33656002)(478600001)(86362001)(122000001)(186003)(83380400001)(38100700002)(26005)(53546011)(6506007)(38070700005);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?WT6lgbNlICdFjIqPUzIHFnDawIa6kFg7SpTdsdUjzhXq42Y1RdogEclNWjJ5?= =?us-ascii?Q?3/NV9TOrPodP405rTDp1b73cJ6oSgVmSeLTF+va+UKR+AZYWteSPhavS+0zN?= =?us-ascii?Q?/ugikL5k4zRaczGQPQKk3qyyFdl/h/rdPw1cIWHLtdzpNwOOu7C2UfOzFMyO?= =?us-ascii?Q?3F2sx7Bc3i6it/pyg9c468XHntXz4Bb1AlVJ1Cms8rZc5i/hcMu7e9Bim6FY?= =?us-ascii?Q?LCo1k/oCg9Clljy23ECN2cvxQhG8wwfHGxqvIFhUhrUQEh0V2dsBkIN1ifwh?= =?us-ascii?Q?oSsHmbdhXUGWuWJ3eEe6wl6+nzcg0cpc2+d0GXP5g9QeRV88zXBEWK6wNBsO?= =?us-ascii?Q?7Pyo7HN1WbzKZwAOSCConpVGn24O+fjV3Y0dvi2EoDX/H7OctYlacAO1OGqZ?= =?us-ascii?Q?hGbVfgb0Y7t1SJUMvIRL4h3LrKlgeZhq0oXDmUttVXi3d7t1TIsn2pUWM2BG?= =?us-ascii?Q?0OzAsVjdctciELFAeVlz8goU8j50Nq/IW+sbzxfyHHZqKrgRh4D0D2n0ek1Q?= =?us-ascii?Q?pm4GQJCPiQ6SUcakYu8bW4W5lBh0hqXyC44+Hy4Ldxy9qWq287CH6Yd0q5EH?= =?us-ascii?Q?W+cpS85KURiWCZHyukK26OsJxzNYx9uEUdgbMDocWJvMasi6DUj7JSeCe3Ck?= =?us-ascii?Q?gQOTkp+JPXOLDbR+Xoc8+Ci81ZK65gXa0aML7NHagOyoxheqtq2Y7qoAABKB?= =?us-ascii?Q?xxxrr3jBoRGiM+xarzSeN6umklOTkC/P56ShdImzHlYM/yBynHKPwsUYlWK3?= =?us-ascii?Q?gx/6FoEzuFbjR15nuaj9K/3X9RYagsJbKdTPKn/HyfEF6as3LLq0MRVwiCH2?= =?us-ascii?Q?8E7aDVDN22KN6j+F4oI3PKKNmHAanOLjtFUXoUktR7Y7EDFHWshfOCi1IJTE?= =?us-ascii?Q?HDhQuTvayHa+WTZD+VcES+NzEYvDWNEE00wEcg6gv2sQWGA1opGO/OzPqQDf?= =?us-ascii?Q?7vKTEl0tmA9O5U0+NXZ3tHWHeKc1y/AQYXKe3dUr/LPBR+3dnMmCuWQGN/Fw?= =?us-ascii?Q?tpcxx04fomIABpbDS9aoft+ozDiHekvKDGocfAYvVPoILbmbJUXmVZW/IbWW?= =?us-ascii?Q?Sl1xNNxnesKMqKozV4aI3LCbkX0SnAdia7R/rjv90qROvqxhwoU1oC1DmEBu?= =?us-ascii?Q?LzFt6XbuB1c/MMb2YZHNQs/8sXaLQl0f2BqOQ7NrvTqyszT23qaS5cUKWPXa?= =?us-ascii?Q?VXuN2IKDxF+OHJKdbH8kNAlztd+UP+6Wosl9EBNRqw0PcWOUOTzKILixAuwK?= =?us-ascii?Q?+0vfug3FL/seuXZX1RhrqNQ+jygkcCTNxokW2fom08oQt0uJfMEWFodFItto?= =?us-ascii?Q?jrRNhGhyZ+IUa+WqLn2UJ6PHOhaprXxjyEhrW1AroohLKIsH7m4W8+X9DviH?= =?us-ascii?Q?ttFjnpN8UrvIOnTAV9yjHBZGBJOqyATTtrctFPSHhQgXW7jpknyrSkIV+pWO?= =?us-ascii?Q?Ro6uQy3krizmMxAEnz/p+/IjX52iL2fMWdhS4mZo/GpGaJrc66PA4Mrumu4I?= =?us-ascii?Q?rNMWgMaFeae4T+BCobr50T6sZkN5SXAQtVtqc+2J8O4AS387ODJF2pa9Pr9+?= =?us-ascii?Q?Vil3AJsU0mROQRvXSUg=3D?= MIME-Version: 1.0 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR12MB3966.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: be445a8a-5b59-4e86-0724-08db82ab8cbc X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Jul 2023 07:42:31.5157 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: lsaOfhO4pvdwuNZjGPWIRhCFvAofb1ipJQwd24CJ+pIK3FY4KP0k+vQrDuDejy4Yfta5sSu6zcztl5Qs025tog== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB8837 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable [AMD Official Use Only - General] Acked-by: Abner Chang > -----Original Message----- > From: Abdul Lateef Attar > Sent: Wednesday, July 12, 2023 2:24 PM > To: devel@edk2.groups.io > Cc: Attar, AbdulLateef (Abdul Lateef) ; Eric > Dong ; Ray Ni ; Rahul Kumar > ; Gerd Hoffmann ; Chang, > Abner > Subject: [PATCH v1 1/1] UefiCpuPkg: Uses gMmst in MmSaveStateLib > > From: Abdul Lateef Attar > > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4182 > > Use gMmst instead of gSmst. > Replace SmmServicesTableLib with MmServicesTableLib. > > Cc: Eric Dong > Cc: Ray Ni > Cc: Rahul Kumar > Cc: Gerd Hoffmann > Cc: Abner Chang > Signed-off-by: Abdul Lateef Attar > --- > UefiCpuPkg/Library/MmSaveStateLib/AmdMmSaveStateLib.inf | 2 +- > UefiCpuPkg/Library/MmSaveStateLib/IntelMmSaveStateLib.inf | 2 +- > UefiCpuPkg/Library/MmSaveStateLib/MmSaveState.h | 2 +- > UefiCpuPkg/Library/MmSaveStateLib/AmdMmSaveState.c | 4 ++-- > UefiCpuPkg/Library/MmSaveStateLib/IntelMmSaveState.c | 2 +- > UefiCpuPkg/Library/MmSaveStateLib/MmSaveStateCommon.c | 8 ++++--- > - > 6 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/UefiCpuPkg/Library/MmSaveStateLib/AmdMmSaveStateLib.inf > b/UefiCpuPkg/Library/MmSaveStateLib/AmdMmSaveStateLib.inf > index 5c0685f283d3..dcee6c401d30 100644 > --- a/UefiCpuPkg/Library/MmSaveStateLib/AmdMmSaveStateLib.inf > +++ b/UefiCpuPkg/Library/MmSaveStateLib/AmdMmSaveStateLib.inf > @@ -31,4 +31,4 @@ [LibraryClasses] > BaseLib > BaseMemoryLib > DebugLib > - SmmServicesTableLib > + MmServicesTableLib > diff --git a/UefiCpuPkg/Library/MmSaveStateLib/IntelMmSaveStateLib.inf > b/UefiCpuPkg/Library/MmSaveStateLib/IntelMmSaveStateLib.inf > index b92dfa643203..b7fd4078f58a 100644 > --- a/UefiCpuPkg/Library/MmSaveStateLib/IntelMmSaveStateLib.inf > +++ b/UefiCpuPkg/Library/MmSaveStateLib/IntelMmSaveStateLib.inf > @@ -31,4 +31,4 @@ [LibraryClasses] > BaseLib > BaseMemoryLib > DebugLib > - SmmServicesTableLib > + MmServicesTableLib > diff --git a/UefiCpuPkg/Library/MmSaveStateLib/MmSaveState.h > b/UefiCpuPkg/Library/MmSaveStateLib/MmSaveState.h > index c3499cbb3b17..6c7e8abd5f62 100644 > --- a/UefiCpuPkg/Library/MmSaveStateLib/MmSaveState.h > +++ b/UefiCpuPkg/Library/MmSaveStateLib/MmSaveState.h > @@ -14,7 +14,7 @@ > #include > #include > #include > -#include > +#include > #include > > // Macro used to simplify the lookup table entries of type > CPU_MM_SAVE_STATE_REGISTER_RANGE > diff --git a/UefiCpuPkg/Library/MmSaveStateLib/AmdMmSaveState.c > b/UefiCpuPkg/Library/MmSaveStateLib/AmdMmSaveState.c > index 9fed52896f5c..3315a6cc44ff 100644 > --- a/UefiCpuPkg/Library/MmSaveStateLib/AmdMmSaveState.c > +++ b/UefiCpuPkg/Library/MmSaveStateLib/AmdMmSaveState.c > @@ -108,7 +108,7 @@ MmSaveStateReadRegister ( > UINT8 DataWidth; > > // Read CPU State > - CpuSaveState =3D (AMD_SMRAM_SAVE_STATE_MAP *)gSmst- > >CpuSaveState[CpuIndex]; > + CpuSaveState =3D (AMD_SMRAM_SAVE_STATE_MAP *)gMmst- > >CpuSaveState[CpuIndex]; > > // Check for special EFI_MM_SAVE_STATE_REGISTER_LMA > if (Register =3D=3D EFI_MM_SAVE_STATE_REGISTER_LMA) { > @@ -226,7 +226,7 @@ MmSaveStateWriteRegister ( > return EFI_NOT_FOUND; > } > > - CpuSaveState =3D gSmst->CpuSaveState[CpuIndex]; > + CpuSaveState =3D gMmst->CpuSaveState[CpuIndex]; > > // > // Do not write non-writable SaveState, because it will cause exceptio= n. > diff --git a/UefiCpuPkg/Library/MmSaveStateLib/IntelMmSaveState.c > b/UefiCpuPkg/Library/MmSaveStateLib/IntelMmSaveState.c > index fd321bb571d5..c2ccd65b1dc4 100644 > --- a/UefiCpuPkg/Library/MmSaveStateLib/IntelMmSaveState.c > +++ b/UefiCpuPkg/Library/MmSaveStateLib/IntelMmSaveState.c > @@ -296,7 +296,7 @@ MmSaveStateWriteRegister ( > return EFI_NOT_FOUND; > } > > - CpuSaveState =3D gSmst->CpuSaveState[CpuIndex]; > + CpuSaveState =3D gMmst->CpuSaveState[CpuIndex]; > > // > // Do not write non-writable SaveState, because it will cause exceptio= n. > diff --git a/UefiCpuPkg/Library/MmSaveStateLib/MmSaveStateCommon.c > b/UefiCpuPkg/Library/MmSaveStateLib/MmSaveStateCommon.c > index 09c6c3f96fed..f66245b82c40 100644 > --- a/UefiCpuPkg/Library/MmSaveStateLib/MmSaveStateCommon.c > +++ b/UefiCpuPkg/Library/MmSaveStateLib/MmSaveStateCommon.c > @@ -99,8 +99,8 @@ MmSaveStateReadRegisterByIndex ( > // > // Write return buffer > // > - ASSERT (gSmst->CpuSaveState[CpuIndex] !=3D NULL); > - CopyMem (Buffer, (UINT8 *)gSmst->CpuSaveState[CpuIndex] + > mCpuWidthOffset[RegisterIndex].Offset32, Width); > + ASSERT (gMmst->CpuSaveState[CpuIndex] !=3D NULL); > + CopyMem (Buffer, (UINT8 *)gMmst->CpuSaveState[CpuIndex] + > mCpuWidthOffset[RegisterIndex].Offset32, Width); > } else { > // > // If 64-bit mode width is zero, then the specified register can not= be > accessed > @@ -119,12 +119,12 @@ MmSaveStateReadRegisterByIndex ( > // > // Write lower 32-bits of return buffer > // > - CopyMem (Buffer, (UINT8 *)gSmst->CpuSaveState[CpuIndex] + > mCpuWidthOffset[RegisterIndex].Offset64Lo, MIN (4, Width)); > + CopyMem (Buffer, (UINT8 *)gMmst->CpuSaveState[CpuIndex] + > mCpuWidthOffset[RegisterIndex].Offset64Lo, MIN (4, Width)); > if (Width > 4) { > // > // Write upper 32-bits of return buffer > // > - CopyMem ((UINT8 *)Buffer + 4, (UINT8 *)gSmst- > >CpuSaveState[CpuIndex] + mCpuWidthOffset[RegisterIndex].Offset64Hi, > Width - 4); > + CopyMem ((UINT8 *)Buffer + 4, (UINT8 *)gMmst- > >CpuSaveState[CpuIndex] + mCpuWidthOffset[RegisterIndex].Offset64Hi, > Width - 4); > } > } > > -- > 2.25.1