From 7de3a1014f848ae3aeb7caa1eb0a667e0e09ccc5 Mon Sep 17 00:00:00 2001 From: "INDIA\\sachinganesh" Date: Thu, 20 Feb 2025 14:57:02 +0530 Subject: [PATCH] UefiCpuPkg/CpuMpPei: 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 --- UefiCpuPkg/CpuMpPei/CpuMp2.c | 138 ++++---- UefiCpuPkg/CpuMpPei/CpuMp2Pei.h | 376 +++++++++++++++++++++ UefiCpuPkg/CpuMpPei/CpuMpPei.c | 4 +- UefiCpuPkg/CpuMpPei/CpuMpPei.h | 4 +- UefiCpuPkg/CpuMpPei/CpuMpPei.inf | 3 +- UefiCpuPkg/CpuMpPei/LoongArch64/CpuMpPei.c | 4 +- 6 files changed, 452 insertions(+), 77 deletions(-) create mode 100644 UefiCpuPkg/CpuMpPei/CpuMp2Pei.h diff --git a/UefiCpuPkg/CpuMpPei/CpuMp2.c b/UefiCpuPkg/CpuMpPei/CpuMp2.c index 9c55eadb18..1157d3f60c 100644 --- a/UefiCpuPkg/CpuMpPei/CpuMp2.c +++ b/UefiCpuPkg/CpuMpPei/CpuMp2.c @@ -1,12 +1,12 @@ /** @file - EDKII_PEI_MP_SERVICES2_PPI Implementation code. + EFI_PEI_MP_SERVICES2_PPI Implementation code. Copyright (c) 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#include "CpuMpPei.h" +#include "CpuMp2Pei.h" /** This service retrieves the number of logical processor in the platform @@ -42,10 +42,10 @@ **/ EFI_STATUS EFIAPI -EdkiiPeiGetNumberOfProcessors ( - IN EDKII_PEI_MP_SERVICES2_PPI *This, - OUT UINTN *NumberOfProcessors, - OUT UINTN *NumberOfEnabledProcessors +PeiGetNumberOfProcessors2 ( + IN EFI_PEI_MP_SERVICES2_PPI *This, + OUT UINTN *NumberOfProcessors, + OUT UINTN *NumberOfEnabledProcessors ) { if ((NumberOfProcessors == NULL) || (NumberOfEnabledProcessors == NULL)) { @@ -84,10 +84,10 @@ EdkiiPeiGetNumberOfProcessors ( **/ EFI_STATUS EFIAPI -EdkiiPeiGetProcessorInfo ( - IN EDKII_PEI_MP_SERVICES2_PPI *This, - IN UINTN ProcessorNumber, - OUT EFI_PROCESSOR_INFORMATION *ProcessorInfoBuffer +PeiGetProcessorInfo2 ( + IN EFI_PEI_MP_SERVICES2_PPI *This, + IN UINTN ProcessorNumber, + OUT EFI_PROCESSOR_INFORMATION *ProcessorInfoBuffer ) { return MpInitLibGetProcessorInfo (ProcessorNumber, ProcessorInfoBuffer, NULL); @@ -109,12 +109,12 @@ EdkiiPeiGetProcessorInfo ( If the timeout specified by TimeoutInMicroSeconds expires before all APs return from Procedure, then Procedure on the failed APs is terminated. All enabled APs - are always available for further calls to EDKII_PEI_MP_SERVICES2_PPI.StartupAllAPs() - and EDKII_PEI_MP_SERVICES2_PPI.StartupThisAP(). If FailedCpuList is not NULL, its + are always available for further calls to EFI_PEI_MP_SERVICES2_PPI.StartupAllAPs() + and EFI_PEI_MP_SERVICES2_PPI.StartupThisAP(). If FailedCpuList is not NULL, its content points to the list of processor handle numbers in which Procedure was terminated. - Note: It is the responsibility of the consumer of the EDKII_PEI_MP_SERVICES2_PPI.StartupAllAPs() + Note: It is the responsibility of the consumer of the EFI_PEI_MP_SERVICES2_PPI.StartupAllAPs() to make sure that the nature of the code that is executed on the BSP and the dispatched APs is well controlled. The MP Services Ppi does not guarantee that the Procedure function is MP-safe. Hence, the tasks that can be run in @@ -125,7 +125,7 @@ EdkiiPeiGetProcessorInfo ( In blocking execution mode, BSP waits until all APs finish or TimeoutInMicroSeconds expires. - @param[in] This A pointer to the EDKII_PEI_MP_SERVICES2_PPI instance. + @param[in] This A pointer to the EFI_PEI_MP_SERVICES2_PPI instance. @param[in] Procedure A pointer to the function to be run on enabled APs of the system. @param[in] SingleThread If TRUE, then all the enabled APs execute the function @@ -139,8 +139,8 @@ EdkiiPeiGetProcessorInfo ( means infinity. If the timeout expires before all APs return from Procedure, then Procedure on the failed APs is terminated. All enabled APs are available for next - function assigned by EDKII_PEI_MP_SERVICES2_PPI.StartupAllAPs() - or EDKII_PEI_MP_SERVICES2_PPI.StartupThisAP(). If the + function assigned by EFI_PEI_MP_SERVICES2_PPI.StartupAllAPs() + or EFI_PEI_MP_SERVICES2_PPI.StartupThisAP(). If the timeout expires in blocking mode, BSP returns EFI_TIMEOUT. @param[in] ProcedureArgument The parameter passed into Procedure for all APs. @@ -156,12 +156,12 @@ EdkiiPeiGetProcessorInfo ( **/ EFI_STATUS EFIAPI -EdkiiPeiStartupAllAPs ( - IN EDKII_PEI_MP_SERVICES2_PPI *This, - IN EFI_AP_PROCEDURE Procedure, - IN BOOLEAN SingleThread, - IN UINTN TimeoutInMicroSeconds, - IN VOID *ProcedureArgument OPTIONAL +PeiStartupAllAPs2 ( + IN EFI_PEI_MP_SERVICES2_PPI *This, + IN EFI_AP_PROCEDURE Procedure, + IN BOOLEAN SingleThread, + IN UINTN TimeoutInMicroSeconds, + IN VOID *ProcedureArgument OPTIONAL ) { return MpInitLibStartupAllAPs ( @@ -186,24 +186,24 @@ EdkiiPeiStartupAllAPs ( If the timeout specified by TimeoutInMicroseconds expires before the AP returns from Procedure, then execution of Procedure by the AP is terminated. The AP is - available for subsequent calls to EDKII_PEI_MP_SERVICES2_PPI.StartupAllAPs() and - EDKII_PEI_MP_SERVICES2_PPI.StartupThisAP(). + available for subsequent calls to EFI_PEI_MP_SERVICES2_PPI.StartupAllAPs() and + EFI_PEI_MP_SERVICES2_PPI.StartupThisAP(). - @param[in] This A pointer to the EDKII_PEI_MP_SERVICES2_PPI instance. + @param[in] This A pointer to the EFI_PEI_MP_SERVICES2_PPI instance. @param[in] Procedure A pointer to the function to be run on enabled APs of the system. @param[in] ProcessorNumber The handle number of the AP. The range is from 0 to the total number of logical processors minus 1. The total number of logical processors can be retrieved by - EDKII_PEI_MP_SERVICES2_PPI.GetNumberOfProcessors(). + EFI_PEI_MP_SERVICES2_PPI.GetNumberOfProcessors(). @param[in] TimeoutInMicroseconds Indicates the time limit in microseconds for APs to return from Procedure, for blocking mode only. Zero means infinity. If the timeout expires before all APs return from Procedure, then Procedure on the failed APs is terminated. All enabled APs are available for next - function assigned by EDKII_PEI_MP_SERVICES2_PPI.StartupAllAPs() - or EDKII_PEI_MP_SERVICES2_PPI.StartupThisAP(). If the + function assigned by EFI_PEI_MP_SERVICES2_PPI.StartupAllAPs() + or EFI_PEI_MP_SERVICES2_PPI.StartupThisAP(). If the timeout expires in blocking mode, BSP returns EFI_TIMEOUT. @param[in] ProcedureArgument The parameter passed into Procedure for all APs. @@ -220,12 +220,12 @@ EdkiiPeiStartupAllAPs ( **/ EFI_STATUS EFIAPI -EdkiiPeiStartupThisAP ( - IN EDKII_PEI_MP_SERVICES2_PPI *This, - IN EFI_AP_PROCEDURE Procedure, - IN UINTN ProcessorNumber, - IN UINTN TimeoutInMicroseconds, - IN VOID *ProcedureArgument OPTIONAL +PeiStartupThisAP2 ( + IN EFI_PEI_MP_SERVICES2_PPI *This, + IN EFI_AP_PROCEDURE Procedure, + IN UINTN ProcessorNumber, + IN UINTN TimeoutInMicroseconds, + IN VOID *ProcedureArgument OPTIONAL ) { return MpInitLibStartupThisAP ( @@ -251,11 +251,11 @@ EdkiiPeiStartupThisAP ( If the BSP cannot be switched prior to the return from this service, then EFI_UNSUPPORTED must be returned. - @param[in] This A pointer to the EDKII_PEI_MP_SERVICES2_PPI instance. + @param[in] This A pointer to the EFI_PEI_MP_SERVICES2_PPI instance. @param[in] ProcessorNumber The handle number of the AP. The range is from 0 to the total number of logical processors minus 1. The total number of logical processors can be retrieved by - EDKII_PEI_MP_SERVICES2_PPI.GetNumberOfProcessors(). + EFI_PEI_MP_SERVICES2_PPI.GetNumberOfProcessors(). @param[in] EnableOldBSP If TRUE, then the old BSP will be listed as an enabled AP. Otherwise, it will be disabled. @@ -272,10 +272,10 @@ EdkiiPeiStartupThisAP ( **/ EFI_STATUS EFIAPI -EdkiiPeiSwitchBSP ( - IN EDKII_PEI_MP_SERVICES2_PPI *This, - IN UINTN ProcessorNumber, - IN BOOLEAN EnableOldBSP +PeiSwitchBSP2 ( + IN EFI_PEI_MP_SERVICES2_PPI *This, + IN UINTN ProcessorNumber, + IN BOOLEAN EnableOldBSP ) { return MpInitLibSwitchBSP (ProcessorNumber, EnableOldBSP); @@ -295,16 +295,16 @@ EdkiiPeiSwitchBSP ( If the enable or disable AP operation cannot be completed prior to the return from this service, then EFI_UNSUPPORTED must be returned. - @param[in] This A pointer to the EDKII_PEI_MP_SERVICES2_PPI instance. + @param[in] This A pointer to the EFI_PEI_MP_SERVICES2_PPI instance. @param[in] ProcessorNumber The handle number of the AP. The range is from 0 to the total number of logical processors minus 1. The total number of logical processors can be retrieved by - EDKII_PEI_MP_SERVICES2_PPI.GetNumberOfProcessors(). + EFI_PEI_MP_SERVICES2_PPI.GetNumberOfProcessors(). @param[in] EnableAP Specifies the new state for the processor for enabled, FALSE for disabled. @param[in] HealthFlag If not NULL, a pointer to a value that specifies the new health status of the AP. This flag corresponds to - StatusFlag defined in EDKII_PEI_MP_SERVICES2_PPI.GetProcessorInfo(). + StatusFlag defined in EFI_PEI_MP_SERVICES2_PPI.GetProcessorInfo(). Only the PROCESSOR_HEALTH_STATUS_BIT is used. All other bits are ignored. If it is NULL, this parameter is ignored. @@ -320,11 +320,11 @@ EdkiiPeiSwitchBSP ( **/ EFI_STATUS EFIAPI -EdkiiPeiEnableDisableAP ( - IN EDKII_PEI_MP_SERVICES2_PPI *This, - IN UINTN ProcessorNumber, - IN BOOLEAN EnableAP, - IN UINT32 *HealthFlag OPTIONAL +PeiEnableDisableAP2 ( + IN EFI_PEI_MP_SERVICES2_PPI *This, + IN UINTN ProcessorNumber, + IN BOOLEAN EnableAP, + IN UINT32 *HealthFlag OPTIONAL ) { return MpInitLibEnableDisableAP (ProcessorNumber, EnableAP, HealthFlag); @@ -337,16 +337,16 @@ EdkiiPeiEnableDisableAP ( This service returns the processor handle number for the calling processor. The returned value is in the range from 0 to the total number of logical processors minus 1. The total number of logical processors can be retrieved - with EDKII_PEI_MP_SERVICES2_PPI.GetNumberOfProcessors(). This service may be + with EFI_PEI_MP_SERVICES2_PPI.GetNumberOfProcessors(). This service may be called from the BSP and APs. If ProcessorNumber is NULL, then EFI_INVALID_PARAMETER is returned. Otherwise, the current processors handle number is returned in ProcessorNumber, and EFI_SUCCESS is returned. - @param[in] This A pointer to the EDKII_PEI_MP_SERVICES2_PPI instance. + @param[in] This A pointer to the EFI_PEI_MP_SERVICES2_PPI instance. @param[out] ProcessorNumber The handle number of the AP. The range is from 0 to the total number of logical processors minus 1. The total number of logical processors can be retrieved by - EDKII_PEI_MP_SERVICES2_PPI.GetNumberOfProcessors(). + EFI_PEI_MP_SERVICES2_PPI.GetNumberOfProcessors(). @retval EFI_SUCCESS The current processor handle number was returned in ProcessorNumber. @@ -354,9 +354,9 @@ EdkiiPeiEnableDisableAP ( **/ EFI_STATUS EFIAPI -EdkiiPeiWhoAmI ( - IN EDKII_PEI_MP_SERVICES2_PPI *This, - OUT UINTN *ProcessorNumber +PeiWhoAmI2 ( + IN EFI_PEI_MP_SERVICES2_PPI *This, + OUT UINTN *ProcessorNumber ) { return MpInitLibWhoAmI (ProcessorNumber); @@ -367,7 +367,7 @@ EdkiiPeiWhoAmI ( run either simultaneously or one at a time in sequence. This service may only be called from the BSP. - @param[in] This A pointer to the EDKII_PEI_MP_SERVICES2_PPI instance. + @param[in] This A pointer to the EFI_PEI_MP_SERVICES2_PPI instance. @param[in] Procedure A pointer to the function to be run on enabled APs of the system. @param[in] TimeoutInMicroSeconds @@ -387,11 +387,11 @@ EdkiiPeiWhoAmI ( **/ EFI_STATUS EFIAPI -EdkiiPeiStartupAllCPUs ( - IN EDKII_PEI_MP_SERVICES2_PPI *This, - IN EFI_AP_PROCEDURE Procedure, - IN UINTN TimeoutInMicroSeconds, - IN VOID *ProcedureArgument OPTIONAL +PeiStartupAllCPUs2 ( + IN EFI_PEI_MP_SERVICES2_PPI *This, + IN EFI_AP_PROCEDURE Procedure, + IN UINTN TimeoutInMicroSeconds, + IN VOID *ProcedureArgument OPTIONAL ) { return MpInitLibStartupAllCPUs ( @@ -404,13 +404,13 @@ EdkiiPeiStartupAllCPUs ( // // CPU MP2 PPI to be installed // -EDKII_PEI_MP_SERVICES2_PPI mMpServices2Ppi = { - EdkiiPeiGetNumberOfProcessors, - EdkiiPeiGetProcessorInfo, - EdkiiPeiStartupAllAPs, - EdkiiPeiStartupThisAP, - EdkiiPeiSwitchBSP, - EdkiiPeiEnableDisableAP, - EdkiiPeiWhoAmI, - EdkiiPeiStartupAllCPUs +EFI_PEI_MP_SERVICES2_PPI mMpServices2Ppi = { + PeiGetNumberOfProcessors2, + PeiGetProcessorInfo2, + PeiStartupAllAPs2, + PeiStartupThisAP2, + PeiSwitchBSP2, + PeiEnableDisableAP2, + PeiWhoAmI2, + PeiStartupAllCPUs2 }; diff --git a/UefiCpuPkg/CpuMpPei/CpuMp2Pei.h b/UefiCpuPkg/CpuMpPei/CpuMp2Pei.h new file mode 100644 index 0000000000..6419f2d2ac --- /dev/null +++ b/UefiCpuPkg/CpuMpPei/CpuMp2Pei.h @@ -0,0 +1,376 @@ +/** @file + Definitions to install Multiple Processor 2 PPI. + + Copyright (c) 2015 - 2023, Intel Corporation. All rights reserved.
+ Copyright (c) 2025, Loongson Technology Corporation Limited. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#ifndef _CPU_MP2_PEI_H_ +#define _CPU_MP2_PEI_H_ + +#include "CpuMpPei.h" +#include + +extern EFI_PEI_MP_SERVICES2_PPI mMpServices2Ppi; + +/** + This service retrieves the number of logical processor in the platform + and the number of those logical processors that are enabled on this boot. + This service may only be called from the BSP. + + This function is used to retrieve the following information: + - The number of logical processors that are present in the system. + - The number of enabled logical processors in the system at the instant + this call is made. + + Because MP Service Ppi provides services to enable and disable processors + dynamically, the number of enabled logical processors may vary during the + course of a boot session. + + If this service is called from an AP, then EFI_DEVICE_ERROR is returned. + If NumberOfProcessors or NumberOfEnabledProcessors is NULL, then + EFI_INVALID_PARAMETER is returned. Otherwise, the total number of processors + is returned in NumberOfProcessors, the number of currently enabled processor + is returned in NumberOfEnabledProcessors, and EFI_SUCCESS is returned. + + @param[in] PeiServices An indirect pointer to the PEI Services Table + published by the PEI Foundation. + @param[in] This Pointer to this instance of the PPI. + @param[out] NumberOfProcessors Pointer to the total number of logical processors in + the system, including the BSP and disabled APs. + @param[out] NumberOfEnabledProcessors + Number of processors in the system that are enabled. + + @retval EFI_SUCCESS The number of logical processors and enabled + logical processors was retrieved. + @retval EFI_DEVICE_ERROR The calling processor is an AP. + @retval EFI_INVALID_PARAMETER NumberOfProcessors is NULL. + NumberOfEnabledProcessors is NULL. +**/ +EFI_STATUS +EFIAPI +PeiGetNumberOfProcessors2 ( + IN EFI_PEI_MP_SERVICES2_PPI *This, + OUT UINTN *NumberOfProcessors, + OUT UINTN *NumberOfEnabledProcessors + ); + +/** + Gets detailed MP-related information on the requested processor at the + instant this call is made. This service may only be called from the BSP. + + This service retrieves detailed MP-related information about any processor + on the platform. Note the following: + - The processor information may change during the course of a boot session. + - The information presented here is entirely MP related. + + Information regarding the number of caches and their sizes, frequency of operation, + slot numbers is all considered platform-related information and is not provided + by this service. + + @param[in] PeiServices An indirect pointer to the PEI Services Table + published by the PEI Foundation. + @param[in] This Pointer to this instance of the PPI. + @param[in] ProcessorNumber Pointer to the total number of logical processors in + the system, including the BSP and disabled APs. + @param[out] ProcessorInfoBuffer Number of processors in the system that are enabled. + + @retval EFI_SUCCESS Processor information was returned. + @retval EFI_DEVICE_ERROR The calling processor is an AP. + @retval EFI_INVALID_PARAMETER ProcessorInfoBuffer is NULL. + @retval EFI_NOT_FOUND The processor with the handle specified by + ProcessorNumber does not exist in the platform. +**/ +EFI_STATUS +EFIAPI +PeiGetProcessorInfo2 ( + IN EFI_PEI_MP_SERVICES2_PPI *This, + IN UINTN ProcessorNumber, + OUT EFI_PROCESSOR_INFORMATION *ProcessorInfoBuffer + ); + +/** + This service executes a caller provided function on all enabled APs. APs can + run either simultaneously or one at a time in sequence. This service supports + both blocking requests only. This service may only + be called from the BSP. + + This function is used to dispatch all the enabled APs to the function specified + by Procedure. If any enabled AP is busy, then EFI_NOT_READY is returned + immediately and Procedure is not started on any AP. + + If SingleThread is TRUE, all the enabled APs execute the function specified by + Procedure one by one, in ascending order of processor handle number. Otherwise, + all the enabled APs execute the function specified by Procedure simultaneously. + + If the timeout specified by TimeoutInMicroSeconds expires before all APs return + from Procedure, then Procedure on the failed APs is terminated. All enabled APs + are always available for further calls to EFI_PEI_MP_SERVICES_PPI.StartupAllAPs() + and EFI_PEI_MP_SERVICES_PPI.StartupThisAP(). If FailedCpuList is not NULL, its + content points to the list of processor handle numbers in which Procedure was + terminated. + + Note: It is the responsibility of the consumer of the EFI_PEI_MP_SERVICES_PPI.StartupAllAPs() + to make sure that the nature of the code that is executed on the BSP and the + dispatched APs is well controlled. The MP Services Ppi does not guarantee + that the Procedure function is MP-safe. Hence, the tasks that can be run in + parallel are limited to certain independent tasks and well-controlled exclusive + code. PEI services and Ppis may not be called by APs unless otherwise + specified. + + In blocking execution mode, BSP waits until all APs finish or + TimeoutInMicroSeconds expires. + + @param[in] PeiServices An indirect pointer to the PEI Services Table + published by the PEI Foundation. + @param[in] This A pointer to the EFI_PEI_MP_SERVICES_PPI instance. + @param[in] Procedure A pointer to the function to be run on enabled APs of + the system. + @param[in] SingleThread If TRUE, then all the enabled APs execute the function + specified by Procedure one by one, in ascending order + of processor handle number. If FALSE, then all the + enabled APs execute the function specified by Procedure + simultaneously. + @param[in] TimeoutInMicroSeconds + Indicates the time limit in microseconds for APs to + return from Procedure, for blocking mode only. Zero + means infinity. If the timeout expires before all APs + return from Procedure, then Procedure on the failed APs + is terminated. All enabled APs are available for next + function assigned by EFI_PEI_MP_SERVICES_PPI.StartupAllAPs() + or EFI_PEI_MP_SERVICES_PPI.StartupThisAP(). If the + timeout expires in blocking mode, BSP returns + EFI_TIMEOUT. + @param[in] ProcedureArgument The parameter passed into Procedure for all APs. + + @retval EFI_SUCCESS In blocking mode, all APs have finished before the + timeout expired. + @retval EFI_DEVICE_ERROR Caller processor is AP. + @retval EFI_NOT_STARTED No enabled APs exist in the system. + @retval EFI_NOT_READY Any enabled APs are busy. + @retval EFI_TIMEOUT In blocking mode, the timeout expired before all + enabled APs have finished. + @retval EFI_INVALID_PARAMETER Procedure is NULL. +**/ +EFI_STATUS +EFIAPI +PeiStartupAllAPs2 ( + IN EFI_PEI_MP_SERVICES2_PPI *This, + IN EFI_AP_PROCEDURE Procedure, + IN BOOLEAN SingleThread, + IN UINTN TimeoutInMicroSeconds, + IN VOID *ProcedureArgument OPTIONAL + ); + +/** + This service lets the caller get one enabled AP to execute a caller-provided + function. The caller can request the BSP to wait for the completion + of the AP. This service may only be called from the BSP. + + This function is used to dispatch one enabled AP to the function specified by + Procedure passing in the argument specified by ProcedureArgument. + The execution is in blocking mode. The BSP waits until the AP finishes or + TimeoutInMicroSecondss expires. + + If the timeout specified by TimeoutInMicroseconds expires before the AP returns + from Procedure, then execution of Procedure by the AP is terminated. The AP is + available for subsequent calls to EFI_PEI_MP_SERVICES_PPI.StartupAllAPs() and + EFI_PEI_MP_SERVICES_PPI.StartupThisAP(). + + @param[in] PeiServices An indirect pointer to the PEI Services Table + published by the PEI Foundation. + @param[in] This A pointer to the EFI_PEI_MP_SERVICES_PPI instance. + @param[in] Procedure A pointer to the function to be run on enabled APs of + the system. + @param[in] ProcessorNumber The handle number of the AP. The range is from 0 to the + total number of logical processors minus 1. The total + number of logical processors can be retrieved by + EFI_PEI_MP_SERVICES_PPI.GetNumberOfProcessors(). + @param[in] TimeoutInMicroseconds + Indicates the time limit in microseconds for APs to + return from Procedure, for blocking mode only. Zero + means infinity. If the timeout expires before all APs + return from Procedure, then Procedure on the failed APs + is terminated. All enabled APs are available for next + function assigned by EFI_PEI_MP_SERVICES_PPI.StartupAllAPs() + or EFI_PEI_MP_SERVICES_PPI.StartupThisAP(). If the + timeout expires in blocking mode, BSP returns + EFI_TIMEOUT. + @param[in] ProcedureArgument The parameter passed into Procedure for all APs. + + @retval EFI_SUCCESS In blocking mode, specified AP finished before the + timeout expires. + @retval EFI_DEVICE_ERROR The calling processor is an AP. + @retval EFI_TIMEOUT In blocking mode, the timeout expired before the + specified AP has finished. + @retval EFI_NOT_FOUND The processor with the handle specified by + ProcessorNumber does not exist. + @retval EFI_INVALID_PARAMETER ProcessorNumber specifies the BSP or disabled AP. + @retval EFI_INVALID_PARAMETER Procedure is NULL. +**/ +EFI_STATUS +EFIAPI +PeiStartupThisAP2 ( + IN EFI_PEI_MP_SERVICES2_PPI *This, + IN EFI_AP_PROCEDURE Procedure, + IN UINTN ProcessorNumber, + IN UINTN TimeoutInMicroseconds, + IN VOID *ProcedureArgument OPTIONAL + ); + +/** + This service switches the requested AP to be the BSP from that point onward. + This service changes the BSP for all purposes. This call can only be performed + by the current BSP. + + This service switches the requested AP to be the BSP from that point onward. + This service changes the BSP for all purposes. The new BSP can take over the + execution of the old BSP and continue seamlessly from where the old one left + off. + + If the BSP cannot be switched prior to the return from this service, then + EFI_UNSUPPORTED must be returned. + + @param[in] PeiServices An indirect pointer to the PEI Services Table + published by the PEI Foundation. + @param[in] This A pointer to the EFI_PEI_MP_SERVICES_PPI instance. + @param[in] ProcessorNumber The handle number of the AP. The range is from 0 to the + total number of logical processors minus 1. The total + number of logical processors can be retrieved by + EFI_PEI_MP_SERVICES_PPI.GetNumberOfProcessors(). + @param[in] EnableOldBSP If TRUE, then the old BSP will be listed as an enabled + AP. Otherwise, it will be disabled. + + @retval EFI_SUCCESS BSP successfully switched. + @retval EFI_UNSUPPORTED Switching the BSP cannot be completed prior to this + service returning. + @retval EFI_UNSUPPORTED Switching the BSP is not supported. + @retval EFI_DEVICE_ERROR The calling processor is an AP. + @retval EFI_NOT_FOUND The processor with the handle specified by + ProcessorNumber does not exist. + @retval EFI_INVALID_PARAMETER ProcessorNumber specifies the current BSP or a disabled + AP. + @retval EFI_NOT_READY The specified AP is busy. +**/ +EFI_STATUS +EFIAPI +PeiSwitchBSP2 ( + IN EFI_PEI_MP_SERVICES2_PPI *This, + IN UINTN ProcessorNumber, + IN BOOLEAN EnableOldBSP + ); + +/** + This service lets the caller enable or disable an AP from this point onward. + This service may only be called from the BSP. + + This service allows the caller enable or disable an AP from this point onward. + The caller can optionally specify the health status of the AP by Health. If + an AP is being disabled, then the state of the disabled AP is implementation + dependent. If an AP is enabled, then the implementation must guarantee that a + complete initialization sequence is performed on the AP, so the AP is in a state + that is compatible with an MP operating system. + + If the enable or disable AP operation cannot be completed prior to the return + from this service, then EFI_UNSUPPORTED must be returned. + + @param[in] PeiServices An indirect pointer to the PEI Services Table + published by the PEI Foundation. + @param[in] This A pointer to the EFI_PEI_MP_SERVICES_PPI instance. + @param[in] ProcessorNumber The handle number of the AP. The range is from 0 to the + total number of logical processors minus 1. The total + number of logical processors can be retrieved by + EFI_PEI_MP_SERVICES_PPI.GetNumberOfProcessors(). + @param[in] EnableAP Specifies the new state for the processor for enabled, + FALSE for disabled. + @param[in] HealthFlag If not NULL, a pointer to a value that specifies the + new health status of the AP. This flag corresponds to + StatusFlag defined in EFI_PEI_MP_SERVICES_PPI.GetProcessorInfo(). + Only the PROCESSOR_HEALTH_STATUS_BIT is used. All other + bits are ignored. If it is NULL, this parameter is + ignored. + + @retval EFI_SUCCESS The specified AP was enabled or disabled successfully. + @retval EFI_UNSUPPORTED Enabling or disabling an AP cannot be completed prior + to this service returning. + @retval EFI_UNSUPPORTED Enabling or disabling an AP is not supported. + @retval EFI_DEVICE_ERROR The calling processor is an AP. + @retval EFI_NOT_FOUND Processor with the handle specified by ProcessorNumber + does not exist. + @retval EFI_INVALID_PARAMETER ProcessorNumber specifies the BSP. +**/ +EFI_STATUS +EFIAPI +PeiEnableDisableAP2 ( + IN EFI_PEI_MP_SERVICES2_PPI *This, + IN UINTN ProcessorNumber, + IN BOOLEAN EnableAP, + IN UINT32 *HealthFlag OPTIONAL + ); + +/** + This return the handle number for the calling processor. This service may be + called from the BSP and APs. + + This service returns the processor handle number for the calling processor. + The returned value is in the range from 0 to the total number of logical + processors minus 1. The total number of logical processors can be retrieved + with EFI_PEI_MP_SERVICES_PPI.GetNumberOfProcessors(). This service may be + called from the BSP and APs. If ProcessorNumber is NULL, then EFI_INVALID_PARAMETER + is returned. Otherwise, the current processors handle number is returned in + ProcessorNumber, and EFI_SUCCESS is returned. + + @param[in] PeiServices An indirect pointer to the PEI Services Table + published by the PEI Foundation. + @param[in] This A pointer to the EFI_PEI_MP_SERVICES_PPI instance. + @param[out] ProcessorNumber The handle number of the AP. The range is from 0 to the + total number of logical processors minus 1. The total + number of logical processors can be retrieved by + EFI_PEI_MP_SERVICES_PPI.GetNumberOfProcessors(). + + @retval EFI_SUCCESS The current processor handle number was returned in + ProcessorNumber. + @retval EFI_INVALID_PARAMETER ProcessorNumber is NULL. +**/ +EFI_STATUS +EFIAPI +PeiWhoAmI2 ( + IN EFI_PEI_MP_SERVICES2_PPI *This, + OUT UINTN *ProcessorNumber + ); + +/** + This service executes a caller provided function on all enabled CPUs. CPUs can + run either simultaneously or one at a time in sequence. This service may only + be called from the BSP. + + @param[in] This A pointer to the EFI_PEI_MP_SERVICES2_PPI instance. + @param[in] Procedure A pointer to the function to be run on enabled APs of + the system. + @param[in] TimeoutInMicroSeconds + Indicates the time limit in microseconds for APs to + return from Procedure, for blocking mode only. Zero + means infinity. If the timeout expires in blocking + mode, BSP returns EFI_TIMEOUT. + @param[in] ProcedureArgument The parameter passed into Procedure for all CPUs. + + @retval EFI_SUCCESS In blocking mode, all APs have finished before the + timeout expired. + @retval EFI_DEVICE_ERROR Caller processor is AP. + @retval EFI_NOT_READY Any enabled APs are busy. + @retval EFI_TIMEOUT In blocking mode, the timeout expired before all + enabled APs have finished. + @retval EFI_INVALID_PARAMETER Procedure is NULL. +**/ +EFI_STATUS +EFIAPI +PeiStartupAllCPUs2 ( + IN EFI_PEI_MP_SERVICES2_PPI *This, + IN EFI_AP_PROCEDURE Procedure, + IN UINTN TimeoutInMicroSeconds, + IN VOID *ProcedureArgument OPTIONAL + ); + +#endif diff --git a/UefiCpuPkg/CpuMpPei/CpuMpPei.c b/UefiCpuPkg/CpuMpPei/CpuMpPei.c index 1b83f61f70..ad0a715b80 100644 --- a/UefiCpuPkg/CpuMpPei/CpuMpPei.c +++ b/UefiCpuPkg/CpuMpPei/CpuMpPei.c @@ -7,12 +7,12 @@ **/ -#include "CpuMpPei.h" +#include "CpuMp2Pei.h" EFI_PEI_PPI_DESCRIPTOR mPeiCpuMpPpiList[] = { { EFI_PEI_PPI_DESCRIPTOR_PPI, - &gEdkiiPeiMpServices2PpiGuid, + &gEfiPeiMpServices2PpiGuid, &mMpServices2Ppi }, { diff --git a/UefiCpuPkg/CpuMpPei/CpuMpPei.h b/UefiCpuPkg/CpuMpPei/CpuMpPei.h index 61568b5763..c2e79e9445 100644 --- a/UefiCpuPkg/CpuMpPei/CpuMpPei.h +++ b/UefiCpuPkg/CpuMpPei/CpuMpPei.h @@ -16,7 +16,6 @@ #include #include #include -#include #include #include @@ -35,8 +34,7 @@ #include -extern EDKII_PEI_MP_SERVICES2_PPI mMpServices2Ppi; -extern EFI_PEI_MP_SERVICES_PPI mMpServicesPpi; +extern EFI_PEI_MP_SERVICES_PPI mMpServicesPpi; /** This service retrieves the number of logical processor in the platform diff --git a/UefiCpuPkg/CpuMpPei/CpuMpPei.inf b/UefiCpuPkg/CpuMpPei/CpuMpPei.inf index 93e7eace00..bbccc2dc48 100644 --- a/UefiCpuPkg/CpuMpPei/CpuMpPei.inf +++ b/UefiCpuPkg/CpuMpPei/CpuMpPei.inf @@ -24,6 +24,7 @@ [Sources] CpuMpPei.h + CpuMp2Pei.h CpuMp.c CpuMp2.c @@ -70,7 +71,7 @@ gEfiSecPlatformInformation2PpiGuid gEfiVectorHandoffInfoPpiGuid ## SOMETIMES_CONSUMES gEfiPeiMemoryDiscoveredPpiGuid ## CONSUMES - gEdkiiPeiMpServices2PpiGuid ## PRODUCES + gEfiPeiMpServices2PpiGuid ## PRODUCES [Pcd] gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask ## CONSUMES diff --git a/UefiCpuPkg/CpuMpPei/LoongArch64/CpuMpPei.c b/UefiCpuPkg/CpuMpPei/LoongArch64/CpuMpPei.c index 705575b339..9256d9d62f 100644 --- a/UefiCpuPkg/CpuMpPei/LoongArch64/CpuMpPei.c +++ b/UefiCpuPkg/CpuMpPei/LoongArch64/CpuMpPei.c @@ -7,12 +7,12 @@ **/ -#include "CpuMpPei.h" +#include "CpuMp2Pei.h" EFI_PEI_PPI_DESCRIPTOR mPeiCpuMpPpiList[] = { { EFI_PEI_PPI_DESCRIPTOR_PPI, - &gEdkiiPeiMpServices2PpiGuid, + &gEfiPeiMpServices2PpiGuid, &mMpServices2Ppi }, {