MdePkg and MdeModulePkg Pcd: Add the new EFI_GET_PCD_INFO_PROTOCOL and EFI_GET_PCD_INFO_PPI support for PI 1.2.1 compliance.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14866 6f19259b-4bc3-4df7-8a09-765794883524

9 files changed, 1001 insertions, 66 deletions

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index b627eb101c..536fba8240 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -376,6 +376,12 @@
   gEdkiiFormBrowserEx2ProtocolGuid = { 0xa770c357, 0xb693, 0x4e6d, { 0xa6, 0xcf, 0xd2, 0x1c, 0x72, 0x8e, 0x55, 0xb } }

 

 [PcdsFeatureFlag]

+  ## Indicates if the Pcd Info Ppi and Protocol should be produced.<BR><BR>

+  #  It can be disabled to save size.<BR><BR>

+  #   TRUE  - Pcd Info Ppi and Protocol will be produced.<BR>

+  #   FALSE - Pcd Info Ppi and Protocol will not be produced.<BR>

+  gEfiMdeModulePkgTokenSpaceGuid.PcdPcdInfoGeneration|TRUE|BOOLEAN|0x0001001C

+

   ## Indicate whether platform can support update capsule across a system reset

   gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|FALSE|BOOLEAN|0x0001001d

 

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c b/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
index 04fcd64306..afe925c5e2 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
+++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
@@ -89,6 +89,25 @@ EFI_PCD_PROTOCOL mEfiPcdInstance = {
   DxePcdGetNextTokenSpace

 };

 

+///

+/// Instance of GET_PCD_INFO_PROTOCOL protocol is EDKII native implementation.

+/// This protocol instance support dynamic and dynamicEx type PCDs.

+///

+GET_PCD_INFO_PROTOCOL mGetPcdInfoInstance = {

+  DxeGetPcdInfoGetInfo,

+  DxeGetPcdInfoGetInfoEx,

+  DxeGetPcdInfoGetSku

+};

+

+///

+/// Instance of EFI_GET_PCD_INFO_PROTOCOL which is defined in PI 1.2.1 Vol 3.

+/// This PPI instance only support dyanmicEx type PCD.

+///

+EFI_GET_PCD_INFO_PROTOCOL  mEfiGetPcdInfoInstance = {

+  DxeGetPcdInfoGetInfoEx,

+  DxeGetPcdInfoGetSku

+};

+

 EFI_HANDLE mPcdHandle = NULL;

 

 /**

@@ -129,11 +148,90 @@ PcdDxeInit (
                   &gEfiPcdProtocolGuid,  &mEfiPcdInstance,

                   NULL

                   );

-                 

   ASSERT_EFI_ERROR (Status);

 

+  if (FeaturePcdGet (PcdPcdInfoGeneration) && mPcdDatabase.DxeDb->PcdNameTableOffset != 0) {

+    //

+    // Install GET_PCD_INFO_PROTOCOL to handle dynamic type PCD

+    // Install EFI_GET_PCD_INFO_PROTOCOL to handle dynamicEx type PCD

+    //

+    Status = gBS->InstallMultipleProtocolInterfaces (

+                    &mPcdHandle,

+                    &gGetPcdInfoProtocolGuid,     &mGetPcdInfoInstance,

+                    &gEfiGetPcdInfoProtocolGuid,  &mEfiGetPcdInfoInstance,

+                    NULL

+                    );

+    ASSERT_EFI_ERROR (Status);

+  }

+

   return Status;

+}

+

+/**

+  Retrieve additional information associated with a PCD token in the default token space.

+

+  This includes information such as the type of value the TokenNumber is associated with as well as possible

+  human readable name that is associated with the token.

+

+  @param[in]    TokenNumber The PCD token number.

+  @param[out]   PcdInfo     The returned information associated with the requested TokenNumber.

+                            The caller is responsible for freeing the buffer that is allocated by callee for PcdInfo->PcdName.

 

+  @retval  EFI_SUCCESS      The PCD information was returned successfully.

+  @retval  EFI_NOT_FOUND    The PCD service could not find the requested token number.

+**/

+EFI_STATUS

+EFIAPI

+DxeGetPcdInfoGetInfo (

+  IN        UINTN           TokenNumber,

+  OUT       EFI_PCD_INFO    *PcdInfo

+  )

+{

+  return DxeGetPcdInfo (NULL, TokenNumber, PcdInfo);

+}

+

+/**

+  Retrieve additional information associated with a PCD token.

+

+  This includes information such as the type of value the TokenNumber is associated with as well as possible

+  human readable name that is associated with the token.

+

+  @param[in]    Guid        The 128-bit unique value that designates the namespace from which to extract the value.

+  @param[in]    TokenNumber The PCD token number.

+  @param[out]   PcdInfo     The returned information associated with the requested TokenNumber.

+                            The caller is responsible for freeing the buffer that is allocated by callee for PcdInfo->PcdName.

+

+  @retval  EFI_SUCCESS      The PCD information was returned successfully.

+  @retval  EFI_NOT_FOUND    The PCD service could not find the requested token number.

+**/

+EFI_STATUS

+EFIAPI

+DxeGetPcdInfoGetInfoEx (

+  IN CONST  EFI_GUID        *Guid,

+  IN        UINTN           TokenNumber,

+  OUT       EFI_PCD_INFO    *PcdInfo

+  )

+{

+  return DxeGetPcdInfo (Guid, TokenNumber, PcdInfo);

+}

+

+/**

+  Retrieve the currently set SKU Id.

+

+  @return   The currently set SKU Id. If the platform has not set at a SKU Id, then the

+            default SKU Id value of 0 is returned. If the platform has set a SKU Id, then the currently set SKU

+            Id is returned.

+**/

+UINTN

+EFIAPI

+DxeGetPcdInfoGetSku (

+  VOID

+  )

+{

+  if (!FeaturePcdGet (PcdPcdInfoGeneration)) {

+    return EFI_UNSUPPORTED;

+  }

+  return mPcdDatabase.PeiDb->SystemSkuId;

 }

 

 /**

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
index 6762bde061..8565b30307 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
+++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
@@ -335,9 +335,12 @@
 [Protocols]

   gPcdProtocolGuid                              ## PRODUCES

   gEfiPcdProtocolGuid                           ## PRODUCES

-  

+  gGetPcdInfoProtocolGuid                       ## SOMETIMES_PRODUCES

+  gEfiGetPcdInfoProtocolGuid                    ## SOMETIMES_PRODUCES

+

 [Pcd]

   gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress  ## SOMETIMES_CONSUMES

+  gEfiMdeModulePkgTokenSpaceGuid.PcdPcdInfoGeneration

 

 [Depex]

   TRUE

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.c b/MdeModulePkg/Universal/PCD/Dxe/Service.c
index 4bdb071a6e..43a3bda776 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Service.c
+++ b/MdeModulePkg/Universal/PCD/Dxe/Service.c
@@ -35,6 +35,317 @@ LIST_ENTRY    *mCallbackFnTable;
 EFI_GUID     **TmpTokenSpaceBuffer;

 UINTN          TmpTokenSpaceBufferCount; 

 

+/**

+  Get Local Token Number by Token Number.

+

+  @param[in]    IsPeiDb     If TRUE, the pcd entry is initialized in PEI phase,

+                            If FALSE, the pcd entry is initialized in DXE phase.

+  @param[in]    TokenNumber The PCD token number.

+

+  @return       Local Token Number.

+**/

