From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mx.groups.io with SMTP id smtpd.web10.13549.1676032762454970695 for ; Fri, 10 Feb 2023 04:39:22 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=iNYKmv4O; spf=pass (domain: intel.com, ip: 134.134.136.20, mailfrom: ray.ni@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1676032762; x=1707568762; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=nyQaSIJ0SKJB3jDt9Lig9FjiHg+ytubIs/gRKcEyU9s=; b=iNYKmv4OfCemA+QL6cEYavVQEVx9LcXwMXCt9nSjFXhM1YtoRMAqZuzc GURci+JefsFeT2SE+GLFrpp93YmtjiIzJ14L5azMjql5P/5qtjafPaspj x0Nm9SZfwx8cP4Ro8MY8p0b1yp0NPp+MrQYqKGe2MH53Rc4LzshnVMn1a LfqX9AtDXwS93zbJFaVn2OYyG2f8dYygCnggkMm4hh1eBFGROKyaA8Dmf x+RAWf4BdV9cDHCakkNwf1I6mZDMnodNcG+RhlMtpTYRZC8zV++DJmHS/ fAZo/E5MLIKS0GCMbuCsMQ9ncaEu7zwUfBxRrC2BrggS5Honc3dfiqcjF A==; X-IronPort-AV: E=McAfee;i="6500,9779,10616"; a="318425565" X-IronPort-AV: E=Sophos;i="5.97,287,1669104000"; d="scan'208";a="318425565" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Feb 2023 04:39:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10616"; a="776906710" X-IronPort-AV: E=Sophos;i="5.97,287,1669104000"; d="scan'208";a="776906710" Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by fmsmga002.fm.intel.com with ESMTP; 10 Feb 2023 04:39:21 -0800 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) 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.16; Fri, 10 Feb 2023 04:39:20 -0800 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16 via Frontend Transport; Fri, 10 Feb 2023 04:39:20 -0800 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.170) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.16; Fri, 10 Feb 2023 04:39:20 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mDPxwK9VTpPKHU90LfOPBN86v4Or/u4xQcfZujvJtqYMGDHoUTKkOiVSgf02nUrd/lCzVUCVHcCulWU1Lpp5MQGnDOjmPNhQ1cUIJ8FCME1mcTxDWxRnhTb/xYvQAYcahVqxusmvhqUTOQKW03kNnpbdivHDh6FRjmdaLjTdmC99maYkIMSrUbEzyvAU4SXy0+/hZ56Ukewi4nUH1BdmM/8Asc+mEteWzTSLhxxvcsyUcYgzWbXgoX4ipS3HMsnmwAlPUbCCxtP0+uS2BkxUtKu/ogoLjd5XwkDYaJuFbXCt3m+GAGjde+WlJwGZV6mpSAn6ckeOMNTQA8Co0D1NxA== 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=kgbYPmBi5Trhyi8PnLF74Yy/vHB0hM926BnwDfnHd5E=; b=dQMKbyLnu5Pu/uPcy7flIevbVYBvX6uppL/3YhiDzne8z0sa9Cdw8adgAde30NZLuMtOBI/nbJF2uAv+CLoopP8rtUORUWpEZx6T5i+nUnTWLK37bbl6q/dove4Tboz/y1DJrXDSohqaI/1Cyg9a9MMQUIGzI8Si7qjKz+vqzwik2NV1EaH67WZO+yeYY/bf8Hk8o58ZjltSv1iSIMeVoFN+9vo9xsW/k6v/QzunyPBJ4+cl3o9cBhvptb4N7AIP/faYQTlk2NYl0HChSnCVsG0JignpuxNBBNk/E6m57aiRN464wjt/VxGuxu0W2+2IqEcA33bDK6Up9BItLzhH8g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from MN6PR11MB8244.namprd11.prod.outlook.com (2603:10b6:208:470::14) by IA1PR11MB8247.namprd11.prod.outlook.com (2603:10b6:208:449::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.17; Fri, 10 Feb 2023 12:39:18 +0000 Received: from MN6PR11MB8244.namprd11.prod.outlook.com ([fe80::f890:e4ec:e2d8:5831]) by MN6PR11MB8244.namprd11.prod.outlook.com ([fe80::f890:e4ec:e2d8:5831%3]) with mapi id 15.20.6086.017; Fri, 10 Feb 2023 12:39:18 +0000 From: "Ni, Ray" To: "Wu, Jiaxin" , "devel@edk2.groups.io" CC: "Dong, Eric" , "Zeng, Star" , Laszlo Ersek , Gerd Hoffmann , "Kumar, Rahul R" Subject: Re: [PATCH v4 4/5] UefiCpuPkg/SmmCpuFeaturesLib: Skip SMBASE configuration Thread-Topic: [PATCH v4 4/5] UefiCpuPkg/SmmCpuFeaturesLib: Skip SMBASE configuration Thread-Index: AQHZPRXxwG3jQdUpeUiD5lqxpJTpEq7IHzXg Date: Fri, 10 Feb 2023 12:39:18 +0000 Message-ID: References: <20230210060519.11100-1-jiaxin.wu@intel.com> <20230210060519.11100-5-jiaxin.wu@intel.com> In-Reply-To: <20230210060519.11100-5-jiaxin.wu@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: MN6PR11MB8244:EE_|IA1PR11MB8247:EE_ x-ms-office365-filtering-correlation-id: 5341e94a-8a76-43c4-c4ca-08db0b63d3b3 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: zrDa3Fq4MyCij5oeg9TugM2m5MLTm8dU9Sg3Y6iinjnqJA6XZWvUHAgwAQ6ncOFo+slT50UXDa01Oveyn8kZhFcFaNbRRE4yJqWNofvxocMemrOmA7nFMjQqvYI/STS6LcX+5klNx3JJ1NIyLHFMy5ArH4i435h/d2jiMJQ4eI0fFkwjsiW+StBxvnH4zhhGKaNDqBZUxqC++ZVgv5D1sSHe9sVw6s91ygB31yFUy/Hh6Ex6TD98IA1loqQpgNAFir8aY1KLILJXLJ1B6iVtUk3UitFvIRmf5sm3PEz4B4VYJ4DxWs+g4zORE9+L3K2zsL0mqh6kYw6aIs1pwfWhllbr/uL3C4G1jyJji0pvU7c1LvEZbC+ks9fI2XkWqiB6oQgtHDNAghb2+fbhg4vXs4ry5GgDPkCVJht6qmp9oT7sqZbCtGfGiWA7X62qyfLE1Zc6YHAba+8C+yoSqVKlA6mzIKNM5vIpvuvP2KCWR4ryYfz0qR0jjsriMvfeQvJaCPVbO2w4gdIHQ5P3Ty8OjStaMOv3oAaEAC/nlx3yR4LYs8IihpyNkz6sjeqOfC20AeoczvebcWiojf/LmUZtL0T8dweOe83qE9BcdUON/NTNorW2CtRPuf3ove9x7uOAlAg9KCI3fWKA278ybwOxA5IcIVlmS360QXc52qdLwSQH7z4LS0MgI24qzhMpigJSfY5JU2Pdpe5v7vKEqzUZsTmYT72cgxsA12MjHPKpkyA= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MN6PR11MB8244.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(136003)(39860400002)(396003)(366004)(346002)(376002)(451199018)(66476007)(4326008)(66946007)(76116006)(8676002)(316002)(38100700002)(66556008)(122000001)(19627235002)(110136005)(54906003)(86362001)(52536014)(33656002)(478600001)(966005)(6506007)(53546011)(186003)(83380400001)(9686003)(26005)(2906002)(107886003)(38070700005)(82960400001)(71200400001)(5660300002)(66446008)(64756008)(41300700001)(8936002)(55016003)(7696005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?6STXai3jL/PrhUOZ+zyc9TxUQVriSRIEVT+7MwzwujWH+8sJC1F/WMVfNmzR?= =?us-ascii?Q?GjGl7Y3JrdQi18KzCnVZ+ebw9p8cHrXpcXClDdCPl++mpA3vOTmFzimZ5e1y?= =?us-ascii?Q?Y3/7fFEntMFJm/IVw2sYZSFThCAajGPVvEn09s5HetwdV6PKNDzJQxrU2L4M?= =?us-ascii?Q?3gdFrm6763EjRdm79ehLdrdJF1v27vZOzGUU6USMBZmFxbyofqV2XMvzIDt4?= =?us-ascii?Q?ArHoV4BDXF3wJTu8685ee8WvchB0vBS3gGJ89H+1KLBkuDexXJ55yABiqMsP?= =?us-ascii?Q?TPzNDDz11dFFBftrbaKM6/Rq0xQggVTLD02rbBYaJFB+YU3AQjK7MCezXSld?= =?us-ascii?Q?5CPi9Wgc1AzNFnIkJccPFPUKRZ+buGET66Eb+auKSSkgve7umz6/ccMMC07M?= =?us-ascii?Q?gCgLHBPk6AFzPkH6loJjShxLYmpDT64czaphehIbJllOBNDk0DcSiuUGX2+n?= =?us-ascii?Q?/jhxpOS9ZxTxXksmKNDxM6hDTLu7fdvcp5F0mRZ8GtfeXUSFvoJMO2pRmA2m?= =?us-ascii?Q?V0O0no+nD7DT6SkliU1if3ZKpD9UwsrqN+OmMlFRyVOTDm6oSplV20ysTqpG?= =?us-ascii?Q?DGC7pIbMxYD93k5mwsvAyzbIfr8s0zNs4v0O5aQHPQEfrazsGUiaG0Ur1jhq?= =?us-ascii?Q?1GJAaysZLHDRonLM6jMfOJCOgSsE+Y6OT95G6bkNN8FVXovH4SaCvmD35WdA?= =?us-ascii?Q?z4dKejvZJNsvqQfeVZbYhl0lRExmOZ3jwGu1nIw/2hcnPyMABMrx5M8xgBj4?= =?us-ascii?Q?PlUX4sDXW3hWIi2P7p5s3bOD3WRAZTRipwUwVIpVn7igh6zDq6wlyIHXEBrz?= =?us-ascii?Q?4VKLQI21OdYkVu58ukiBrVTnVIOu70nh24p1G0EJ6yQoMO4Bxoja5iw+Eo01?= =?us-ascii?Q?XtTjkg0JvamtRdfRZzZHFmxAxsjCJEUKFVxslTrZh/0BTADRw7vVkZM2S9FZ?= =?us-ascii?Q?sMwbQMO9K+6o/AvTcCMmBbz7RTxxqwQ6cowJn7Dy0rEiGlMKbdM4h0q4bhi7?= =?us-ascii?Q?E9VQ3l9Q9bYpl6jYQ0w0j96JtBOHqkPS2Z3YGYSiv9Zz9Jkl3mPcTuIKUeIM?= =?us-ascii?Q?7gTYWUqISaWtE53jf0gNyygRLfb4OQ2wPgrex4wxzGL66lc91jWa7sKnVath?= =?us-ascii?Q?NhN6gz115f18Okea47G0fceeXH4gFZQTok4R18usLfkPz/5RkCvzhnlkVTs8?= =?us-ascii?Q?xvJjQItrivFxMug2GAVAaqclz1Z6O++GsUxJMHBMqpyBsPl597L1Of+Ve+ED?= =?us-ascii?Q?nLlzrnoi02j21Q4StVyqwRIiBYfIEPxSWEm1KgAN0wpH0Ut8vSIsnmnQP2Qd?= =?us-ascii?Q?qUL/5Ce+s86g4hp45I5vElno4VlrCBIxAGNkTVBfWgIoMfHbSwrHOzwvaXKJ?= =?us-ascii?Q?ZVMGNYvq5a7LD+cLFt69bCgdSJsrAoPrT7pNgGUyECnwNbW0tqQrgGGz65eC?= =?us-ascii?Q?tV7s+ilmFbLm1yWQoq0dcKTM8uFNHuP/EOhH/KnPf2FllRdgYFL3u3QSVd66?= =?us-ascii?Q?B/IYLqsLuzmaYIP94zaCQHW+IgOLLIcmWc5IrkDmLd5GnJZIBNmBs30ZQjcq?= =?us-ascii?Q?tMHMhFlXsUnIu47Py/jdFtn2S2jxVfH9TP+63mSI?= 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: 5341e94a-8a76-43c4-c4ca-08db0b63d3b3 X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Feb 2023 12:39:18.4186 (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: ublj8L635TcXbFBqXh7zf7CSjd2QDr2RR5qdWj5cJ7MsjkXqBDQ5s0fl9jWynMeQhH8V7Dp0y1N3DiLMQ5illQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR11MB8247 Return-Path: ray.ni@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Ray Ni -- but please update the copyright year. > -----Original Message----- > From: Wu, Jiaxin > Sent: Friday, February 10, 2023 2:05 PM > To: devel@edk2.groups.io > Cc: Dong, Eric ; Ni, Ray ; Zeng, S= tar > ; Laszlo Ersek ; Gerd Hoffmann > ; Kumar, Rahul R > Subject: [PATCH v4 4/5] UefiCpuPkg/SmmCpuFeaturesLib: Skip SMBASE > configuration >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4337 >=20 > This patch is to avoid configure SMBASE if SmBase relocation has been > done. If gSmmBaseHobGuid found, means SmBase info has been relocated > and recorded in the SmBase array. No need to do the relocation in > SmmCpuFeaturesInitializeProcessor(). >=20 > Cc: Eric Dong > Cc: Ray Ni > Cc: Zeng Star > Cc: Laszlo Ersek > Cc: Gerd Hoffmann > Cc: Rahul Kumar > Signed-off-by: Jiaxin Wu > --- > .../Library/SmmCpuFeaturesLib/CpuFeaturesLib.h | 2 ++ > .../SmmCpuFeaturesLib/IntelSmmCpuFeaturesLib.c | 23 > +++++++++++++++++++--- > .../SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf | 4 ++++ > .../SmmCpuFeaturesLib/SmmCpuFeaturesLibStm.inf | 1 + > UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.c | 1 - > .../StandaloneMmCpuFeaturesLib.inf | 4 ++++ > 6 files changed, 31 insertions(+), 4 deletions(-) >=20 > diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/CpuFeaturesLib.h > b/UefiCpuPkg/Library/SmmCpuFeaturesLib/CpuFeaturesLib.h > index fd3e902547..c2e4fbe96b 100644 > --- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/CpuFeaturesLib.h > +++ b/UefiCpuPkg/Library/SmmCpuFeaturesLib/CpuFeaturesLib.h > @@ -7,15 +7,17 @@ > **/ >=20 > #ifndef CPU_FEATURES_LIB_H_ > #define CPU_FEATURES_LIB_H_ >=20 > +#include > #include > #include > #include > #include > #include > +#include >=20 > /** > Performs library initialization. >=20 > This initialization function contains common functionality shared betw= en all > diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/IntelSmmCpuFeaturesLib.= c > b/UefiCpuPkg/Library/SmmCpuFeaturesLib/IntelSmmCpuFeaturesLib.c > index d5eaaa7a99..7c3836286b 100644 > --- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/IntelSmmCpuFeaturesLib.c > +++ b/UefiCpuPkg/Library/SmmCpuFeaturesLib/IntelSmmCpuFeaturesLib.c > @@ -36,10 +36,16 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > // Set default value to assume IA-32 Architectural MSRs are used > // > UINT32 mSmrrPhysBaseMsr =3D SMM_FEATURES_LIB_IA32_SMRR_PHYSBASE; > UINT32 mSmrrPhysMaskMsr =3D SMM_FEATURES_LIB_IA32_SMRR_PHYSMASK; >=20 > +// > +// Indicate SmBase for each Processors has been relocated or not. If TRU= E, > +// means no need to do the relocation in SmmCpuFeaturesInitializeProcess= or(). > +// > +BOOLEAN mSmmCpuFeaturesSmmRelocated; > + > // > // Set default value to assume MTRRs need to be configured on each SMI > // > BOOLEAN mNeedConfigureMtrrs =3D TRUE; >=20 > @@ -142,10 +148,16 @@ CpuFeaturesLibInitialization ( > // > // Allocate array for state of SMRR enable on all CPUs > // > mSmrrEnabled =3D (BOOLEAN *)AllocatePool (sizeof (BOOLEAN) * > GetCpuMaxLogicalProcessorNumber ()); > ASSERT (mSmrrEnabled !=3D NULL); > + > + // > + // If gSmmBaseHobGuid found, means SmBase info has been relocated and > recorded > + // in the SmBase array. > + // > + mSmmCpuFeaturesSmmRelocated =3D (BOOLEAN)(GetFirstGuidHob > (&gSmmBaseHobGuid) !=3D NULL); > } >=20 > /** > Called during the very first SMI into System Management Mode to initia= lize > CPU features, including SMBASE, for the currently executing CPU. Sinc= e this > @@ -185,14 +197,19 @@ SmmCpuFeaturesInitializeProcessor ( > UINT32 RegEdx; > UINTN FamilyId; > UINTN ModelId; >=20 > // > - // Configure SMBASE. > + // No need to configure SMBASE if SmBase relocation has been done. > // > - CpuState =3D (SMRAM_SAVE_STATE_MAP > *)(UINTN)(SMM_DEFAULT_SMBASE + SMRAM_SAVE_STATE_MAP_OFFSET); > - CpuState->x86.SMBASE =3D (UINT32)CpuHotPlugData->SmBase[CpuIndex]; > + if (!mSmmCpuFeaturesSmmRelocated) { > + // > + // Configure SMBASE. > + // > + CpuState =3D (SMRAM_SAVE_STATE_MAP > *)(UINTN)(SMM_DEFAULT_SMBASE + SMRAM_SAVE_STATE_MAP_OFFSET); > + CpuState->x86.SMBASE =3D (UINT32)CpuHotPlugData->SmBase[CpuIndex]; > + } >=20 > // > // Intel(R) 64 and IA-32 Architectures Software Developer's Manual > // Volume 3C, Section 35.2 MSRs in the Intel(R) Core(TM) 2 Processor F= amily > // > diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf > b/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf > index 9ac7dde78f..280a4b8b39 100644 > --- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf > +++ b/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf > @@ -31,10 +31,14 @@ > [LibraryClasses] > BaseLib > PcdLib > MemoryAllocationLib > DebugLib > + HobLib > + > +[Guids] > + gSmmBaseHobGuid ## CONSUMES >=20 > [Pcd] > gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber ## > SOMETIMES_CONSUMES >=20 > [FeaturePcd] > diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLibStm.in= f > b/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLibStm.inf > index 86d367e0a0..4bb045244b 100644 > --- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLibStm.inf > +++ b/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLibStm.inf > @@ -62,10 +62,11 @@ >=20 > [Guids] > gMsegSmramGuid ## SOMETIMES_CONSUMES ## HOB > gEfiAcpi20TableGuid ## SOMETIMES_CONSUMES ## Syst= emTable > gEfiAcpi10TableGuid ## SOMETIMES_CONSUMES ## Syst= emTable > + gSmmBaseHobGuid ## CONSUMES >=20 > [Pcd] > gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber ## > SOMETIMES_CONSUMES > gUefiCpuPkgTokenSpaceGuid.PcdCpuMsegSize ## > SOMETIMES_CONSUMES > gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStmExceptionStackSize ## > SOMETIMES_CONSUMES > diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.c > b/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.c > index 3cf162ada0..455fe83991 100644 > --- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.c > +++ b/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.c > @@ -6,11 +6,10 @@ >=20 > **/ >=20 > #include > #include > -#include > #include > #include > #include > #include > #include > diff --git > a/UefiCpuPkg/Library/SmmCpuFeaturesLib/StandaloneMmCpuFeaturesLib.inf > b/UefiCpuPkg/Library/SmmCpuFeaturesLib/StandaloneMmCpuFeaturesLib.inf > index b1f60a5505..63259e44e7 100644 > --- > a/UefiCpuPkg/Library/SmmCpuFeaturesLib/StandaloneMmCpuFeaturesLib.inf > +++ > b/UefiCpuPkg/Library/SmmCpuFeaturesLib/StandaloneMmCpuFeaturesLib.inf > @@ -32,10 +32,14 @@ > [LibraryClasses] > BaseLib > DebugLib > MemoryAllocationLib > PcdLib > + HobLib > + > +[Guids] > + gSmmBaseHobGuid ## CONSUMES >=20 > [FixedPcd] > gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber ## > SOMETIMES_CONSUMES >=20 > [FeaturePcd] > -- > 2.16.2.windows.1