public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [PATCH v3 0/9] merge UefiCpuPkg/UefiCpuLib to MdePkg/CpuLib
@ 2022-11-01  7:58 Zhiguang Liu
  2022-11-01  7:58 ` [PATCH v3 1/9] OvmfPkg: Add CpuLib to module INFs that depend on UefiCpuLib Zhiguang Liu
                   ` (8 more replies)
  0 siblings, 9 replies; 18+ messages in thread
From: Zhiguang Liu @ 2022-11-01  7:58 UTC (permalink / raw)
  To: devel; +Cc: Zhiguang Liu

V3:
Months ago, Pu Yu sent this patch serial and get reviewed-by, but some
haven't been merged. Because the code base is changed, to merge the remaining
patches into latest code base, two patches for OvmfPkg are modified.

Please OvmfPkg maintainers and reviewers help review patch #1 and #4.
Other patches keep unchanged and don't need review again.

V2:
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3394
Today lots of duplicated code call CPUID and calculates the address mask.
Adding an API named GetPhysicalAddressBits in UefiCpuLib can solve this
problem, but at the same time cause MdeModulePkg depend on UefiCpuPkg
which does not meet the design spec. So merge UefiCpuLib to CpuLib is a
good way to sovle these problems. To minimize the impact,this change is
carried out in four steps.

Yu Pu (8):
  MdePkg: Move API and implementation from UefiCpuLib to CpuLib
  IntelFsp2Pkg: Remove UefiCpuLib from module INFs.
  OvmfPkg: Remove UefiCpuLib from module INFs.
  PcAtChipsetPkg: Remove UefiCpuLib from module INFs.
  SourceLevelDebugPkg: Remove UefiCpuLib from module INFs.
  UefiCpuPkg: Remove UefiCpuLib from module INFs.
  UefiPayloadPkg: Remove UefiCpuLib from module INFs.
  UefiCpuLib: Remove UefiCpuLib.

Zhiguang Liu (1):
  OvmfPkg: Add CpuLib to module INFs that depend on UefiCpuLib.

 IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf       |  1 -
 IntelFsp2Pkg/FspSecCore/SecMain.h             |  1 -
 IntelFsp2Pkg/IntelFsp2Pkg.dsc                 |  1 -
 IntelFsp2Pkg/Tools/Tests/QemuFspPkg.dsc       |  1 -
 .../FspmWrapperPeim/FspmWrapperPeim.inf       |  1 -
 .../FspsWrapperPeim/FspsWrapperPeim.inf       |  1 -
 IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc   |  1 -
 MdePkg/Include/Library/CpuLib.h               | 48 ++++++++++++++
 MdePkg/Library/BaseCpuLib/BaseCpuLib.inf      |  6 ++
 .../BaseCpuLib}/Ia32/InitializeFpu.nasm       |  0
 .../BaseCpuLib}/X64/InitializeFpu.nasm        |  0
 .../Library/BaseCpuLib/X86BaseCpuLib.c        |  2 +-
 OvmfPkg/AmdSev/AmdSevX64.dsc                  |  1 -
 OvmfPkg/Bhyve/BhyveX64.dsc                    |  1 -
 OvmfPkg/CloudHv/CloudHvX64.dsc                |  1 -
 OvmfPkg/IntelTdx/Sec/SecMain.c                |  2 +-
 OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c    |  2 +-
 OvmfPkg/Microvm/MicrovmX64.dsc                |  1 -
 OvmfPkg/OvmfPkgIa32.dsc                       |  1 -
 OvmfPkg/OvmfPkgIa32X64.dsc                    |  1 -
 OvmfPkg/OvmfPkgX64.dsc                        |  1 -
 OvmfPkg/OvmfXen.dsc                           |  1 -
 OvmfPkg/Sec/SecMain.c                         |  1 -
 OvmfPkg/Sec/SecMain.inf                       |  1 -
 PcAtChipsetPkg/PcAtChipsetPkg.dsc             |  1 -
 SourceLevelDebugPkg/SourceLevelDebugPkg.dsc   |  1 -
 UefiCpuPkg/CpuDxe/CpuDxe.h                    |  1 -
 UefiCpuPkg/CpuDxe/CpuDxe.inf                  |  1 -
 UefiCpuPkg/Include/Library/UefiCpuLib.h       | 65 -------------------
 .../Library/BaseUefiCpuLib/BaseUefiCpuLib.inf | 41 ------------
 .../Library/BaseUefiCpuLib/BaseUefiCpuLib.uni | 16 -----
 .../Library/BaseXApicLib/BaseXApicLib.c       |  1 -
 .../Library/BaseXApicLib/BaseXApicLib.inf     |  1 -
 .../BaseXApicX2ApicLib/BaseXApicX2ApicLib.c   |  1 -
 .../BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf |  1 -
 UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf |  1 -
 UefiCpuPkg/Library/MpInitLib/MpLib.h          |  1 -
 UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf |  1 -
 UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h    |  1 -
 UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf  |  1 -
 .../PiSmmCpuDxeSmm/SmmProfileInternal.h       |  1 -
 UefiCpuPkg/SecCore/SecCore.inf                |  1 -
 UefiCpuPkg/SecCore/SecCoreNative.inf          |  1 -
 UefiCpuPkg/SecCore/SecMain.h                  |  1 -
 UefiCpuPkg/UefiCpuPkg.dec                     |  5 --
 UefiCpuPkg/UefiCpuPkg.dsc                     |  2 -
 .../UefiPayloadEntry/UefiPayloadEntry.h       |  1 -
 .../UefiPayloadEntry/UefiPayloadEntry.inf     |  1 -
 .../UniversalPayloadEntry.inf                 |  1 -
 UefiPayloadPkg/UefiPayloadPkg.dsc             |  1 -
 50 files changed, 57 insertions(+), 170 deletions(-)
 rename {UefiCpuPkg/Library/BaseUefiCpuLib => MdePkg/Library/BaseCpuLib}/Ia32/InitializeFpu.nasm (100%)
 rename {UefiCpuPkg/Library/BaseUefiCpuLib => MdePkg/Library/BaseCpuLib}/X64/InitializeFpu.nasm (100%)
 rename UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.c => MdePkg/Library/BaseCpuLib/X86BaseCpuLib.c (93%)
 delete mode 100644 UefiCpuPkg/Include/Library/UefiCpuLib.h
 delete mode 100644 UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
 delete mode 100644 UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.uni

-- 
2.31.1.windows.1


^ permalink raw reply	[flat|nested] 18+ messages in thread
* [PATCH v3 1/9] OvmfPkg: Add CpuLib to module INFs that depend on UefiCpuLib.
  2022-11-01  7:58 [PATCH v3 0/9] merge UefiCpuPkg/UefiCpuLib to MdePkg/CpuLib Zhiguang Liu
@ 2022-11-01  7:58 ` Zhiguang Liu
  2022-11-04  6:43   ` [edk2-devel] " Ni, Ray
  2022-11-04  6:44   ` Zhiguang Liu
  2022-11-01  7:58 ` [PATCH v3 2/9] MdePkg: Move API and implementation from UefiCpuLib to CpuLib Zhiguang Liu
                   ` (7 subsequent siblings)
  8 siblings, 2 replies; 18+ messages in thread
From: Zhiguang Liu @ 2022-11-01  7:58 UTC (permalink / raw)
  To: devel
  Cc: Zhiguang Liu, Ard Biesheuvel, Jiewen Yao, Jordan Justen,
	Gerd Hoffmann

There are two libraries: MdePkg/CpuLib and UefiCpuPkg/UefiCpuLib and
UefiCpuPkg/UefiCpuLib will be merged to MdePkg/CpuLib. To avoid build
failure, add CpuLib dependency to all modules that depend on UefiCpuLib.

Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
---
 OvmfPkg/IntelTdx/Sec/SecMain.c             | 1 +
 OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/OvmfPkg/IntelTdx/Sec/SecMain.c b/OvmfPkg/IntelTdx/Sec/SecMain.c
index ab01ec9ab1..eef47f17e4 100644
--- a/OvmfPkg/IntelTdx/Sec/SecMain.c
+++ b/OvmfPkg/IntelTdx/Sec/SecMain.c
@@ -17,6 +17,7 @@
 #include <Library/BaseMemoryLib.h>
 #include <Library/PcdLib.h>
 #include <Library/UefiCpuLib.h>
+#include <Library/CpuLib.h>
 #include <Library/DebugAgentLib.h>
 #include <Library/IoLib.h>
 #include <Library/PeCoffLib.h>
diff --git a/OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c b/OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c
index 74cb55611f..0e2515ca38 100644
--- a/OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c
+++ b/OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c
@@ -11,6 +11,7 @@
 #include <Library/BaseMemoryLib.h>
 #include <Library/PcdLib.h>
 #include <Library/UefiCpuLib.h>
+#include <Library/CpuLib.h>
 #include <Library/SynchronizationLib.h>
 #include <Uefi/UefiBaseType.h>
 #include <Library/TdxLib.h>
-- 
2.31.1.windows.1


^ permalink raw reply related	[flat|nested] 18+ messages in thread
* [PATCH v3 2/9] MdePkg: Move API and implementation from UefiCpuLib to CpuLib
  2022-11-01  7:58 [PATCH v3 0/9] merge UefiCpuPkg/UefiCpuLib to MdePkg/CpuLib Zhiguang Liu
  2022-11-01  7:58 ` [PATCH v3 1/9] OvmfPkg: Add CpuLib to module INFs that depend on UefiCpuLib Zhiguang Liu