+UINT32

+GetLocalTokenNumber (

+  IN BOOLEAN            IsPeiDb,

+  IN UINTN              TokenNumber

+  )

+{

+  UINT32                *LocalTokenNumberTable;

+  UINT32                LocalTokenNumber;

+  UINTN                 Size;

+  UINTN                 MaxSize;

+

+  //

+  // 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--;

+

+  LocalTokenNumberTable  = IsPeiDb ? (UINT32 *)((UINT8 *)mPcdDatabase.PeiDb + mPcdDatabase.PeiDb->LocalTokenNumberTableOffset) : 

+                                     (UINT32 *)((UINT8 *)mPcdDatabase.DxeDb + mPcdDatabase.DxeDb->LocalTokenNumberTableOffset);

+  TokenNumber            = IsPeiDb ? TokenNumber : TokenNumber - mPeiLocalTokenCount;

+

+  LocalTokenNumber = LocalTokenNumberTable[TokenNumber];

+

+  Size = (LocalTokenNumber & PCD_DATUM_TYPE_ALL_SET) >> PCD_DATUM_TYPE_SHIFT;

+

+  if ((LocalTokenNumber & PCD_TYPE_SKU_ENABLED) == PCD_TYPE_SKU_ENABLED) {

+    if (Size == 0) {

+      GetPtrTypeSize (TokenNumber, &MaxSize);

+    } else {

+      MaxSize = Size;

+    }

+    LocalTokenNumber = GetSkuEnabledTokenNumber (LocalTokenNumber & ~PCD_TYPE_SKU_ENABLED, MaxSize, IsPeiDb);

+  }

+

+  return LocalTokenNumber;

+}

+

+/**

+  Get PCD type by Local Token Number.

+

+  @param[in]    LocalTokenNumber The PCD local token number.

+

+  @return       PCD type.

+**/

+EFI_PCD_TYPE

+GetPcdType (

+  IN UINT32             LocalTokenNumber

+  )

+{

+  switch (LocalTokenNumber & PCD_DATUM_TYPE_ALL_SET) {

+    case PCD_DATUM_TYPE_POINTER:

+      return EFI_PCD_TYPE_PTR;

+    case PCD_DATUM_TYPE_UINT8:

+      if (LocalTokenNumber & PCD_DATUM_TYPE_UINT8_BOOLEAN) {

+        return EFI_PCD_TYPE_BOOL;

+      } else {

+        return EFI_PCD_TYPE_8;

+      }

+    case PCD_DATUM_TYPE_UINT16:

+      return EFI_PCD_TYPE_16;

+    case PCD_DATUM_TYPE_UINT32:

+      return EFI_PCD_TYPE_32;

+    case PCD_DATUM_TYPE_UINT64:

+      return EFI_PCD_TYPE_64;

+    default:

+      ASSERT (FALSE);

+      return EFI_PCD_TYPE_8;

+  }

+}

+

+/**

+  Get PCD name.

+

+  @param[in]    OnlyTokenSpaceName  If TRUE, only need to get the TokenSpaceCName.

+                                    If FALSE, need to get the full PCD name.

+  @param[in]    IsPeiDb             If TRUE, the pcd entry is initialized in PEI phase,

+                                    If FALSE, the pcd entry is initialized in DXE phase.

+  @param[in]    TokenNumber         The PCD token number.

+

+  @return       The TokenSpaceCName or full PCD name.

+**/

+CHAR8 *

+GetPcdName (

+  IN BOOLEAN            OnlyTokenSpaceName,

+  IN BOOLEAN            IsPeiDb,

+  IN UINTN              TokenNumber

+  )

+{

+  PCD_DATABASE_INIT *Database;

+  UINT8             *StringTable;

+  PCD_NAME_INDEX    *PcdNameIndex;

+  CHAR8             *TokenSpaceName;

+  CHAR8             *PcdName;

+  CHAR8             *Name;

+

+  //

+  // 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--;

+

+  Database = IsPeiDb ? mPcdDatabase.PeiDb: mPcdDatabase.DxeDb;

+  TokenNumber = IsPeiDb ? TokenNumber : TokenNumber - mPeiLocalTokenCount;

+

+  StringTable = (UINT8 *) Database + Database->StringTableOffset;

+

+  //

+  // Get the PCD name index.

+  //

+  PcdNameIndex = (PCD_NAME_INDEX *)((UINT8 *) Database + Database->PcdNameTableOffset) + TokenNumber;

+  TokenSpaceName = (CHAR8 *)&StringTable[PcdNameIndex->TokenSpaceCNameIndex];

+  PcdName = (CHAR8 *)&StringTable[PcdNameIndex->PcdCNameIndex];

+

+  if (OnlyTokenSpaceName) {

+    //

+    // Only need to get the TokenSpaceCName.

+    //

+    Name = AllocateCopyPool (AsciiStrSize (TokenSpaceName), TokenSpaceName);

+  } else {

+    //

+    // Need to get the full PCD name.

+    //

+    Name = AllocateZeroPool (AsciiStrSize (TokenSpaceName) + AsciiStrSize (PcdName));

+    //

+    // Catenate TokenSpaceCName and PcdCName with a '.' to form the full PCD name.

+    //

+    AsciiStrCat (Name, TokenSpaceName);

+    Name[AsciiStrSize (TokenSpaceName) - sizeof (CHAR8)] = '.';

+    AsciiStrCat (Name, PcdName);  

+  }

+

+  return Name;

+}

+

+/**

+  Retrieve additional information associated with a PCD token.

+

+  This includes information such as the type of value the TokenNumber is associated with as well as possible

+  human readable name that is associated with the token.

+

+  @param[in]    IsPeiDb     If TRUE, the pcd entry is initialized in PEI phase,

+                            If FALSE, the pcd entry is initialized in DXE phase.

+  @param[in]    Guid        The 128-bit unique value that designates the namespace from which to extract the value.

+  @param[in]    TokenNumber The PCD token number.

+  @param[out]   PcdInfo     The returned information associated with the requested TokenNumber.

+                            The caller is responsible for freeing the buffer that is allocated by callee for PcdInfo->PcdName. 

+

+  @retval  EFI_SUCCESS      The PCD information was returned successfully

+  @retval  EFI_NOT_FOUND    The PCD service could not find the requested token number.

+**/

+EFI_STATUS

+ExGetPcdInfo (

+  IN        BOOLEAN             IsPeiDb,

+  IN CONST  EFI_GUID            *Guid,

+  IN        UINTN               TokenNumber,

+  OUT       EFI_PCD_INFO        *PcdInfo

+  )

