[edk2-devel] [PATCH v3 0/9] merge UefiCpuPkg/UefiCpuLib to MdePkg/CpuLib

Zhiguang Liu posted 9 patches 1 year, 5 months ago
Failed in applying to current master (apply log)
There is a newer version of this series
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
[edk2-devel] [PATCH v3 0/9] merge UefiCpuPkg/UefiCpuLib to MdePkg/CpuLib
Posted by Zhiguang Liu 1 year, 5 months ago
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



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#95804): https://edk2.groups.io/g/devel/message/95804
Mute This Topic: https://groups.io/mt/94704513/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-