@ 2022-11-01  7:58 ` Zhiguang Liu
  2022-11-01  7:58 ` [PATCH v3 3/9] IntelFsp2Pkg: Remove UefiCpuLib from module INFs Zhiguang Liu
                   ` (6 subsequent siblings)
  8 siblings, 0 replies; 18+ messages in thread
From: Zhiguang Liu @ 2022-11-01  7:58 UTC (permalink / raw)
  To: devel
  Cc: Yu Pu, Michael D Kinney, Liming Gao, Zhiguang Liu, Eric Dong,
	Ray Ni, Rahul Kumar

From: Yu Pu <yu.pu@intel.com>

There are two libraries: MdePkg/CpuLib and UefiCpuPkg/UefiCpuLib. This
patch merges UefiCpuPkg/UefiCpuLib to MdePkg/CpuLib.

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Zhiguang Liu <zhiguang.liu@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
Signed-off-by: Yu Pu <yu.pu@intel.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
---
 MdePkg/Include/Library/CpuLib.h               | 48 ++++++++++++++++++
 MdePkg/Library/BaseCpuLib/BaseCpuLib.inf      |  6 +++
 .../BaseCpuLib}/Ia32/InitializeFpu.nasm       |  0
 .../BaseCpuLib}/X64/InitializeFpu.nasm        |  0
 .../Library/BaseCpuLib/X86BaseCpuLib.c        |  2 +-
 UefiCpuPkg/Include/Library/UefiCpuLib.h       | 49 -------------------
 .../Library/BaseUefiCpuLib/BaseUefiCpuLib.inf |  8 +--
 .../BaseUefiCpuLib/BaseUefiCpuLibNull.c       | 16 ++++++
 8 files changed, 72 insertions(+), 57 deletions(-)
 rename {UefiCpuPkg/Library/BaseUefiCpuLib => MdePkg/Library/BaseCpuLib}/Ia32/InitializeFpu.nasm (100%)
 rename {UefiCpuPkg/Library/BaseUefiCpuLib => MdePkg/Library/BaseCpuLib}/X64/InitializeFpu.nasm (100%)
 rename UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.c => MdePkg/Library/BaseCpuLib/X86BaseCpuLib.c (93%)
 create mode 100644 UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLibNull.c

diff --git a/MdePkg/Include/Library/CpuLib.h b/MdePkg/Include/Library/CpuLib.h
index 25f6d9478c..3f29937dc7 100644
--- a/MdePkg/Include/Library/CpuLib.h
+++ b/MdePkg/Include/Library/CpuLib.h
@@ -41,4 +41,52 @@ CpuFlushTlb (
   VOID
   );
 
+#if defined (MDE_CPU_IA32) || defined (MDE_CPU_X64)
+
+/**
+  Initializes floating point units for requirement of UEFI specification.
+  This function initializes floating-point control word to 0x027F (all exceptions
+  masked,double-precision, round-to-nearest) and multimedia-extensions control word
+  (if supported) to 0x1F80 (all exceptions masked, round-to-nearest, flush to zero
+  for masked underflow).
+**/
+VOID
+EFIAPI
+InitializeFloatingPointUnits (
+  VOID
+  );
+
+/**
+  Determine if the standard CPU signature is "AuthenticAMD".
+  @retval TRUE  The CPU signature matches.
+  @retval FALSE The CPU signature does not match.
+**/
+BOOLEAN
+EFIAPI
+StandardSignatureIsAuthenticAMD (
+  VOID
+  );
+
+/**
+  Return the 32bit CPU family and model value.
+  @return CPUID[01h].EAX with Processor Type and Stepping ID cleared.
+**/
+UINT32
+EFIAPI
+GetCpuFamilyModel (
+  VOID
+  );
+
+/**
+  Return the CPU stepping ID.
+  @return CPU stepping ID value in CPUID[01h].EAX.
+**/
+UINT8
+EFIAPI
+GetCpuSteppingId (
+  VOID
+  );
+
+#endif
+
 #endif
diff --git a/MdePkg/Library/BaseCpuLib/BaseCpuLib.inf b/MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
index 6b230f6e6d..b2bc958ec8 100644
--- a/MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
+++ b/MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
@@ -29,6 +29,9 @@
 #  VALID_ARCHITECTURES           = IA32 X64 EBC ARM AARCH64 RISCV64 LOONGARCH64
 #
 
+[Sources.IA32, Sources.X64]
+  X86BaseCpuLib.c
+
 [Sources.IA32]
   Ia32/CpuSleep.c | MSFT
   Ia32/CpuFlushTlb.c | MSFT
@@ -39,10 +42,13 @@
   Ia32/CpuSleepGcc.c | GCC
   Ia32/CpuFlushTlbGcc.c | GCC
 
+  Ia32/InitializeFpu.nasm
+
 [Sources.X64]
   X64/CpuFlushTlb.nasm
   X64/CpuSleep.nasm
 
+  X64/InitializeFpu.nasm
 
 [Sources.EBC]
   Ebc/CpuSleepFlushTlb.c
diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/Ia32/InitializeFpu.nasm b/MdePkg/Library/BaseCpuLib/Ia32/InitializeFpu.nasm
similarity index 100%
rename from UefiCpuPkg/Library/BaseUefiCpuLib/Ia32/InitializeFpu.nasm
rename to MdePkg/Library/BaseCpuLib/Ia32/InitializeFpu.nasm
diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/X64/InitializeFpu.nasm b/MdePkg/Library/BaseCpuLib/X64/InitializeFpu.nasm
similarity index 100%
rename from UefiCpuPkg/Library/BaseUefiCpuLib/X64/InitializeFpu.nasm
rename to MdePkg/Library/BaseCpuLib/X64/InitializeFpu.nasm
diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.c b/MdePkg/Library/BaseCpuLib/X86BaseCpuLib.c
similarity index 93%
rename from UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.c
rename to MdePkg/Library/BaseCpuLib/X86BaseCpuLib.c
index 5d925bc273..1cad32a4be 100644
--- a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.c
+++ b/MdePkg/Library/BaseCpuLib/X86BaseCpuLib.c
@@ -13,7 +13,7 @@
 #include <Register/Amd/Cpuid.h>
 
 #include <Library/BaseLib.h>
-#include <Library/UefiCpuLib.h>
+#include <Library/CpuLib.h>
 
 /**
   Determine if the standard CPU signature is "AuthenticAMD".
diff --git a/UefiCpuPkg/Include/Library/UefiCpuLib.h b/UefiCpuPkg/Include/Library/UefiCpuLib.h
index 0ff4a35774..ab6982db6e 100644
--- a/UefiCpuPkg/Include/Library/UefiCpuLib.h
+++ b/UefiCpuPkg/Include/Library/UefiCpuLib.h
@@ -13,53 +13,4 @@
 #ifndef __UEFI_CPU_LIB_H__
 #define __UEFI_CPU_LIB_H__
 
-/**
-  Initializes floating point units for requirement of UEFI specification.
-
-  This function initializes floating-point control word to 0x027F (all exceptions
-  masked,double-precision, round-to-nearest) and multimedia-extensions control word
-  (if supported) to 0x1F80 (all exceptions masked, round-to-nearest, flush to zero
-  for masked underflow).
-
-**/
-VOID
-EFIAPI
-InitializeFloatingPointUnits (
-  VOID
-  );
-
-/**
-  Determine if the standard CPU signature is "AuthenticAMD".
-
-  @retval TRUE  The CPU signature matches.
-  @retval FALSE The CPU signature does not match.
-
-**/
-BOOLEAN
-EFIAPI
-StandardSignatureIsAuthenticAMD (
-  VOID
-  );
-
-/**
-  Return the 32bit CPU family and model value.
-
-  @return CPUID[01h].EAX with Processor Type and Stepping ID cleared.
-**/
-UINT32
-EFIAPI
-GetCpuFamilyModel (
-  VOID
-  );
-
-/**
-  Return the CPU stepping ID.
-  @return CPU stepping ID value in CPUID[01h].EAX.
-**/
-UINT8
-EFIAPI
-GetCpuSteppingId (
-  VOID
-  );
-
 #endif
diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf b/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
index 34d3a7bb43..9f8b62d87a 100644
--- a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
+++ b/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
@@ -24,14 +24,8 @@
 #  VALID_ARCHITECTURES           = IA32 X64
 #
 
-[Sources.IA32]
-  Ia32/InitializeFpu.nasm
-
-[Sources.X64]
-  X64/InitializeFpu.nasm
-
 [Sources]
-  BaseUefiCpuLib.c
+  BaseUefiCpuLibNull.c
 
 [Packages]
   MdePkg/MdePkg.dec
diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLibNull.c b/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLibNull.c
new file mode 100644
index 0000000000..24693635e4
--- /dev/null
+++ b/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLibNull.c
@@ -0,0 +1,16 @@
+/** @file
+This library contains a dummy function to pass build.
+
+Copyright (c) 2022, Intel Corporation. All rights reserved.
+
+SPDX-License-Identifier: BSD-2-Clause-Patent
+**/
+#include <Base.h>
+
+VOID
+Dummy (
+  VOID
+  )
+{
+
+}
-- 
2.31.1.windows.1


^ permalink raw reply related	[flat|nested] 18+ messages in thread
* [PATCH v3 3/9] IntelFsp2Pkg: Remove UefiCpuLib from module INFs.
  2022-11-01  7:58 [PATCH v3 0/9] merge UefiCpuPkg/UefiCpuLib to MdePkg/CpuLib Zhiguang Liu
  2022-11-01  7:58 ` [PATCH v3 1/9] OvmfPkg: Add CpuLib to module INFs that depend on UefiCpuLib Zhiguang Liu
  2022-11-01  7:58 ` [PATCH v3 2/9] MdePkg: Move API and implementation from UefiCpuLib to CpuLib Zhiguang Liu
@ 2022-11-01  7:58 ` Zhiguang Liu
  2022-11-01 16:11   ` Chiu, Chasel
  2022-11-01  7:58 ` [PATCH v3 4/9] OvmfPkg: " Zhiguang Liu
                   ` (5 subsequent siblings)
  8 siblings, 1 reply; 18+ messages in thread
From: Zhiguang Liu @ 2022-11-01  7:58 UTC (permalink / raw)
  To: devel; +Cc: Yu Pu, Chasel Chiu, Nate DeSimone, Star Zeng

From: Yu Pu <yu.pu@intel.com>

Because UefiCpuPkg/UefiCpuLib is merged to MdePkg/CpuLib, remove the
dependency of UefiCpuLib.

Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Signed-off-by: Yu Pu <yu.pu@intel.com>
Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>
---
 IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf                 | 1 -
 IntelFsp2Pkg/FspSecCore/SecMain.h                       | 1 -
 IntelFsp2Pkg/IntelFsp2Pkg.dsc                           | 1 -
 IntelFsp2Pkg/Tools/Tests/QemuFspPkg.dsc                 | 1 -
 IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf | 1 -
 IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf | 1 -
 IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc             | 1 -
 7 files changed, 7 deletions(-)

diff --git a/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf b/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf
index f920f1f6d0..8029832235 100644
--- a/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf
+++ b/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf
@@ -59,7 +59,6 @@
   FspCommonLib
   FspSecPlatformLib
   CpuLib
-  UefiCpuLib
 
 [Pcd]
   gIntelFsp2PkgTokenSpaceGuid.PcdTemporaryRamBase              ## CONSUMES
diff --git a/IntelFsp2Pkg/FspSecCore/SecMain.h b/IntelFsp2Pkg/FspSecCore/SecMain.h
index a09653da96..023deb7e2b 100644
--- a/IntelFsp2Pkg/FspSecCore/SecMain.h
+++ b/IntelFsp2Pkg/FspSecCore/SecMain.h
@@ -21,7 +21,6 @@
 #include <Library/FspSwitchStackLib.h>
 #include <Library/FspCommonLib.h>
 #include <Library/CpuLib.h>
-#include <Library/UefiCpuLib.h>
 #include <FspEas.h>
 
 typedef
diff --git a/IntelFsp2Pkg/IntelFsp2Pkg.dsc b/IntelFsp2Pkg/IntelFsp2Pkg.dsc
index 0713f0028d..f236a7010b 100644
--- a/IntelFsp2Pkg/IntelFsp2Pkg.dsc
+++ b/IntelFsp2Pkg/IntelFsp2Pkg.dsc
@@ -27,7 +27,6 @@
   PciCf8Lib|MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.inf
   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
   UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
-  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
 
   ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf
   PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
diff --git a/IntelFsp2Pkg/Tools/Tests/QemuFspPkg.dsc b/IntelFsp2Pkg/Tools/Tests/QemuFspPkg.dsc
index 961576c9a7..3155812118 100644
--- a/IntelFsp2Pkg/Tools/Tests/QemuFspPkg.dsc
+++ b/IntelFsp2Pkg/Tools/Tests/QemuFspPkg.dsc
@@ -107,7 +107,6 @@
   PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf
   PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
   OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
-  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
 !if $(TARGET) == DEBUG
   DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
   SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
diff --git a/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf b/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf
index 332509e0bc..0307ce0acc 100644
--- a/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf
+++ b/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf
@@ -38,7 +38,6 @@
   FspWrapperPlatformLib
   FspWrapperHobProcessLib
   CpuLib
-  UefiCpuLib
   PeCoffGetEntryPointLib
   PeCoffExtraActionLib
   PerformanceLib
diff --git a/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf b/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf
index f9c2ffca1c..a7b28e56b5 100644
--- a/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf
+++ b/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf
@@ -39,7 +39,6 @@
   FspWrapperPlatformLib
   FspWrapperHobProcessLib
   CpuLib
-  UefiCpuLib
   PeCoffGetEntryPointLib
   PeCoffExtraActionLib
   PerformanceLib
diff --git a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc
index b1fc2291c8..fe621244a6 100644
--- a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc
+++ b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc
@@ -41,7 +41,6 @@
   DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf
 
   # UefiCpuPkg
-  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
   LocalApicLib|UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf
 
   # FSP Wrapper Lib
-- 
2.31.1.windows.1


^ permalink raw reply related	[flat|nested] 18+ messages in thread
* [PATCH v3 4/9] OvmfPkg: Remove UefiCpuLib from module INFs.
  2022-11-01  7:58 [PATCH v3 0/9] merge UefiCpuPkg/UefiCpuLib to MdePkg/CpuLib Zhiguang Liu
                   ` (2 preceding siblings ...)
  2022-11-01  7:58 ` [PATCH v3 3/9] IntelFsp2Pkg: Remove UefiCpuLib from module INFs Zhiguang Liu
@ 2022-11-01  7:58 ` Zhiguang Liu
  2022-11-04  6:43   ` [edk2-devel] " Ni, Ray
  2022-11-01  7:58 ` [PATCH v3 5/9] PcAtChipsetPkg: " Zhiguang Liu
                   ` (4 subsequent siblings)
  8 siblings, 1 reply; 18+ messages in thread
From: Zhiguang Liu @ 2022-11-01  7:58 UTC (permalink / raw)
  To: devel
  Cc: Yu Pu, Ard Biesheuvel, Jiewen Yao, Jordan Justen, Gerd Hoffmann,
	Zhiguang Liu

From: Yu Pu <yu.pu@intel.com>

Because UefiCpuPkg/UefiCpuLib is merged to MdePkg/CpuLib, remove the
dependency of UefiCpuLib.

Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Yu Pu <yu.pu@intel.com>
Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
---
 OvmfPkg/AmdSev/AmdSevX64.dsc               | 1 -
 OvmfPkg/Bhyve/BhyveX64.dsc                 | 1 -
 OvmfPkg/CloudHv/CloudHvX64.dsc             | 1 -
 OvmfPkg/IntelTdx/Sec/SecMain.c             | 1 -
 OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c | 1 -
 OvmfPkg/Microvm/MicrovmX64.dsc             | 1 -
 OvmfPkg/OvmfPkgIa32.dsc                    | 1 -
 OvmfPkg/OvmfPkgIa32X64.dsc                 | 1 -
 OvmfPkg/OvmfPkgX64.dsc                     | 1 -
 OvmfPkg/OvmfXen.dsc                        | 1 -
 OvmfPkg/Sec/SecMain.c                      | 1 -
 OvmfPkg/Sec/SecMain.inf                    | 1 -
 12 files changed, 12 deletions(-)

diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
index 90e8a213ef..b894d710f7 100644
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
@@ -154,7 +154,6 @@
   UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
   DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf
   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
-  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
   SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
   UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
   SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.inf
diff --git a/OvmfPkg/Bhyve/BhyveX64.dsc b/OvmfPkg/Bhyve/BhyveX64.dsc
index 475b88b21a..9a4b1a3d15 100644
--- a/OvmfPkg/Bhyve/BhyveX64.dsc
+++ b/OvmfPkg/Bhyve/BhyveX64.dsc
@@ -160,7 +160,6 @@
   DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf
   NvVarsFileLib|OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.inf
   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
-  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
   SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
   UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
   SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.inf
diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc
index 10b16104ac..23aa065606 100644
--- a/OvmfPkg/CloudHv/CloudHvX64.dsc
+++ b/OvmfPkg/CloudHv/CloudHvX64.dsc
@@ -181,7 +181,6 @@
   DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf
   NvVarsFileLib|OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.inf
   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
-  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
   SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
   SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.inf
   QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibNull.inf
diff --git a/OvmfPkg/IntelTdx/Sec/SecMain.c b/OvmfPkg/IntelTdx/Sec/SecMain.c
index eef47f17e4..3f5c8e82f4 100644
--- a/OvmfPkg/IntelTdx/Sec/SecMain.c
+++ b/OvmfPkg/IntelTdx/Sec/SecMain.c
@@ -16,7 +16,6 @@
 #include <Library/DebugLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/PcdLib.h>
-#include <Library/UefiCpuLib.h>
 #include <Library/CpuLib.h>
 #include <Library/DebugAgentLib.h>
 #include <Library/IoLib.h>
diff --git a/OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c b/OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c
index 0e2515ca38..8bd6202279 100644
--- a/OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c
+++ b/OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c
@@ -10,7 +10,6 @@
 #include <Library/DebugLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/PcdLib.h>
-#include <Library/UefiCpuLib.h>
 #include <Library/CpuLib.h>
 #include <Library/SynchronizationLib.h>
 #include <Uefi/UefiBaseType.h>
diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc
index 7eff8e2a88..4903712321 100644
--- a/OvmfPkg/Microvm/MicrovmX64.dsc
+++ b/OvmfPkg/Microvm/MicrovmX64.dsc
@@ -179,7 +179,6 @@
   DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf
   NvVarsFileLib|OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.inf
   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
-  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
   SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
   UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
   SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.inf
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index e9ba491237..662a2d9140 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -182,7 +182,6 @@
   DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf
   NvVarsFileLib|OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.inf
   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
-  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
   SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
   UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
   SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.inf
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index af566b953f..8ce659300d 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -186,7 +186,6 @@
   DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf
   NvVarsFileLib|OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.inf
   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
-  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
   SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
   UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
   SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.inf
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index f39d9cd117..d9223b33d2 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -198,7 +198,6 @@
   DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf
   NvVarsFileLib|OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.inf
   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
-  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
   SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
   UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
   SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.inf
diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc
index 58a7c97cdd..dcd14ea372 100644
--- a/OvmfPkg/OvmfXen.dsc
+++ b/OvmfPkg/OvmfXen.dsc
@@ -161,7 +161,6 @@
   DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf
   NvVarsFileLib|OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.inf
   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
-  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
   SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
   UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
   SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.inf
diff --git a/OvmfPkg/Sec/SecMain.c b/OvmfPkg/Sec/SecMain.c
index 1167d22a68..af3a2c41e2 100644
--- a/OvmfPkg/Sec/SecMain.c
+++ b/OvmfPkg/Sec/SecMain.c
@@ -18,7 +18,6 @@
 #include <Library/PeiServicesLib.h>
 #include <Library/PcdLib.h>
 #include <Library/CpuLib.h>
-#include <Library/UefiCpuLib.h>
 #include <Library/DebugAgentLib.h>
 #include <Library/IoLib.h>
 #include <Library/PeCoffLib.h>
diff --git a/OvmfPkg/Sec/SecMain.inf b/OvmfPkg/Sec/SecMain.inf
index 561a840f29..3c47a664a9 100644
--- a/OvmfPkg/Sec/SecMain.inf
+++ b/OvmfPkg/Sec/SecMain.inf
@@ -45,7 +45,6 @@
   PeiServicesLib
   PcdLib
   CpuLib
-  UefiCpuLib
   DebugAgentLib
   IoLib
   PeCoffLib
-- 
2.31.1.windows.1


^ permalink raw reply related	[flat|nested] 18+ messages in thread
* [PATCH v3 5/9] PcAtChipsetPkg: Remove UefiCpuLib from module INFs.
  2022-11-01  7:58 [PATCH v3 0/9] merge UefiCpuPkg/UefiCpuLib to MdePkg/CpuLib Zhiguang Liu
                   ` (3 preceding siblings ...)
  2022-11-01  7:58 ` [PATCH v3 4/9] OvmfPkg: " Zhiguang Liu
@ 2022-11-01  7:58 ` Zhiguang Liu
  2022-11-01  7:58 ` [PATCH v3 6/9] SourceLevelDebugPkg: " Zhiguang Liu
                   ` (3 subsequent siblings)
  8 siblings, 0 replies; 18+ messages in thread
