From nobody Sun Feb 8 14:52:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+45129+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+45129+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1565244909; cv=none; d=zoho.com; s=zohoarc; b=Pwr5nuH4MvvUdvO5lF12pwsV8EVG1BNM84P1kf7m7z+y5LTqoDVY8TqfVy9qGiKdhDizUL92OAc1fxn4QjK+IzvUIu5EwMqX40G2N1pOX6ZOxjTP9h5UB2xwKREr7Nu0XgRFXEvGkJF7rdHEi6qHb3Ao+rNxIuRodfyl6Lty38Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565244909; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=WmkEsArhQ19+Tfu8ffjELveKQFazPKGoS23k9j6A4zU=; b=k6QycS4aEfLCz/vBsfs+mIn7M4k+ODHoy2jZuwN6VINH4lN6i1DZi8/HCI9dhn+8SaoYF/+nJqv4mm1HSTJjXcGpX+59vNlled09V0XcxiHgDQ7ga0Bd7nEoubvXuFG4pdMt+z3MYdsUAXFI2smYD27qOKi0agt3P6UsSaWbZtk= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+45129+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1565244909411946.79829589442; Wed, 7 Aug 2019 23:15:09 -0700 (PDT) Return-Path: X-Received: from mga14.intel.com (mga14.intel.com []) by groups.io with SMTP; Wed, 07 Aug 2019 23:15:06 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Aug 2019 23:15:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,360,1559545200"; d="scan'208";a="198921398" X-Received: from ydong10-win10.ccr.corp.intel.com ([10.239.158.133]) by fmsmga004.fm.intel.com with ESMTP; 07 Aug 2019 23:15:05 -0700 From: "Dong, Eric" To: devel@edk2.groups.io Cc: "Ni, Ray" , Laszlo Ersek Subject: [edk2-devel] [Patch v5 9/9] UefiCpuPkg: Update code to include register definitions from MdePkg Date: Thu, 8 Aug 2019 14:14:48 +0800 Message-Id: <20190808061448.14684-10-eric.dong@intel.com> In-Reply-To: <20190808061448.14684-1-eric.dong@intel.com> References: <20190808061448.14684-1-eric.dong@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,eric.dong@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1565244908; bh=zzjWi6UBCIVO/DsO/eUXJ3LQwQym7VvyyC3s7eR3cxw=; h=Cc:Date:From:Reply-To:Subject:To; b=vPLUMkVbSTqGpeiDehcbIOOdG6L8qEIfDkEWTsKYWzUd9AASuK1aSxNp5dz4T0EsRdp m+3BIQo9qDrm8hBPZg1OnN34BNea20VQuWb4hOZswN9+exgfwWRDX6FqdUUxt4PEJlChQ BGemV6ZPN9+HjFG/8kBCJS+aONSgoO+Nv68= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: "Ni, Ray" Signed-off-by: Ray Ni Reviewed-by: Eric Dong Regression-tested-by: Laszlo Ersek Signed-off-by: Eric Dong --- UefiCpuPkg/Application/Cpuid/Cpuid.c | 2 +- UefiCpuPkg/CpuDxe/CpuDxe.h | 4 ++-- UefiCpuPkg/CpuDxe/CpuPageTable.c | 4 ++-- UefiCpuPkg/CpuMpPei/CpuPaging.c | 6 +++--- UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h | 2 +- UefiCpuPkg/Include/Library/SmmCpuFeaturesLib.h | 2 +- UefiCpuPkg/Include/Protocol/SmMonitorInit.h | 4 ++-- UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c | 6 +++--- .../Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c | 6 +++--- .../Library/CpuCommonFeaturesLib/CpuCommonFeatures.h | 6 +++--- UefiCpuPkg/Library/MpInitLib/MpLib.h | 8 ++++---- UefiCpuPkg/Library/MtrrLib/MtrrLib.c | 4 ++-- UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c | 6 +++--- UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.c | 6 +++--- UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h | 4 ++-- UefiCpuPkg/PiSmmCpuDxeSmm/SmramSaveState.c | 2 -- 16 files changed, 35 insertions(+), 37 deletions(-) diff --git a/UefiCpuPkg/Application/Cpuid/Cpuid.c b/UefiCpuPkg/Application/= Cpuid/Cpuid.c index 2f907034e6..7a994eba9a 100644 --- a/UefiCpuPkg/Application/Cpuid/Cpuid.c +++ b/UefiCpuPkg/Application/Cpuid/Cpuid.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include =20 /// /// Macro used to display the value of a bit field in a register returned = by CPUID. diff --git a/UefiCpuPkg/CpuDxe/CpuDxe.h b/UefiCpuPkg/CpuDxe/CpuDxe.h index b029be430b..a6762f1a0b 100644 --- a/UefiCpuPkg/CpuDxe/CpuDxe.h +++ b/UefiCpuPkg/CpuDxe/CpuDxe.h @@ -1,7 +1,7 @@ /** @file CPU DXE Module to produce CPU ARCH Protocol and CPU MP Protocol. =20 - Copyright (c) 2008 - 2017, Intel Corporation. All rights reserved.
+ Copyright (c) 2008 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -13,7 +13,7 @@ =20 #include #include -#include +#include =20 #include #include diff --git a/UefiCpuPkg/CpuDxe/CpuPageTable.c b/UefiCpuPkg/CpuDxe/CpuPageTa= ble.c index 36ce90d66c..ec5cd424fc 100644 --- a/UefiCpuPkg/CpuDxe/CpuPageTable.c +++ b/UefiCpuPkg/CpuDxe/CpuPageTable.c @@ -15,8 +15,8 @@ #include #include #include -#include -#include +#include +#include =20 #include "CpuDxe.h" #include "CpuPageTable.h" diff --git a/UefiCpuPkg/CpuMpPei/CpuPaging.c b/UefiCpuPkg/CpuMpPei/CpuPagin= g.c index 57a75539ee..a462e7ee1e 100644 --- a/UefiCpuPkg/CpuMpPei/CpuPaging.c +++ b/UefiCpuPkg/CpuMpPei/CpuPaging.c @@ -1,14 +1,14 @@ /** @file Basic paging support for the CPU to enable Stack Guard. =20 -Copyright (c) 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2018 - 2019, Intel Corporation. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 -#include -#include +#include +#include #include #include #include diff --git a/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h b/UefiCpuP= kg/Include/Library/RegisterCpuFeaturesLib.h index 191348d770..e420e7f075 100644 --- a/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h +++ b/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h @@ -10,7 +10,7 @@ #define __REGISTER_CPU_FEATURES_LIB_H__ =20 #include -#include +#include #include =20 /// diff --git a/UefiCpuPkg/Include/Library/SmmCpuFeaturesLib.h b/UefiCpuPkg/In= clude/Library/SmmCpuFeaturesLib.h index e6c5679e13..39ca304b31 100644 --- a/UefiCpuPkg/Include/Library/SmmCpuFeaturesLib.h +++ b/UefiCpuPkg/Include/Library/SmmCpuFeaturesLib.h @@ -11,7 +11,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =20 #include #include -#include +#include #include =20 /// diff --git a/UefiCpuPkg/Include/Protocol/SmMonitorInit.h b/UefiCpuPkg/Inclu= de/Protocol/SmMonitorInit.h index fa57cb18a5..db2ce11f1e 100644 --- a/UefiCpuPkg/Include/Protocol/SmMonitorInit.h +++ b/UefiCpuPkg/Include/Protocol/SmMonitorInit.h @@ -1,7 +1,7 @@ /** @file STM service protocol definition =20 - Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2015 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -10,7 +10,7 @@ #define _SM_MONITOR_INIT_PROTOCOL_H_ =20 #include -#include +#include =20 #define EFI_SM_MONITOR_INIT_PROTOCOL_GUID \ { 0x228f344d, 0xb3de, 0x43bb, 0xa4, 0xd7, 0xea, 0x20, 0xb, 0x1b, 0x14,= 0x82} diff --git a/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c b/UefiCpuPkg/Li= brary/BaseXApicLib/BaseXApicLib.c index 89f4f6550f..33ea15ca29 100644 --- a/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c +++ b/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c @@ -10,10 +10,10 @@ =20 **/ =20 -#include +#include #include -#include -#include +#include +#include =20 #include #include diff --git a/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c b/U= efiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c index 89eeb3a955..d0f92b33dc 100644 --- a/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c +++ b/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c @@ -11,10 +11,10 @@ =20 **/ =20 -#include +#include #include -#include -#include +#include +#include =20 #include #include diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeatures.h b/= UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeatures.h index 8406c6c161..25d0174727 100644 --- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeatures.h +++ b/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeatures.h @@ -1,7 +1,7 @@ /** @file CPU Common features library header file. =20 - Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.
+ Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -19,8 +19,8 @@ #include #include =20 -#include -#include +#include +#include =20 /** Prepares for the data used by CPU feature detection and initialization. diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.h b/UefiCpuPkg/Library/MpIn= itLib/MpLib.h index 4b12f91d47..107872b367 100644 --- a/UefiCpuPkg/Library/MpInitLib/MpLib.h +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.h @@ -11,10 +11,10 @@ =20 #include =20 -#include -#include -#include -#include +#include +#include +#include +#include =20 #include #include diff --git a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c b/UefiCpuPkg/Library/Mtrr= Lib/MtrrLib.c index 9415897b48..dfa848022b 100644 --- a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c +++ b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c @@ -11,8 +11,8 @@ **/ =20 #include -#include -#include +#include +#include =20 #include #include diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c b/Uef= iCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c index 0e7fd80488..bddb7a219c 100644 --- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c +++ b/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c @@ -1,7 +1,7 @@ /** @file The CPU specific programming for PiSmmCpuDxeSmm module. =20 -Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -13,8 +13,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include #include #include -#include -#include +#include +#include =20 // // Machine Specific Registers (MSRs) diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.c b/UefiCpuPkg/Lib= rary/SmmCpuFeaturesLib/SmmStm.c index 82c63da002..52a376c27d 100644 --- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.c +++ b/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.c @@ -15,9 +15,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include =20 #include =20 diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h b/UefiCpuPkg/PiSmmC= puDxeSmm/PiSmmCpuDxeSmm.h index 186809f431..92f0db351c 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h @@ -53,8 +53,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include #include =20 -#include -#include +#include +#include =20 #include "CpuService.h" #include "SmmProfile.h" diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmramSaveState.c b/UefiCpuPkg/PiSmmC= puDxeSmm/SmramSaveState.c index 11102c9cbf..b1a492725a 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmramSaveState.c +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmramSaveState.c @@ -14,8 +14,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include #include #include -#include -#include =20 #include "PiSmmCpuDxeSmm.h" =20 --=20 2.21.0.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 (#45129): https://edk2.groups.io/g/devel/message/45129 Mute This Topic: https://groups.io/mt/32796012/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-