X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=EdkModulePkg%2FUniversal%2FPCD%2FPei%2FService.c;h=011e3aa36ef4d9133988355ec18771184b2f4001;hp=247ebadcd7559724e5af3e65e19e8613f67b1b89;hb=bb5545b663e1d8ac4fd37003d5ba26fafdad5831;hpb=8a43e8dd550a3e92238b3c22bb6ea67d41097e86

diff --git a/EdkModulePkg/Universal/PCD/Pei/Service.c b/EdkModulePkg/Universal/PCD/Pei/Service.c
index 247ebadcd7..011e3aa36e 100644
--- a/EdkModulePkg/Universal/PCD/Pei/Service.c
+++ b/EdkModulePkg/Universal/PCD/Pei/Service.c
@@ -46,12 +46,27 @@ PeiRegisterCallBackWorker (
 
   if (Guid == NULL) {
     TokenNumber = ExTokenNumber;
+
+    //
+    // TokenNumber Zero is reserved as PCD_INVALID_TOKEN_NUMBER.
+    // We have to decrement TokenNumber by 1 to make it usable
+    // as the array index.
+    //
+    TokenNumber--;
     ASSERT (TokenNumber < PEI_NEX_TOKEN_NUMBER);
   } else {
     TokenNumber = GetExPcdTokenNumber (Guid, ExTokenNumber);
+
+    //
+    // TokenNumber Zero is reserved as PCD_INVALID_TOKEN_NUMBER.
+    // We have to decrement TokenNumber by 1 to make it usable
+    // as the array index.
+    //
+    TokenNumber--;
     ASSERT (TokenNumber < PEI_LOCAL_TOKEN_NUMBER);
   }
 
+
   LocalTokenNumber = GetPcdDatabase()->Init.LocalTokenNumberTable[TokenNumber];
 
   ASSERT ((LocalTokenNumber & PCD_TYPE_HII) == 0);
@@ -144,11 +159,10 @@ GetHiiVariable (
   VOID       *Buffer;
   EFI_PEI_READ_ONLY_VARIABLE_PPI *VariablePpi;
 
-  Status = PeiCoreLocatePpi (&gEfiPeiReadOnlyVariablePpiGuid, 0, NULL, (VOID **) &VariablePpi);
+  Status = PeiServicesLocatePpi (&gEfiPeiReadOnlyVariablePpiGuid, 0, NULL, (VOID **) &VariablePpi);
   ASSERT_EFI_ERROR (Status);
 
   Size = 0;
-
   Status = VariablePpi->PeiGetVariable (
                           GetPeiServicesTablePointer (),
                           VariableName,
@@ -157,25 +171,30 @@ GetHiiVariable (
                           &Size,
                           NULL
                             );
-  ASSERT (Status == EFI_BUFFER_TOO_SMALL);
+  if (Status == EFI_BUFFER_TOO_SMALL) {
 
-  Status = PeiCoreAllocatePool (Size, &Buffer);
-  ASSERT_EFI_ERROR (Status);
 
-  Status = VariablePpi->PeiGetVariable (
-                            GetPeiServicesTablePointer (),
-                            (UINT16 *) VariableName,
-                            (EFI_GUID *) VariableGuid,
-                            NULL,
-                            &Size,
-                            Buffer
-                            );
-  ASSERT_EFI_ERROR (Status);
+    Status = PeiServicesAllocatePool (Size, &Buffer);
+    ASSERT_EFI_ERROR (Status);
 
-  *VariableSize = Size;
-  *VariableData = Buffer;
+    Status = VariablePpi->PeiGetVariable (
+                              GetPeiServicesTablePointer (),
+                              (UINT16 *) VariableName,
+                              (EFI_GUID *) VariableGuid,
+                              NULL,
+                              &Size,
+                              Buffer
+                              );
+    ASSERT_EFI_ERROR (Status);
+
+    *VariableSize = Size;
+    *VariableData = Buffer;
+
+    return EFI_SUCCESS;
+  } else {
+    return EFI_NOT_FOUND;
+  }
 
-  return EFI_SUCCESS;
 }
 
 
@@ -244,6 +263,13 @@ InvokeCallbackOnSet (
   PCD_PPI_CALLBACK    *CallbackTable;
   UINTN               Idx;
 
+  //
+  // TokenNumber Zero is reserved as PCD_INVALID_TOKEN_NUMBER.
+  // We have to decrement TokenNumber by 1 to make it usable
+  // as the array index.
+  //
+  TokenNumber--;
+  
   if (Guid == NULL)
     ASSERT (TokenNumber < PEI_LOCAL_TOKEN_NUMBER);
 
@@ -283,6 +309,13 @@ SetWorker (
   UINTN               Offset;
   VOID                *InternalData;
 
+  //
+  // TokenNumber Zero is reserved as PCD_INVALID_TOKEN_NUMBER.
+  // We have to decrement TokenNumber by 1 to make it usable
+  // as the array index.
+  //
+  TokenNumber--;
+
   ASSERT (TokenNumber < PEI_LOCAL_TOKEN_NUMBER);
     
   PeiPcdDb = GetPcdDatabase ();
@@ -301,7 +334,7 @@ SetWorker (
   // type PCD entry in ExSetWorker.
   //
   if (TokenNumber < PEI_NEX_TOKEN_NUMBER) {
-    InvokeCallbackOnSet (0, NULL, TokenNumber, Data, Size);
+    InvokeCallbackOnSet (0, NULL, TokenNumber + 1, Data, Size);
   }
 
   if ((LocalTokenNumber & PCD_TYPE_SKU_ENABLED) == PCD_TYPE_SKU_ENABLED) {
@@ -322,7 +355,7 @@ SetWorker (
     case PCD_TYPE_STRING:
       StringTableIdx = *((UINT16 *)InternalData);
       CopyMem (&PeiPcdDb->Init.StringTable[StringTableIdx], Data, Size);
-      break;
+      return EFI_SUCCESS;
 
     case PCD_TYPE_DATA:
     {
@@ -421,9 +454,16 @@ GetWorker (
   UINT32              LocalTokenNumber;
   UINTN               Size;
 
+  //
+  // TokenNumber Zero is reserved as PCD_INVALID_TOKEN_NUMBER.
+  // We have to decrement TokenNumber by 1 to make it usable
+  // as the array index.
+  //
+  TokenNumber--;
+
   ASSERT (TokenNumber < PEI_LOCAL_TOKEN_NUMBER);
 
-  Size = PeiPcdGetSize(TokenNumber);
+  Size = PeiPcdGetSize(TokenNumber + 1);
   
   ASSERT (GetSize == Size || GetSize == 0);
 
@@ -454,15 +494,20 @@ GetWorker (
       Name = &StringTable[VariableHead->StringIndex];
 
       Status = GetHiiVariable (Guid, Name, &Data, &DataSize);
-      ASSERT_EFI_ERROR (Status);
-      ASSERT (DataSize >= (UINTN) (VariableHead->Offset + Size));
 
-      return (VOID *) ((UINT8 *) Data + VariableHead->Offset);
+      if (Status == EFI_SUCCESS) {
+        ASSERT (DataSize >= (UINTN) (VariableHead->Offset + Size));
+        return (VOID *) ((UINT8 *) Data + VariableHead->Offset);
+      } else {
+        //
+        // Return the default value specified by Platform Integrator 
+        //
+        return (VOID *) ((UINT8 *) PeiPcdDb + VariableHead->DefaultValueOffset);
+      }
     }
 
     case PCD_TYPE_DATA:
       return (VOID *) ((UINT8 *)PeiPcdDb + Offset);
-      break;
 
     case PCD_TYPE_STRING:
       StringTableIdx = (UINT16) *((UINT8 *) PeiPcdDb + Offset);
@@ -500,6 +545,10 @@ GetExPcdTokenNumber (
   GuidTable   = PeiPcdDb->Init.GuidTable;
 
   MatchGuid = ScanGuid (GuidTable, sizeof(PeiPcdDb->Init.GuidTable), Guid);
+  //
+  // We need to ASSERT here. If GUID can't be found in GuidTable, this is a
+  // error in the BUILD system.
+  //
   ASSERT (MatchGuid != NULL);
   
   MatchGuidIdx = MatchGuid - GuidTable;