From: Zhiguang Liu @ 2022-11-01  7:58 UTC (permalink / raw)
  To: devel; +Cc: Yu Pu, Ray Ni

From: Yu Pu <yu.pu@intel.com>

Because UefiCpuPkg/UefiCpuLib is merged to MdePkg/CpuLib, remove the
dependency of UefiCpuLib.

Cc: Ray Ni <ray.ni@intel.com>
Signed-off-by: Yu Pu <yu.pu@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
---
 PcAtChipsetPkg/PcAtChipsetPkg.dsc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/PcAtChipsetPkg/PcAtChipsetPkg.dsc b/PcAtChipsetPkg/PcAtChipsetPkg.dsc
index 451e60ddc8..2f02ecf6fd 100644
--- a/PcAtChipsetPkg/PcAtChipsetPkg.dsc
+++ b/PcAtChipsetPkg/PcAtChipsetPkg.dsc
@@ -42,7 +42,6 @@
   ResetSystemLib|PcAtChipsetPkg/Library/ResetSystemLib/ResetSystemLib.inf
   IoApicLib|PcAtChipsetPkg/Library/BaseIoApicLib/BaseIoApicLib.inf
   LocalApicLib|UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf
-  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
   ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf
   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
 
-- 
2.31.1.windows.1


^ permalink raw reply related	[flat|nested] 18+ messages in thread
* [PATCH v3 6/9] SourceLevelDebugPkg: Remove UefiCpuLib from module INFs.
  2022-11-01  7:58 [PATCH v3 0/9] merge UefiCpuPkg/UefiCpuLib to MdePkg/CpuLib Zhiguang Liu
                   ` (4 preceding siblings ...)
  2022-11-01  7:58 ` [PATCH v3 5/9] PcAtChipsetPkg: " Zhiguang Liu
@ 2022-11-01  7:58 ` Zhiguang Liu
  2022-11-02  1:04   ` Wu, Hao A
  2022-11-01  7:58 ` [PATCH v3 7/9] UefiCpuPkg: " Zhiguang Liu
                   ` (2 subsequent siblings)
  8 siblings, 1 reply; 18+ messages in thread
From: Zhiguang Liu @ 2022-11-01  7:58 UTC (permalink / raw)
  To: devel; +Cc: Yu Pu, Hao A Wu, Ray Ni

From: Yu Pu <yu.pu@intel.com>

Because UefiCpuPkg/UefiCpuLib is merged to MdePkg/CpuLib, remove the
dependency of UefiCpuLib.

Cc: Hao A Wu <hao.a.wu@intel.com>
Signed-off-by: Yu Pu <yu.pu@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
---
 SourceLevelDebugPkg/SourceLevelDebugPkg.dsc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/SourceLevelDebugPkg/SourceLevelDebugPkg.dsc b/SourceLevelDebugPkg/SourceLevelDebugPkg.dsc
index eba64a7b78..986dd5a769 100644
--- a/SourceLevelDebugPkg/SourceLevelDebugPkg.dsc
+++ b/SourceLevelDebugPkg/SourceLevelDebugPkg.dsc
@@ -35,7 +35,6 @@
   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
   SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
   LocalApicLib|UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf
