tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UefiCpuPkg/MpInitLib: Remove redundant CpuStateFinished State. 

Current CPU state definition include CpuStateIdle and CpuStateFinished.
After investigation, current code can use CpuStateIdle to replace the
CpuStateFinished. It will reduce the state number and easy for maintenance.

> Before this patch, the state transitions for an AP are:
>
>   Idle ----> Ready ----> Busy ----> Finished ----> Idle
>        [BSP]       [AP]       [AP]           [BSP]
>
> After the patch, the state transitions for an AP are:
>
>   Idle ----> Ready ----> Busy ----> Idle
>        [BSP]       [AP]       [AP]

Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
Eric Dong 2018-07-24 22:25:41 +08:00
parent 98d20e44dc
commit 2a5997f899
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
UefiCpuPkg/Library/MpInitLib/MpLib.c
View File

@ -696,7 +696,7 @@ ApWakeupFunction (
} }
} }
} }
SetApState (&CpuMpData->CpuData[ProcessorNumber], CpuStateFinished); SetApState (&CpuMpData->CpuData[ProcessorNumber], CpuStateIdle);
} }
} }
@ -1352,18 +1352,17 @@ CheckThisAP (
CpuData = &CpuMpData->CpuData[ProcessorNumber]; CpuData = &CpuMpData->CpuData[ProcessorNumber];
// //
// Check the CPU state of AP. If it is CpuStateFinished, then the AP has finished its task. // Check the CPU state of AP. If it is CpuStateIdle, then the AP has finished its task.
// Only BSP and corresponding AP access this unit of CPU Data. This means the AP will not modify the // Only BSP and corresponding AP access this unit of CPU Data. This means the AP will not modify the
// value of state after setting the it to CpuStateFinished, so BSP can safely make use of its value. // value of state after setting the it to CpuStateIdle, so BSP can safely make use of its value.
// //
// //
// If the AP finishes for StartupThisAP(), return EFI_SUCCESS. // If the AP finishes for StartupThisAP(), return EFI_SUCCESS.
// //
if (GetApState(CpuData) == CpuStateFinished) { if (GetApState(CpuData) == CpuStateIdle) {
if (CpuData->Finished != NULL) { if (CpuData->Finished != NULL) {
*(CpuData->Finished) = TRUE; *(CpuData->Finished) = TRUE;
} }
SetApState (CpuData, CpuStateIdle);
return EFI_SUCCESS; return EFI_SUCCESS;
} else { } else {
// //
@ -1420,14 +1419,13 @@ CheckAllAPs (
CpuData = &CpuMpData->CpuData[ProcessorNumber]; CpuData = &CpuMpData->CpuData[ProcessorNumber];
// //
// Check the CPU state of AP. If it is CpuStateFinished, then the AP has finished its task. // Check the CPU state of AP. If it is CpuStateIdle, then the AP has finished its task.
// Only BSP and corresponding AP access this unit of CPU Data. This means the AP will not modify the // Only BSP and corresponding AP access this unit of CPU Data. This means the AP will not modify the
// value of state after setting the it to CpuStateFinished, so BSP can safely make use of its value. // value of state after setting the it to CpuStateIdle, so BSP can safely make use of its value.
// //
if (GetApState(CpuData) == CpuStateFinished) { if (GetApState(CpuData) == CpuStateIdle) {
CpuMpData->RunningCount ++; CpuMpData->RunningCount ++;
CpuMpData->CpuData[ProcessorNumber].Waiting = FALSE; CpuMpData->CpuData[ProcessorNumber].Waiting = FALSE;
SetApState(CpuData, CpuStateIdle);
// //
// If in Single Thread mode, then search for the next waiting AP for execution. // If in Single Thread mode, then search for the next waiting AP for execution.
@ -1923,7 +1921,7 @@ SwitchBSPWorker (
// //
// Wait for old BSP finished AP task // Wait for old BSP finished AP task
// //
while (GetApState (&CpuMpData->CpuData[CallerNumber]) != CpuStateFinished) { while (GetApState (&CpuMpData->CpuData[CallerNumber]) != CpuStateIdle) {
CpuPause (); CpuPause ();
} }

5
UefiCpuPkg/Library/MpInitLib/MpLib.h
View File

@ -81,11 +81,14 @@ typedef enum {
// //
// AP state // AP state
// //
// The state transitions for an AP when it process a procedure are:
// Idle ----> Ready ----> Busy ----> Idle
// [BSP] [AP] [AP]
//
typedef enum { typedef enum {
CpuStateIdle, CpuStateIdle,
CpuStateReady, CpuStateReady,
CpuStateBusy, CpuStateBusy,
CpuStateFinished,
CpuStateDisabled CpuStateDisabled
} CPU_STATE; } CPU_STATE;