From 4871be91bdadc66fe82b9334e40c9cf9a9eddede Mon Sep 17 00:00:00 2001
From: Michael Kubacki <michael.kubacki@microsoft.com>
Date: Wed, 30 Aug 2023 17:59:28 -0400
Subject: [PATCH] Integrate UefiCpuLib breaking change (#689)

## Description

Updates the repo for a change that merged UefiCpuLib with CpuLib.

UefiCpuLib will be removed entirely soon so all references are updated
to CpuLib.

Includes the following submodule updates:

- `MU_BASECORE` to `v2023020005.0.1`
- `Common/MU` to `v2023020001.4.1`
- `Common/MU_TIANO` to `v2023020001.4.1`
- `Features/MM_SUPV` to `v8.1.5`

---

- [ ] Impacts functionality?
- **Functionality** - Does the change ultimately impact how firmware
functions?
- Examples: Add a new library, publish a new PPI, update an algorithm,
...
- [ ] Impacts security?
- **Security** - Does the change have a direct security impact on an
application,
    flow, or firmware?
  - Examples: Crypto algorithm change, buffer overflow fix, parameter
    validation improvement, ...
- [ ] Breaking change?
- **Breaking change** - Will anyone consuming this change experience a
break
    in build or boot behavior?
- Examples: Add a new library class, move a module to a different repo,
call
    a function in a new library class in a pre-existing module, ...
- [ ] Includes tests?
  - **Tests** - Does the change include any explicit test code?
  - Examples: Unit tests, integration tests, robot tests, ...
- [ ] Includes documentation?
- **Documentation** - Does the change contain explicit documentation
additions
    outside direct code modifications (and comments)?
- Examples: Update readme file, add feature readme file, link to
documentation
    on an a separate Web page, ...

## How This Was Tested

- CI package build (via PR checks)

## Integration Instructions

N/A

---

Associated Changes in Submodules

- https://github.com/microsoft/mu_feature_mm_supv/pull/164
- https://github.com/microsoft/mu_plus/pull/304
- https://github.com/microsoft/mu_tiano_plus/pull/174

Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
---
 Common/MU                                      | 2 +-
 Common/MU_TIANO                                | 2 +-
 Features/MM_SUPV                               | 2 +-
 MU_BASECORE                                    | 2 +-
 Platforms/QemuQ35Pkg/CpuInfoDxe/CpuInfoDxe.c   | 2 +-
 Platforms/QemuQ35Pkg/CpuInfoDxe/CpuInfoDxe.inf | 4 ++--
 Platforms/QemuQ35Pkg/QemuQ35Pkg.dsc            | 1 -
 Platforms/QemuQ35Pkg/Sec/SecMain.c             | 2 +-
 Platforms/QemuQ35Pkg/Sec/SecMain.inf           | 2 +-
 9 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Common/MU b/Common/MU
index df40d6ac7..e5f9bd733 160000
--- a/Common/MU
+++ b/Common/MU
@@ -1 +1 @@
-Subproject commit df40d6ac752dbf1659b7d4c42d870bcfab3ee9d0
+Subproject commit e5f9bd7331ef270354d640f058373f22f48260fe
diff --git a/Common/MU_TIANO b/Common/MU_TIANO
index 59daf253f..3dcc6f801 160000
--- a/Common/MU_TIANO
+++ b/Common/MU_TIANO
@@ -1 +1 @@
-Subproject commit 59daf253f83f0f92a95b18ff0a3de14547d37d95
+Subproject commit 3dcc6f80197af96d43c91ee0e2b561e878ba5d20
diff --git a/Features/MM_SUPV b/Features/MM_SUPV
index 87dd5569f..6fb2f88bf 160000
--- a/Features/MM_SUPV
+++ b/Features/MM_SUPV
@@ -1 +1 @@
-Subproject commit 87dd5569f55bf7996c4fd46721d12ab8fcc52e55
+Subproject commit 6fb2f88bf28231857170f1d3cf8da62cafda5b8b
diff --git a/MU_BASECORE b/MU_BASECORE
index 6c351bc07..c8cdc60a6 160000
--- a/MU_BASECORE
+++ b/MU_BASECORE
@@ -1 +1 @@
-Subproject commit 6c351bc0775db91a698f53344b60b84acc8da224
+Subproject commit c8cdc60a6e689681f0c81209aeb71e26fd023416
diff --git a/Platforms/QemuQ35Pkg/CpuInfoDxe/CpuInfoDxe.c b/Platforms/QemuQ35Pkg/CpuInfoDxe/CpuInfoDxe.c
index 1b13c5704..15c2aa469 100644
--- a/Platforms/QemuQ35Pkg/CpuInfoDxe/CpuInfoDxe.c
+++ b/Platforms/QemuQ35Pkg/CpuInfoDxe/CpuInfoDxe.c
@@ -12,7 +12,7 @@
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/BaseLib.h>
 #include <Library/PrintLib.h>
-#include <Library/UefiCpuLib.h>
+#include <Library/CpuLib.h>
 #include <Register/Intel/Cpuid.h>
 
 #define MAX_MESSAGE_LENGTH  64
diff --git a/Platforms/QemuQ35Pkg/CpuInfoDxe/CpuInfoDxe.inf b/Platforms/QemuQ35Pkg/CpuInfoDxe/CpuInfoDxe.inf
index df00cfa8c..ec23f937a 100644
--- a/Platforms/QemuQ35Pkg/CpuInfoDxe/CpuInfoDxe.inf
+++ b/Platforms/QemuQ35Pkg/CpuInfoDxe/CpuInfoDxe.inf
@@ -15,7 +15,7 @@
   ENTRY_POINT       = CpuInfoDxeEntryPoint
 
 [Sources]
-  CpuInfoDxe.c 
+  CpuInfoDxe.c
 
 [Packages]
   MdePkg/MdePkg.dec
@@ -28,7 +28,7 @@
   UefiLib
   BaseLib
   PrintLib
-  UefiCpuLib
+  CpuLib
   UefiDriverEntryPoint
   UefiBootServicesTableLib
 
diff --git a/Platforms/QemuQ35Pkg/QemuQ35Pkg.dsc b/Platforms/QemuQ35Pkg/QemuQ35Pkg.dsc
index 7a2a28a89..4e1cc3543 100644
--- a/Platforms/QemuQ35Pkg/QemuQ35Pkg.dsc
+++ b/Platforms/QemuQ35Pkg/QemuQ35Pkg.dsc
@@ -144,7 +144,6 @@
 
   # CPU/SMBUS/Peripherals Libraries
   CpuLib              |MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
-  UefiCpuLib          |UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
   SynchronizationLib  |MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
   LocalApicLib        |UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf
   SmbusLib            |MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf
diff --git a/Platforms/QemuQ35Pkg/Sec/SecMain.c b/Platforms/QemuQ35Pkg/Sec/SecMain.c
index 061681a96..6aff88870 100644
--- a/Platforms/QemuQ35Pkg/Sec/SecMain.c
+++ b/Platforms/QemuQ35Pkg/Sec/SecMain.c
@@ -17,7 +17,7 @@
 #include <Library/BaseMemoryLib.h>
 #include <Library/PeiServicesLib.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/Platforms/QemuQ35Pkg/Sec/SecMain.inf b/Platforms/QemuQ35Pkg/Sec/SecMain.inf
index 049d14d52..36be2f2a5 100644
--- a/Platforms/QemuQ35Pkg/Sec/SecMain.inf
+++ b/Platforms/QemuQ35Pkg/Sec/SecMain.inf
@@ -45,7 +45,7 @@
   BaseMemoryLib
   PeiServicesLib
   PcdLib
-  UefiCpuLib
+  CpuLib
   DebugAgentLib
   IoLib
   PeCoffLib