From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web11.10899.1676281136059635994 for ; Mon, 13 Feb 2023 01:38:56 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=Zdr1MhWU; spf=pass (domain: intel.com, ip: 192.55.52.151, 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=1676281136; x=1707817136; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=cMJNTJC1uzbyNlWOj1wBuiOEA5bKa5S/qAJf4wAhEKA=; b=Zdr1MhWUXoa4ft9nCpnoW/CFKYrsXpOmZyD1uPblV33N0pQWoxGTYRpb dnbtYp0830Ewq8uRdX3GYSb4aVsp17o7Tc2ABh6qaG3tP2xH9SBQHHa/U TrLVpdrA6COwxiIwTZOLIAKgI6WEgUSPYneC+VT8Lr89bGx3HnUy2mlSD Gr3OWqNOOciHKFUKarJl8ddgoleI/cwDCgRZabcwXi0IdjvqrLQfrN9ZE NObxy9sG1IUza52mUpZ3pdKVEe8HfHv+Nf15aw1GbiaFZHpFwdW2EfnZw pEt4wleMNoZ70pUh+pebH59SrrxcyYSF3zWag7pKew23qlOyb+/TbLkcm A==; X-IronPort-AV: E=McAfee;i="6500,9779,10619"; a="311214783" X-IronPort-AV: E=Sophos;i="5.97,293,1669104000"; d="scan'208";a="311214783" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Feb 2023 01:38:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10619"; a="662117187" X-IronPort-AV: E=Sophos;i="5.97,293,1669104000"; d="scan'208";a="662117187" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by orsmga007.jf.intel.com with ESMTP; 13 Feb 2023 01:38:49 -0800 Received: from orsmsx603.amr.corp.intel.com (10.22.229.16) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Mon, 13 Feb 2023 01:38:47 -0800 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16 via Frontend Transport; Mon, 13 Feb 2023 01:38:47 -0800 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.101) 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.16; Mon, 13 Feb 2023 01:38:46 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KKDk/7bVG7nYacfE5LA9TtTZgJs47BbZbeFvW2pO2x9ZGYqIaQMVOqokcq//GE00B+LU2xUZ0B/dvlt4YNo+q1MNfBCwXfP8pUdINfUVfyR8VP4vnrdlC8TUMV6UxBAu+zw+RnsydmuKQYSQtK4dqKn1y/8HFwiqdjFQAvU+Ur6lQAWVcKVaJptji794MnqWdcwIthRW44PdLB85190uJoZ1ydpmDsgXN3ZtGjtg5YWxiNjEcRXrg86g/0lSYUy2tiPfonET6z80EFGYxECWjXZdHefyi5AU30C3GZnhtgKLU/1QTAe2V1JCu0ZApMvc018WVjXmyO7q8SdeWsQy/A== 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=5xb/1uRS5NQSOKQqhkT5V6YXJTsRybre8k/O2hlaF24=; b=Fl/41/Ac1AhpCjz56Ea1n0OXDI5TU4/g+39vqmlObKcsi108tEeESN8AIphFQXmtMGB5HG4bNyWpaVGi4FBvSq8zDU8yV57/E70SzuZnZAjur4jneE78r2jjIAhyhbzlNuWydaJKqPKxr9zUYf0Alf3E1hUrNcE/jEPPwThqyaO8lza1QM8LnaitODpyaEIjkCRukWlrmK3K7SuOYV/4DU7rGWcMEG/pLMkO/g0ocGwhdTuF9YYzX4fVhMSMe5euBcw2nnLx3C1mCa2VmQwsQWKtFr+bNfYL+l1t8exE1wVm14hoYug21dMOVgaiEcE4QLy1ZrD5jn/ojasnNiQsMQ== 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 CY5PR11MB6390.namprd11.prod.outlook.com (2603:10b6:930:39::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.24; Mon, 13 Feb 2023 09:38:44 +0000 Received: from MN6PR11MB8244.namprd11.prod.outlook.com ([fe80::f890:e4ec:e2d8:5831]) by MN6PR11MB8244.namprd11.prod.outlook.com ([fe80::f890:e4ec:e2d8:5831%4]) with mapi id 15.20.6086.024; Mon, 13 Feb 2023 09:38:44 +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 v6 5/6] UefiCpuPkg/SmmCpuFeaturesLib: Skip SMBASE configuration Thread-Topic: [PATCH v6 5/6] UefiCpuPkg/SmmCpuFeaturesLib: Skip SMBASE configuration Thread-Index: AQHZP4dsssbL23CqjkeMms+PXyHUlq7Mnshw Date: Mon, 13 Feb 2023 09:38:44 +0000 Message-ID: References: <20230213084417.9232-1-jiaxin.wu@intel.com> <20230213084417.9232-6-jiaxin.wu@intel.com> In-Reply-To: <20230213084417.9232-6-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_|CY5PR11MB6390:EE_ x-ms-office365-filtering-correlation-id: 31142478-afe3-4442-1b50-08db0da61988 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: E1Vs78xVLZa4e8fMWPThYBVEz9Uk2MLSxBbRxp3QKYGCknv3t6cWxwgwkU1i1ALbzSwNZhxYVDiyscKZNhApHhz7yEDUEKjQKGC23c8eNz/LyIek2Z9qCIrqwxmcHf/SvkEhCpa2pMoJraK+JccMl3wEMRsIzTGP6n6bn902jyePpV4aRs8lhaCOl7EnkHeB4ck1+Tx9sL5hqwKIGrsaMFEArBif+MdCDY+mM8XoWrn3/HWxZ8BcOzBg90NMoJciwL5umAK0XMJF6l/jEBpOdNkTVleqj42L48P71H5ymV3ocrDzhopT8uXnOQn7u95qiLaKP4oKs1ZVqL/24YAoy4B+9wGGtPfv5cEtPRq9sYhDwaRp8VC00Pm9n//hponEdFqvzujaVj/KCw9QNVwt8nH/A6FoXToFz1mu/aquYU+5zYn3ZIbVKXyxdWnAklKHiXqbCJ+dHK2USGyEal1HuPGnD9ETFtYzwT7pRJvHiluSeHCqFmrAQYAD9VDeJlM+qNxxgYzqmV2CztLiTCp35Sg6b3fiB66Y4k2Dk1kVKMN4rJY7/IbeTqps670w6o7BlPP2Kh+07yKZm0sduGcZTRzADh9o17+h/vBRputrRzeJlsdLte6YM2MsP/5mc4tq7B8QVDHDgF30FxqKv4Ag0+9+LGk0UZHHZcq7lzGWfBQYdKYC8AYN3kvKSuxHw7O/KG0vsWp9I0Nv8A4Fl2gIwYD69vorCwyYO7bUF4r53d0= 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)(376002)(396003)(346002)(366004)(136003)(39860400002)(451199018)(2906002)(5660300002)(83380400001)(55016003)(26005)(186003)(38070700005)(9686003)(122000001)(82960400001)(66946007)(38100700002)(76116006)(4326008)(8676002)(64756008)(19627235002)(54906003)(316002)(66446008)(66556008)(8936002)(66476007)(33656002)(41300700001)(478600001)(107886003)(53546011)(45080400002)(86362001)(52536014)(6506007)(110136005)(71200400001)(7696005)(966005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?EpSb6KLiHIlwY5ElNKBs9n566QAGaA5ZBbz+3hA5jigOfJJoHUdzpj/OpqYP?= =?us-ascii?Q?m5NFG/gmyN0SgkLecBOrentuksg6ukhgS/5fTahMA0eiS5voeu3/xTww5GQa?= =?us-ascii?Q?IVEQ0WrJ2FROZ8tWTVai6Ggac3aUFpEW8wsH7qTkr+djEwIv2g7p/LeSIfl4?= =?us-ascii?Q?Fu7cM4xiYbni5KBo/2jK5aco5DWV6lWVvEES+8WYx7nUQi3J8mRoRCfm5YhA?= =?us-ascii?Q?Ib2kqPOTRA+zWv0pUADUfiFKh0+Jsa1DnftPouSB+9UaAyxb0yBrbd4H+wID?= =?us-ascii?Q?k859nTt7dQ7VsM3swMskMFxUfxEH1PoWMsehNyMpgQ07dsIXOI65B1RPOaAj?= =?us-ascii?Q?PdanWWf9Ur5uBPgWa1dZQupI4FJ5L0L+Kq6pggML8zuHK7ahhzMT9FcDY0bw?= =?us-ascii?Q?v8mh/p5vW8SMK1BlKtrNMasdwKPJ+wPJD/YzuGKDmJKX/b50PZePGA65n/s9?= =?us-ascii?Q?sX9IIVGd6ZiMt9XAS3grOhYccZoSFi7Uy4+fjIDLdbbEz6ryoj46s10M4Az0?= =?us-ascii?Q?cyEuh/UVcIS4Q29nhDSjJB3d0Ccmo6vR0pNiRJha/VVGwTIK4uxw69zRAZxK?= =?us-ascii?Q?DEQZDi3ks/M4dUbWStnB3NQy4vELJRJA9gqJHQb/cHcEKNviSO7kRxK8ZxYo?= =?us-ascii?Q?mtO6vfWdvGZOdaqNh8FrqYz8CNWGq2wky3oQLiH1fO1iyT9NELkaUCF2e08I?= =?us-ascii?Q?6OQIWsU4EPi65Y3psxduvngpKzv5XtUAcfN4eyRlBsoQkiSEXRcOphMOX+pR?= =?us-ascii?Q?SGG3wbMozOmllZEs7saLAaBK1jV08JyPM6sa8NNAAejr3Uc6lij8Hg9rXdUX?= =?us-ascii?Q?7HUbR1IyIGECLfsFPU3+qSkmOU9Xxr6+/pyDuBKJXsxIJ4vQcW6GCkXtlVH7?= =?us-ascii?Q?FWWFeJZtqZPZwXcPQvx8tkj3vSbjD7pJyaQwh7LnlP4kgHuawCEsOpuv7OWN?= =?us-ascii?Q?ONorL0gly4B2YIyb+uImr6nH+f+IIOktaDp6utcUhF7Kny2eFvhjWIns2lpI?= =?us-ascii?Q?sWxp2doUzOn+Upt+eLEjQ5V6yxKiXVSf4QYJHN18KTRcrid7kc5yp5QElk3z?= =?us-ascii?Q?UnjBdAgEXeBzkmA1OFH81qaL2Y+KoPJjTFw7/f9Dnp2N8oubUNcwznGAC8zS?= =?us-ascii?Q?KAFyHHIuZgQxBoGSt0ngEVYP5dk6IFW0wQr7u3MjmPppE+8SxBV5YKgmD/53?= =?us-ascii?Q?bKFlHQqRsK/Y/IPErfC0I1HRrhLDA3uFFmMzIJGugHzMT8urAwyaPa5MXw9x?= =?us-ascii?Q?lTtAwv/umK4Q/R8HNOipywY4/HDoo4waXQA5lmcqEOVJFvM1W2cAK+3E7UQe?= =?us-ascii?Q?fOVGd5yW4gdbTUUal5wBMB2zE87Qw64LWWJot3AXb0ldKyVpFqfTdvqGzWZR?= =?us-ascii?Q?t5Ol7BfSW5UPKbGBl2yrX/aIe58CWIwfo7IlGRDTztwpHwqTbe3ZMlXeEWr0?= =?us-ascii?Q?8zs+qWYT27uBI4JQqmixCCBUbDnujLKkzPanOTNNL/bG5BpBxreTcBUYaJ1o?= =?us-ascii?Q?YhnQO6EYwNziBUJKX+EAJLpa4m1oVVj5EprV2otxCC/v1M1CgYhD/cekeveI?= =?us-ascii?Q?EcZIMPTVsoaKcZV+MrLduxLaKE64d02jh9wolFIw?= 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: 31142478-afe3-4442-1b50-08db0da61988 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Feb 2023 09:38:44.6827 (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: bIfs4kjh/rxsow/1K0fBEmnr1WCwiVgCepyjYH62U2mEMcdzjqQU+lRHeG8heHDjZqLcAVXXmEgxWyiabCVBgw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR11MB6390 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 I remember I already provided the R-B. Reviewed-by: Ray Ni > -----Original Message----- > From: Wu, Jiaxin > Sent: Monday, February 13, 2023 4:44 PM > To: devel@edk2.groups.io > Cc: Dong, Eric ; Ni, Ray ; Zeng, S= tar > ; Laszlo Ersek ; Gerd Hoffmann > ; Kumar, Rahul R > Subject: [PATCH v6 5/6] 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 | 25 > ++++++++++++++++++---- > .../SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf | 6 +++++- > .../SmmCpuFeaturesLib/SmmCpuFeaturesLibStm.inf | 3 ++- > UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.c | 3 +-- > .../StandaloneMmCpuFeaturesLib.inf | 6 +++++- > 6 files changed, 36 insertions(+), 9 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..1a2c706fa1 100644 > --- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/IntelSmmCpuFeaturesLib.c > +++ b/UefiCpuPkg/Library/SmmCpuFeaturesLib/IntelSmmCpuFeaturesLib.c > @@ -1,9 +1,9 @@ > /** @file > Implementation shared across all library instances. >=20 > -Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.
> +Copyright (c) 2010 - 2023, Intel Corporation. All rights reserved.
> Copyright (c) Microsoft Corporation.
> SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > **/ >=20 > @@ -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 > SmmCpuFeaturesInitializeProcessor(). > +// > +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 > Family > // > diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf > b/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf > index 9ac7dde78f..46ae2bf85e 100644 > --- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf > +++ b/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf > @@ -1,9 +1,9 @@ > ## @file > # The CPU specific programming for PiSmmCpuDxeSmm module. > # > -# Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved. > +# Copyright (c) 2009 - 2023, Intel Corporation. All rights reserved. > # SPDX-License-Identifier: BSD-2-Clause-Patent > # > ## >=20 > [Defines] > @@ -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.inf > b/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLibStm.inf > index 86d367e0a0..51322ff189 100644 > --- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLibStm.inf > +++ b/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLibStm.inf > @@ -1,10 +1,10 @@ > ## @file > # The CPU specific programming for PiSmmCpuDxeSmm module when STM > support > # is included. > # > -# Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved. > +# Copyright (c) 2009 - 2023, Intel Corporation. All rights reserved. > # SPDX-License-Identifier: BSD-2-Clause-Patent > # > ## >=20 > [Defines] > @@ -62,10 +62,11 @@ >=20 > [Guids] > gMsegSmramGuid ## SOMETIMES_CONSUMES ## HOB > gEfiAcpi20TableGuid ## SOMETIMES_CONSUMES ## > SystemTable > gEfiAcpi10TableGuid ## SOMETIMES_CONSUMES ## > SystemTable > + 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..6cb1c515c0 100644 > --- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.c > +++ b/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.c > @@ -1,16 +1,15 @@ > /** @file > SMM STM support functions >=20 > - Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.
> + Copyright (c) 2015 - 2023, Intel Corporation. All rights reserved.
> SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > **/ >=20 > #include > #include > -#include > #include > #include > #include > #include > #include > diff --git > a/UefiCpuPkg/Library/SmmCpuFeaturesLib/StandaloneMmCpuFeaturesLib.i > nf > b/UefiCpuPkg/Library/SmmCpuFeaturesLib/StandaloneMmCpuFeaturesLib.i > nf > index b1f60a5505..c836939d33 100644 > --- > a/UefiCpuPkg/Library/SmmCpuFeaturesLib/StandaloneMmCpuFeaturesLib.i > nf > +++ > b/UefiCpuPkg/Library/SmmCpuFeaturesLib/StandaloneMmCpuFeaturesLib.i > nf > @@ -1,9 +1,9 @@ > ## @file > # Standalone MM CPU specific programming. > # > -# Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved. > +# Copyright (c) 2009 - 2023, Intel Corporation. All rights reserved. > # Copyright (c) Microsoft Corporation.
> # SPDX-License-Identifier: BSD-2-Clause-Patent > # > ## >=20 > @@ -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