-  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
   PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
   SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
   PeCoffExtraActionLib|SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLibDebug.inf
-- 
2.31.1.windows.1


^ permalink raw reply related	[flat|nested] 18+ messages in thread
* [PATCH v3 7/9] UefiCpuPkg: Remove UefiCpuLib from module INFs.
  2022-11-01  7:58 [PATCH v3 0/9] merge UefiCpuPkg/UefiCpuLib to MdePkg/CpuLib Zhiguang Liu
                   ` (5 preceding siblings ...)
  2022-11-01  7:58 ` [PATCH v3 6/9] SourceLevelDebugPkg: " Zhiguang Liu
@ 2022-11-01  7:58 ` Zhiguang Liu
  2022-11-01  7:58 ` [PATCH v3 8/9] UefiPayloadPkg: " Zhiguang Liu
  2022-11-01  7:58 ` [PATCH v3 9/9] UefiCpuLib: Remove UefiCpuLib Zhiguang Liu
  8 siblings, 0 replies; 18+ messages in thread
From: Zhiguang Liu @ 2022-11-01  7:58 UTC (permalink / raw)
  To: devel; +Cc: Yu Pu, Eric Dong, Ray Ni, Rahul Kumar

From: Yu Pu <yu.pu@intel.com>

Because UefiCpuPkg/UefiCpuLib is merged to MdePkg/CpuLib, remove the
dependency of UefiCpuLib.

Cc: Eric Dong <eric.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
Signed-off-by: Yu Pu <yu.pu@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
---
 UefiCpuPkg/CpuDxe/CpuDxe.h                                   | 1 -
 UefiCpuPkg/CpuDxe/CpuDxe.inf                                 | 1 -
 UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c               | 1 -
 UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf             | 1 -
 UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c   | 1 -
 UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf | 1 -
 UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf                | 1 -
 UefiCpuPkg/Library/MpInitLib/MpLib.h                         | 1 -
 UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf                | 1 -
 UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h                   | 1 -
 UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf                 | 1 -
 UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfileInternal.h               | 1 -
 UefiCpuPkg/SecCore/SecCore.inf                               | 1 -
 UefiCpuPkg/SecCore/SecCoreNative.inf                         | 1 -
 UefiCpuPkg/SecCore/SecMain.h                                 | 1 -
 15 files changed, 15 deletions(-)

diff --git a/UefiCpuPkg/CpuDxe/CpuDxe.h b/UefiCpuPkg/CpuDxe/CpuDxe.h
index 2208671cb9..49a390b4c4 100644
--- a/UefiCpuPkg/CpuDxe/CpuDxe.h
+++ b/UefiCpuPkg/CpuDxe/CpuDxe.h
@@ -28,7 +28,6 @@
 #include <Library/DebugLib.h>
 #include <Library/MtrrLib.h>
 #include <Library/LocalApicLib.h>
-#include <Library/UefiCpuLib.h>
 #include <Library/UefiLib.h>
 #include <Library/CpuExceptionHandlerLib.h>
 #include <Library/HobLib.h>
diff --git a/UefiCpuPkg/CpuDxe/CpuDxe.inf b/UefiCpuPkg/CpuDxe/CpuDxe.inf
index 2352418992..1d3e9f8cdb 100644
--- a/UefiCpuPkg/CpuDxe/CpuDxe.inf
+++ b/UefiCpuPkg/CpuDxe/CpuDxe.inf
@@ -33,7 +33,6 @@
   UefiBootServicesTableLib
   UefiDriverEntryPoint
   LocalApicLib
-  UefiCpuLib
   UefiLib
   CpuExceptionHandlerLib
   HobLib
diff --git a/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c b/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c
index a944c3d01c..008b8a070b 100644
--- a/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c
+++ b/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c
@@ -22,7 +22,6 @@
 #include <Library/TimerLib.h>
 #include <Library/PcdLib.h>
 #include <Library/CpuLib.h>
-#include <Library/UefiCpuLib.h>
 
 //
 // Library internal functions
diff --git a/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf b/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf
index a85b69e0a1..8c4eb65548 100644
--- a/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf
+++ b/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf
@@ -39,7 +39,6 @@
   IoLib
   PcdLib
   CpuLib
-  UefiCpuLib
 
 [Pcd]
   gUefiCpuPkgTokenSpaceGuid.PcdCpuInitIpiDelayInMicroSeconds  ## SOMETIMES_CONSUMES
diff --git a/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c b/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c
index 1e45ffc318..0ba0499631 100644
--- a/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c
+++ b/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c
@@ -23,7 +23,6 @@
 #include <Library/TimerLib.h>
 #include <Library/PcdLib.h>
 #include <Library/CpuLib.h>
-#include <Library/UefiCpuLib.h>
 #include <IndustryStandard/Tdx.h>
 
 //
diff --git a/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf b/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf
index 31ebdd39c6..713f1859c2 100644
--- a/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf
+++ b/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf
@@ -39,7 +39,6 @@
   IoLib
   PcdLib
   CpuLib
-  UefiCpuLib
 
 [Pcd]
   gUefiCpuPkgTokenSpaceGuid.PcdCpuInitIpiDelayInMicroSeconds  ## SOMETIMES_CONSUMES
diff --git a/UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf b/UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf
index e1cd0b3500..7450d9c729 100644
--- a/UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf
+++ b/UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf
@@ -49,7 +49,6 @@
   HobLib
   MtrrLib
   CpuLib
-  UefiCpuLib
   UefiBootServicesTableLib
   DebugAgentLib
   SynchronizationLib
diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.h b/UefiCpuPkg/Library/MpInitLib/MpLib.h
index f5086e497e..b02645d7d6 100644
--- a/UefiCpuPkg/Library/MpInitLib/MpLib.h
+++ b/UefiCpuPkg/Library/MpInitLib/MpLib.h
@@ -27,7 +27,6 @@
 #include <Library/DebugLib.h>
 #include <Library/LocalApicLib.h>
 #include <Library/CpuLib.h>
-#include <Library/UefiCpuLib.h>
 #include <Library/TimerLib.h>
 #include <Library/SynchronizationLib.h>
 #include <Library/MtrrLib.h>
diff --git a/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf b/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf
index 5facf4db94..98864c6484 100644
--- a/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf
+++ b/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf
@@ -49,7 +49,6 @@
   HobLib
   MtrrLib
   CpuLib
-  UefiCpuLib
   SynchronizationLib
   PeiServicesLib
   PcdLib
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h
index ef8bf5947d..abf44c0042 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h
@@ -44,7 +44,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/HobLib.h>
 #include <Library/LocalApicLib.h>
 #include <Library/CpuLib.h>
-#include <Library/UefiCpuLib.h>
 #include <Library/CpuExceptionHandlerLib.h>
 #include <Library/ReportStatusCodeLib.h>
 #include <Library/SmmCpuFeaturesLib.h>
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf
index deef00f9c6..fdd89da223 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf
@@ -89,7 +89,6 @@
   HobLib
   PciLib
   LocalApicLib
-  UefiCpuLib
   SmmCpuPlatformHookLib
   CpuExceptionHandlerLib
   UefiLib
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfileInternal.h b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfileInternal.h
index 0e60509e20..964dd52817 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfileInternal.h
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfileInternal.h
@@ -14,7 +14,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/UefiRuntimeServicesTableLib.h>
 #include <Library/DxeServicesTableLib.h>
 #include <Library/CpuLib.h>
-#include <Library/UefiCpuLib.h>
 #include <IndustryStandard/Acpi.h>
 
 #include "SmmProfileArch.h"
diff --git a/UefiCpuPkg/SecCore/SecCore.inf b/UefiCpuPkg/SecCore/SecCore.inf
index f021997f27..3758aded3b 100644
--- a/UefiCpuPkg/SecCore/SecCore.inf
+++ b/UefiCpuPkg/SecCore/SecCore.inf
@@ -48,7 +48,6 @@
   PcdLib
   DebugAgentLib
   CpuLib
-  UefiCpuLib
   PeCoffGetEntryPointLib
   PeCoffExtraActionLib
   CpuExceptionHandlerLib
diff --git a/UefiCpuPkg/SecCore/SecCoreNative.inf b/UefiCpuPkg/SecCore/SecCoreNative.inf
index e0a1b44a7e..1ee6ff7d88 100644
--- a/UefiCpuPkg/SecCore/SecCoreNative.inf
+++ b/UefiCpuPkg/SecCore/SecCoreNative.inf
@@ -45,7 +45,6 @@
   PcdLib
   DebugAgentLib
   CpuLib
-  UefiCpuLib
   PeCoffGetEntryPointLib
   PeCoffExtraActionLib
   CpuExceptionHandlerLib
diff --git a/UefiCpuPkg/SecCore/SecMain.h b/UefiCpuPkg/SecCore/SecMain.h
index 26c54bd926..880e6cd1b8 100644
--- a/UefiCpuPkg/SecCore/SecMain.h
+++ b/UefiCpuPkg/SecCore/SecMain.h
@@ -24,7 +24,6 @@
 #include <Library/BaseMemoryLib.h>
 #include <Library/PlatformSecLib.h>
 #include <Library/CpuLib.h>
-#include <Library/UefiCpuLib.h>
 #include <Library/PeCoffGetEntryPointLib.h>
 #include <Library/PeCoffExtraActionLib.h>
 #include <Library/DebugAgentLib.h>
-- 
2.31.1.windows.1


^ permalink raw reply related	[flat|nested] 18+ messages in thread
* [PATCH v3 8/9] UefiPayloadPkg: Remove UefiCpuLib from module INFs.
  2022-11-01  7:58 [PATCH v3 0/9] merge UefiCpuPkg/UefiCpuLib to MdePkg/CpuLib Zhiguang Liu
                   ` (6 preceding siblings ...)
  2022-11-01  7:58 ` [PATCH v3 7/9] UefiCpuPkg: " Zhiguang Liu
@ 2022-11-01  7:58 ` Zhiguang Liu
  2022-11-02  5:22   ` [edk2-devel] " Lu, James
  2022-11-03 14:11   ` Guo Dong
  2022-11-01  7:58 ` [PATCH v3 9/9] UefiCpuLib: Remove UefiCpuLib Zhiguang Liu
  8 siblings, 2 replies; 18+ messages in thread
From: Zhiguang Liu @ 2022-11-01  7:58 UTC (permalink / raw)
  To: devel; +Cc: Yu Pu, Guo Dong, Ray Ni, Maurice Ma, Benjamin You, Sean Rhodes

From: Yu Pu <yu.pu@intel.com>

Because UefiCpuPkg/UefiCpuLib is merged to MdePkg/CpuLib, remove the
dependency of UefiCpuLib.

Cc: Guo Dong <guo.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Maurice Ma <maurice.ma@intel.com>
Cc: Benjamin You <benjamin.you@intel.com>
Cc: Sean Rhodes <sean@starlabs.systems>
Signed-off-by: Yu Pu <yu.pu@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
---
 UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h        | 1 -
 UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf      | 1 -
 UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf | 1 -
 UefiPayloadPkg/UefiPayloadPkg.dsc                         | 1 -
 4 files changed, 4 deletions(-)

diff --git a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h
index d1c7425b28..ad8a9fd22b 100644
--- a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h
+++ b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h
@@ -24,7 +24,6 @@
 #include <Library/BlParseLib.h>
 #include <Library/PlatformSupportLib.h>
 #include <Library/CpuLib.h>
-#include <Library/UefiCpuLib.h>
 #include <IndustryStandard/Acpi.h>
 #include <IndustryStandard/MemoryMappedConfigurationSpaceAccessTable.h>
 #include <Guid/SerialPortInfoGuid.h>
diff --git a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf
index 95446dd997..d47e8e76cf 100644
--- a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf
+++ b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf
@@ -55,7 +55,6 @@
   PeCoffLib
   PlatformSupportLib
   CpuLib
-  UefiCpuLib
 
 [Guids]
   gEfiMemoryTypeInformationGuid
diff --git a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf b/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf
index 3b4836042a..c4f4f28eaa 100644
--- a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf
+++ b/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf
@@ -53,7 +53,6 @@
   HobLib
   PeCoffLib
   CpuLib
-  UefiCpuLib
 
 [Guids]
   gEfiMemoryTypeInformationGuid
diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayloadPkg.dsc
index 1150be6acd..b7712d4de1 100644
--- a/UefiPayloadPkg/UefiPayloadPkg.dsc
+++ b/UefiPayloadPkg/UefiPayloadPkg.dsc
@@ -221,7 +221,6 @@
   UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
   DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
-  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
   SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
 
   #
-- 
2.31.1.windows.1


^ permalink raw reply related	[flat|nested] 18+ messages in thread
* [PATCH v3 9/9] UefiCpuLib: Remove UefiCpuLib.
  2022-11-01  7:58 [PATCH v3 0/9] merge UefiCpuPkg/UefiCpuLib to MdePkg/CpuLib Zhiguang Liu
                   ` (7 preceding siblings ...)
  2022-11-01  7:58 ` [PATCH v3 8/9] UefiPayloadPkg: " Zhiguang Liu
@ 2022-11-01  7:58 ` Zhiguang Liu
  8 siblings, 0 replies; 18+ messages in thread