+{

+  PCD_DATABASE_INIT     *Database;

+  UINTN                 GuidTableIdx;

+  EFI_GUID              *MatchGuid;

+  EFI_GUID              *GuidTable;

+  DYNAMICEX_MAPPING     *ExMapTable;

+  UINTN                 Index;

+  UINT32                LocalTokenNumber;

+

+  Database = IsPeiDb ? mPcdDatabase.PeiDb: mPcdDatabase.DxeDb;

+

+  GuidTable = (EFI_GUID *)((UINT8 *)Database + Database->GuidTableOffset);

+  MatchGuid = ScanGuid (GuidTable, Database->GuidTableCount * sizeof(EFI_GUID), Guid);

+

+  if (MatchGuid == NULL) {

+    return EFI_NOT_FOUND;

+  }

+

+  GuidTableIdx = MatchGuid - GuidTable;

+

+  ExMapTable = (DYNAMICEX_MAPPING *)((UINT8 *)Database + Database->ExMapTableOffset);

+

+  //

+  // Find the PCD by GuidTableIdx and ExTokenNumber in ExMapTable.

+  //

+  for (Index = 0; Index < Database->ExTokenCount; Index++) {

+    if (ExMapTable[Index].ExGuidIndex == GuidTableIdx) {

+      if (TokenNumber == PCD_INVALID_TOKEN_NUMBER) {

+        //

+        // TokenNumber is 0, follow spec to set PcdType to EFI_PCD_TYPE_8,

+        // PcdSize to 0 and PcdName to the null-terminated ASCII string

+        // associated with the token's namespace Guid.

+        //

+        PcdInfo->PcdType = EFI_PCD_TYPE_8;

+        PcdInfo->PcdSize = 0;

+        //

+        // Here use one representative in the token space to get the TokenSpaceCName.

+        // 

+        PcdInfo->PcdName = GetPcdName (TRUE, IsPeiDb, ExMapTable[Index].TokenNumber);

+        return EFI_SUCCESS;

+      } else if (ExMapTable[Index].ExTokenNumber == TokenNumber) {

+        PcdInfo->PcdSize = DxePcdGetSize (ExMapTable[Index].TokenNumber);

+        LocalTokenNumber = GetLocalTokenNumber (IsPeiDb, ExMapTable[Index].TokenNumber);

+        PcdInfo->PcdType = GetPcdType (LocalTokenNumber);

+        PcdInfo->PcdName = GetPcdName (FALSE, IsPeiDb, ExMapTable[Index].TokenNumber);

+        return EFI_SUCCESS;

+      }

+    }

+  }

+

+  return EFI_NOT_FOUND;

+}

+

+/**

+  Retrieve additional information associated with a PCD token.

+

+  This includes information such as the type of value the TokenNumber is associated with as well as possible

+  human readable name that is associated with the token.

+

+  @param[in]    Guid        The 128-bit unique value that designates the namespace from which to extract the value.

+  @param[in]    TokenNumber The PCD token number.

+  @param[out]   PcdInfo     The returned information associated with the requested TokenNumber.

+                            The caller is responsible for freeing the buffer that is allocated by callee for PcdInfo->PcdName.

+

+  @retval  EFI_SUCCESS      The PCD information was returned successfully.

+  @retval  EFI_NOT_FOUND    The PCD service could not find the requested token number.

+**/

+EFI_STATUS

+DxeGetPcdInfo (

+  IN CONST  EFI_GUID        *Guid,

+  IN        UINTN           TokenNumber,

+  OUT       EFI_PCD_INFO    *PcdInfo

+  )

