UefiCpuPkg: Update code to include register definitions from MdePkg

Signed-off-by: Ray Ni <ray.ni@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
Regression-tested-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Eric Dong <eric.dong@intel.com>
This commit is contained in:
Ni, Ray 2019-08-01 17:58:31 +08:00 committed by Eric Dong
parent e057908f8d
commit 01acb06c4f
16 changed files with 35 additions and 37 deletions
UefiCpuPkg
Application/Cpuid
CpuDxe
CpuMpPei
Include
Library
BaseXApicLib
BaseXApicX2ApicLib
CpuCommonFeaturesLib
MpInitLib
MtrrLib
SmmCpuFeaturesLib
PiSmmCpuDxeSmm

View File

@ -9,7 +9,7 @@
#include <Uefi.h> #include <Uefi.h>
#include <Library/BaseLib.h> #include <Library/BaseLib.h>
#include <Library/UefiLib.h> #include <Library/UefiLib.h>
#include <Register/Cpuid.h> #include <Register/Intel/Cpuid.h>
/// ///
/// Macro used to display the value of a bit field in a register returned by CPUID. /// Macro used to display the value of a bit field in a register returned by CPUID.

View File

@ -1,7 +1,7 @@
/** @file /** @file
CPU DXE Module to produce CPU ARCH Protocol and CPU MP Protocol. CPU DXE Module to produce CPU ARCH Protocol and CPU MP Protocol.
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 SPDX-License-Identifier: BSD-2-Clause-Patent
**/ **/
@ -13,7 +13,7 @@
#include <Protocol/Cpu.h> #include <Protocol/Cpu.h>
#include <Protocol/MpService.h> #include <Protocol/MpService.h>
#include <Register/Msr.h> #include <Register/Intel/Msr.h>
#include <Ppi/SecPlatformInformation.h> #include <Ppi/SecPlatformInformation.h>
#include <Ppi/SecPlatformInformation2.h> #include <Ppi/SecPlatformInformation2.h>

View File

@ -15,8 +15,8 @@
#include <Library/SynchronizationLib.h> #include <Library/SynchronizationLib.h>
#include <Library/PrintLib.h> #include <Library/PrintLib.h>
#include <Protocol/SmmBase2.h> #include <Protocol/SmmBase2.h>
#include <Register/Cpuid.h> #include <Register/Intel/Cpuid.h>
#include <Register/Msr.h> #include <Register/Intel/Msr.h>
#include "CpuDxe.h" #include "CpuDxe.h"
#include "CpuPageTable.h" #include "CpuPageTable.h"

View File

@ -1,14 +1,14 @@
/** @file /** @file
Basic paging support for the CPU to enable Stack Guard. Basic paging support for the CPU to enable Stack Guard.
Copyright (c) 2018, Intel Corporation. All rights reserved.<BR> Copyright (c) 2018 - 2019, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent SPDX-License-Identifier: BSD-2-Clause-Patent
**/ **/
#include <Register/Cpuid.h> #include <Register/Intel/Cpuid.h>
#include <Register/Msr.h> #include <Register/Intel/Msr.h>
#include <Library/MemoryAllocationLib.h> #include <Library/MemoryAllocationLib.h>
#include <Library/CpuLib.h> #include <Library/CpuLib.h>
#include <Library/BaseLib.h> #include <Library/BaseLib.h>

View File

@ -10,7 +10,7 @@
#define __REGISTER_CPU_FEATURES_LIB_H__ #define __REGISTER_CPU_FEATURES_LIB_H__
#include <AcpiCpuData.h> #include <AcpiCpuData.h>
#include <Register/Cpuid.h> #include <Register/Intel/Cpuid.h>
#include <Protocol/MpService.h> #include <Protocol/MpService.h>
/// ///

View File

@ -11,7 +11,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#include <Protocol/MpService.h> #include <Protocol/MpService.h>
#include <Protocol/SmmCpu.h> #include <Protocol/SmmCpu.h>
#include <Register/SmramSaveStateMap.h> #include <Register/Intel/SmramSaveStateMap.h>
#include <CpuHotPlugData.h> #include <CpuHotPlugData.h>
/// ///

View File

@ -1,7 +1,7 @@
/** @file /** @file
STM service protocol definition STM service protocol definition
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 SPDX-License-Identifier: BSD-2-Clause-Patent
**/ **/
@ -10,7 +10,7 @@
#define _SM_MONITOR_INIT_PROTOCOL_H_ #define _SM_MONITOR_INIT_PROTOCOL_H_
#include <PiSmm.h> #include <PiSmm.h>
#include <Register/StmApi.h> #include <Register/Intel/StmApi.h>
#define EFI_SM_MONITOR_INIT_PROTOCOL_GUID \ #define EFI_SM_MONITOR_INIT_PROTOCOL_GUID \
{ 0x228f344d, 0xb3de, 0x43bb, 0xa4, 0xd7, 0xea, 0x20, 0xb, 0x1b, 0x14, 0x82} { 0x228f344d, 0xb3de, 0x43bb, 0xa4, 0xd7, 0xea, 0x20, 0xb, 0x1b, 0x14, 0x82}

View File

