From mboxrd@z Thu Jan  1 00:00:00 1970
Authentication-Results: mx.groups.io;
 dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.65, mailfrom: eric.dong@intel.com)
Received: from mga03.intel.com (mga03.intel.com [134.134.136.65])
 by groups.io with SMTP; Thu, 01 Aug 2019 19:30:11 -0700
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from orsmga005.jf.intel.com ([10.7.209.41])
  by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Aug 2019 19:30:10 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.64,336,1559545200"; 
   d="scan'208";a="348287363"
Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201])
  by orsmga005.jf.intel.com with ESMTP; 01 Aug 2019 19:30:09 -0700
Received: from fmsmsx111.amr.corp.intel.com (10.18.116.5) by
 FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS)
 id 14.3.439.0; Thu, 1 Aug 2019 19:29:39 -0700
Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by
 fmsmsx111.amr.corp.intel.com (10.18.116.5) with Microsoft SMTP Server (TLS)
 id 14.3.439.0; Thu, 1 Aug 2019 19:29:37 -0700
Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.19]) by
 SHSMSX152.ccr.corp.intel.com ([169.254.6.62]) with mapi id 14.03.0439.000;
 Fri, 2 Aug 2019 10:29:35 +0800
From: "Dong, Eric" <eric.dong@intel.com>
To: "Ni, Ray" <ray.ni@intel.com>, "devel@edk2.groups.io"
	<devel@edk2.groups.io>
CC: Laszlo Ersek <lersek@redhat.com>
Subject: Re: [PATCH v4 8/8] UefiCpuPkg: Update code to include register definitions from MdePkg
Thread-Topic: [PATCH v4 8/8] UefiCpuPkg: Update code to include register
 definitions from MdePkg
Thread-Index: AQHVSE/R+PqFlfK5YUyMuHeQelYTK6bnIumA
Date: Fri, 2 Aug 2019 02:29:35 +0000
Message-ID: <ED077930C258884BBCB450DB737E662259EBA517@shsmsx102.ccr.corp.intel.com>
References: <20190801095831.274356-1-ray.ni@intel.com>
 <20190801095831.274356-9-ray.ni@intel.com>
In-Reply-To: <20190801095831.274356-9-ray.ni@intel.com>
Accept-Language: en-US
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
x-originating-ip: [10.239.127.40]
MIME-Version: 1.0
Return-Path: eric.dong@intel.com
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable

Ray,

I found you miss to update copyright time for SmmStm.c file.

With fix for this file, Reviewed-by: Eric Dong <eric.dong@intel.com>

Thanks,
Eric