From: Zhiguang Liu @ 2022-11-01  7:58 UTC (permalink / raw)
  To: devel; +Cc: Yu Pu, Eric Dong, Ray Ni, Rahul Kumar, Zhiguang Liu

From: Yu Pu <yu.pu@intel.com>

Because UefiCpuPkg/UefiCpuLib is merged to MdePkg/CpuLib and all modules
are updated to not depend on this library, remove it completely.

Cc: Eric Dong <eric.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
Signed-off-by: Yu Pu <yu.pu@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
---
 UefiCpuPkg/Include/Library/UefiCpuLib.h       | 16 ---------
 .../Library/BaseUefiCpuLib/BaseUefiCpuLib.inf | 35 -------------------
 .../Library/BaseUefiCpuLib/BaseUefiCpuLib.uni | 16 ---------
 .../BaseUefiCpuLib/BaseUefiCpuLibNull.c       | 16 ---------
 UefiCpuPkg/UefiCpuPkg.dec                     |  5 ---
 UefiCpuPkg/UefiCpuPkg.dsc                     |  2 --
 6 files changed, 90 deletions(-)
 delete mode 100644 UefiCpuPkg/Include/Library/UefiCpuLib.h
 delete mode 100644 UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
 delete mode 100644 UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.uni
 delete mode 100644 UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLibNull.c

diff --git a/UefiCpuPkg/Include/Library/UefiCpuLib.h b/UefiCpuPkg/Include/Library/UefiCpuLib.h
deleted file mode 100644
index ab6982db6e..0000000000
--- a/UefiCpuPkg/Include/Library/UefiCpuLib.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/** @file
-  Public header file for UEFI CPU library class.
-
-  This library class defines some routines that are generic for IA32 family CPU
-  to be UEFI specification compliant.
-
-  Copyright (c) 2009 - 2021, Intel Corporation. All rights reserved.<BR>
-  Copyright (c) 2020, AMD Inc. All rights reserved.<BR>
-  SPDX-License-Identifier: BSD-2-Clause-Patent
-
-**/
-
-#ifndef __UEFI_CPU_LIB_H__
-#define __UEFI_CPU_LIB_H__
-
-#endif
diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf b/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
deleted file mode 100644
index 9f8b62d87a..0000000000
--- a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
+++ /dev/null
@@ -1,35 +0,0 @@
-## @file
-#  This library defines some routines that are generic for IA32 family CPU.
-#
-#  The library routines are UEFI specification compliant.
-#
-#  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
-#  Copyright (c) 2020, AMD Inc. All rights reserved.<BR>
-#  SPDX-License-Identifier: BSD-2-Clause-Patent
-#
-##
-
-[Defines]
-  INF_VERSION                    = 0x00010005
-  BASE_NAME                      = BaseUefiCpuLib
-  MODULE_UNI_FILE                = BaseUefiCpuLib.uni
-  FILE_GUID                      = 34C24FD7-7A90-45c2-89FD-946473D9CE98
-  MODULE_TYPE                    = BASE
-  VERSION_STRING                 = 1.0
-  LIBRARY_CLASS                  = UefiCpuLib
-
-#
-# The following information is for reference only and not required by the build tools.
-#
-#  VALID_ARCHITECTURES           = IA32 X64
-#
-
-[Sources]
-  BaseUefiCpuLibNull.c
-
-[Packages]
-  MdePkg/MdePkg.dec
-  UefiCpuPkg/UefiCpuPkg.dec
-
-[LibraryClasses]
-  BaseLib
diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.uni b/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.uni
deleted file mode 100644
index 83c96cea67..0000000000
--- a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.uni
+++ /dev/null
@@ -1,16 +0,0 @@
-// /** @file
-// This library defines some routines that are generic for IA32 family CPU.
-//
-// The library routines are UEFI specification compliant.
-//
-// Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
-//
-// SPDX-License-Identifier: BSD-2-Clause-Patent
-//
-// **/
-
-
-#string STR_MODULE_ABSTRACT             #language en-US "Defines generic routines for IA32 family CPUs."
-
-#string STR_MODULE_DESCRIPTION          #language en-US "The library routines comply with the UEFI Specification."
-
diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLibNull.c b/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLibNull.c
deleted file mode 100644
index 24693635e4..0000000000
--- a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLibNull.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/** @file
-This library contains a dummy function to pass build.
-
-Copyright (c) 2022, Intel Corporation. All rights reserved.
-
-SPDX-License-Identifier: BSD-2-Clause-Patent
-**/
-#include <Base.h>
-
-VOID
-Dummy (
-  VOID
-  )
-{
-
-}
diff --git a/UefiCpuPkg/UefiCpuPkg.dec b/UefiCpuPkg/UefiCpuPkg.dec
index 718323d904..73aa2b7017 100644
--- a/UefiCpuPkg/UefiCpuPkg.dec
+++ b/UefiCpuPkg/UefiCpuPkg.dec
@@ -18,11 +18,6 @@
   Include
 
 [LibraryClasses]
-  ##  @libraryclass  Defines some routines that are generic for IA32 family CPU
-  ##                 to be UEFI specification compliant.
-  ##
-  UefiCpuLib|Include/Library/UefiCpuLib.h
-
   ##  @libraryclass  Defines some routines that are used to register/manage/program
   ##                 CPU features.
   ##
diff --git a/UefiCpuPkg/UefiCpuPkg.dsc b/UefiCpuPkg/UefiCpuPkg.dsc
index 0e1a99ddc0..6aae0cbd75 100644
--- a/UefiCpuPkg/UefiCpuPkg.dsc
+++ b/UefiCpuPkg/UefiCpuPkg.dsc
@@ -31,7 +31,6 @@
   SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf
   DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
-  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
   MtrrLib|UefiCpuPkg/Library/MtrrLib/MtrrLib.inf
   PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
@@ -140,7 +139,6 @@
   UefiCpuPkg/CpuIo2Smm/CpuIo2StandaloneMm.inf
   UefiCpuPkg/CpuMpPei/CpuMpPei.inf
   UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf
-  UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
   UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf
   UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf
   UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeaturesLib.inf
-- 
2.31.1.windows.1


^ permalink raw reply related	[flat|nested] 18+ messages in thread
* Re: [PATCH v3 3/9] IntelFsp2Pkg: Remove UefiCpuLib from module INFs.
  2022-11-01  7:58 ` [PATCH v3 3/9] IntelFsp2Pkg: Remove UefiCpuLib from module INFs Zhiguang Liu
@ 2022-11-01 16:11   ` Chiu, Chasel
  0 siblings, 0 replies; 18+ messages in thread
From: Chiu, Chasel @ 2022-11-01 16:11 UTC (permalink / raw)
  To: Liu, Zhiguang, devel@edk2.groups.io
  Cc: Yu Pu, Desimone, Nathaniel L, Zeng, Star


Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>

Thanks,
Chasel


> -----Original Message-----
> From: Liu, Zhiguang <zhiguang.liu@intel.com>
> Sent: Tuesday, November 1, 2022 12:59 AM
> To: devel@edk2.groups.io
> Cc: Yu Pu <yu.pu@intel.com>; Chiu, Chasel <chasel.chiu@intel.com>;
> Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Zeng, Star
> <star.zeng@intel.com>
> Subject: [PATCH v3 3/9] IntelFsp2Pkg: Remove UefiCpuLib from module
> INFs.
> 
> From: Yu Pu <yu.pu@intel.com>
> 
> Because UefiCpuPkg/UefiCpuLib is merged to MdePkg/CpuLib, remove the
> dependency of UefiCpuLib.
> 
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> Cc: Star Zeng <star.zeng@intel.com>
> Signed-off-by: Yu Pu <yu.pu@intel.com>
> Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>
> ---
>  IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf                 | 1 -
>  IntelFsp2Pkg/FspSecCore/SecMain.h                       | 1 -
>  IntelFsp2Pkg/IntelFsp2Pkg.dsc                           | 1 -
>  IntelFsp2Pkg/Tools/Tests/QemuFspPkg.dsc                 | 1 -
>  IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf | 1 -
> IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf | 1 -
>  IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc             | 1 -
>  7 files changed, 7 deletions(-)
> 
> diff --git a/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf
> b/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf
> index f920f1f6d0..8029832235 100644
> --- a/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf
> +++ b/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf
> @@ -59,7 +59,6 @@
>    FspCommonLib
>    FspSecPlatformLib
>    CpuLib
> -  UefiCpuLib
> 
>  [Pcd]
>    gIntelFsp2PkgTokenSpaceGuid.PcdTemporaryRamBase              ##
> CONSUMES
> diff --git a/IntelFsp2Pkg/FspSecCore/SecMain.h
> b/IntelFsp2Pkg/FspSecCore/SecMain.h
> index a09653da96..023deb7e2b 100644
> --- a/IntelFsp2Pkg/FspSecCore/SecMain.h
> +++ b/IntelFsp2Pkg/FspSecCore/SecMain.h
> @@ -21,7 +21,6 @@
>  #include <Library/FspSwitchStackLib.h>
>  #include <Library/FspCommonLib.h>
>  #include <Library/CpuLib.h>
> -#include <Library/UefiCpuLib.h>
>  #include <FspEas.h>
> 
>  typedef
> diff --git a/IntelFsp2Pkg/IntelFsp2Pkg.dsc b/IntelFsp2Pkg/IntelFsp2Pkg.dsc
> index 0713f0028d..f236a7010b 100644
> --- a/IntelFsp2Pkg/IntelFsp2Pkg.dsc
> +++ b/IntelFsp2Pkg/IntelFsp2Pkg.dsc
> @@ -27,7 +27,6 @@
>    PciCf8Lib|MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.inf
>    IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
> 
> UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDeco
> mpressLib.inf
> -  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
> 
> 
> ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseR
> eportStatusCodeLibNull.inf
> 
> PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanc
> eLibNull.inf
> diff --git a/IntelFsp2Pkg/Tools/Tests/QemuFspPkg.dsc
> b/IntelFsp2Pkg/Tools/Tests/QemuFspPkg.dsc
> index 961576c9a7..3155812118 100644
> --- a/IntelFsp2Pkg/Tools/Tests/QemuFspPkg.dsc
> +++ b/IntelFsp2Pkg/Tools/Tests/QemuFspPkg.dsc
> @@ -107,7 +107,6 @@
> 
> PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePl
> atformHookLibNull.inf
> 
> PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanc
> eLibNull.inf
> 
> OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLib
> Null/OemHookStatusCodeLibNull.inf
> -  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
>  !if $(TARGET) == DEBUG
> 
> DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort
> .inf
> 
> SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPo
> rtLib16550.inf
> diff --git a/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf
> b/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf
> index 332509e0bc..0307ce0acc 100644
> --- a/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf
> +++ b/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf
> @@ -38,7 +38,6 @@
>    FspWrapperPlatformLib
>    FspWrapperHobProcessLib
>    CpuLib
> -  UefiCpuLib
>    PeCoffGetEntryPointLib
>    PeCoffExtraActionLib
>    PerformanceLib
> diff --git a/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf
> b/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf
> index f9c2ffca1c..a7b28e56b5 100644
> --- a/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf
> +++ b/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf
> @@ -39,7 +39,6 @@
>    FspWrapperPlatformLib
>    FspWrapperHobProcessLib
>    CpuLib
> -  UefiCpuLib
>    PeCoffGetEntryPointLib
>    PeCoffExtraActionLib
>    PerformanceLib
> diff --git a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc
> b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc
> index b1fc2291c8..fe621244a6 100644
> --- a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc
> +++ b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc
> @@ -41,7 +41,6 @@
> 
> DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLi
> bNull.inf
> 
>    # UefiCpuPkg
> -  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
>    LocalApicLib|UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf
> 
>    # FSP Wrapper Lib
> --
> 2.31.1.windows.1