@ -10,10 +10,10 @@
**/ **/
#include <Register/Cpuid.h> #include <Register/Intel/Cpuid.h>
#include <Register/Amd/Cpuid.h> #include <Register/Amd/Cpuid.h>
#include <Register/Msr.h> #include <Register/Intel/Msr.h>
#include <Register/LocalApic.h> #include <Register/Intel/LocalApic.h>
#include <Library/BaseLib.h> #include <Library/BaseLib.h>
#include <Library/DebugLib.h> #include <Library/DebugLib.h>

View File

@ -11,10 +11,10 @@
**/ **/
#include <Register/Cpuid.h> #include <Register/Intel/Cpuid.h>
#include <Register/Amd/Cpuid.h> #include <Register/Amd/Cpuid.h>
#include <Register/Msr.h> #include <Register/Intel/Msr.h>
#include <Register/LocalApic.h> #include <Register/Intel/LocalApic.h>
#include <Library/BaseLib.h> #include <Library/BaseLib.h>
#include <Library/DebugLib.h> #include <Library/DebugLib.h>

View File

@ -1,7 +1,7 @@
/** @file /** @file
CPU Common features library header file. CPU Common features library header file.
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 SPDX-License-Identifier: BSD-2-Clause-Patent
**/ **/
@ -19,8 +19,8 @@
#include <Library/MemoryAllocationLib.h> #include <Library/MemoryAllocationLib.h>
#include <Library/LocalApicLib.h> #include <Library/LocalApicLib.h>
#include <Register/Cpuid.h> #include <Register/Intel/Cpuid.h>
#include <Register/Msr.h> #include <Register/Intel/Msr.h>
/** /**
Prepares for the data used by CPU feature detection and initialization. Prepares for the data used by CPU feature detection and initialization.

View File

@ -11,10 +11,10 @@
#include <PiPei.h> #include <PiPei.h>
#include <Register/Cpuid.h> #include <Register/Intel/Cpuid.h>
#include <Register/Msr.h> #include <Register/Intel/Msr.h>
#include <Register/LocalApic.h> #include <Register/Intel/LocalApic.h>
#include <Register/Microcode.h> #include <Register/Intel/Microcode.h>
#include <Library/MpInitLib.h> #include <Library/MpInitLib.h>
#include <Library/BaseLib.h> #include <Library/BaseLib.h>

View File

@ -11,8 +11,8 @@
**/ **/
#include <Uefi.h> #include <Uefi.h>
#include <Register/Cpuid.h> #include <Register/Intel/Cpuid.h>
#include <Register/Msr.h> #include <Register/Intel/Msr.h>
#include <Library/MtrrLib.h> #include <Library/MtrrLib.h>
#include <Library/BaseLib.h> #include <Library/BaseLib.h>

View File

@ -1,7 +1,7 @@
/** @file /** @file
The CPU specific programming for PiSmmCpuDxeSmm module. The CPU specific programming for PiSmmCpuDxeSmm module.
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 SPDX-License-Identifier: BSD-2-Clause-Patent
**/ **/
@ -13,8 +13,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#include <Library/PcdLib.h> #include <Library/PcdLib.h>
#include <Library/MemoryAllocationLib.h> #include <Library/MemoryAllocationLib.h>
#include <Library/DebugLib.h> #include <Library/DebugLib.h>
#include <Register/Cpuid.h> #include <Register/Intel/Cpuid.h>
#include <Register/SmramSaveStateMap.h> #include <Register/Intel/SmramSaveStateMap.h>
// //
// Machine Specific Registers (MSRs) // Machine Specific Registers (MSRs)

View File

@ -15,9 +15,9 @@
#include <Library/UefiBootServicesTableLib.h> #include <Library/UefiBootServicesTableLib.h>
#include <Library/SmmServicesTableLib.h> #include <Library/SmmServicesTableLib.h>
#include <Library/TpmMeasurementLib.h> #include <Library/TpmMeasurementLib.h>
#include <Register/Cpuid.h> #include <Register/Intel/Cpuid.h>
#include <Register/ArchitecturalMsr.h> #include <Register/Intel/ArchitecturalMsr.h>
#include <Register/SmramSaveStateMap.h> #include <Register/Intel/SmramSaveStateMap.h>
#include <Protocol/MpService.h> #include <Protocol/MpService.h>

View File

@ -53,8 +53,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#include <AcpiCpuData.h> #include <AcpiCpuData.h>
#include <CpuHotPlugData.h> #include <CpuHotPlugData.h>
#include <Register/Cpuid.h> #include <Register/Intel/Cpuid.h>
#include <Register/Msr.h> #include <Register/Intel/Msr.h>
#include "CpuService.h" #include "CpuService.h"
#include "SmmProfile.h" #include "SmmProfile.h"

View File

@ -14,8 +14,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#include <Library/BaseMemoryLib.h> #include <Library/BaseMemoryLib.h>
#include <Library/SmmServicesTableLib.h> #include <Library/SmmServicesTableLib.h>
#include <Library/DebugLib.h> #include <Library/DebugLib.h>
#include <Register/Cpuid.h>
#include <Register/SmramSaveStateMap.h>
#include "PiSmmCpuDxeSmm.h" #include "PiSmmCpuDxeSmm.h"