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

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

diff --git a/EdkModulePkg/Universal/PCD/Dxe/Service.c b/EdkModulePkg/Universal/PCD/Dxe/Service.c
index f175b14db238635ddad4aca521671305c90a4cd4..13abab001a824920ad34cfc345169dd56f50b335 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Dxe/Service.c
+++ b/EdkModulePkg/Universal/PCD/Dxe/Service.c
@@ -1,5 +1,5 @@
 /** @file\r
 /** @file\r

-Private functions used by PCD DXE driver.s\r
+Private functions used by PCD DXE driver.\r

 \r
 Copyright (c) 2006, Intel Corporation\r
 All rights reserved. This program and the accompanying materials\r
 \r
 Copyright (c) 2006, Intel Corporation\r
 All rights reserved. This program and the accompanying materials\r


@@ -17,11 +17,6 @@ Module Name: Service.c
 #include "Service.h"\r
 \r
 \r
 #include "Service.h"\r
 \r
 \r

-//\r
-// Build Tool will generate DXE_PCD_DB_INIT_VALUE in Autogen.h\r
-// Compression Algorithm will take care of the size optimization.\r
-//\r
-\r

 PCD_DATABASE * mPcdDatabase;\r
 \r
 LIST_ENTRY *mCallbackFnTable;\r
 PCD_DATABASE * mPcdDatabase;\r
 \r
 LIST_ENTRY *mCallbackFnTable;\r


@@ -34,24 +29,31 @@ GetWorker (
 {\r
   UINT32              *LocalTokenNumberTable;\r
   UINT16              *SizeTable;\r
 {\r
   UINT32              *LocalTokenNumberTable;\r
   UINT16              *SizeTable;\r

-  BOOLEAN             IsPeiDb;\r
-  UINT32              Offset;\r

   EFI_GUID            *GuidTable;\r
   UINT16              *StringTable;\r
   EFI_GUID            *Guid;\r
   UINT16              *Name;\r
   VARIABLE_HEAD       *VariableHead;\r
   UINT8               *VaraiableDefaultBuffer;\r
   EFI_GUID            *GuidTable;\r
   UINT16              *StringTable;\r
   EFI_GUID            *Guid;\r
   UINT16              *Name;\r
   VARIABLE_HEAD       *VariableHead;\r
   UINT8               *VaraiableDefaultBuffer;\r

-  EFI_STATUS          Status;\r
-  UINTN               DataSize;\r

   UINT8               *Data;\r
   VPD_HEAD            *VpdHead;\r
   UINT8               *PcdDb;\r
   UINT8               *Data;\r
   VPD_HEAD            *VpdHead;\r
   UINT8               *PcdDb;\r

-  UINT16              StringTableIdx;      \r
-  UINT32              LocalTokenNumber;\r
+  VOID                *RetPtr;\r

   UINTN               MaxSize;\r
   UINTN               TmpTokenNumber;\r
   UINTN               MaxSize;\r
   UINTN               TmpTokenNumber;\r

+  UINTN               DataSize;\r
+  EFI_STATUS          Status;\r
+  UINT32              LocalTokenNumber;\r
+  UINT32              Offset;\r
+  UINT16              StringTableIdx;      \r
+  BOOLEAN             IsPeiDb;\r
+\r
+  //\r
+  // Aquire lock to prevent reentrance from TPL_CALLBACK level\r
+  //\r
+  EfiAcquireLock (&mPcdDatabaseLock);\r

 \r
 \r

+  RetPtr = NULL;\r

   //\r
   // TokenNumber Zero is reserved as PCD_INVALID_TOKEN_NUMBER.\r
   // We have to decrement TokenNumber by 1 to make it usable\r
   //\r
   // TokenNumber Zero is reserved as PCD_INVALID_TOKEN_NUMBER.\r
   // We have to decrement TokenNumber by 1 to make it usable\r


@@ -61,12 +63,20 @@ GetWorker (
 \r
   TmpTokenNumber = TokenNumber;\r
   \r
 \r
   TmpTokenNumber = TokenNumber;\r
   \r

-  ASSERT (TokenNumber < PCD_TOTAL_TOKEN_NUMBER);\r
+  //\r
+  // PCD_TOTAL_TOKEN_NUMBER is a auto-generated constant.\r
+  // It could be zero. EBC compiler is very choosy. It may\r
+  // report warning. So we add 1 in each size of the \r
+  // comparison.\r
+  //\r
+  ASSERT (TokenNumber + 1 < PCD_TOTAL_TOKEN_NUMBER + 1);\r

 \r
   ASSERT ((GetSize == DxePcdGetSize (TokenNumber + 1)) || (GetSize == 0));\r
 \r
 \r
   ASSERT ((GetSize == DxePcdGetSize (TokenNumber + 1)) || (GetSize == 0));\r
 \r

-  \r
-  IsPeiDb = (TokenNumber < PEI_LOCAL_TOKEN_NUMBER) ? TRUE : FALSE;\r
+  // EBC compiler is very choosy. It may report warning about comparison\r
+  // between UINTN and 0 . So we add 1 in each size of the \r
+  // comparison.\r
+  IsPeiDb = (TokenNumber + 1 < PEI_LOCAL_TOKEN_NUMBER + 1) ? TRUE : FALSE;\r

 \r
   LocalTokenNumberTable  = IsPeiDb ? mPcdDatabase->PeiDb.Init.LocalTokenNumberTable : \r
                                      mPcdDatabase->DxeDb.Init.LocalTokenNumberTable;\r
 \r
   LocalTokenNumberTable  = IsPeiDb ? mPcdDatabase->PeiDb.Init.LocalTokenNumberTable : \r
                                      mPcdDatabase->DxeDb.Init.LocalTokenNumberTable;\r


@@ -97,7 +107,8 @@ GetWorker (
   switch (LocalTokenNumber & PCD_TYPE_ALL_SET) {\r
     case PCD_TYPE_VPD:\r
       VpdHead = (VPD_HEAD *) ((UINT8 *) PcdDb + Offset);\r
   switch (LocalTokenNumber & PCD_TYPE_ALL_SET) {\r
     case PCD_TYPE_VPD:\r
       VpdHead = (VPD_HEAD *) ((UINT8 *) PcdDb + Offset);\r

-      return (VOID *) (UINTN) (FixedPcdGet32(PcdVpdBaseAddress) + VpdHead->Offset);\r
+      RetPtr = (VOID *) (UINTN) (FixedPcdGet32(PcdVpdBaseAddress) + VpdHead->Offset);\r
+      break;\r

       \r
     case PCD_TYPE_HII:\r
       GuidTable   = IsPeiDb ? mPcdDatabase->PeiDb.Init.GuidTable :\r
       \r
     case PCD_TYPE_HII:\r
       GuidTable   = IsPeiDb ? mPcdDatabase->PeiDb.Init.GuidTable :\r


@@ -116,7 +127,7 @@ GetWorker (
           // It is a pointer type. So get the MaxSize reserved for\r
           // this PCD entry.\r
           //\r
           // It is a pointer type. So get the MaxSize reserved for\r
           // this PCD entry.\r
           //\r

-          GetPtrTypeSize (TokenNumber, &GetSize);\r
+          GetPtrTypeSize (TmpTokenNumber, &GetSize);\r

         }\r
         CopyMem (VaraiableDefaultBuffer, Data + VariableHead->Offset, GetSize);\r
         FreePool (Data);\r
         }\r
         CopyMem (VaraiableDefaultBuffer, Data + VariableHead->Offset, GetSize);\r
         FreePool (Data);\r


@@ -131,14 +142,16 @@ GetWorker (
       // Return 1) either the default value specified by Platform Integrator \r
       //        2) Or the value Set by a PCD set operation.\r
       //\r
       // Return 1) either the default value specified by Platform Integrator \r
       //        2) Or the value Set by a PCD set operation.\r
       //\r

-      return (VOID *) VaraiableDefaultBuffer;\r
+      RetPtr = (VOID *) VaraiableDefaultBuffer;\r
+      break;\r

 \r
     case PCD_TYPE_STRING:\r
       StringTableIdx = (UINT16) *((UINT8 *) PcdDb + Offset);\r
 \r
     case PCD_TYPE_STRING:\r
       StringTableIdx = (UINT16) *((UINT8 *) PcdDb + Offset);\r

-      return (VOID *) &StringTable[StringTableIdx];\r
+      RetPtr = (VOID *) &StringTable[StringTableIdx];\r
+      break;\r

 \r
     case PCD_TYPE_DATA:\r
 \r
     case PCD_TYPE_DATA:\r

-      return (VOID *) ((UINT8 *) PcdDb + Offset);\r
+      RetPtr = (VOID *) ((UINT8 *) PcdDb + Offset);\r

       break;\r
 \r
     default:\r
       break;\r
 \r
     default:\r


@@ -147,9 +160,9 @@ GetWorker (
       \r
   }\r
 \r
       \r
   }\r
 \r

-  ASSERT (FALSE);\r
-      \r
-  return NULL;\r
+  EfiReleaseLock (&mPcdDatabaseLock);\r
+  \r
+  return RetPtr;\r

   \r
 }\r
 \r
   \r
 }\r
 \r


@@ -252,14 +265,14 @@ DxeUnRegisterCallBackWorker (
 \r
 \r
 \r
 \r
 \r
 \r

-UINTN           \r
+EFI_STATUS\r

 ExGetNextTokeNumber (\r
 ExGetNextTokeNumber (\r

-  IN CONST EFI_GUID         *Guid,\r
-  IN UINTN                  TokenNumber,\r
-  IN EFI_GUID               *GuidTable,\r
-  IN UINTN                  SizeOfGuidTable,\r
-  IN DYNAMICEX_MAPPING      *ExMapTable,\r
-  IN UINTN                  SizeOfExMapTable\r
+  IN      CONST EFI_GUID         *Guid,\r
+  IN OUT  UINTN                  *TokenNumber,\r
+  IN      EFI_GUID               *GuidTable,\r
+  IN      UINTN                  SizeOfGuidTable,\r
+  IN      DYNAMICEX_MAPPING      *ExMapTable,\r
+  IN      UINTN                  SizeOfExMapTable\r

   )\r
 {\r
   EFI_GUID         *MatchGuid;\r
   )\r
 {\r
   EFI_GUID         *MatchGuid;\r


@@ -269,7 +282,7 @@ ExGetNextTokeNumber (
 \r
   MatchGuid = ScanGuid (GuidTable, SizeOfGuidTable, Guid);\r
   if (MatchGuid == NULL) {\r
 \r
   MatchGuid = ScanGuid (GuidTable, SizeOfGuidTable, Guid);\r
   if (MatchGuid == NULL) {\r

-    return PCD_INVALID_TOKEN_NUMBER;\r
+    return EFI_NOT_FOUND;\r

   }\r
 \r
   Found = FALSE;\r
   }\r
 \r
   Found = FALSE;\r


@@ -282,35 +295,39 @@ ExGetNextTokeNumber (
   }\r
 \r
   if (Found) {\r
   }\r
 \r
   if (Found) {\r

-    if (TokenNumber == PCD_INVALID_TOKEN_NUMBER) {\r
-      return ExMapTable[Idx].ExTokenNumber;\r
+    if (*TokenNumber == PCD_INVALID_TOKEN_NUMBER) {\r
+      *TokenNumber = ExMapTable[Idx].ExTokenNumber;\r
+      return EFI_SUCCESS;\r

     }\r
 \r
     for ( ; Idx < SizeOfExMapTable; Idx++) {\r
     }\r
 \r
     for ( ; Idx < SizeOfExMapTable; Idx++) {\r

-      if (ExMapTable[Idx].ExTokenNumber == TokenNumber) {\r
+      if (ExMapTable[Idx].ExTokenNumber == *TokenNumber) {\r

         Idx++;\r
         if (Idx == SizeOfExMapTable) {\r
           //\r
           // Exceed the length of ExMap Table\r
           //\r
         Idx++;\r
         if (Idx == SizeOfExMapTable) {\r
           //\r
           // Exceed the length of ExMap Table\r
           //\r

-          return PCD_INVALID_TOKEN_NUMBER;\r
+          *TokenNumber = PCD_INVALID_TOKEN_NUMBER;\r
+          return EFI_SUCCESS;\r

         } else if (ExMapTable[Idx].ExGuidIndex == GuidTableIdx) {\r
           //\r
           // Found the next match\r
           //\r
         } else if (ExMapTable[Idx].ExGuidIndex == GuidTableIdx) {\r
           //\r
           // Found the next match\r
           //\r

-          return ExMapTable[Idx].ExTokenNumber;\r
+          *TokenNumber = ExMapTable[Idx].ExTokenNumber;\r
+          return EFI_SUCCESS;\r

         } else {\r
           //\r
           // Guid has been changed. It is the next Token Space Guid.\r
           // We should flag no more TokenNumber.\r
           //\r
         } else {\r
           //\r
           // Guid has been changed. It is the next Token Space Guid.\r
           // We should flag no more TokenNumber.\r
           //\r

-          return PCD_INVALID_TOKEN_NUMBER;\r
+          *TokenNumber = PCD_INVALID_TOKEN_NUMBER;\r
+          return EFI_SUCCESS;\r

         }\r
       }\r
     }\r
   }\r
   \r
         }\r
       }\r
     }\r
   }\r
   \r

-  return PCD_INVALID_TOKEN_NUMBER;\r
+  return EFI_NOT_FOUND;\r

 }\r
   \r
 \r
 }\r
   \r
 \r


@@ -329,7 +346,6 @@ BuildPcdDxeDataBase (
   ASSERT (mPcdDatabase != NULL);\r
 \r
   GuidHob = GetFirstGuidHob (&gPcdDataBaseHobGuid);\r
   ASSERT (mPcdDatabase != NULL);\r
 \r
   GuidHob = GetFirstGuidHob (&gPcdDataBaseHobGuid);\r

-\r

   if (GuidHob != NULL) {\r
 \r
     //\r
   if (GuidHob != NULL) {\r
 \r
     //\r


@@ -358,11 +374,12 @@ BuildPcdDxeDataBase (
   // Initialized the Callback Function Table\r
   //\r
 \r
   // Initialized the Callback Function Table\r
   //\r
 \r

-  if (PCD_TOTAL_TOKEN_NUMBER != 0) {\r
-    mCallbackFnTable = AllocateZeroPool (PCD_TOTAL_TOKEN_NUMBER * sizeof (LIST_ENTRY));\r
-  }\r
+  mCallbackFnTable = AllocateZeroPool (PCD_TOTAL_TOKEN_NUMBER * sizeof (LIST_ENTRY));\r

   \r
   \r

-  for (Idx = 0; Idx < PCD_TOTAL_TOKEN_NUMBER; Idx++) {\r
+  // EBC compiler is very choosy. It may report warning about comparison\r
+  // between UINTN and 0 . So we add 1 in each size of the \r
+  // comparison.\r
+  for (Idx = 0; Idx + 1 < PCD_TOTAL_TOKEN_NUMBER + 1; Idx++) {\r

     InitializeListHead (&mCallbackFnTable[Idx]);\r
   }\r
     \r
     InitializeListHead (&mCallbackFnTable[Idx]);\r
   }\r
     \r


@@ -375,18 +392,18 @@ EFI_STATUS
 GetHiiVariable (\r
   IN  EFI_GUID      *VariableGuid,\r
   IN  UINT16        *VariableName,\r
 GetHiiVariable (\r
   IN  EFI_GUID      *VariableGuid,\r
   IN  UINT16        *VariableName,\r

-  OUT VOID          **VariableData,\r
+  OUT UINT8         **VariableData,\r

   OUT UINTN         *VariableSize\r
   )\r
 {\r
   UINTN      Size;\r
   EFI_STATUS Status;\r
   OUT UINTN         *VariableSize\r
   )\r
 {\r
   UINTN      Size;\r
   EFI_STATUS Status;\r

-  VOID       *Buffer;\r
+  UINT8      *Buffer;\r

 \r
   Size = 0;\r
   Buffer = NULL;\r
   \r
 \r
   Size = 0;\r
   Buffer = NULL;\r
   \r

-  Status = EfiGetVariable (\r
+  Status = gRT->GetVariable (\r

     (UINT16 *)VariableName,\r
     VariableGuid,\r
     NULL,\r
     (UINT16 *)VariableName,\r
     VariableGuid,\r
     NULL,\r


@@ -395,11 +412,11 @@ GetHiiVariable (
     );\r
   \r
   if (Status == EFI_BUFFER_TOO_SMALL) {\r
     );\r
   \r
   if (Status == EFI_BUFFER_TOO_SMALL) {\r

-    Buffer = AllocatePool (Size);\r
+    Buffer = (UINT8 *) AllocatePool (Size);\r

 \r
     ASSERT (Buffer != NULL);\r
 \r
 \r
     ASSERT (Buffer != NULL);\r
 \r

-    Status = EfiGetVariable (\r
+    Status = gRT->GetVariable (\r

       VariableName,\r
       VariableGuid,\r
       NULL,\r
       VariableName,\r
       VariableGuid,\r
       NULL,\r


@@ -553,6 +570,11 @@ SetWorker (
   UINTN               MaxSize;\r
   UINTN               TmpTokenNumber;\r
 \r
   UINTN               MaxSize;\r
   UINTN               TmpTokenNumber;\r
 \r

+  //\r
+  // Aquire lock to prevent reentrance from TPL_CALLBACK level\r
+  //\r
+  EfiAcquireLock (&mPcdDatabaseLock);\r
+\r

   //\r
   // TokenNumber Zero is reserved as PCD_INVALID_TOKEN_NUMBER.\r
   // We have to decrement TokenNumber by 1 to make it usable\r
   //\r
   // TokenNumber Zero is reserved as PCD_INVALID_TOKEN_NUMBER.\r
   // We have to decrement TokenNumber by 1 to make it usable\r


@@ -562,19 +584,29 @@ SetWorker (
 \r
   TmpTokenNumber = TokenNumber;\r
   \r
 \r
   TmpTokenNumber = TokenNumber;\r
   \r

-  ASSERT (TokenNumber < PCD_TOTAL_TOKEN_NUMBER);\r
+  // EBC compiler is very choosy. It may report warning about comparison\r
+  // between UINTN and 0 . So we add 1 in each size of the \r
+  // comparison.\r
+\r
+  ASSERT (TokenNumber + 1 < PCD_TOTAL_TOKEN_NUMBER + 1);\r

 \r
   if (!PtrType) {\r
     ASSERT (*Size == DxePcdGetSize (TokenNumber + 1));\r
   }\r
   \r
 \r
   if (!PtrType) {\r
     ASSERT (*Size == DxePcdGetSize (TokenNumber + 1));\r
   }\r
   \r

-  IsPeiDb = (TokenNumber < PEI_LOCAL_TOKEN_NUMBER) ? TRUE : FALSE;\r
+  // EBC compiler is very choosy. It may report warning about comparison\r
+  // between UINTN and 0 . So we add 1 in each size of the \r
+  // comparison.\r
+  IsPeiDb = (TokenNumber + 1 < PEI_LOCAL_TOKEN_NUMBER + 1) ? TRUE : FALSE;\r

 \r
   LocalTokenNumberTable  = IsPeiDb ? mPcdDatabase->PeiDb.Init.LocalTokenNumberTable : \r
                                      mPcdDatabase->DxeDb.Init.LocalTokenNumberTable;\r
 \r
 \r
   LocalTokenNumberTable  = IsPeiDb ? mPcdDatabase->PeiDb.Init.LocalTokenNumberTable : \r
                                      mPcdDatabase->DxeDb.Init.LocalTokenNumberTable;\r
 \r

-  if ((TokenNumber < PEI_NEX_TOKEN_NUMBER) ||\r
-      (TokenNumber >= PEI_LOCAL_TOKEN_NUMBER || TokenNumber < (PEI_LOCAL_TOKEN_NUMBER + DXE_NEX_TOKEN_NUMBER))) {\r
+  // EBC compiler is very choosy. It may report warning about comparison\r
+  // between UINTN and 0 . So we add 1 in each size of the \r
+  // comparison.\r
+  if ((TokenNumber + 1 < PEI_NEX_TOKEN_NUMBER + 1) ||\r
+      (TokenNumber + 1 >= PEI_LOCAL_TOKEN_NUMBER + 1 || TokenNumber + 1 < (PEI_LOCAL_TOKEN_NUMBER + DXE_NEX_TOKEN_NUMBER + 1))) {\r

     InvokeCallbackOnSet (0, NULL, TokenNumber + 1, Data, *Size);\r
   }\r
 \r
     InvokeCallbackOnSet (0, NULL, TokenNumber + 1, Data, *Size);\r
   }\r
 \r


@@ -604,20 +636,23 @@ SetWorker (
   switch (LocalTokenNumber & PCD_TYPE_ALL_SET) {\r
     case PCD_TYPE_VPD:\r
       ASSERT (FALSE);\r
   switch (LocalTokenNumber & PCD_TYPE_ALL_SET) {\r
     case PCD_TYPE_VPD:\r
       ASSERT (FALSE);\r

-      return EFI_INVALID_PARAMETER;\r
+      Status = EFI_INVALID_PARAMETER;\r
+      break;\r

     \r
     case PCD_TYPE_STRING:\r
     \r
     case PCD_TYPE_STRING:\r

-      if (SetPtrTypeSize (TokenNumber, Size)) {\r
+      if (SetPtrTypeSize (TmpTokenNumber, Size)) {\r

         CopyMem (&StringTable[*((UINT16 *)InternalData)], Data, *Size);\r
         CopyMem (&StringTable[*((UINT16 *)InternalData)], Data, *Size);\r

-        return EFI_SUCCESS;\r
+        Status = EFI_SUCCESS;\r

       } else {\r
       } else {\r

-        return EFI_INVALID_PARAMETER;\r
+        Status = EFI_INVALID_PARAMETER;\r

       }\r
       }\r

+      break;\r

 \r
     case PCD_TYPE_HII:\r
       if (PtrType) {\r
 \r
     case PCD_TYPE_HII:\r
       if (PtrType) {\r

-        if (!SetPtrTypeSize (TokenNumber, Size)) {\r
-          return EFI_INVALID_PARAMETER;\r
+        if (!SetPtrTypeSize (TmpTokenNumber, Size)) {\r
+          Status = EFI_INVALID_PARAMETER;\r
+          break;\r

         }\r
       }\r
       \r
         }\r
       }\r
       \r


@@ -634,54 +669,55 @@ SetWorker (
 \r
       if (EFI_NOT_FOUND == Status) {\r
         CopyMem (PcdDb + VariableHead->DefaultValueOffset, Data, *Size);\r
 \r
       if (EFI_NOT_FOUND == Status) {\r
         CopyMem (PcdDb + VariableHead->DefaultValueOffset, Data, *Size);\r

-        return EFI_SUCCESS;\r
-      } else {\r
-        return Status;\r
-      }\r
+        Status = EFI_SUCCESS;\r
+      } \r
+      break;\r

       \r
       \r

-      //\r
-      // Bug Bug: Please implement this\r
-      //\r
-\r

     case PCD_TYPE_DATA:\r
       if (PtrType) {\r
     case PCD_TYPE_DATA:\r
       if (PtrType) {\r

-        if (SetPtrTypeSize (TokenNumber, Size)) {\r
+        if (SetPtrTypeSize (TmpTokenNumber, Size)) {\r

           CopyMem (InternalData, Data, *Size);\r
           CopyMem (InternalData, Data, *Size);\r

-          return EFI_SUCCESS;\r
+          Status = EFI_SUCCESS;\r

         } else {\r
         } else {\r

-          return EFI_INVALID_PARAMETER;\r
+          Status = EFI_INVALID_PARAMETER;\r

         }\r
         }\r

+        break;\r

       }\r
 \r
       }\r
 \r

+      Status = EFI_SUCCESS;\r

       switch (*Size) {\r
         case sizeof(UINT8):\r
           *((UINT8 *) InternalData) = *((UINT8 *) Data);\r
       switch (*Size) {\r
         case sizeof(UINT8):\r
           *((UINT8 *) InternalData) = *((UINT8 *) Data);\r

-          return EFI_SUCCESS;\r
+          break;\r

 \r
         case sizeof(UINT16):\r
           *((UINT16 *) InternalData) = *((UINT16 *) Data);\r
 \r
         case sizeof(UINT16):\r
           *((UINT16 *) InternalData) = *((UINT16 *) Data);\r

-          return EFI_SUCCESS;\r
+          break;\r

 \r
         case sizeof(UINT32):\r
           *((UINT32 *) InternalData) = *((UINT32 *) Data);\r
 \r
         case sizeof(UINT32):\r
           *((UINT32 *) InternalData) = *((UINT32 *) Data);\r

-          return EFI_SUCCESS;\r
+          break;\r

 \r
         case sizeof(UINT64):\r
           *((UINT64 *) InternalData) = *((UINT64 *) Data);\r
 \r
         case sizeof(UINT64):\r
           *((UINT64 *) InternalData) = *((UINT64 *) Data);\r

-          return EFI_SUCCESS;\r
+          break;\r

 \r
         default:\r
           ASSERT (FALSE);\r
 \r
         default:\r
           ASSERT (FALSE);\r

-          return EFI_NOT_FOUND;\r
+          Status = EFI_NOT_FOUND;\r
+          break;\r

       }\r
       }\r

+      break;\r

 \r
     default:\r
       ASSERT (FALSE);\r
 \r
     default:\r
       ASSERT (FALSE);\r

+      Status = EFI_NOT_FOUND;\r

       break;\r
     }\r
       break;\r
     }\r

-      \r
-  ASSERT (FALSE);\r
-  return EFI_NOT_FOUND;\r
+\r
+  EfiReleaseLock (&mPcdDatabaseLock);\r
+  \r
+  return Status;\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -751,10 +787,10 @@ SetHiiVariable (
 \r
   Size = 0;\r
 \r
 \r
   Size = 0;\r
 \r

-  Status = EfiGetVariable (\r
+  Status = gRT->GetVariable (\r

     (UINT16 *)VariableName,\r
     VariableGuid,\r
     (UINT16 *)VariableName,\r
     VariableGuid,\r

-    &Attribute,\r
+    NULL,\r

     &Size,\r
     NULL\r
     );\r
     &Size,\r
     NULL\r
     );\r


@@ -765,7 +801,7 @@ SetHiiVariable (
 \r
     ASSERT (Buffer != NULL);\r
 \r
 \r
     ASSERT (Buffer != NULL);\r
 \r

-    Status = EfiGetVariable (\r
+    Status = gRT->GetVariable (\r

       VariableName,\r
       VariableGuid,\r
       &Attribute,\r
       VariableName,\r
       VariableGuid,\r
       &Attribute,\r


@@ -777,7 +813,7 @@ SetHiiVariable (
 \r
     CopyMem ((UINT8 *)Buffer + Offset, Data, DataSize);\r
 \r
 \r
     CopyMem ((UINT8 *)Buffer + Offset, Data, DataSize);\r
 \r

-    Status = EfiSetVariable (\r
+    Status = gRT->SetVariable (\r

               VariableName,\r
               VariableGuid,\r
               Attribute,\r
               VariableName,\r
               VariableGuid,\r
               Attribute,\r


@@ -979,7 +1015,10 @@ GetPtrTypeSize (
   BOOLEAN     IsPeiDb;\r
   UINT32      *LocalTokenNumberTable;\r
 \r
   BOOLEAN     IsPeiDb;\r
   UINT32      *LocalTokenNumberTable;\r
 \r

-  IsPeiDb = (BOOLEAN) (LocalTokenNumberTableIdx < PEI_LOCAL_TOKEN_NUMBER);\r
+  // EBC compiler is very choosy. It may report warning about comparison\r
+  // between UINTN and 0 . So we add 1 in each size of the \r
+  // comparison.\r
+  IsPeiDb = (BOOLEAN) (LocalTokenNumberTableIdx + 1 < PEI_LOCAL_TOKEN_NUMBER + 1);\r

 \r
 \r
   if (IsPeiDb) {\r
 \r
 \r
   if (IsPeiDb) {\r


@@ -1051,7 +1090,10 @@ SetPtrTypeSize (
   BOOLEAN     IsPeiDb;\r
   UINT32      *LocalTokenNumberTable;\r
 \r
   BOOLEAN     IsPeiDb;\r
   UINT32      *LocalTokenNumberTable;\r
 \r

-  IsPeiDb = (BOOLEAN) (LocalTokenNumberTableIdx < PEI_LOCAL_TOKEN_NUMBER);\r
+  // EBC compiler is very choosy. It may report warning about comparison\r
+  // between UINTN and 0 . So we add 1 in each size of the \r
+  // comparison.\r
+  IsPeiDb = (BOOLEAN) (LocalTokenNumberTableIdx + 1 < PEI_LOCAL_TOKEN_NUMBER + 1);\r

 \r
   if (IsPeiDb) {\r
     LocalTokenNumberTable = mPcdDatabase->PeiDb.Init.LocalTokenNumberTable;\r
 \r
   if (IsPeiDb) {\r
     LocalTokenNumberTable = mPcdDatabase->PeiDb.Init.LocalTokenNumberTable;\r