UefiCpuPkg/CpuMpPei: Produce EDKII_PEI_MP_SERVICES2_PPI.

[mirror_edk2.git] / UefiCpuPkg / CpuMpPei / CpuMpPei.c

diff --git a/UefiCpuPkg/CpuMpPei/CpuMpPei.c b/UefiCpuPkg/CpuMpPei/CpuMpPei.c
index 926541c93712ade823158540b99f3035b6a369b5..07ccbe7c6a91febda2ce9169eac46db57d9c8f73 100644 (file)
--- a/UefiCpuPkg/CpuMpPei/CpuMpPei.c
+++ b/UefiCpuPkg/CpuMpPei/CpuMpPei.c
@@ -1,13 +1,15 @@
 /** @file\r
   CPU PEI Module installs CPU Multiple Processor PPI.\r
 \r
-  Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2015 - 2019, Intel Corporation. All rights reserved.<BR>\r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
 #include "CpuMpPei.h"\r
 \r
+extern EDKII_PEI_MP_SERVICES2_PPI            mMpServices2Ppi;\r
+\r
 //\r
 // CPU MP PPI to be installed\r
 //\r
@@ -21,10 +23,17 @@ EFI_PEI_MP_SERVICES_PPI                mMpServicesPpi = {
   PeiWhoAmI,\r
 };\r
 \r
-EFI_PEI_PPI_DESCRIPTOR           mPeiCpuMpPpiDesc = {\r
-  (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
-  &gEfiPeiMpServicesPpiGuid,\r
-  &mMpServicesPpi\r
+EFI_PEI_PPI_DESCRIPTOR           mPeiCpuMpPpiList[] = {\r
+  {\r
+    EFI_PEI_PPI_DESCRIPTOR_PPI,\r
+    &gEdkiiPeiMpServices2PpiGuid,\r
+    &mMpServices2Ppi\r
+  },\r
+  {\r
+    (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
+    &gEfiPeiMpServicesPpiGuid,\r
+    &mMpServicesPpi\r
+  }\r
 };\r
 \r
 /**\r
@@ -667,7 +676,7 @@ InitializeCpuMpWorker (
   //\r
   // Install CPU MP PPI\r
   //\r
-  Status = PeiServicesInstallPpi(&mPeiCpuMpPpiDesc);\r
+  Status = PeiServicesInstallPpi(mPeiCpuMpPpiList);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   return Status;\r