> -----Original Message-----
> From: Ni, Ray
> Sent: Thursday, August 1, 2019 5:59 PM
> To: devel@edk2.groups.io
> Cc: Dong, Eric <eric.dong@intel.com>; Laszlo Ersek <lersek@redhat.com>
> Subject: [PATCH v4 8/8] UefiCpuPkg: Update code to include register
> definitions from MdePkg
>=20
> Signed-off-by: Ray Ni <ray.ni@intel.com>
> Cc: Eric Dong <eric.dong@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> ---
>  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(-)
>=20
> 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 <Uefi.h>
>  #include <Library/BaseLib.h>
>  #include <Library/UefiLib.h>
> -#include <Register/Cpuid.h>
> +#include <Register/Intel/Cpuid.h>
>=20
>  ///
>  /// Macro used to display the value of a bit field in a register returne=
d 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.<BR>
> +  Copyright (c) 2008 - 2019, Intel Corporation. All rights
> + reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
> @@ -13,7 +13,7 @@
>=20
>  #include <Protocol/Cpu.h>
>  #include <Protocol/MpService.h>
> -#include <Register/Msr.h>
> +#include <Register/Intel/Msr.h>
>=20
>  #include <Ppi/SecPlatformInformation.h>  #include
> <Ppi/SecPlatformInformation2.h> diff --git
> a/UefiCpuPkg/CpuDxe/CpuPageTable.c
> b/UefiCpuPkg/CpuDxe/CpuPageTable.c
> index 36ce90d66c..ec5cd424fc 100644
> --- a/UefiCpuPkg/CpuDxe/CpuPageTable.c
> +++ b/UefiCpuPkg/CpuDxe/CpuPageTable.c
> @@ -15,8 +15,8 @@
>  #include <Library/SynchronizationLib.h>  #include <Library/PrintLib.h>
> #include <Protocol/SmmBase2.h> -#include <Register/Cpuid.h> -#include
> <Register/Msr.h>
> +#include <Register/Intel/Cpuid.h>
> +#include <Register/Intel/Msr.h>
>=20
>  #include "CpuDxe.h"
>  #include "CpuPageTable.h"
> diff --git a/UefiCpuPkg/CpuMpPei/CpuPaging.c
> b/UefiCpuPkg/CpuMpPei/CpuPaging.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.<BR>
> +Copyright (c) 2018 - 2019, Intel Corporation. All rights reserved.<BR>
>=20
>  SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> -#include <Register/Cpuid.h>
> -#include <Register/Msr.h>
> +#include <Register/Intel/Cpuid.h>
> +#include <Register/Intel/Msr.h>
>  #include <Library/MemoryAllocationLib.h>  #include <Library/CpuLib.h>
> #include <Library/BaseLib.h> diff --git
> a/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h
> b/UefiCpuPkg/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 <AcpiCpuData.h>
> -#include <Register/Cpuid.h>
> +#include <Register/Intel/Cpuid.h>
>  #include <Protocol/MpService.h>
>=20
>  ///
> diff --git a/UefiCpuPkg/Include/Library/SmmCpuFeaturesLib.h
> b/UefiCpuPkg/Include/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 <Protocol/MpService.h>
>  #include <Protocol/SmmCpu.h>
> -#include <Register/SmramSaveStateMap.h>
> +#include <Register/Intel/SmramSaveStateMap.h>
>  #include <CpuHotPlugData.h>
>=20
>  ///
> diff --git a/UefiCpuPkg/Include/Protocol/SmMonitorInit.h
> b/UefiCpuPkg/Include/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.<BR>
> +  Copyright (c) 2015 - 2019, Intel Corporation. All rights
> + reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
> @@ -10,7 +10,7 @@
>  #define _SM_MONITOR_INIT_PROTOCOL_H_
>=20
>  #include <PiSmm.h>
> -#include <Register/StmApi.h>
> +#include <Register/Intel/StmApi.h>
>=20
>  #define EFI_SM_MONITOR_INIT_PROTOCOL_GUID \
>      { 0x228f344d, 0xb3de, 0x43bb, 0xa4, 0xd7, 0xea, 0x20, 0xb, 0x1b, 0x1=
4,
> 0x82} diff --git a/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c
> b/UefiCpuPkg/Library/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 <Register/Cpuid.h>
> +#include <Register/Intel/Cpuid.h>
>  #include <Register/Amd/Cpuid.h>
> -#include <Register/Msr.h>
> -#include <Register/LocalApic.h>
> +#include <Register/Intel/Msr.h>
> +#include <Register/Intel/LocalApic.h>
>=20
>  #include <Library/BaseLib.h>
>  #include <Library/DebugLib.h>
> diff --git a/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c
> b/UefiCpuPkg/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 <Register/Cpuid.h>
> +#include <Register/Intel/Cpuid.h>
>  #include <Register/Amd/Cpuid.h>
> -#include <Register/Msr.h>
> -#include <Register/LocalApic.h>
> +#include <Register/Intel/Msr.h>
> +#include <Register/Intel/LocalApic.h>
>=20
>  #include <Library/BaseLib.h>
>  #include <Library/DebugLib.h>
> 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.<BR>
> +  Copyright (c) 2017 - 2019, Intel Corporation. All rights
> + reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
> @@ -19,8 +19,8 @@
>  #include <Library/MemoryAllocationLib.h>  #include <Library/LocalApicLib=
.h>
>=20
> -#include <Register/Cpuid.h>
> -#include <Register/Msr.h>
> +#include <Register/Intel/Cpuid.h>
> +#include <Register/Intel/Msr.h>
>=20
>  /**
>    Prepares for the data used by CPU feature detection and initialization=
.
> diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.h
> b/UefiCpuPkg/Library/MpInitLib/MpLib.h
> index 4b12f91d47..107872b367 100644
> --- a/UefiCpuPkg/Library/MpInitLib/MpLib.h
> +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.h
> @@ -11,10 +11,10 @@
>=20
>  #include <PiPei.h>
>=20
> -#include <Register/Cpuid.h>
> -#include <Register/Msr.h>
> -#include <Register/LocalApic.h>
> -#include <Register/Microcode.h>
> +#include <Register/Intel/Cpuid.h>
> +#include <Register/Intel/Msr.h>
> +#include <Register/Intel/LocalApic.h>
> +#include <Register/Intel/Microcode.h>
>=20
>  #include <Library/MpInitLib.h>
>  #include <Library/BaseLib.h>
> diff --git a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
> b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
> index 9415897b48..dfa848022b 100644
> --- a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
> +++ b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
> @@ -11,8 +11,8 @@
>  **/
>=20
>  #include <Uefi.h>
> -#include <Register/Cpuid.h>
> -#include <Register/Msr.h>
> +#include <Register/Intel/Cpuid.h>
> +#include <Register/Intel/Msr.h>
>=20
>  #include <Library/MtrrLib.h>
>  #include <Library/BaseLib.h>
> diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c
> b/UefiCpuPkg/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.<BR>
> +Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
> @@ -13,8 +13,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent  #include
> <Library/PcdLib.h>  #include <Library/MemoryAllocationLib.h>  #include
> <Library/DebugLib.h> -#include <Register/Cpuid.h> -#include
> <Register/SmramSaveStateMap.h>
> +#include <Register/Intel/Cpuid.h>
> +#include <Register/Intel/SmramSaveStateMap.h>
>=20
>  //
>  // Machine Specific Registers (MSRs)
> diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.c
> b/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.c
> index 82c63da002..52a376c27d 100644
> --- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.c
> +++ b/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.c
> @@ -15,9 +15,9 @@
>  #include <Library/UefiBootServicesTableLib.h>
>  #include <Library/SmmServicesTableLib.h>  #include
> <Library/TpmMeasurementLib.h> -#include <Register/Cpuid.h> -#include
> <Register/ArchitecturalMsr.h> -#include <Register/SmramSaveStateMap.h>
> +#include <Register/Intel/Cpuid.h>
> +#include <Register/Intel/ArchitecturalMsr.h>
> +#include <Register/Intel/SmramSaveStateMap.h>
>=20
>  #include <Protocol/MpService.h>
>=20
> diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h
> b/UefiCpuPkg/PiSmmCpuDxeSmm/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
> <AcpiCpuData.h>  #include <CpuHotPlugData.h>
>=20
> -#include <Register/Cpuid.h>
> -#include <Register/Msr.h>
> +#include <Register/Intel/Cpuid.h>
> +#include <Register/Intel/Msr.h>
>=20
>  #include "CpuService.h"
>  #include "SmmProfile.h"
> diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmramSaveState.c
> b/UefiCpuPkg/PiSmmCpuDxeSmm/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
> <Library/BaseMemoryLib.h>  #include <Library/SmmServicesTableLib.h>
> #include <Library/DebugLib.h> -#include <Register/Cpuid.h> -#include
> <Register/SmramSaveStateMap.h>
>=20
>  #include "PiSmmCpuDxeSmm.h"
>=20
> --
> 2.21.0.windows.1