+{

+  EFI_STATUS            Status;

+  BOOLEAN               PeiExMapTableEmpty;

+  BOOLEAN               DxeExMapTableEmpty;

+  UINT32                LocalTokenNumber;

+  BOOLEAN               IsPeiDb;

+

+  if (!FeaturePcdGet (PcdPcdInfoGeneration)) {

+    return EFI_UNSUPPORTED;

+  }

+

+  ASSERT (PcdInfo != NULL);

+

+  Status = EFI_NOT_FOUND;

+  PeiExMapTableEmpty = mPeiExMapTableEmpty;

+  DxeExMapTableEmpty = mDxeExMapTableEmpty;

+

+  if (Guid == NULL) {

+    if (((TokenNumber + 1 > mPeiNexTokenCount + 1) && (TokenNumber + 1 <= mPeiLocalTokenCount + 1)) ||

+        ((TokenNumber + 1 > (mPeiLocalTokenCount + mDxeNexTokenCount + 1)))) {

+      return EFI_NOT_FOUND;

+    } else if (TokenNumber == PCD_INVALID_TOKEN_NUMBER) {

+      //

+      // TokenNumber is 0, follow spec to set PcdType to EFI_PCD_TYPE_8,

+      // PcdSize to 0 and PcdName to NULL for default Token Space.

+      //

+      PcdInfo->PcdType = EFI_PCD_TYPE_8;

+      PcdInfo->PcdSize = 0;

+      PcdInfo->PcdName = NULL;

+    } else {

+      PcdInfo->PcdSize = DxePcdGetSize (TokenNumber);

+      IsPeiDb = FALSE;

+      if ((TokenNumber + 1 <= mPeiNexTokenCount + 1)) {

+        IsPeiDb = TRUE;

+      }

+      LocalTokenNumber = GetLocalTokenNumber (IsPeiDb, TokenNumber);

+      PcdInfo->PcdType = GetPcdType (LocalTokenNumber);

+      PcdInfo->PcdName = GetPcdName (FALSE, IsPeiDb, TokenNumber);

+    }

+    return EFI_SUCCESS;

+  }

+

+  if (PeiExMapTableEmpty && DxeExMapTableEmpty) {

+    return EFI_NOT_FOUND;

+  }

+

+  if (!PeiExMapTableEmpty) {

+    Status = ExGetPcdInfo (

+               TRUE,

+               Guid,

+               TokenNumber,

+               PcdInfo

+               );

+  }

+

+  if (Status == EFI_SUCCESS) {

+    return Status;

+  }

+

+  if (!DxeExMapTableEmpty) {

+    Status = ExGetPcdInfo (

+               FALSE,

+               Guid,

+               TokenNumber,

+               PcdInfo

+               );

+  }

+

+  return Status;

+}

 

 /**

   Get the PCD entry pointer in PCD database.

@@ -56,7 +367,6 @@ GetWorker (
   IN UINTN             GetSize

   )

 {

-  UINT32              *LocalTokenNumberTable;

   EFI_GUID            *GuidTable;

   UINT8               *StringTable;

   EFI_GUID            *Guid;

@@ -67,7 +377,6 @@ GetWorker (
   VPD_HEAD            *VpdHead;

   UINT8               *PcdDb;

   VOID                *RetPtr;

-  UINTN               MaxSize;

   UINTN               TmpTokenNumber;

   UINTN               DataSize;

   EFI_STATUS          Status;

@@ -107,22 +416,7 @@ GetWorker (
   // comparison.

   IsPeiDb = (BOOLEAN) ((TokenNumber + 1 < mPeiLocalTokenCount + 1) ? TRUE : FALSE);

 

-  LocalTokenNumberTable  = IsPeiDb ? (UINT32 *)((UINT8 *)mPcdDatabase.PeiDb + mPcdDatabase.PeiDb->LocalTokenNumberTableOffset) : 

-                                     (UINT32 *)((UINT8 *)mPcdDatabase.DxeDb + mPcdDatabase.DxeDb->LocalTokenNumberTableOffset);

-

-  TokenNumber            = IsPeiDb ? TokenNumber :

-                                     TokenNumber - mPeiLocalTokenCount;

-

-  LocalTokenNumber = LocalTokenNumberTable[TokenNumber];

-  

-  if ((LocalTokenNumber & PCD_TYPE_SKU_ENABLED) == PCD_TYPE_SKU_ENABLED) {

-    if (GetSize == 0) {

-      GetPtrTypeSize (TmpTokenNumber, &MaxSize);

-    } else {

-      MaxSize = GetSize;

-    }

-    LocalTokenNumber = GetSkuEnabledTokenNumber (LocalTokenNumber & ~PCD_TYPE_SKU_ENABLED, MaxSize, IsPeiDb);

-  }

+  LocalTokenNumber = GetLocalTokenNumber (IsPeiDb, TokenNumber + 1);

 

   PcdDb = IsPeiDb ? ((UINT8 *) mPcdDatabase.PeiDb) : ((UINT8 *) mPcdDatabase.DxeDb);

                                     

@@ -792,7 +1086,6 @@ SetWorker (
   IN          BOOLEAN                 PtrType

   )

 {

-  UINT32              *LocalTokenNumberTable;

   BOOLEAN             IsPeiDb;

   UINT32              LocalTokenNumber;

   EFI_GUID            *GuidTable;

@@ -861,22 +1154,7 @@ SetWorker (
   //

   IsPeiDb = (BOOLEAN) ((TokenNumber + 1 < mPeiLocalTokenCount + 1) ? TRUE : FALSE);

 

-  LocalTokenNumberTable  = IsPeiDb ? (UINT32 *)((UINT8 *)mPcdDatabase.PeiDb + mPcdDatabase.PeiDb->LocalTokenNumberTableOffset) : 

-                                     (UINT32 *)((UINT8 *)mPcdDatabase.DxeDb + mPcdDatabase.DxeDb->LocalTokenNumberTableOffset) ;

-

-  TokenNumber = IsPeiDb ? TokenNumber

-                        : TokenNumber - mPeiLocalTokenCount;

-

-  LocalTokenNumber = LocalTokenNumberTable[TokenNumber];

-  

-  if ((LocalTokenNumber & PCD_TYPE_SKU_ENABLED) == PCD_TYPE_SKU_ENABLED) {

-    if (PtrType) {

-      GetPtrTypeSize (TmpTokenNumber, &MaxSize);

-    } else {

-      MaxSize = *Size;

-    }

-    LocalTokenNumber = GetSkuEnabledTokenNumber (LocalTokenNumber & ~PCD_TYPE_SKU_ENABLED, MaxSize, IsPeiDb);

-  }

+  LocalTokenNumber = GetLocalTokenNumber (IsPeiDb, TokenNumber + 1);

 

   Offset = LocalTokenNumber & PCD_DATABASE_OFFSET_MASK;

 

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.h b/MdeModulePkg/Universal/PCD/Dxe/Service.h
index 292a74cfb5..55717dc982 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Service.h
+++ b/MdeModulePkg/Universal/PCD/Dxe/Service.h
@@ -20,6 +20,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Guid/PcdDataBaseSignatureGuid.h>

 #include <Protocol/Pcd.h>

 #include <Protocol/PiPcd.h>

+#include <Protocol/PcdInfo.h>

+#include <Protocol/PiPcdInfo.h>

 #include <Library/BaseLib.h>

 #include <Library/DebugLib.h>

 #include <Library/UefiLib.h>

@@ -44,6 +46,61 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   #error "Please make sure the version of PCD DXE Service and the generated PCD DXE Database match."

 #endif

 

+/**

+  Retrieve additional information associated with a PCD token in the default token space.

+

+  This includes information such as the type of value the TokenNumber is associated with as well as possible

+  human readable name that is associated with the token.

+

+  @param[in]    TokenNumber The PCD token number.

+  @param[out]   PcdInfo     The returned information associated with the requested TokenNumber.

+                            The caller is responsible for freeing the buffer that is allocated by callee for PcdInfo->PcdName.

+

+  @retval  EFI_SUCCESS      The PCD information was returned successfully.

+  @retval  EFI_NOT_FOUND    The PCD service could not find the requested token number.

+**/

+EFI_STATUS

+EFIAPI

+DxeGetPcdInfoGetInfo (

+  IN        UINTN           TokenNumber,

+  OUT       EFI_PCD_INFO    *PcdInfo

+  );

+

+/**

+  Retrieve additional information associated with a PCD token.

+

+  This includes information such as the type of value the TokenNumber is associated with as well as possible

+  human readable name that is associated with the token.

+

+  @param[in]    Guid        The 128-bit unique value that designates the namespace from which to extract the value.

+  @param[in]    TokenNumber The PCD token number.

+  @param[out]   PcdInfo     The returned information associated with the requested TokenNumber.

+                            The caller is responsible for freeing the buffer that is allocated by callee for PcdInfo->PcdName.

+

+  @retval  EFI_SUCCESS      The PCD information was returned successfully.

+  @retval  EFI_NOT_FOUND    The PCD service could not find the requested token number.

+**/

+EFI_STATUS

+EFIAPI

+DxeGetPcdInfoGetInfoEx (

+  IN CONST  EFI_GUID        *Guid,

+  IN        UINTN           TokenNumber,

+  OUT       EFI_PCD_INFO    *PcdInfo

+  );

+

+/**

+  Retrieve the currently set SKU Id.

+

+  @return   The currently set SKU Id. If the platform has not set at a SKU Id, then the

+            default SKU Id value of 0 is returned. If the platform has set a SKU Id, then the currently set SKU

+            Id is returned.

+**/

+UINTN

+EFIAPI

+DxeGetPcdInfoGetSku (

+  VOID

+  );

+

 //

 // Protocol Interface function declaration.

 //

