Add Lock for cirtical section in PCD database processing routines as PCD database...

[mirror_edk2.git] / EdkModulePkg / Universal / PCD / Dxe / Pcd.c

diff --git a/EdkModulePkg/Universal/PCD/Dxe/Pcd.c b/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
index bb17b88e196a87b9d840ae8f75acdfe73544c27a..57c67d67136672c518f5caac1fd84b78e42815e4 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
+++ b/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
@@ -17,6 +17,7 @@ Module Name: Pcd.c
 \r
 #include "Service.h"\r
 \r
+EFI_LOCK mPcdDatabaseLock = EFI_INITIALIZE_LOCK_VARIABLE(EFI_TPL_CALLBACK);\r
 \r
 PCD_PROTOCOL mPcdInstance = {\r
   DxePcdSetSku,\r
@@ -61,7 +62,7 @@ PCD_PROTOCOL mPcdInstance = {
 //\r
 // Static global to reduce the code size\r
 //\r
-static EFI_HANDLE NewHandle = NULL;\r
+static EFI_HANDLE mNewHandle = NULL;\r
 \r
 EFI_STATUS\r
 EFIAPI\r
@@ -81,7 +82,7 @@ PcdDxeInit (
   BuildPcdDxeDataBase ();\r
 \r
   Status = gBS->InstallProtocolInterface (\r
-                  &NewHandle,\r
+                  &mNewHandle,\r
                   &gPcdProtocolGuid,\r
                   EFI_NATIVE_INTERFACE,\r
                   &mPcdInstance\r
@@ -472,9 +473,20 @@ DxeRegisterCallBackOnSet (
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
   )\r
 {\r
+  EFI_STATUS Status;\r
+  \r
   ASSERT (CallBackFunction != NULL);\r
   \r
-  return DxeRegisterCallBackWorker (TokenNumber, Guid, CallBackFunction);\r
+  //\r
+  // Aquire lock to prevent reentrance from TPL_CALLBACK level\r
+  //\r
+  EfiAcquireLock (&mPcdDatabaseLock);\r
+\r
+  Status = DxeRegisterCallBackWorker (TokenNumber, Guid, CallBackFunction);\r
+\r
+  EfiReleaseLock (&mPcdDatabaseLock);\r
+  \r
+  return Status;\r
 }\r
 \r
 \r
@@ -487,9 +499,20 @@ DxeUnRegisterCallBackOnSet (
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
   )\r
 {\r
+  EFI_STATUS Status;\r
+  \r
   ASSERT (CallBackFunction != NULL);\r
+\r
+  //\r
+  // Aquire lock to prevent reentrance from TPL_CALLBACK level\r
+  //\r
+  EfiAcquireLock (&mPcdDatabaseLock);\r
   \r
-  return DxeUnRegisterCallBackWorker (TokenNumber, Guid, CallBackFunction);\r
+  Status = DxeUnRegisterCallBackWorker (TokenNumber, Guid, CallBackFunction);\r
+\r
+  EfiReleaseLock (&mPcdDatabaseLock);\r
+  \r
+  return Status;\r
 }\r
 \r
 \r