^ permalink raw reply	[flat|nested] 18+ messages in thread
* Re: [PATCH v3 6/9] SourceLevelDebugPkg: Remove UefiCpuLib from module INFs.
  2022-11-01  7:58 ` [PATCH v3 6/9] SourceLevelDebugPkg: " Zhiguang Liu
@ 2022-11-02  1:04   ` Wu, Hao A
  0 siblings, 0 replies; 18+ messages in thread
From: Wu, Hao A @ 2022-11-02  1:04 UTC (permalink / raw)
  To: Liu, Zhiguang, devel@edk2.groups.io; +Cc: Yu Pu, Ni, Ray

Acked-by: Hao A Wu <hao.a.wu@intel.com>

Best Regards,
Hao Wu

> -----Original Message-----
> From: Liu, Zhiguang <zhiguang.liu@intel.com>
> Sent: Tuesday, November 1, 2022 3:59 PM
> To: devel@edk2.groups.io
> Cc: Yu Pu <yu.pu@intel.com>; Wu, Hao A <hao.a.wu@intel.com>; Ni, Ray
> <ray.ni@intel.com>
> Subject: [PATCH v3 6/9] SourceLevelDebugPkg: Remove UefiCpuLib from
> module INFs.
> 
> From: Yu Pu <yu.pu@intel.com>
> 
> Because UefiCpuPkg/UefiCpuLib is merged to MdePkg/CpuLib, remove the
> dependency of UefiCpuLib.
> 
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Signed-off-by: Yu Pu <yu.pu@intel.com>
> Reviewed-by: Ray Ni <ray.ni@intel.com>
> ---
>  SourceLevelDebugPkg/SourceLevelDebugPkg.dsc | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/SourceLevelDebugPkg/SourceLevelDebugPkg.dsc
> b/SourceLevelDebugPkg/SourceLevelDebugPkg.dsc
> index eba64a7b78..986dd5a769 100644
> --- a/SourceLevelDebugPkg/SourceLevelDebugPkg.dsc
> +++ b/SourceLevelDebugPkg/SourceLevelDebugPkg.dsc
> @@ -35,7 +35,6 @@
>    IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
> 
> SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizati
> onLib.inf
>    LocalApicLib|UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf
> -  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
> 
> PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeC
> offGetEntryPointLib.inf
> 
> SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLi
> b16550.inf
> 
> PeCoffExtraActionLib|SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebu
> g/PeCoffExtraActionLibDebug.inf
> --
> 2.31.1.windows.1


^ permalink raw reply	[flat|nested] 18+ messages in thread
* Re: [edk2-devel] [PATCH v3 8/9] UefiPayloadPkg: Remove UefiCpuLib from module INFs.
  2022-11-01  7:58 ` [PATCH v3 8/9] UefiPayloadPkg: " Zhiguang Liu
@ 2022-11-02  5:22   ` Lu, James
  2022-11-02  5:30     ` Guo, Gua
  2022-11-03 14:11   ` Guo Dong
  1 sibling, 1 reply; 18+ messages in thread
From: Lu, James @ 2022-11-02  5:22 UTC (permalink / raw)
  To: devel@edk2.groups.io, Liu, Zhiguang
  Cc: Yu Pu, Dong, Guo, Ni, Ray, Maurice Ma, You, Benjamin,
	Rhodes, Sean

Reviewed-by: James Lu <james.lu@intel.com>

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Zhiguang Liu
Sent: Tuesday, November 1, 2022 3:59 PM
To: devel@edk2.groups.io
Cc: Yu Pu <yu.pu@intel.com>; Dong, Guo <guo.dong@intel.com>; Ni, Ray <ray.ni@intel.com>; Maurice Ma <maurice.ma@intel.com>; You, Benjamin <benjamin.you@intel.com>; Rhodes, Sean <sean@starlabs.systems>
Subject: [edk2-devel] [PATCH v3 8/9] UefiPayloadPkg: Remove UefiCpuLib from module INFs.

From: Yu Pu <yu.pu@intel.com>

Because UefiCpuPkg/UefiCpuLib is merged to MdePkg/CpuLib, remove the dependency of UefiCpuLib.

Cc: Guo Dong <guo.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Maurice Ma <maurice.ma@intel.com>
Cc: Benjamin You <benjamin.you@intel.com>
Cc: Sean Rhodes <sean@starlabs.systems>
Signed-off-by: Yu Pu <yu.pu@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
---
 UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h        | 1 -
 UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf      | 1 -
 UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf | 1 -
 UefiPayloadPkg/UefiPayloadPkg.dsc                         | 1 -
 4 files changed, 4 deletions(-)

diff --git a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h
index d1c7425b28..ad8a9fd22b 100644
--- a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h
+++ b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h
@@ -24,7 +24,6 @@
 #include <Library/BlParseLib.h>
 #include <Library/PlatformSupportLib.h>  #include <Library/CpuLib.h> -#include <Library/UefiCpuLib.h>  #include <IndustryStandard/Acpi.h>  #include <IndustryStandard/MemoryMappedConfigurationSpaceAccessTable.h>
 #include <Guid/SerialPortInfoGuid.h>
diff --git a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf
index 95446dd997..d47e8e76cf 100644
--- a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf
+++ b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf
@@ -55,7 +55,6 @@
   PeCoffLib
   PlatformSupportLib
   CpuLib
-  UefiCpuLib
 
 [Guids]
   gEfiMemoryTypeInformationGuid
diff --git a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf b/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf
index 3b4836042a..c4f4f28eaa 100644
--- a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf
+++ b/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf
@@ -53,7 +53,6 @@
   HobLib
   PeCoffLib
   CpuLib
-  UefiCpuLib
 
 [Guids]
   gEfiMemoryTypeInformationGuid
diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayloadPkg.dsc
index 1150be6acd..b7712d4de1 100644
--- a/UefiPayloadPkg/UefiPayloadPkg.dsc
+++ b/UefiPayloadPkg/UefiPayloadPkg.dsc
@@ -221,7 +221,6 @@
   UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
   DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
-  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
   SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
 
   #
--
2.31.1.windows.1







^ permalink raw reply related	[flat|nested] 18+ messages in thread
* Re: [edk2-devel] [PATCH v3 8/9] UefiPayloadPkg: Remove UefiCpuLib from module INFs.
  2022-11-02  5:22   ` [edk2-devel] " Lu, James
@ 2022-11-02  5:30     ` Guo, Gua
  0 siblings, 0 replies; 18+ messages in thread
From: Guo, Gua @ 2022-11-02  5:30 UTC (permalink / raw)
  To: devel@edk2.groups.io, Lu, James, Liu, Zhiguang
  Cc: Yu Pu, Dong, Guo, Ni, Ray, Maurice Ma, You, Benjamin,
	Rhodes, Sean

Reviewed-by: Gua Guo <gua.guo@intel.com>

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Lu, James
Sent: Wednesday, November 2, 2022 1:23 PM
To: devel@edk2.groups.io; Liu, Zhiguang <zhiguang.liu@intel.com>
Cc: Yu Pu <yu.pu@intel.com>; Dong, Guo <guo.dong@intel.com>; Ni, Ray <ray.ni@intel.com>; Maurice Ma <maurice.ma@intel.com>; You, Benjamin <benjamin.you@intel.com>; Rhodes, Sean <sean@starlabs.systems>
Subject: Re: [edk2-devel] [PATCH v3 8/9] UefiPayloadPkg: Remove UefiCpuLib from module INFs.

Reviewed-by: James Lu <james.lu@intel.com>

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Zhiguang Liu
Sent: Tuesday, November 1, 2022 3:59 PM
To: devel@edk2.groups.io
Cc: Yu Pu <yu.pu@intel.com>; Dong, Guo <guo.dong@intel.com>; Ni, Ray <ray.ni@intel.com>; Maurice Ma <maurice.ma@intel.com>; You, Benjamin <benjamin.you@intel.com>; Rhodes, Sean <sean@starlabs.systems>
Subject: [edk2-devel] [PATCH v3 8/9] UefiPayloadPkg: Remove UefiCpuLib from module INFs.

From: Yu Pu <yu.pu@intel.com>

Because UefiCpuPkg/UefiCpuLib is merged to MdePkg/CpuLib, remove the dependency of UefiCpuLib.

Cc: Guo Dong <guo.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Maurice Ma <maurice.ma@intel.com>
Cc: Benjamin You <benjamin.you@intel.com>
Cc: Sean Rhodes <sean@starlabs.systems>
Signed-off-by: Yu Pu <yu.pu@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
---
 UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h        | 1 -
 UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf      | 1 -
 UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf | 1 -
 UefiPayloadPkg/UefiPayloadPkg.dsc                         | 1 -
 4 files changed, 4 deletions(-)

diff --git a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h
index d1c7425b28..ad8a9fd22b 100644
--- a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h
+++ b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h
@@ -24,7 +24,6 @@
 #include <Library/BlParseLib.h>
 #include <Library/PlatformSupportLib.h>  #include <Library/CpuLib.h> -#include <Library/UefiCpuLib.h>  #include <IndustryStandard/Acpi.h>  #include <IndustryStandard/MemoryMappedConfigurationSpaceAccessTable.h>
 #include <Guid/SerialPortInfoGuid.h>
