EmulatorPkg/Mpservice: Remove StackLock for Info.StateFlag

[mirror_edk2.git] / EmulatorPkg / CpuRuntimeDxe / MpService.c

diff --git a/EmulatorPkg/CpuRuntimeDxe/MpService.c b/EmulatorPkg/CpuRuntimeDxe/MpService.c
index bffc82b0479fed4fbe2233111e194997645711f1..d79abd2989626546b2e0f6896b4ed238115e8ad4 100644 (file)
--- a/EmulatorPkg/CpuRuntimeDxe/MpService.c
+++ b/EmulatorPkg/CpuRuntimeDxe/MpService.c
@@ -59,7 +59,7 @@ IsBSP (
   EFI_STATUS  Status;\r
   UINTN       ProcessorNumber;\r
 \r
-  Status = CpuMpServicesWhoAmI (&mMpSercicesTemplate, &ProcessorNumber);\r
+  Status = CpuMpServicesWhoAmI (&mMpServicesTemplate, &ProcessorNumber);\r
   if (EFI_ERROR (Status)) {\r
     return FALSE;\r
   }\r
@@ -440,9 +440,9 @@ CpuMpServicesStartupAllAps (
     if (ProcessorData->State == CPU_STATE_IDLE) {\r
       gMPSystem.StartCount++;\r
 \r
-      gThread->MutexLock (&ProcessorData->StateLock);\r
+      gThread->MutexLock (ProcessorData->StateLock);\r
       ProcessorData->State = APInitialState;\r
-      gThread->MutexUnlock (&ProcessorData->StateLock);\r
+      gThread->MutexUnlock (ProcessorData->StateLock);\r
 \r
       if (SingleThread) {\r
         APInitialState = CPU_STATE_BLOCKED;\r
@@ -512,11 +512,16 @@ CpuMpServicesStartupAllAps (
         if (SingleThread) {\r
           Status = GetNextBlockedNumber (&NextNumber);\r
           if (!EFI_ERROR (Status)) {\r
+            gThread->MutexLock (gMPSystem.ProcessorData[NextNumber].StateLock);\r
             gMPSystem.ProcessorData[NextNumber].State = CPU_STATE_READY;\r
+            gThread->MutexUnlock (gMPSystem.ProcessorData[NextNumber].StateLock);\r
           }\r
         }\r
 \r
+        gThread->MutexLock (ProcessorData->StateLock);\r
         ProcessorData->State = CPU_STATE_IDLE;\r
+        gThread->MutexUnlock (ProcessorData->StateLock);\r
+\r
         break;\r
 \r
       default:\r
@@ -694,14 +699,14 @@ CpuMpServicesStartupThisAP (
 \r
   // Blocking\r
   while (TRUE) {\r
-    gThread->MutexLock (&gMPSystem.ProcessorData[ProcessorNumber].StateLock);\r
+    gThread->MutexLock (gMPSystem.ProcessorData[ProcessorNumber].StateLock);\r
     if (gMPSystem.ProcessorData[ProcessorNumber].State == CPU_STATE_FINISHED) {\r
       gMPSystem.ProcessorData[ProcessorNumber].State = CPU_STATE_IDLE;\r
-      gThread->MutexUnlock (&gMPSystem.ProcessorData[ProcessorNumber].StateLock);\r
+      gThread->MutexUnlock (gMPSystem.ProcessorData[ProcessorNumber].StateLock);\r
       break;\r
     }\r
 \r
-    gThread->MutexUnlock (&gMPSystem.ProcessorData[ProcessorNumber].StateLock);\r
+    gThread->MutexUnlock (gMPSystem.ProcessorData[ProcessorNumber].StateLock);\r
 \r
     if ((TimeoutInMicroseconds != 0) && (Timeout < 0)) {\r
       return EFI_TIMEOUT;\r
@@ -860,8 +865,6 @@ CpuMpServicesEnableDisableAP (
     return EFI_UNSUPPORTED;\r
   }\r
 \r
-  gThread->MutexLock (&gMPSystem.ProcessorData[ProcessorNumber].StateLock);\r
-\r
   if (EnableAP) {\r
     if ((gMPSystem.ProcessorData[ProcessorNumber].Info.StatusFlag & PROCESSOR_ENABLED_BIT) == 0 ) {\r
       gMPSystem.NumberOfEnabledProcessors++;\r
@@ -879,8 +882,6 @@ CpuMpServicesEnableDisableAP (
     gMPSystem.ProcessorData[ProcessorNumber].Info.StatusFlag |= (*HealthFlag & PROCESSOR_HEALTH_STATUS_BIT);\r
   }\r
 \r
-  gThread->MutexUnlock (&gMPSystem.ProcessorData[ProcessorNumber].StateLock);\r
-\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -936,7 +937,7 @@ CpuMpServicesWhoAmI (
 \r
 \r
 \r
-EFI_MP_SERVICES_PROTOCOL  mMpSercicesTemplate = {\r
+EFI_MP_SERVICES_PROTOCOL  mMpServicesTemplate = {\r
   CpuMpServicesGetNumberOfProcessors,\r
   CpuMpServicesGetProcessorInfo,\r
   CpuMpServicesStartupAllAps,\r
@@ -1010,9 +1011,9 @@ CpuCheckAllAPsStatus (
         if (!EFI_ERROR (Status)) {\r
           NextData = &gMPSystem.ProcessorData[NextNumber];\r
 \r
-          gThread->MutexLock (&NextData->ProcedureLock);\r
+          gThread->MutexLock (NextData->StateLock);\r
           NextData->State = CPU_STATE_READY;\r
-          gThread->MutexUnlock (&NextData->ProcedureLock);\r
+          gThread->MutexUnlock (NextData->StateLock);\r
 \r
           SetApProcedure (NextData, gMPSystem.Procedure, gMPSystem.ProcedureArgument);\r
         }\r
@@ -1348,7 +1349,7 @@ CpuMpServicesInit (
   Handle = NULL;\r
   Status = gBS->InstallMultipleProtocolInterfaces (\r
                   &Handle,\r
-                  &gEfiMpServiceProtocolGuid,   &mMpSercicesTemplate,\r
+                  &gEfiMpServiceProtocolGuid,   &mMpServicesTemplate,\r
                   NULL\r
                   );\r
   return Status;\r