@@ -758,6 +815,27 @@ typedef struct {
 //

 

 /**

+  Retrieve additional information associated with a PCD token.

+

+  This includes information such as the type of value the TokenNumber is associated with as well as possible

+  human readable name that is associated with the token.

+

+  @param[in]    Guid        The 128-bit unique value that designates the namespace from which to extract the value.

+  @param[in]    TokenNumber The PCD token number.

+  @param[out]   PcdInfo     The returned information associated with the requested TokenNumber.

+                            The caller is responsible for freeing the buffer that is allocated by callee for PcdInfo->PcdName. 

+

+  @retval  EFI_SUCCESS      The PCD information was returned successfully

+  @retval  EFI_NOT_FOUND    The PCD service could not find the requested token number.

+**/

+EFI_STATUS

+DxeGetPcdInfo (

+  IN CONST  EFI_GUID        *Guid,

+  IN        UINTN           TokenNumber,

+  OUT       EFI_PCD_INFO    *PcdInfo

+  );

+

+/**

   Wrapper function for setting non-pointer type value for a PCD entry.

 

   @param TokenNumber     Pcd token number autogenerated by build tools.

diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.c b/MdeModulePkg/Universal/PCD/Pei/Pcd.c
index 557b915a12..a9ee051263 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Pcd.c
+++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.c
@@ -83,6 +83,25 @@ EFI_PEI_PCD_PPI  mEfiPcdPpiInstance = {
   PeiPcdGetNextTokenSpace

 };

 

+///

+/// Instance of GET_PCD_INFO_PPI protocol is EDKII native implementation.

+/// This protocol instance support dynamic and dynamicEx type PCDs.

+///

+GET_PCD_INFO_PPI mGetPcdInfoInstance = {

+  PeiGetPcdInfoGetInfo,

+  PeiGetPcdInfoGetInfoEx,

+  PeiGetPcdInfoGetSku

+};

+

+///

+/// Instance of EFI_GET_PCD_INFO_PPI which is defined in PI 1.2.1 Vol 3.

+/// This PPI instance only support dyanmicEx type PCD.

+///

+EFI_GET_PCD_INFO_PPI  mEfiGetPcdInfoInstance = {

+  PeiGetPcdInfoGetInfoEx,

+  PeiGetPcdInfoGetSku

+};

+

 EFI_PEI_PPI_DESCRIPTOR  mPpiList[] = {

   {

     EFI_PEI_PPI_DESCRIPTOR_PPI,

@@ -96,6 +115,19 @@ EFI_PEI_PPI_DESCRIPTOR  mPpiList[] = {
   }

 };

 

+EFI_PEI_PPI_DESCRIPTOR  mPpiList2[] = {

+  {

+    EFI_PEI_PPI_DESCRIPTOR_PPI,

+    &gGetPcdInfoPpiGuid,

+    &mGetPcdInfoInstance

+  },

+  {

+    (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),

+    &gEfiGetPcdInfoPpiGuid,

+    &mEfiGetPcdInfoInstance

+  }

+};

+

 /**

   Main entry for PCD PEIM driver.

   

@@ -114,20 +146,99 @@ PcdPeimInit (
   IN CONST EFI_PEI_SERVICES     **PeiServices

   )

 {

-  EFI_STATUS Status;

-  

-  BuildPcdDatabase (FileHandle);

+  EFI_STATUS        Status;

+  PEI_PCD_DATABASE  *DataBase;

+

+  DataBase = BuildPcdDatabase (FileHandle);

 

   //

   // Install PCD_PPI and EFI_PEI_PCD_PPI.

   //

   Status = PeiServicesInstallPpi (&mPpiList[0]);

   ASSERT_EFI_ERROR (Status);

-  

+

+  //

+  // Only install PcdInfo PPI when the feature is enabled and PCD info content is present. 

+  //

+  if (FeaturePcdGet (PcdPcdInfoGeneration) && (DataBase->PcdNameTableOffset != 0)) {

+    //

+    // Install GET_PCD_INFO_PPI and EFI_GET_PCD_INFO_PPI.

+    //

+    Status = PeiServicesInstallPpi (&mPpiList2[0]);

+    ASSERT_EFI_ERROR (Status);

+  }

+

   return Status;

 }

 

 /**

+  Retrieve additional information associated with a PCD token in the default token space.

+

+  This includes information such as the type of value the TokenNumber is associated with as well as possible

+  human readable name that is associated with the token.

+

+  @param[in]    TokenNumber The PCD token number.

+  @param[out]   PcdInfo     The returned information associated with the requested TokenNumber.

+                            The caller is responsible for freeing the buffer that is allocated by callee for PcdInfo->PcdName.

+

+  @retval  EFI_SUCCESS      The PCD information was returned successfully.

+  @retval  EFI_NOT_FOUND    The PCD service could not find the requested token number.

+**/

+EFI_STATUS

+EFIAPI

+PeiGetPcdInfoGetInfo (

+  IN        UINTN           TokenNumber,

+  OUT       EFI_PCD_INFO    *PcdInfo

+  )

+{

+  return PeiGetPcdInfo (NULL, TokenNumber, PcdInfo);

+}

+

+/**

+  Retrieve additional information associated with a PCD token.

+

+  This includes information such as the type of value the TokenNumber is associated with as well as possible

+  human readable name that is associated with the token.

+

+  @param[in]    Guid        The 128-bit unique value that designates the namespace from which to extract the value.

+  @param[in]    TokenNumber The PCD token number.

+  @param[out]   PcdInfo     The returned information associated with the requested TokenNumber.

+                            The caller is responsible for freeing the buffer that is allocated by callee for PcdInfo->PcdName.

+

+  @retval  EFI_SUCCESS      The PCD information was returned successfully.

+  @retval  EFI_NOT_FOUND    The PCD service could not find the requested token number.

+**/

+EFI_STATUS

+EFIAPI

+PeiGetPcdInfoGetInfoEx (

+  IN CONST  EFI_GUID        *Guid,

+  IN        UINTN           TokenNumber,

+  OUT       EFI_PCD_INFO    *PcdInfo

+  )

+{

+  return PeiGetPcdInfo (Guid, TokenNumber, PcdInfo);

+}

+

+/**

+  Retrieve the currently set SKU Id.

+

+  @return   The currently set SKU Id. If the platform has not set at a SKU Id, then the

+            default SKU Id value of 0 is returned. If the platform has set a SKU Id, then the currently set SKU

+            Id is returned.

+**/

+UINTN

+EFIAPI

+PeiGetPcdInfoGetSku (

+  VOID

+  )

+{

+  if (!FeaturePcdGet (PcdPcdInfoGeneration)) {

+    return EFI_UNSUPPORTED;

+  }

+  return GetPcdDatabase()->SystemSkuId;

+}

+

+/**

   Sets the SKU value for subsequent calls to set or get PCD token values.

 

   SetSku() sets the SKU Id to be used for subsequent calls to set or get PCD values. 

diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
index 8c2ab190a7..fabe63c4f4 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
+++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
@@ -322,6 +322,7 @@
   BaseLib

   PeimEntryPoint

   DebugLib

+  MemoryAllocationLib

 

 [Guids]

   ## PRODUCES            ## HOB

@@ -333,13 +334,16 @@
   gEfiPeiReadOnlyVariable2PpiGuid               ## SOMETIMES_CONSUMES

   gPcdPpiGuid                                   ## PRODUCES

   gEfiPeiPcdPpiGuid                             ## PRODUCES

-  

+  gGetPcdInfoPpiGuid                            ## SOMETIMES_PRODUCES

+  gEfiGetPcdInfoPpiGuid                         ## SOMETIMES_PRODUCES

+

 [FeaturePcd]

   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiFullPcdDatabaseEnable  ## CONSUMES

 

 [Pcd]

   gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress ## SOMETIMES_CONSUMES

   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPcdCallBackNumberPerPcdEntry || gEfiMdeModulePkgTokenSpaceGuid.PcdPeiFullPcdDatabaseEnable ## SOMETIMES_CONSUMES

+  gEfiMdeModulePkgTokenSpaceGuid.PcdPcdInfoGeneration

 

 [Depex]

   TRUE

diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.c b/MdeModulePkg/Universal/PCD/Pei/Service.c
index 47e87d3bcd..04ae874a21 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Service.c
+++ b/MdeModulePkg/Universal/PCD/Pei/Service.c
@@ -16,6 +16,284 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "Service.h"

 

 /**

+  Get Local Token Number by Token Number.

+

+  @param[in]    Database    PCD database.

+  @param[in]    TokenNumber The PCD token number.

+

+  @return       Local Token Number.

+**/

+UINT32

+GetLocalTokenNumber (

+  IN PEI_PCD_DATABASE   *Database,

+  IN UINTN              TokenNumber

+  )

+{

+  UINT32                LocalTokenNumber;

+  UINTN                 Size;

+  UINTN                 MaxSize;

+

+  //

+  // 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--;

+

+  LocalTokenNumber = *((UINT32 *)((UINT8 *)Database + Database->LocalTokenNumberTableOffset) + TokenNumber);

+

+  Size = (LocalTokenNumber & PCD_DATUM_TYPE_ALL_SET) >> PCD_DATUM_TYPE_SHIFT;

+

+  if ((LocalTokenNumber & PCD_TYPE_SKU_ENABLED) == PCD_TYPE_SKU_ENABLED) {

+    if (Size == 0) {

+      GetPtrTypeSize (TokenNumber, &MaxSize, Database);

+    } else {

+      MaxSize = Size;

+    }

+    LocalTokenNumber = GetSkuEnabledTokenNumber (LocalTokenNumber & ~PCD_TYPE_SKU_ENABLED, MaxSize);

+  }

+

+  return LocalTokenNumber;

+}

+

+/**

+  Get PCD type by Local Token Number.

+

+  @param[in]    LocalTokenNumber The PCD local token number.

+

+  @return       PCD type.

+**/

+EFI_PCD_TYPE

+GetPcdType (

+  IN UINT32             LocalTokenNumber

+  )

+{

+  switch (LocalTokenNumber & PCD_DATUM_TYPE_ALL_SET) {

+    case PCD_DATUM_TYPE_POINTER:

+      return EFI_PCD_TYPE_PTR;

+    case PCD_DATUM_TYPE_UINT8:

+      if (LocalTokenNumber & PCD_DATUM_TYPE_UINT8_BOOLEAN) {

+        return EFI_PCD_TYPE_BOOL;

+      } else {

+        return EFI_PCD_TYPE_8;

+      }

+    case PCD_DATUM_TYPE_UINT16:

+      return EFI_PCD_TYPE_16;

+    case PCD_DATUM_TYPE_UINT32:

+      return EFI_PCD_TYPE_32;

+    case PCD_DATUM_TYPE_UINT64:

+      return EFI_PCD_TYPE_64;

+    default:

+      ASSERT (FALSE);

+      return EFI_PCD_TYPE_8;

+  }

+}

+

+/**

+  Get PCD name.

+

+  @param[in]    OnlyTokenSpaceName  If TRUE, only need to get the TokenSpaceCName.

+                                    If FALSE, need to get the full PCD name.

+  @param[in]    Database            PCD database.

+  @param[in]    TokenNumber         The PCD token number.

+

+  @return       The TokenSpaceCName or full PCD name.

+**/

+CHAR8 *

+GetPcdName (

+  IN BOOLEAN            OnlyTokenSpaceName,

+  IN PEI_PCD_DATABASE   *Database,

+  IN UINTN              TokenNumber

+  )

+{

+  UINT8             *StringTable;

+  PCD_NAME_INDEX    *PcdNameIndex;

+  CHAR8             *TokenSpaceName;

+  CHAR8             *PcdName;

+  CHAR8             *Name;

+

+  //

+  // 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--;

+

+  StringTable = (UINT8 *) Database + Database->StringTableOffset;

+

+  //

+  // Get the PCD name index.

+  //

+  PcdNameIndex = (PCD_NAME_INDEX *)((UINT8 *) Database + Database->PcdNameTableOffset) + TokenNumber;

+  TokenSpaceName = (CHAR8 *)&StringTable[PcdNameIndex->TokenSpaceCNameIndex];

+  PcdName = (CHAR8 *)&StringTable[PcdNameIndex->PcdCNameIndex];

+

+  if (OnlyTokenSpaceName) {

+    //

+    // Only need to get the TokenSpaceCName.

+    //

+    Name = AllocateCopyPool (AsciiStrSize (TokenSpaceName), TokenSpaceName);

+  } else {

+    //

+    // Need to get the full PCD name.

+    //

+    Name = AllocateZeroPool (AsciiStrSize (TokenSpaceName) + AsciiStrSize (PcdName));

+    //

+    // Catenate TokenSpaceCName and PcdCName with a '.' to form the full PCD name.

+    //

+    AsciiStrCat (Name, TokenSpaceName);

+    Name[AsciiStrSize (TokenSpaceName) - sizeof (CHAR8)] = '.';

+    AsciiStrCat (Name, PcdName);  

+  }

+

+  return Name;

+}

+

+/**

+  Retrieve additional information associated with a PCD token.

+

+  This includes information such as the type of value the TokenNumber is associated with as well as possible

+  human readable name that is associated with the token.

+

+  @param[in]    Database    PCD database.

+  @param[in]    Guid        The 128-bit unique value that designates the namespace from which to extract the value.

+  @param[in]    TokenNumber The PCD token number.

+  @param[out]   PcdInfo     The returned information associated with the requested TokenNumber.

+                            The caller is responsible for freeing the buffer that is allocated by callee for PcdInfo->PcdName. 

+

+  @retval  EFI_SUCCESS      The PCD information was returned successfully

+  @retval  EFI_NOT_FOUND    The PCD service could not find the requested token number.

+**/

+EFI_STATUS

+ExGetPcdInfo (

+  IN        PEI_PCD_DATABASE    *Database,

+  IN CONST  EFI_GUID            *Guid,

+  IN        UINTN               TokenNumber,

+  OUT       EFI_PCD_INFO        *PcdInfo

+  )

+{

+  UINTN                 GuidTableIdx;

+  EFI_GUID              *MatchGuid;

+  EFI_GUID              *GuidTable;

+  DYNAMICEX_MAPPING     *ExMapTable;

+  UINTN                 Index;

+  UINT32                LocalTokenNumber;

+

+  GuidTable = (EFI_GUID *)((UINT8 *)Database + Database->GuidTableOffset);

+  MatchGuid = ScanGuid (GuidTable, Database->GuidTableCount * sizeof(EFI_GUID), Guid);

+

+  if (MatchGuid == NULL) {

+    return EFI_NOT_FOUND;

+  }

+

+  GuidTableIdx = MatchGuid - GuidTable;

+

+  ExMapTable = (DYNAMICEX_MAPPING *)((UINT8 *)Database + Database->ExMapTableOffset);

+

+  //

+  // Find the PCD by GuidTableIdx and ExTokenNumber in ExMapTable.

+  //

+  for (Index = 0; Index < Database->ExTokenCount; Index++) {

+    if (ExMapTable[Index].ExGuidIndex == GuidTableIdx) {

+      if (TokenNumber == PCD_INVALID_TOKEN_NUMBER) {

+        //

+        // TokenNumber is 0, follow spec to set PcdType to EFI_PCD_TYPE_8,

+        // PcdSize to 0 and PcdName to the null-terminated ASCII string

+        // associated with the token's namespace Guid.

+        //

+        PcdInfo->PcdType = EFI_PCD_TYPE_8;

+        PcdInfo->PcdSize = 0;

+        //

+        // Here use one representative in the token space to get the TokenSpaceCName.

+        // 

+        PcdInfo->PcdName = GetPcdName (TRUE, Database, ExMapTable[Index].TokenNumber);

+        return EFI_SUCCESS;

+      } else if (ExMapTable[Index].ExTokenNumber == TokenNumber) {

+        PcdInfo->PcdSize = PeiPcdGetSize (ExMapTable[Index].TokenNumber);

+        LocalTokenNumber = GetLocalTokenNumber (Database, ExMapTable[Index].TokenNumber);

+        PcdInfo->PcdType = GetPcdType (LocalTokenNumber);

+        PcdInfo->PcdName = GetPcdName (FALSE, Database, ExMapTable[Index].TokenNumber);

+        return EFI_SUCCESS;

+      }

+    }

+  }

+

+  return EFI_NOT_FOUND;

+}

+

+/**

+  Retrieve additional information associated with a PCD token.

+

+  This includes information such as the type of value the TokenNumber is associated with as well as possible

+  human readable name that is associated with the token.

+

+  @param[in]    Guid        The 128-bit unique value that designates the namespace from which to extract the value.

+  @param[in]    TokenNumber The PCD token number.

+  @param[out]   PcdInfo     The returned information associated with the requested TokenNumber.

+                            The caller is responsible for freeing the buffer that is allocated by callee for PcdInfo->PcdName.

+

+  @retval  EFI_SUCCESS      The PCD information was returned successfully.

+  @retval  EFI_NOT_FOUND    The PCD service could not find the requested token number.

+**/

+EFI_STATUS

+PeiGetPcdInfo (

+  IN CONST  EFI_GUID        *Guid,

+  IN        UINTN           TokenNumber,

+  OUT       EFI_PCD_INFO    *PcdInfo

+  )

+{

+  PEI_PCD_DATABASE      *PeiPcdDb;

+  BOOLEAN               PeiExMapTableEmpty;

+  UINTN                 PeiNexTokenNumber;

+  UINT32                LocalTokenNumber;

+

+  if (!FeaturePcdGet (PcdPcdInfoGeneration)) {

+    return EFI_UNSUPPORTED;

+  }

+

+  ASSERT (PcdInfo != NULL);

+

+  PeiPcdDb          = GetPcdDatabase ();

+  PeiNexTokenNumber = PeiPcdDb->LocalTokenCount - PeiPcdDb->ExTokenCount;

+

+  if (PeiPcdDb->ExTokenCount == 0) {

+    PeiExMapTableEmpty = TRUE;

+  } else {

+    PeiExMapTableEmpty = FALSE;

+  }

+

+  if (Guid == NULL) {

+    if (TokenNumber > PeiNexTokenNumber) {

+      return EFI_NOT_FOUND;

+    } else if (TokenNumber == PCD_INVALID_TOKEN_NUMBER) {

+      //

+      // TokenNumber is 0, follow spec to set PcdType to EFI_PCD_TYPE_8,

+      // PcdSize to 0 and PcdName to NULL for default Token Space.

+      //

+      PcdInfo->PcdType = EFI_PCD_TYPE_8;

+      PcdInfo->PcdSize = 0;

+      PcdInfo->PcdName = NULL;

+    } else {

+      PcdInfo->PcdSize = PeiPcdGetSize (TokenNumber);

+      LocalTokenNumber = GetLocalTokenNumber (PeiPcdDb, TokenNumber);

+      PcdInfo->PcdType = GetPcdType (LocalTokenNumber);

+      PcdInfo->PcdName = GetPcdName (FALSE, PeiPcdDb, TokenNumber);

+    }

+    return EFI_SUCCESS;

+  } else {

+    if (PeiExMapTableEmpty) {

+      return EFI_NOT_FOUND;

+    }

+    return ExGetPcdInfo (

+             PeiPcdDb,

+             Guid,

+             TokenNumber,

+             PcdInfo

+             );

+  }

+}

+

+/**

   The function registers the CallBackOnSet fucntion

   according to TokenNumber and EFI_GUID space.

 

@@ -150,8 +428,9 @@ LocateExPcdBinary (
 

   @param  FileHandle  Handle of the file the external PCD database binary located.

 

+  @return Pointer to PCD database.

 **/

-VOID

+PEI_PCD_DATABASE *

 BuildPcdDatabase (

   IN EFI_PEI_FILE_HANDLE    FileHandle

   )

@@ -182,6 +461,8 @@ BuildPcdDatabase (
   CallbackFnTable = BuildGuidHob (&gEfiCallerIdGuid, SizeOfCallbackFnTable);

   

   ZeroMem (CallbackFnTable, SizeOfCallbackFnTable);

+

+  return Database;

 }

 

 /**

@@ -462,8 +743,6 @@ SetWorker (
   // comparison.

   ASSERT (TokenNumber + 1 < (LocalTokenCount + 1));

 

-  LocalTokenNumber = *((UINT32 *)((UINT8 *)PeiPcdDb + PeiPcdDb->LocalTokenNumberTableOffset) + TokenNumber);

-

   if (PtrType) {

     //

     // Get MaxSize first, then check new size with max buffer size.

@@ -489,14 +768,7 @@ SetWorker (
     InvokeCallbackOnSet (0, NULL, TokenNumber + 1, Data, *Size);

   }

 

-  if ((LocalTokenNumber & PCD_TYPE_SKU_ENABLED) == PCD_TYPE_SKU_ENABLED) {

-    if (PtrType) {

-      GetPtrTypeSize (TokenNumber, &MaxSize, PeiPcdDb);

-    } else {

-      MaxSize = *Size;

-    }

-    LocalTokenNumber = GetSkuEnabledTokenNumber (LocalTokenNumber & ~PCD_TYPE_SKU_ENABLED, MaxSize);

-  }

+  LocalTokenNumber = GetLocalTokenNumber (PeiPcdDb, TokenNumber + 1);

 

   Offset          = LocalTokenNumber & PCD_DATABASE_OFFSET_MASK;

   InternalData    = (VOID *) ((UINT8 *) PeiPcdDb + Offset);

@@ -677,7 +949,6 @@ GetWorker (
   STRING_HEAD         StringTableIdx;

   PEI_PCD_DATABASE    *PeiPcdDb;

   UINT32              LocalTokenNumber;

-  UINTN               MaxSize;

   UINT32              LocalTokenCount;

 

   //

@@ -697,16 +968,7 @@ GetWorker (
 

   ASSERT ((GetSize == PeiPcdGetSize(TokenNumber + 1)) || (GetSize == 0));

 

-  LocalTokenNumber = *((UINT32 *)((UINT8 *)PeiPcdDb + PeiPcdDb->LocalTokenNumberTableOffset) + TokenNumber);

-

-  if ((LocalTokenNumber & PCD_TYPE_SKU_ENABLED) == PCD_TYPE_SKU_ENABLED) {

-    if (GetSize == 0) {

-      GetPtrTypeSize (TokenNumber, &MaxSize, PeiPcdDb);

-    } else {

-      MaxSize = GetSize;

-    }

-    LocalTokenNumber = GetSkuEnabledTokenNumber (LocalTokenNumber & ~PCD_TYPE_SKU_ENABLED, MaxSize);

-  }

+  LocalTokenNumber = GetLocalTokenNumber (PeiPcdDb, TokenNumber + 1);

 

   Offset      = LocalTokenNumber & PCD_DATABASE_OFFSET_MASK;

   StringTable = (UINT8 *)PeiPcdDb + PeiPcdDb->StringTableOffset;

diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.h b/MdeModulePkg/Universal/PCD/Pei/Service.h
index 1928dcb928..2bd28b28c9 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Service.h
+++ b/MdeModulePkg/Universal/PCD/Pei/Service.h
@@ -19,6 +19,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Ppi/ReadOnlyVariable2.h>

 #include <Ppi/Pcd.h>

 #include <Ppi/PiPcd.h>

+#include <Ppi/PcdInfo.h>

+#include <Ppi/PiPcdInfo.h>

 #include <Guid/PcdDataBaseHobGuid.h>

 #include <Guid/PcdDataBaseSignatureGuid.h>

 #include <Library/DebugLib.h>

@@ -28,7 +30,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/PeiServicesLib.h>

 #include <Library/PcdLib.h>

 #include <Library/BaseMemoryLib.h>

-

+#include <Library/MemoryAllocationLib.h>

 

 //

 // Please make sure the PCD Serivce PEIM Version is consistent with

@@ -43,6 +45,61 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   #error "Please make sure the version of PCD PEIM Service and the generated PCD PEI Database match."

 #endif

 

+/**

+  Retrieve additional information associated with a PCD token in the default token space.

+

+  This includes information such as the type of value the TokenNumber is associated with as well as possible

+  human readable name that is associated with the token.

+

+  @param[in]    TokenNumber The PCD token number.

+  @param[out]   PcdInfo     The returned information associated with the requested TokenNumber.

+                            The caller is responsible for freeing the buffer that is allocated by callee for PcdInfo->PcdName.

+

+  @retval  EFI_SUCCESS      The PCD information was returned successfully.

+  @retval  EFI_NOT_FOUND    The PCD service could not find the requested token number.

+**/

+EFI_STATUS

+EFIAPI

+PeiGetPcdInfoGetInfo (

+  IN        UINTN           TokenNumber,

+  OUT       EFI_PCD_INFO    *PcdInfo

+  );

+

+/**

+  Retrieve additional information associated with a PCD token.

+

+  This includes information such as the type of value the TokenNumber is associated with as well as possible

+  human readable name that is associated with the token.

+

+  @param[in]    Guid        The 128-bit unique value that designates the namespace from which to extract the value.

+  @param[in]    TokenNumber The PCD token number.

+  @param[out]   PcdInfo     The returned information associated with the requested TokenNumber.

+                            The caller is responsible for freeing the buffer that is allocated by callee for PcdInfo->PcdName.

+

+  @retval  EFI_SUCCESS      The PCD information was returned successfully.

+  @retval  EFI_NOT_FOUND    The PCD service could not find the requested token number.

+**/

+EFI_STATUS

+EFIAPI

+PeiGetPcdInfoGetInfoEx (

+  IN CONST  EFI_GUID        *Guid,

+  IN        UINTN           TokenNumber,

+  OUT       EFI_PCD_INFO    *PcdInfo

+  );

+

+/**

+  Retrieve the currently set SKU Id.

+

+  @return   The currently set SKU Id. If the platform has not set at a SKU Id, then the

+            default SKU Id value of 0 is returned. If the platform has set a SKU Id, then the currently set SKU

+            Id is returned.

+**/

+UINTN

+EFIAPI

+PeiGetPcdInfoGetSku (

+  VOID

+  );

+

 //

 // PPI Interface Implementation Declaration.

 //

@@ -753,6 +810,27 @@ PeiPcdGetNextTokenSpace (
   IN OUT CONST EFI_GUID           **Guid

   );

 

+/**

+  Retrieve additional information associated with a PCD token.

+

+  This includes information such as the type of value the TokenNumber is associated with as well as possible

+  human readable name that is associated with the token.

+

+  @param[in]    Guid        The 128-bit unique value that designates the namespace from which to extract the value.

+  @param[in]    TokenNumber The PCD token number.

+  @param[out]   PcdInfo     The returned information associated with the requested TokenNumber.

+                            The caller is responsible for freeing the buffer that is allocated by callee for PcdInfo->PcdName. 

+

+  @retval  EFI_SUCCESS      The PCD information was returned successfully

+  @retval  EFI_NOT_FOUND    The PCD service could not find the requested token number.

+**/

+EFI_STATUS

+EFIAPI

+PeiGetPcdInfo (

+  IN CONST  EFI_GUID        *Guid,

+  IN        UINTN           TokenNumber,

+  OUT       EFI_PCD_INFO    *PcdInfo

+  );

 

 /* Internal Function definitions */

 /**

@@ -916,6 +994,21 @@ GetExPcdTokenNumber (
   );

 

 /**

+  Find the local token number according to system SKU ID.

+

+  @param LocalTokenNumber PCD token number

+  @param Size             The size of PCD entry.

+

+  @return Token number according to system SKU ID.

+

+**/

+UINT32

+GetSkuEnabledTokenNumber (

+  UINT32 LocalTokenNumber,

+  UINTN  Size

+  );

+

+/**

   The function registers the CallBackOnSet fucntion

   according to TokenNumber and EFI_GUID space.

 

@@ -942,8 +1035,10 @@ PeiRegisterCallBackWorker (
 

   @param  FileHandle  Handle of the file the external PCD database binary located.

 

+  @return Pointer to PCD database.

+

 **/

-VOID

+PEI_PCD_DATABASE *

 BuildPcdDatabase (

   IN EFI_PEI_FILE_HANDLE    FileHandle

   );