diff --git a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf
index 95446dd997..d47e8e76cf 100644
--- a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf
+++ b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf
@@ -55,7 +55,6 @@
   PeCoffLib
   PlatformSupportLib
   CpuLib
-  UefiCpuLib
 
 [Guids]
   gEfiMemoryTypeInformationGuid
diff --git a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf b/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf
index 3b4836042a..c4f4f28eaa 100644
--- a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf
+++ b/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf
@@ -53,7 +53,6 @@
   HobLib
   PeCoffLib
   CpuLib
-  UefiCpuLib
 
 [Guids]
   gEfiMemoryTypeInformationGuid
diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayloadPkg.dsc
index 1150be6acd..b7712d4de1 100644
--- a/UefiPayloadPkg/UefiPayloadPkg.dsc
+++ b/UefiPayloadPkg/UefiPayloadPkg.dsc
@@ -221,7 +221,6 @@
   UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
   DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
-  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
   SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
 
   #
--
2.31.1.windows.1












^ permalink raw reply related	[flat|nested] 18+ messages in thread
* Re: [PATCH v3 8/9] UefiPayloadPkg: Remove UefiCpuLib from module INFs.
  2022-11-01  7:58 ` [PATCH v3 8/9] UefiPayloadPkg: " Zhiguang Liu
  2022-11-02  5:22   ` [edk2-devel] " Lu, James
@ 2022-11-03 14:11   ` Guo Dong
  1 sibling, 0 replies; 18+ messages in thread
From: Guo Dong @ 2022-11-03 14:11 UTC (permalink / raw)
  To: Liu, Zhiguang, devel@edk2.groups.io
  Cc: Yu Pu, Ni, Ray, Maurice Ma, You, Benjamin, Rhodes, Sean

Reviewed-by: Guo Dong <guo.dong@intel.com>

-----Original Message-----
From: Liu, Zhiguang <zhiguang.liu@intel.com> 
Sent: Tuesday, November 1, 2022 12:59 AM
To: devel@edk2.groups.io
Cc: Yu Pu <yu.pu@intel.com>; Dong, Guo <guo.dong@intel.com>; Ni, Ray <ray.ni@intel.com>; Maurice Ma <maurice.ma@intel.com>; You, Benjamin <benjamin.you@intel.com>; Rhodes, Sean <sean@starlabs.systems>
Subject: [PATCH v3 8/9] UefiPayloadPkg: Remove UefiCpuLib from module INFs.

From: Yu Pu <yu.pu@intel.com>

Because UefiCpuPkg/UefiCpuLib is merged to MdePkg/CpuLib, remove the dependency of UefiCpuLib.

Cc: Guo Dong <guo.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Maurice Ma <maurice.ma@intel.com>
Cc: Benjamin You <benjamin.you@intel.com>
Cc: Sean Rhodes <sean@starlabs.systems>
Signed-off-by: Yu Pu <yu.pu@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
---
 UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h        | 1 -
 UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf      | 1 -
 UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf | 1 -
 UefiPayloadPkg/UefiPayloadPkg.dsc                         | 1 -
 4 files changed, 4 deletions(-)

diff --git a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h
index d1c7425b28..ad8a9fd22b 100644
--- a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h
+++ b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h
@@ -24,7 +24,6 @@
 #include <Library/BlParseLib.h>
 #include <Library/PlatformSupportLib.h>  #include <Library/CpuLib.h> -#include <Library/UefiCpuLib.h>  #include <IndustryStandard/Acpi.h>  #include <IndustryStandard/MemoryMappedConfigurationSpaceAccessTable.h>
 #include <Guid/SerialPortInfoGuid.h>
diff --git a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf
index 95446dd997..d47e8e76cf 100644
--- a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf
+++ b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf
@@ -55,7 +55,6 @@
   PeCoffLib
   PlatformSupportLib
   CpuLib
-  UefiCpuLib
 
 [Guids]
   gEfiMemoryTypeInformationGuid
diff --git a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf b/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf
index 3b4836042a..c4f4f28eaa 100644
--- a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf
+++ b/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf
@@ -53,7 +53,6 @@
   HobLib
   PeCoffLib
   CpuLib
-  UefiCpuLib
 
 [Guids]
   gEfiMemoryTypeInformationGuid
diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayloadPkg.dsc
index 1150be6acd..b7712d4de1 100644
--- a/UefiPayloadPkg/UefiPayloadPkg.dsc
+++ b/UefiPayloadPkg/UefiPayloadPkg.dsc
@@ -221,7 +221,6 @@
   UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
   DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
-  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
   SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
 
   #
--
2.31.1.windows.1


^ permalink raw reply related	[flat|nested] 18+ messages in thread
* Re: [edk2-devel] [PATCH v3 1/9] OvmfPkg: Add CpuLib to module INFs that depend on UefiCpuLib.
  2022-11-01  7:58 ` [PATCH v3 1/9] OvmfPkg: Add CpuLib to module INFs that depend on UefiCpuLib Zhiguang Liu
@ 2022-11-04  6:43   ` Ni, Ray
  2022-11-04  6:44   ` Zhiguang Liu
  1 sibling, 0 replies; 18+ messages in thread
From: Ni, Ray @ 2022-11-04  6:43 UTC (permalink / raw)
  To: devel@edk2.groups.io, Liu, Zhiguang
  Cc: Ard Biesheuvel, Yao, Jiewen, Justen, Jordan L, Gerd Hoffmann

Reviewed-by: Ray Ni <ray.ni@intel.com>

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of
> Zhiguang Liu
> Sent: Tuesday, November 1, 2022 3:59 PM
> To: devel@edk2.groups.io
> Cc: Liu, Zhiguang <zhiguang.liu@intel.com>; Ard Biesheuvel
> <ardb+tianocore@kernel.org>; Yao, Jiewen <jiewen.yao@intel.com>; Justen,
> Jordan L <jordan.l.justen@intel.com>; Gerd Hoffmann <kraxel@redhat.com>
> Subject: [edk2-devel] [PATCH v3 1/9] OvmfPkg: Add CpuLib to module INFs
> that depend on UefiCpuLib.
> 
> There are two libraries: MdePkg/CpuLib and UefiCpuPkg/UefiCpuLib and
> UefiCpuPkg/UefiCpuLib will be merged to MdePkg/CpuLib. To avoid build
> failure, add CpuLib dependency to all modules that depend on UefiCpuLib.
> 
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
> ---
>  OvmfPkg/IntelTdx/Sec/SecMain.c             | 1 +
>  OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c | 1 +
>  2 files changed, 2 insertions(+)
> 
> diff --git a/OvmfPkg/IntelTdx/Sec/SecMain.c
> b/OvmfPkg/IntelTdx/Sec/SecMain.c
> index ab01ec9ab1..eef47f17e4 100644
> --- a/OvmfPkg/IntelTdx/Sec/SecMain.c
> +++ b/OvmfPkg/IntelTdx/Sec/SecMain.c
> @@ -17,6 +17,7 @@
>  #include <Library/BaseMemoryLib.h>
>  #include <Library/PcdLib.h>
>  #include <Library/UefiCpuLib.h>
> +#include <Library/CpuLib.h>
>  #include <Library/DebugAgentLib.h>
>  #include <Library/IoLib.h>
>  #include <Library/PeCoffLib.h>
> diff --git a/OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c
> b/OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c
> index 74cb55611f..0e2515ca38 100644
> --- a/OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c
> +++ b/OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c
> @@ -11,6 +11,7 @@
>  #include <Library/BaseMemoryLib.h>
>  #include <Library/PcdLib.h>
>  #include <Library/UefiCpuLib.h>
> +#include <Library/CpuLib.h>
>  #include <Library/SynchronizationLib.h>
>  #include <Uefi/UefiBaseType.h>
>  #include <Library/TdxLib.h>
> --
> 2.31.1.windows.1
> 
> 
> 
> 
> 


^ permalink raw reply	[flat|nested] 18+ messages in thread
* Re: [edk2-devel] [PATCH v3 4/9] OvmfPkg: Remove UefiCpuLib from module INFs.
  2022-11-01  7:58 ` [PATCH v3 4/9] OvmfPkg: " Zhiguang Liu
@ 2022-11-04  6:43   ` Ni, Ray
  0 siblings, 0 replies; 18+ messages in thread
From: Ni, Ray @ 2022-11-04  6:43 UTC (permalink / raw)
  To: devel@edk2.groups.io, Liu, Zhiguang
  Cc: Yu Pu, Ard Biesheuvel, Yao, Jiewen, Justen, Jordan L,
	Gerd Hoffmann

