From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web12.27525.1649670361806041493 for ; Mon, 11 Apr 2022 02:46:02 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=nqO477G7; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: yu.pu@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1649670361; x=1681206361; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=+xyPL0uMCbPzdDYiHOumo2jGsUnZNuQADZLBrksb50M=; b=nqO477G7lXsmkbhy3Q1ylgVBbeo0sLf0K8/6kPFCLmrrVdSFHRvTUPNW UZWMGCPypyko/OfsEc/Uz1YV1tiYkNXyf0AXij+KacX6nVEM7KDugqwNT pnij4GQwrsRSoCyLiyMpJYHDRep5eR9GZ+jdKMmykOChchW6rvwn2SfZH aXZVvl4e9E90nrZLx1dD9YkwgDxG+zcGj3sCqh/FzC/TARXIuIAPDWOjS h/4inIL51Yl3gp/Ay1bhIVJZ7D7/I34VIY3mtWJbmzpyG507OOQg9QX6w 7wA0tsECwaw+W12Ju3zYEkefjaIKOIkTIETBtBLXtgIK70naK150cbiQk g==; X-IronPort-AV: E=McAfee;i="6400,9594,10313"; a="324989870" X-IronPort-AV: E=Sophos;i="5.90,251,1643702400"; d="scan'208";a="324989870" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Apr 2022 02:46:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,251,1643702400"; d="scan'208";a="507044894" Received: from shwdeopenlab704.ccr.corp.intel.com ([10.239.182.50]) by orsmga003.jf.intel.com with ESMTP; 11 Apr 2022 02:45:59 -0700 From: Yu Pu To: devel@edk2.groups.io Cc: Yu Pu Subject: [PATCH v1 00/15] Merge UefiCpuPkg/UefiCpuLib to MdePkg/CpuLib Date: Mon, 11 Apr 2022 17:45:40 +0800 Message-Id: <20220411094555.1375-1-yu.pu@intel.com> X-Mailer: git-send-email 2.30.0.windows.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D3394=0D =0D Today lots of duplicated code call CPUID and calculates the address mask.=0D Adding an API named GetPhysicalAddressBits in UefiCpuLib can solve this=0D problem, but at the same time cause MdeModulePkg depend on UefiCpuPkg=0D which does not meet the design spec. So merge UefiCpuLib to CpuLib is a=0D good way to sovle these problems. To minimize the impact,this operation=0D is divided into four steps. This patch sets contain the first step: add=0D CpuLib to module INFs that depend on UefiCpuLib. Yu Pu (15): IntelFsp2Pkg: Add CpuLib to module INFs that depend on UefiCpuLib IntelFsp2WrapperPkg: Add CpuLib to module INFs that depend on UefiCpuLib. MdePkg: Add CpuLib to module INFs that depend on UefiCpuLib. OvmfPkg: Add CpuLib to module INFs that depend on UefiCpuLib. UefiCpuPkg: Add CpuLib to module INFs that depend on UefiCpuLib. UefiPayloadPkg: Add CpuLib to module INFs that depend on UefiCpuLib. MdePkg: Move API and implementation from UefiCpuLib to CpuLib UefiCpuPkg: 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. UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.c =3D> MdePkg/Library/Bas= eCpuLib/X86BaseCpuLib.c | 8 +-- OvmfPkg/Sec/SecMain.c = | 2 +- UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c = | 2 +- UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c = | 2 +- IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf = | 2 +- IntelFsp2Pkg/FspSecCore/SecMain.h = | 2 +- IntelFsp2Pkg/IntelFsp2Pkg.dsc = | 1 - IntelFsp2Pkg/Tools/Tests/QemuFspPkg.dsc = | 1 - IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf = | 2 +- IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf = | 2 +- IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc = | 1 - MdePkg/Include/Library/CpuLib.h = | 48 +++++++++++++++ MdePkg/Library/BaseCpuLib/BaseCpuLib.inf = | 6 ++ {UefiCpuPkg/Library/BaseUefiCpuLib =3D> MdePkg/Library/BaseCpuLib}/Ia32/In= itializeFpu.nasm | 0 {UefiCpuPkg/Library/BaseUefiCpuLib =3D> MdePkg/Library/BaseCpuLib}/X64/Ini= tializeFpu.nasm | 0 MdePkg/MdeLibs.dsc.inc = | 1 + OvmfPkg/AmdSev/AmdSevX64.dsc = | 1 - OvmfPkg/Bhyve/BhyveX64.dsc = | 1 - OvmfPkg/CloudHv/CloudHvX64.dsc = | 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.inf = | 2 +- PcAtChipsetPkg/PcAtChipsetPkg.dsc = | 1 - SourceLevelDebugPkg/SourceLevelDebugPkg.dsc = | 1 - UefiCpuPkg/CpuDxe/CpuDxe.h = | 1 - UefiCpuPkg/CpuDxe/CpuDxe.inf = | 1 - UefiCpuPkg/Include/Library/UefiCpuLib.h = | 65 -------------------- UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf = | 41 ------------ UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.uni = | 16 ----- UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf = | 2 +- UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf = | 2 +- UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf = | 1 - UefiCpuPkg/Library/MpInitLib/MpLib.h = | 1 - UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf = | 1 - UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h = | 2 +- UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf = | 1 - UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfileInternal.h = | 1 - UefiCpuPkg/SecCore/SecCore.inf = | 2 +- UefiCpuPkg/SecCore/SecCoreNative.inf = | 2 +- UefiCpuPkg/SecCore/SecMain.h = | 2 +- UefiCpuPkg/UefiCpuPkg.dec = | 5 -- UefiCpuPkg/UefiCpuPkg.dsc = | 2 - UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h = | 2 +- UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf = | 2 +- UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf = | 2 +- UefiPayloadPkg/UefiPayloadPkg.dsc = | 1 - 49 files changed, 73 insertions(+), 174 deletions(-) rename UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.c =3D> MdePkg/Libr= ary/BaseCpuLib/X86BaseCpuLib.c (93%) rename {UefiCpuPkg/Library/BaseUefiCpuLib =3D> MdePkg/Library/BaseCpuLib}/= Ia32/InitializeFpu.nasm (100%) rename {UefiCpuPkg/Library/BaseUefiCpuLib =3D> MdePkg/Library/BaseCpuLib}/= X64/InitializeFpu.nasm (100%) delete mode 100644 UefiCpuPkg/Include/Library/UefiCpuLib.h delete mode 100644 UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf delete mode 100644 UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.uni --=20 2.30.0.windows.2