UefiCpuPkg/Library: Rename EDKII_PEI_MP_SERVICES2_PPI

EDKII_PEI_MP_SERVICES2_PPI has been renamed to EFI_PEI_MP_SERVICES2_PPI
and moved to MdePkg.

Relevant changes have been made here.

Signed-off-by: Sachin Ganesh <sachinganesh@ami.com>
This commit is contained in:
INDIA\sachinganesh
2025-02-20 15:06:58 +05:30
committed by mergify[bot]
parent b66d325cc0
commit 1d6b8aafa7
10 changed files with 50 additions and 50 deletions

View File

@@ -104,8 +104,8 @@ typedef struct {
} CPUID_CACHE_DATA;
typedef union {
EDKII_PEI_MP_SERVICES2_PPI *Ppi;
EFI_MP_SERVICES_PROTOCOL *Protocol;
EFI_PEI_MP_SERVICES2_PPI *Ppi;
EFI_MP_SERVICES_PROTOCOL *Protocol;
} MP_SERVICES;
typedef struct {
@@ -128,13 +128,13 @@ typedef struct {
#define MAX_NUM_OF_PACKAGE 100
/**
Get EDKII_PEI_MP_SERVICES2_PPI or EFI_MP_SERVICES_PROTOCOL pointer.
Get EFI_PEI_MP_SERVICES2_PPI or EFI_MP_SERVICES_PROTOCOL pointer.
@param[out] MpServices A pointer to the buffer where EDKII_PEI_MP_SERVICES2_PPI or
@param[out] MpServices A pointer to the buffer where EFI_PEI_MP_SERVICES2_PPI or
EFI_MP_SERVICES_PROTOCOL is stored
@retval EFI_SUCCESS EDKII_PEI_MP_SERVICES2_PPI or EFI_MP_SERVICES_PROTOCOL interface is returned
@retval EFI_NOT_FOUND EDKII_PEI_MP_SERVICES2_PPI or EFI_MP_SERVICES_PROTOCOL interface is not found
@retval EFI_SUCCESS EFI_PEI_MP_SERVICES2_PPI or EFI_MP_SERVICES_PROTOCOL interface is returned
@retval EFI_NOT_FOUND EFI_PEI_MP_SERVICES2_PPI or EFI_MP_SERVICES_PROTOCOL interface is not found
**/
EFI_STATUS
CpuCacheInfoGetMpServices (

View File

@@ -15,12 +15,12 @@
#include <InternalCpuCacheInfoLib.h>
/**
Get EDKII_PEI_MP_SERVICES2_PPI pointer.
Get EFI_PEI_MP_SERVICES2_PPI pointer.
@param[out] MpServices A pointer to the buffer where EDKII_PEI_MP_SERVICES2_PPI is stored
@param[out] MpServices A pointer to the buffer where EFI_PEI_MP_SERVICES2_PPI is stored
@retval EFI_SUCCESS EDKII_PEI_MP_SERVICES2_PPI interface is returned
@retval EFI_NOT_FOUND EDKII_PEI_MP_SERVICES2_PPI interface is not found
@retval EFI_SUCCESS EFI_PEI_MP_SERVICES2_PPI interface is returned
@retval EFI_NOT_FOUND EFI_PEI_MP_SERVICES2_PPI interface is not found
**/
EFI_STATUS
CpuCacheInfoGetMpServices (
@@ -29,7 +29,7 @@ CpuCacheInfoGetMpServices (
{
EFI_STATUS Status;
Status = PeiServicesLocatePpi (&gEdkiiPeiMpServices2PpiGuid, 0, NULL, (VOID **)&MpServices->Ppi);
Status = PeiServicesLocatePpi (&gEfiPeiMpServices2PpiGuid, 0, NULL, (VOID **)&MpServices->Ppi);
ASSERT_EFI_ERROR (Status);
return Status;

View File

@@ -35,9 +35,9 @@
PeiServicesTablePointerLib
[Ppis]
gEdkiiPeiMpServices2PpiGuid
gEfiPeiMpServices2PpiGuid
[Pcd]
[Depex]
gEdkiiPeiMpServices2PpiGuid
gEfiPeiMpServices2PpiGuid

View File

@@ -66,8 +66,8 @@ typedef struct {
} CPU_REGISTER_BUFFER;
typedef union {
EDKII_PEI_MP_SERVICES2_PPI *Ppi;
EFI_MP_SERVICES_PROTOCOL *Protocol;
EFI_PEI_MP_SERVICES2_PPI *Ppi;
EFI_MP_SERVICES_PROTOCOL *Protocol;
} MP_SERVICES;
typedef struct {
@@ -212,7 +212,7 @@ CompareCpuContext (
);
/**
Get EFI_MP_SERVICES_PROTOCOL/EDKII_PEI_MP_SERVICES2_PPI pointer.
Get EFI_MP_SERVICES_PROTOCOL/EFI_PEI_MP_SERVICES2_PPI pointer.
@param[out] MpServices Pointer to the MP_SERVICES buffer

View File

@@ -54,8 +54,8 @@
gUefiCpuPkgTokenSpaceGuid.PcdCpuApStackSize ## CONSUMES
[Ppis]
gEdkiiPeiMpServices2PpiGuid ## CONSUMES
gEfiPeiMpServices2PpiGuid ## CONSUMES
[Depex]
gEdkiiPeiMpServices2PpiGuid AND
gEfiPeiMpServices2PpiGuid AND
gEfiPeiMemoryDiscoveredPpiGuid

View File

@@ -137,19 +137,19 @@ MpServicesUnitTestWhoAmI (
}
/**
Get EDKII_PEI_MP_SERVICES2_PPI pointer.
Get EFI_PEI_MP_SERVICES2_PPI pointer.
@param[out] MpServices Pointer to the buffer where EDKII_PEI_MP_SERVICES2_PPI is stored
@param[out] MpServices Pointer to the buffer where EFI_PEI_MP_SERVICES2_PPI is stored
@retval EFI_SUCCESS EDKII_PEI_MP_SERVICES2_PPI interface is returned
@retval EFI_NOT_FOUND EDKII_PEI_MP_SERVICES2_PPI interface is not found
@retval EFI_SUCCESS EFI_PEI_MP_SERVICES2_PPI interface is returned
@retval EFI_NOT_FOUND EFI_PEI_MP_SERVICES2_PPI interface is not found
**/
EFI_STATUS
GetMpServices (
OUT MP_SERVICES *MpServices
)
{
return PeiServicesLocatePpi (&gEdkiiPeiMpServices2PpiGuid, 0, NULL, (VOID **)&MpServices->Ppi);
return PeiServicesLocatePpi (&gEfiPeiMpServices2PpiGuid, 0, NULL, (VOID **)&MpServices->Ppi);
}
/**

View File

@@ -77,7 +77,7 @@ GetMpService (
// Get MP Services2 Ppi
//
Status = PeiServicesLocatePpi (
&gEdkiiPeiMpServices2PpiGuid,
&gEfiPeiMpServices2PpiGuid,
0,
NULL,
(VOID **)&MpService.Ppi
@@ -98,9 +98,9 @@ GetProcessorIndex (
IN CPU_FEATURES_DATA *CpuFeaturesData
)
{
EFI_STATUS Status;
EDKII_PEI_MP_SERVICES2_PPI *CpuMp2Ppi;
UINTN ProcessorIndex;
EFI_STATUS Status;
EFI_PEI_MP_SERVICES2_PPI *CpuMp2Ppi;
UINTN ProcessorIndex;
CpuMp2Ppi = CpuFeaturesData->MpService.Ppi;
@@ -130,9 +130,9 @@ GetProcessorInformation (
OUT EFI_PROCESSOR_INFORMATION *ProcessorInfoBuffer
)
{
EDKII_PEI_MP_SERVICES2_PPI *CpuMp2Ppi;
EFI_STATUS Status;
CPU_FEATURES_DATA *CpuFeaturesData;
EFI_PEI_MP_SERVICES2_PPI *CpuMp2Ppi;
EFI_STATUS Status;
CPU_FEATURES_DATA *CpuFeaturesData;
CpuFeaturesData = GetCpuFeaturesData ();
CpuMp2Ppi = CpuFeaturesData->MpService.Ppi;
@@ -159,9 +159,9 @@ StartupAllAPsWorker (
IN EFI_EVENT MpEvent
)
{
EFI_STATUS Status;
EDKII_PEI_MP_SERVICES2_PPI *CpuMp2Ppi;
CPU_FEATURES_DATA *CpuFeaturesData;
EFI_STATUS Status;
EFI_PEI_MP_SERVICES2_PPI *CpuMp2Ppi;
CPU_FEATURES_DATA *CpuFeaturesData;
CpuFeaturesData = GetCpuFeaturesData ();
CpuMp2Ppi = CpuFeaturesData->MpService.Ppi;
@@ -191,9 +191,9 @@ StartupAllCPUsWorker (
IN EFI_AP_PROCEDURE Procedure
)
{
EFI_STATUS Status;
EDKII_PEI_MP_SERVICES2_PPI *CpuMp2Ppi;
CPU_FEATURES_DATA *CpuFeaturesData;
EFI_STATUS Status;
EFI_PEI_MP_SERVICES2_PPI *CpuMp2Ppi;
CPU_FEATURES_DATA *CpuFeaturesData;
CpuFeaturesData = GetCpuFeaturesData ();
@@ -220,9 +220,9 @@ SwitchNewBsp (
IN UINTN ProcessorNumber
)
{
EFI_STATUS Status;
EDKII_PEI_MP_SERVICES2_PPI *CpuMp2Ppi;
CPU_FEATURES_DATA *CpuFeaturesData;
EFI_STATUS Status;
EFI_PEI_MP_SERVICES2_PPI *CpuMp2Ppi;
CPU_FEATURES_DATA *CpuFeaturesData;
CpuFeaturesData = GetCpuFeaturesData ();
CpuMp2Ppi = CpuFeaturesData->MpService.Ppi;
@@ -254,9 +254,9 @@ GetNumberOfProcessor (
OUT UINTN *NumberOfEnabledProcessors
)
{
EFI_STATUS Status;
EDKII_PEI_MP_SERVICES2_PPI *CpuMp2Ppi;
CPU_FEATURES_DATA *CpuFeaturesData;
EFI_STATUS Status;
EFI_PEI_MP_SERVICES2_PPI *CpuMp2Ppi;
CPU_FEATURES_DATA *CpuFeaturesData;
CpuFeaturesData = GetCpuFeaturesData ();
CpuMp2Ppi = CpuFeaturesData->MpService.Ppi;

View File

@@ -45,7 +45,7 @@
IoLib
[Ppis]
gEdkiiPeiMpServices2PpiGuid ## CONSUMES
gEfiPeiMpServices2PpiGuid ## CONSUMES
[Pcd]
gUefiCpuPkgTokenSpaceGuid.PcdCpuS3DataAddress ## CONSUMES
@@ -54,4 +54,4 @@
gUefiCpuPkgTokenSpaceGuid.PcdCpuFeaturesSetting ## CONSUMES ## PRODUCES
[Depex]
gEdkiiPeiMpServices2PpiGuid AND gEdkiiCpuFeaturesSetDoneGuid
gEfiPeiMpServices2PpiGuid AND gEdkiiCpuFeaturesSetDoneGuid

View File

@@ -64,8 +64,8 @@ typedef struct {
} PROGRAM_CPU_REGISTER_FLAGS;
typedef union {
EFI_MP_SERVICES_PROTOCOL *Protocol;
EDKII_PEI_MP_SERVICES2_PPI *Ppi;
EFI_MP_SERVICES_PROTOCOL *Protocol;
EFI_PEI_MP_SERVICES2_PPI *Ppi;
} MP_SERVICES;
typedef struct {

View File

@@ -166,9 +166,9 @@ SmmInitHandler (
**/
VOID
SmmRelocateBases (
IN EDKII_PEI_MP_SERVICES2_PPI *MpServices2,
IN EFI_PHYSICAL_ADDRESS SmmRelocationStart,
IN UINTN TileSize
IN EFI_PEI_MP_SERVICES2_PPI *MpServices2,
IN EFI_PHYSICAL_ADDRESS SmmRelocationStart,
IN UINTN TileSize
)
{
EFI_STATUS Status;
@@ -424,7 +424,7 @@ SplitSmramHobForSmmRelocation (
EFI_STATUS
EFIAPI
SmmRelocationInit (
IN EDKII_PEI_MP_SERVICES2_PPI *MpServices2
IN EFI_PEI_MP_SERVICES2_PPI *MpServices2
)
{
EFI_STATUS Status;