Reviewed-by: Ray Ni <ray.ni@intel.com>

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of
> Zhiguang Liu
> Sent: Tuesday, November 1, 2022 3:59 PM
> To: devel@edk2.groups.io
> Cc: Yu Pu <yu.pu@intel.com>; Ard Biesheuvel <ardb+tianocore@kernel.org>;
> Yao, Jiewen <jiewen.yao@intel.com>; Justen, Jordan L
> <jordan.l.justen@intel.com>; Gerd Hoffmann <kraxel@redhat.com>; Liu,
> Zhiguang <zhiguang.liu@intel.com>
> Subject: [edk2-devel] [PATCH v3 4/9] OvmfPkg: Remove UefiCpuLib from
> module INFs.
> 
> From: Yu Pu <yu.pu@intel.com>
> 
> Because UefiCpuPkg/UefiCpuLib is merged to MdePkg/CpuLib, remove the
> dependency of UefiCpuLib.
> 
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Signed-off-by: Yu Pu <yu.pu@intel.com>
> Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
> ---
>  OvmfPkg/AmdSev/AmdSevX64.dsc               | 1 -
>  OvmfPkg/Bhyve/BhyveX64.dsc                 | 1 -
>  OvmfPkg/CloudHv/CloudHvX64.dsc             | 1 -
>  OvmfPkg/IntelTdx/Sec/SecMain.c             | 1 -
>  OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c | 1 -
>  OvmfPkg/Microvm/MicrovmX64.dsc             | 1 -
>  OvmfPkg/OvmfPkgIa32.dsc                    | 1 -
>  OvmfPkg/OvmfPkgIa32X64.dsc                 | 1 -
>  OvmfPkg/OvmfPkgX64.dsc                     | 1 -
>  OvmfPkg/OvmfXen.dsc                        | 1 -
>  OvmfPkg/Sec/SecMain.c                      | 1 -
>  OvmfPkg/Sec/SecMain.inf                    | 1 -
>  12 files changed, 12 deletions(-)
> 
> diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc
> b/OvmfPkg/AmdSev/AmdSevX64.dsc
> index 90e8a213ef..b894d710f7 100644
> --- a/OvmfPkg/AmdSev/AmdSevX64.dsc
> +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
> @@ -154,7 +154,6 @@
> 
> UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiA
> pplicationEntryPoint.inf
> 
> DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiD
> evicePathLibDevicePathProtocol.inf
>    FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
> -  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
> 
> SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementL
> ib/DxeSecurityManagementLib.inf
>    UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
> 
> SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariable
> sLib.inf
> diff --git a/OvmfPkg/Bhyve/BhyveX64.dsc b/OvmfPkg/Bhyve/BhyveX64.dsc
> index 475b88b21a..9a4b1a3d15 100644
> --- a/OvmfPkg/Bhyve/BhyveX64.dsc
> +++ b/OvmfPkg/Bhyve/BhyveX64.dsc
> @@ -160,7 +160,6 @@
> 
> DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiD
> evicePathLibDevicePathProtocol.inf
>    NvVarsFileLib|OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.inf
>    FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
> -  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
> 
> SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementL
> ib/DxeSecurityManagementLib.inf
>    UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
> 
> SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariable
> sLib.inf
> diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc
> b/OvmfPkg/CloudHv/CloudHvX64.dsc
> index 10b16104ac..23aa065606 100644
> --- a/OvmfPkg/CloudHv/CloudHvX64.dsc
> +++ b/OvmfPkg/CloudHv/CloudHvX64.dsc
> @@ -181,7 +181,6 @@
> 
> DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiD
> evicePathLibDevicePathProtocol.inf
>    NvVarsFileLib|OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.inf
>    FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
> -  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
> 
> SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementL
> ib/DxeSecurityManagementLib.inf
> 
> SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariable
> sLib.inf
>    QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibNull.inf
> diff --git a/OvmfPkg/IntelTdx/Sec/SecMain.c
> b/OvmfPkg/IntelTdx/Sec/SecMain.c
> index eef47f17e4..3f5c8e82f4 100644
> --- a/OvmfPkg/IntelTdx/Sec/SecMain.c
> +++ b/OvmfPkg/IntelTdx/Sec/SecMain.c
> @@ -16,7 +16,6 @@
>  #include <Library/DebugLib.h>
>  #include <Library/BaseMemoryLib.h>
>  #include <Library/PcdLib.h>
> -#include <Library/UefiCpuLib.h>
>  #include <Library/CpuLib.h>
>  #include <Library/DebugAgentLib.h>
>  #include <Library/IoLib.h>
> diff --git a/OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c
> b/OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c
> index 0e2515ca38..8bd6202279 100644
> --- a/OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c
> +++ b/OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c
> @@ -10,7 +10,6 @@
>  #include <Library/DebugLib.h>
>  #include <Library/BaseMemoryLib.h>
>  #include <Library/PcdLib.h>
> -#include <Library/UefiCpuLib.h>
>  #include <Library/CpuLib.h>
>  #include <Library/SynchronizationLib.h>
>  #include <Uefi/UefiBaseType.h>
> diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc
> b/OvmfPkg/Microvm/MicrovmX64.dsc
> index 7eff8e2a88..4903712321 100644
> --- a/OvmfPkg/Microvm/MicrovmX64.dsc
> +++ b/OvmfPkg/Microvm/MicrovmX64.dsc
> @@ -179,7 +179,6 @@
> 
> DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiD
> evicePathLibDevicePathProtocol.inf
>    NvVarsFileLib|OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.inf
>    FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
> -  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
> 
> SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementL
> ib/DxeSecurityManagementLib.inf
>    UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
> 
> SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariable
> sLib.inf
> diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
> index e9ba491237..662a2d9140 100644
> --- a/OvmfPkg/OvmfPkgIa32.dsc
> +++ b/OvmfPkg/OvmfPkgIa32.dsc
> @@ -182,7 +182,6 @@
> 
> DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiD
> evicePathLibDevicePathProtocol.inf
>    NvVarsFileLib|OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.inf
>    FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
> -  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
> 
> SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementL
> ib/DxeSecurityManagementLib.inf
>    UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
> 
> SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariable
> sLib.inf
> diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
> index af566b953f..8ce659300d 100644
> --- a/OvmfPkg/OvmfPkgIa32X64.dsc
> +++ b/OvmfPkg/OvmfPkgIa32X64.dsc
> @@ -186,7 +186,6 @@
> 
> DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiD
> evicePathLibDevicePathProtocol.inf
>    NvVarsFileLib|OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.inf
>    FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
> -  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
> 
> SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementL
> ib/DxeSecurityManagementLib.inf
>    UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
> 
> SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariable
> sLib.inf
> diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
> index f39d9cd117..d9223b33d2 100644
> --- a/OvmfPkg/OvmfPkgX64.dsc
> +++ b/OvmfPkg/OvmfPkgX64.dsc
> @@ -198,7 +198,6 @@
> 
> DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiD
> evicePathLibDevicePathProtocol.inf
>    NvVarsFileLib|OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.inf
>    FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
> -  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
> 
> SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementL
> ib/DxeSecurityManagementLib.inf
>    UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
> 
> SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariable
> sLib.inf
> diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc
> index 58a7c97cdd..dcd14ea372 100644
> --- a/OvmfPkg/OvmfXen.dsc
> +++ b/OvmfPkg/OvmfXen.dsc
> @@ -161,7 +161,6 @@
> 
> DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiD
> evicePathLibDevicePathProtocol.inf
>    NvVarsFileLib|OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.inf
>    FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
> -  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
> 
> SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementL
> ib/DxeSecurityManagementLib.inf
>    UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
> 
> SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariable
> sLib.inf
> diff --git a/OvmfPkg/Sec/SecMain.c b/OvmfPkg/Sec/SecMain.c
> index 1167d22a68..af3a2c41e2 100644
> --- a/OvmfPkg/Sec/SecMain.c
> +++ b/OvmfPkg/Sec/SecMain.c
> @@ -18,7 +18,6 @@
>  #include <Library/PeiServicesLib.h>
>  #include <Library/PcdLib.h>
>  #include <Library/CpuLib.h>
> -#include <Library/UefiCpuLib.h>
>  #include <Library/DebugAgentLib.h>
>  #include <Library/IoLib.h>
>  #include <Library/PeCoffLib.h>
> diff --git a/OvmfPkg/Sec/SecMain.inf b/OvmfPkg/Sec/SecMain.inf
> index 561a840f29..3c47a664a9 100644
> --- a/OvmfPkg/Sec/SecMain.inf
> +++ b/OvmfPkg/Sec/SecMain.inf
> @@ -45,7 +45,6 @@
>    PeiServicesLib
>    PcdLib
>    CpuLib
> -  UefiCpuLib
>    DebugAgentLib
>    IoLib
>    PeCoffLib
> --
> 2.31.1.windows.1
> 
> 
> 
> 
> 


^ permalink raw reply	[flat|nested] 18+ messages in thread
* Re: [PATCH v3 1/9] OvmfPkg: Add CpuLib to module INFs that depend on UefiCpuLib.
  2022-11-01  7:58 ` [PATCH v3 1/9] OvmfPkg: Add CpuLib to module INFs that depend on UefiCpuLib Zhiguang Liu
  2022-11-04  6:43   ` [edk2-devel] " Ni, Ray
@ 2022-11-04  6:44   ` Zhiguang Liu
  1 sibling, 0 replies; 18+ messages in thread
From: Zhiguang Liu @ 2022-11-04  6:44 UTC (permalink / raw)
  To: devel@edk2.groups.io
  Cc: Ard Biesheuvel, Yao, Jiewen, Justen, Jordan L, Gerd Hoffmann

Hi OvmfPkg Maintainers,
Could you help review this patch, and also the patch "[PATCH v3 4/9] OvmfPkg: Remove UefiCpuLib from module INFs." ?

Thanks
Zhiguang

> -----Original Message-----
> From: Liu, Zhiguang <zhiguang.liu@intel.com>
> Sent: Tuesday, November 1, 2022 3:59 PM
> To: devel@edk2.groups.io
> Cc: Liu, Zhiguang <zhiguang.liu@intel.com>; Ard Biesheuvel
> <ardb+tianocore@kernel.org>; Yao, Jiewen <jiewen.yao@intel.com>; Justen,
> Jordan L <jordan.l.justen@intel.com>; Gerd Hoffmann <kraxel@redhat.com>
> Subject: [PATCH v3 1/9] OvmfPkg: Add CpuLib to module INFs that depend
> on UefiCpuLib.
> 
> There are two libraries: MdePkg/CpuLib and UefiCpuPkg/UefiCpuLib and
> UefiCpuPkg/UefiCpuLib will be merged to MdePkg/CpuLib. To avoid build
> failure, add CpuLib dependency to all modules that depend on UefiCpuLib.
> 
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
> ---
>  OvmfPkg/IntelTdx/Sec/SecMain.c             | 1 +
>  OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c | 1 +
>  2 files changed, 2 insertions(+)
> 
> diff --git a/OvmfPkg/IntelTdx/Sec/SecMain.c
> b/OvmfPkg/IntelTdx/Sec/SecMain.c index ab01ec9ab1..eef47f17e4 100644
> --- a/OvmfPkg/IntelTdx/Sec/SecMain.c
> +++ b/OvmfPkg/IntelTdx/Sec/SecMain.c
> @@ -17,6 +17,7 @@
>  #include <Library/BaseMemoryLib.h>
>  #include <Library/PcdLib.h>
>  #include <Library/UefiCpuLib.h>
> +#include <Library/CpuLib.h>
>  #include <Library/DebugAgentLib.h>
>  #include <Library/IoLib.h>
>  #include <Library/PeCoffLib.h>
> diff --git a/OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c
> b/OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c
> index 74cb55611f..0e2515ca38 100644
> --- a/OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c
> +++ b/OvmfPkg/Library/TdxMailboxLib/TdxMailbox.c
> @@ -11,6 +11,7 @@
>  #include <Library/BaseMemoryLib.h>
>  #include <Library/PcdLib.h>
>  #include <Library/UefiCpuLib.h>
> +#include <Library/CpuLib.h>
>  #include <Library/SynchronizationLib.h>  #include <Uefi/UefiBaseType.h>
> #include <Library/TdxLib.h>
> --
> 2.31.1.windows.1


^ permalink raw reply	[flat|nested] 18+ messages in thread
end of thread, other threads:[~2022-11-04  6:44 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-01  7:58 [PATCH v3 0/9] merge UefiCpuPkg/UefiCpuLib to MdePkg/CpuLib Zhiguang Liu
2022-11-01  7:58 ` [PATCH v3 1/9] OvmfPkg: Add CpuLib to module INFs that depend on UefiCpuLib Zhiguang Liu
2022-11-04  6:43   ` [edk2-devel] " Ni, Ray
2022-11-04  6:44   ` Zhiguang Liu
2022-11-01  7:58 ` [PATCH v3 2/9] MdePkg: Move API and implementation from UefiCpuLib to CpuLib Zhiguang Liu
2022-11-01  7:58 ` [PATCH v3 3/9] IntelFsp2Pkg: Remove UefiCpuLib from module INFs Zhiguang Liu
2022-11-01 16:11   ` Chiu, Chasel
2022-11-01  7:58 ` [PATCH v3 4/9] OvmfPkg: " Zhiguang Liu
2022-11-04  6:43   ` [edk2-devel] " Ni, Ray
2022-11-01  7:58 ` [PATCH v3 5/9] PcAtChipsetPkg: " Zhiguang Liu
2022-11-01  7:58 ` [PATCH v3 6/9] SourceLevelDebugPkg: " Zhiguang Liu
2022-11-02  1:04   ` Wu, Hao A
2022-11-01  7:58 ` [PATCH v3 7/9] UefiCpuPkg: " Zhiguang Liu
2022-11-01  7:58 ` [PATCH v3 8/9] UefiPayloadPkg: " Zhiguang Liu
2022-11-02  5:22   ` [edk2-devel] " Lu, James
2022-11-02  5:30     ` Guo, Gua
2022-11-03 14:11   ` Guo Dong
2022-11-01  7:58 ` [PATCH v3 9/9] UefiCpuLib: Remove UefiCpuLib Zhiguang Liu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox