/** @file\r
Help functions used by PCD DXE driver.\r
\r
-Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2014, Hewlett-Packard Development Company, L.P.<BR>\r
+Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+(C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
which accompanies this distribution. The full text of the license may be found at\r
EFI_GUID **TmpTokenSpaceBuffer;\r
UINTN TmpTokenSpaceBufferCount; \r
\r
+UINTN mPeiPcdDbSize = 0;\r
+PEI_PCD_DATABASE *mPeiPcdDbBinary = NULL;\r
+UINTN mDxePcdDbSize = 0;\r
+DXE_PCD_DATABASE *mDxePcdDbBinary = NULL;\r
+\r
/**\r
Get Local Token Number by Token Number.\r
\r
)\r
{\r
UINT32 *LocalTokenNumberTable;\r
- UINT32 LocalTokenNumber;\r
- UINTN Size;\r
- UINTN MaxSize;\r
\r
//\r
// TokenNumber Zero is reserved as PCD_INVALID_TOKEN_NUMBER.\r
(UINT32 *)((UINT8 *)mPcdDatabase.DxeDb + mPcdDatabase.DxeDb->LocalTokenNumberTableOffset);\r
TokenNumber = IsPeiDb ? TokenNumber : TokenNumber - mPeiLocalTokenCount;\r
\r
- LocalTokenNumber = LocalTokenNumberTable[TokenNumber];\r
-\r
- Size = (LocalTokenNumber & PCD_DATUM_TYPE_ALL_SET) >> PCD_DATUM_TYPE_SHIFT;\r
-\r
- if ((LocalTokenNumber & PCD_TYPE_SKU_ENABLED) == PCD_TYPE_SKU_ENABLED) {\r
- if (Size == 0) {\r
- GetPtrTypeSize (TokenNumber, &MaxSize);\r
- } else {\r
- MaxSize = Size;\r
- }\r
- LocalTokenNumber = GetSkuEnabledTokenNumber (LocalTokenNumber & ~PCD_TYPE_SKU_ENABLED, MaxSize, IsPeiDb);\r
- }\r
-\r
- return LocalTokenNumber;\r
+ return LocalTokenNumberTable[TokenNumber];\r
}\r
\r
/**\r
case PCD_DATUM_TYPE_POINTER:\r
return EFI_PCD_TYPE_PTR;\r
case PCD_DATUM_TYPE_UINT8:\r
- if (LocalTokenNumber & PCD_DATUM_TYPE_UINT8_BOOLEAN) {\r
+ if ((LocalTokenNumber & PCD_DATUM_TYPE_UINT8_BOOLEAN) == PCD_DATUM_TYPE_UINT8_BOOLEAN) {\r
return EFI_PCD_TYPE_BOOL;\r
} else {\r
return EFI_PCD_TYPE_8;\r
{\r
PCD_DATABASE_INIT *Database;\r
UINT8 *StringTable;\r
+ UINTN NameSize;\r
PCD_NAME_INDEX *PcdNameIndex;\r
CHAR8 *TokenSpaceName;\r
CHAR8 *PcdName;\r
CHAR8 *Name;\r
\r
+ //\r
+ // Return NULL when PCD name table is absent. \r
+ //\r
+ if (IsPeiDb) {\r
+ if (mPcdDatabase.PeiDb->PcdNameTableOffset == 0) {\r
+ return NULL;\r
+ }\r
+ } else {\r
+ if (mPcdDatabase.DxeDb->PcdNameTableOffset == 0) {\r
+ return NULL;\r
+ }\r
+ }\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
// Need to get the full PCD name.\r
//\r
- Name = AllocateZeroPool (AsciiStrSize (TokenSpaceName) + AsciiStrSize (PcdName));\r
+ NameSize = AsciiStrSize (TokenSpaceName) + AsciiStrSize (PcdName);\r
+ Name = AllocateZeroPool (NameSize);\r
+ ASSERT (Name != NULL);\r
//\r
// Catenate TokenSpaceCName and PcdCName with a '.' to form the full PCD name.\r
//\r
- AsciiStrCat (Name, TokenSpaceName);\r
+ AsciiStrCatS (Name, NameSize, TokenSpaceName);\r
Name[AsciiStrSize (TokenSpaceName) - sizeof (CHAR8)] = '.';\r
- AsciiStrCat (Name, PcdName); \r
+ AsciiStrCatS (Name, NameSize, PcdName); \r
}\r
\r
return Name;\r
switch (LocalTokenNumber & PCD_TYPE_ALL_SET) {\r
case PCD_TYPE_VPD:\r
VpdHead = (VPD_HEAD *) ((UINT8 *) PcdDb + Offset);\r
- RetPtr = (VOID *) (UINTN) (PcdGet32 (PcdVpdBaseAddress) + VpdHead->Offset);\r
+ RetPtr = (VOID *) ((UINTN) PcdGet32 (PcdVpdBaseAddress) + VpdHead->Offset);\r
\r
break;\r
\r
// string array in string table.\r
//\r
StringTableIdx = *(STRING_HEAD*)((UINT8 *) PcdDb + VariableHead->DefaultValueOffset); \r
- VaraiableDefaultBuffer = (VOID *) (StringTable + StringTableIdx); \r
+ VaraiableDefaultBuffer = (UINT8 *) (StringTable + StringTableIdx); \r
} else {\r
VaraiableDefaultBuffer = (UINT8 *) PcdDb + VariableHead->DefaultValueOffset;\r
}\r
Status = GetHiiVariable (Guid, Name, &Data, &DataSize);\r
if (Status == EFI_SUCCESS) {\r
- if (GetSize == 0) {\r
+ if (DataSize >= (VariableHead->Offset + GetSize)) {\r
+ if (GetSize == 0) {\r
+ //\r
+ // It is a pointer type. So get the MaxSize reserved for\r
+ // this PCD entry.\r
+ //\r
+ GetPtrTypeSize (TmpTokenNumber, &GetSize);\r
+ if (GetSize > (DataSize - VariableHead->Offset)) {\r
+ //\r
+ // Use actual valid size.\r
+ //\r
+ GetSize = DataSize - VariableHead->Offset;\r
+ }\r
+ }\r
//\r
- // It is a pointer type. So get the MaxSize reserved for\r
- // this PCD entry.\r
+ // If the operation is successful, we copy the data\r
+ // to the default value buffer in the PCD Database.\r
+ // So that we can free the Data allocated in GetHiiVariable.\r
//\r
- GetPtrTypeSize (TmpTokenNumber, &GetSize);\r
+ CopyMem (VaraiableDefaultBuffer, Data + VariableHead->Offset, GetSize);\r
}\r
- //\r
- // If the operation is successful, we copy the data\r
- // to the default value buffer in the PCD Database.\r
- // So that we can free the Data allocated in GetHiiVariable.\r
- //\r
- CopyMem (VaraiableDefaultBuffer, Data + VariableHead->Offset, GetSize);\r
FreePool (Data);\r
}\r
RetPtr = (VOID *) VaraiableDefaultBuffer;\r
}\r
\r
for ( ; Index < ExMapTableCount; Index++) {\r
- if (ExMapTable[Index].ExTokenNumber == *TokenNumber) {\r
+ if ((ExMapTable[Index].ExTokenNumber == *TokenNumber) && (ExMapTable[Index].ExGuidIndex == GuidTableIdx)) {\r
break;\r
}\r
}\r
VOID\r
) \r
{\r
- DXE_PCD_DATABASE *DxePcdDbBinary;\r
- UINTN DxePcdDbSize;\r
EFI_STATUS Status;\r
\r
- DxePcdDbBinary = NULL;\r
//\r
// Search the External Pcd database from one section of current FFS, \r
// and read it to memory\r
Status = GetSectionFromFfs (\r
EFI_SECTION_RAW,\r
0,\r
- (VOID **) &DxePcdDbBinary,\r
- &DxePcdDbSize\r
+ (VOID **) &mDxePcdDbBinary,\r
+ &mDxePcdDbSize\r
);\r
ASSERT_EFI_ERROR (Status);\r
\r
//\r
// Check the first bytes (Header Signature Guid) and build version.\r
//\r
- if (!CompareGuid ((VOID *)DxePcdDbBinary, &gPcdDataBaseSignatureGuid) ||\r
- (DxePcdDbBinary->BuildVersion != PCD_SERVICE_DXE_VERSION)) {\r
+ if (!CompareGuid ((VOID *)mDxePcdDbBinary, &gPcdDataBaseSignatureGuid) ||\r
+ (mDxePcdDbBinary->BuildVersion != PCD_SERVICE_DXE_VERSION)) {\r
ASSERT (FALSE);\r
}\r
\r
- return DxePcdDbBinary;\r
+ return mDxePcdDbBinary;\r
+}\r
+\r
+/**\r
+ Update PCD database base on current SkuId\r
+\r
+ @param SkuId Current SkuId\r
+ @param IsPeiDb Whether to update PEI PCD database.\r
+\r
+ @retval EFI_SUCCESS Update PCD database successfully.\r
+ @retval EFI_NOT_FOUND Not found PCD database for current SkuId.\r
+**/\r
+EFI_STATUS\r
+UpdatePcdDatabase (\r
+ IN SKU_ID SkuId,\r
+ IN BOOLEAN IsPeiDb\r
+ )\r
+{\r
+ UINTN Index;\r
+ PCD_DATABASE_SKU_DELTA *SkuDelta;\r
+ PCD_DATA_DELTA *SkuDeltaData;\r
+\r
+ if (IsPeiDb && mPeiPcdDbBinary != NULL) {\r
+ //\r
+ // Find the delta data for PEI DB\r
+ //\r
+ Index = (mPcdDatabase.PeiDb->Length + 7) & (~7);\r
+ SkuDelta = NULL;\r
+ while (Index < mPeiPcdDbSize) {\r
+ SkuDelta = (PCD_DATABASE_SKU_DELTA *) ((UINT8 *) mPeiPcdDbBinary + Index);\r
+ if (SkuDelta->SkuId == SkuId && SkuDelta->SkuIdCompared == 0) {\r
+ break;\r
+ }\r
+ Index = (Index + SkuDelta->Length + 7) & (~7);\r
+ }\r
+\r
+ //\r
+ // Patch the delta data into current PCD database\r
+ //\r
+ if (Index < mPeiPcdDbSize && SkuDelta != NULL) {\r
+ SkuDeltaData = (PCD_DATA_DELTA *) (SkuDelta + 1);\r
+ while ((UINT8 *) SkuDeltaData < (UINT8 *) SkuDelta + SkuDelta->Length) {\r
+ *((UINT8 *) mPcdDatabase.PeiDb + SkuDeltaData->Offset) = (UINT8) SkuDeltaData->Value;\r
+ SkuDeltaData ++;\r
+ }\r
+ } else {\r
+ return EFI_NOT_FOUND;\r
+ }\r
+ }\r
+\r
+ //\r
+ // Find the delta data for DXE DB\r
+ //\r
+ Index = (mPcdDatabase.DxeDb->Length + 7) & (~7);\r
+ SkuDelta = NULL;\r
+ while (Index < mDxePcdDbSize) {\r
+ SkuDelta = (PCD_DATABASE_SKU_DELTA *) ((UINT8 *) mDxePcdDbBinary + Index);\r
+ if (SkuDelta->SkuId == SkuId && SkuDelta->SkuIdCompared == 0) {\r
+ break;\r
+ }\r
+ Index = (Index + SkuDelta->Length + 7) & (~7);\r
+ }\r
+\r
+ //\r
+ // Patch the delta data into current PCD database\r
+ //\r
+ if (Index < mDxePcdDbSize && SkuDelta != NULL) {\r
+ SkuDeltaData = (PCD_DATA_DELTA *) (SkuDelta + 1);\r
+ while ((UINT8 *) SkuDeltaData < (UINT8 *) SkuDelta + SkuDelta->Length) {\r
+ *((UINT8 *) mPcdDatabase.DxeDb + SkuDeltaData->Offset) = (UINT8) SkuDeltaData->Value;\r
+ SkuDeltaData ++;\r
+ }\r
+ return EFI_SUCCESS;\r
+ }\r
+\r
+ return EFI_NOT_FOUND;\r
}\r
\r
/**\r
UINTN Index;\r
UINT32 PcdDxeDbLen;\r
VOID *PcdDxeDb;\r
+ EFI_STATUS Status;\r
+\r
+ //\r
+ // Assign PCD Entries with default value to PCD DATABASE\r
+ //\r
+ mPcdDatabase.DxeDb = LocateExPcdBinary ();\r
+ ASSERT(mPcdDatabase.DxeDb != NULL);\r
+ PcdDxeDbLen = mPcdDatabase.DxeDb->Length + mPcdDatabase.DxeDb->UninitDataBaseSize;\r
+ PcdDxeDb = AllocateZeroPool (PcdDxeDbLen);\r
+ ASSERT (PcdDxeDb != NULL);\r
+ CopyMem (PcdDxeDb, mPcdDatabase.DxeDb, mPcdDatabase.DxeDb->Length);\r
+ mPcdDatabase.DxeDb = PcdDxeDb;\r
\r
GuidHob = GetFirstGuidHob (&gPcdDataBaseHobGuid);\r
if (GuidHob != NULL) {\r
// be NULL. If it is NULL, we just copy over the DXE Default\r
// Value to PCD Database.\r
//\r
- \r
PeiDatabase = (PEI_PCD_DATABASE *) GET_GUID_HOB_DATA (GuidHob);\r
+\r
+ //\r
+ // Get next one that stores full PEI data\r
+ //\r
+ GuidHob = GetNextGuidHob (&gPcdDataBaseHobGuid, GET_NEXT_HOB (GuidHob));\r
+ if (GuidHob != NULL) {\r
+ mPeiPcdDbBinary = (PEI_PCD_DATABASE *) GET_GUID_HOB_DATA (GuidHob);\r
+ mPeiPcdDbSize = (UINTN) GET_GUID_HOB_DATA_SIZE (GuidHob);\r
+ }\r
+\r
//\r
// Assign PCD Entries refereneced in PEI phase to PCD DATABASE\r
//\r
mPcdDatabase.PeiDb = PeiDatabase;\r
+ //\r
+ // Inherit the SystemSkuId from PEI phase.\r
+ //\r
+ if (mPcdDatabase.PeiDb->SystemSkuId != 0) {\r
+ Status = UpdatePcdDatabase (mPcdDatabase.PeiDb->SystemSkuId, FALSE);\r
+ ASSERT_EFI_ERROR (Status);\r
+ }\r
+ mPcdDatabase.DxeDb->SystemSkuId = mPcdDatabase.PeiDb->SystemSkuId;\r
+ } else {\r
+ mPcdDatabase.PeiDb = AllocateZeroPool (sizeof (PEI_PCD_DATABASE));\r
+ ASSERT(mPcdDatabase.PeiDb != NULL);\r
}\r
\r
- //\r
- // Assign PCD Entries with default value to PCD DATABASE\r
- //\r
- mPcdDatabase.DxeDb = LocateExPcdBinary ();\r
- ASSERT(mPcdDatabase.DxeDb != NULL);\r
- PcdDxeDbLen = mPcdDatabase.DxeDb->Length + mPcdDatabase.DxeDb->UninitDataBaseSize;\r
- PcdDxeDb = AllocateZeroPool (PcdDxeDbLen);\r
- ASSERT (PcdDxeDb != NULL);\r
- CopyMem (PcdDxeDb, mPcdDatabase.DxeDb, mPcdDatabase.DxeDb->Length);\r
- FreePool (mPcdDatabase.DxeDb);\r
- mPcdDatabase.DxeDb = PcdDxeDb;\r
-\r
//\r
// Initialized the external PCD database local variables\r
//\r
return Status;\r
}\r
\r
-/**\r
- Find the local token number according to system SKU ID.\r
-\r
- @param LocalTokenNumber PCD token number\r
- @param Size The size of PCD entry.\r
- @param IsPeiDb If TRUE, the PCD entry is initialized in PEI phase.\r
- If False, the PCD entry is initialized in DXE phase.\r
-\r
- @return Token number according to system SKU ID.\r
-\r
-**/\r
-UINT32\r
-GetSkuEnabledTokenNumber (\r
- UINT32 LocalTokenNumber,\r
- UINTN Size,\r
- BOOLEAN IsPeiDb\r
- ) \r
-{\r
- SKU_HEAD *SkuHead;\r
- SKU_ID *SkuIdTable;\r
- INTN Index;\r
- UINT8 *Value;\r
- UINT8 *PcdDb;\r
- BOOLEAN FoundSku;\r
-\r
- ASSERT ((LocalTokenNumber & PCD_TYPE_SKU_ENABLED) == 0);\r
-\r
- PcdDb = IsPeiDb ? (UINT8 *) mPcdDatabase.PeiDb : (UINT8 *) mPcdDatabase.DxeDb;\r
-\r
- SkuHead = (SKU_HEAD *) (PcdDb + (LocalTokenNumber & PCD_DATABASE_OFFSET_MASK));\r
- Value = (UINT8 *) (PcdDb + SkuHead->SkuDataStartOffset); \r
-\r
- SkuIdTable = (SKU_ID *)(PcdDb + SkuHead->SkuIdTableOffset);\r
- //\r
- // Find the current system's SKU ID entry in SKU ID table.\r
- //\r
- FoundSku = FALSE;\r
- for (Index = 0; Index < SkuIdTable[0]; Index++) {\r
- if (mPcdDatabase.PeiDb->SystemSkuId == SkuIdTable[Index + 1]) {\r
- FoundSku = TRUE;\r
- break;\r
- }\r
- }\r
- \r
- //\r
- // Find the default SKU ID entry in SKU ID table.\r
- //\r
- \r
- if(!FoundSku) {\r
- for (Index = 0; Index < SkuIdTable[0]; Index++) {\r
- if (0 == SkuIdTable[Index + 1]) {\r
- break;\r
- }\r
- }\r
- }\r
- ASSERT (Index < SkuIdTable[0]);\r
-\r
- switch (LocalTokenNumber & PCD_TYPE_ALL_SET) {\r
- case PCD_TYPE_VPD:\r
- Value = (UINT8 *) &(((VPD_HEAD *) Value)[Index]);\r
- return (UINT32) ((Value - PcdDb) | PCD_TYPE_VPD);\r
-\r
- case PCD_TYPE_HII:\r
- Value = (UINT8 *) &(((VARIABLE_HEAD *) Value)[Index]);\r
- return (UINT32) ((Value - PcdDb) | PCD_TYPE_HII);\r
-\r
- case PCD_TYPE_HII|PCD_TYPE_STRING:\r
- Value = (UINT8 *) &(((VARIABLE_HEAD *) Value)[Index]);\r
- return (UINT32) ((Value - PcdDb) | PCD_TYPE_HII | PCD_TYPE_STRING);\r
-\r
- case PCD_TYPE_STRING:\r
- Value = (UINT8 *) &(((STRING_HEAD *) Value)[Index]);\r
- return (UINT32) ((Value - PcdDb) | PCD_TYPE_STRING);\r
- \r
- case PCD_TYPE_DATA:\r
- Value += Size * Index;\r
- return (UINT32) ((Value - PcdDb) | PCD_TYPE_DATA);\r
-\r
- default:\r
- ASSERT (FALSE);\r
- }\r
-\r
- ASSERT (FALSE);\r
-\r
- return 0;\r
- \r
-}\r
-\r
/**\r
Invoke the callback function when dynamic PCD entry was set, if this PCD entry \r
has registered callback function.\r
EFI_GUID *Guid;\r
UINT16 *Name;\r
UINTN VariableOffset;\r
+ UINT32 Attributes;\r
VOID *InternalData;\r
VARIABLE_HEAD *VariableHead;\r
UINTN Offset;\r
Guid = GuidTable + VariableHead->GuidTableIndex;\r
Name = (UINT16*) (StringTable + VariableHead->StringIndex);\r
VariableOffset = VariableHead->Offset;\r
- Status = SetHiiVariable (Guid, Name, Data, *Size, VariableOffset);\r
-\r
- if (EFI_NOT_FOUND == Status) {\r
- if ((LocalTokenNumber & PCD_TYPE_ALL_SET) == (PCD_TYPE_HII|PCD_TYPE_STRING)) {\r
- CopyMem (\r
- StringTable + *(STRING_HEAD *)(PcdDb + VariableHead->DefaultValueOffset),\r
- Data,\r
- *Size\r
- );\r
- } else {\r
- CopyMem (PcdDb + VariableHead->DefaultValueOffset, Data, *Size);\r
- } \r
- Status = EFI_SUCCESS;\r
- }\r
+ Attributes = VariableHead->Attributes;\r
+ Status = SetHiiVariable (Guid, Name, Attributes, Data, *Size, VariableOffset);\r
break;\r
\r
case PCD_TYPE_DATA:\r
\r
}\r
\r
+/**\r
+ Get variable size and data from HII-type PCDs.\r
+\r
+ @param[in] VariableGuid Guid of variable which stored value of a HII-type PCD.\r
+ @param[in] VariableName Unicode name of variable which stored value of a HII-type PCD.\r
+ @param[out] VariableSize Pointer to variable size got from HII-type PCDs.\r
+ @param[out] VariableData Pointer to variable data got from HII-type PCDs.\r
+\r
+**/\r
+VOID\r
+GetVariableSizeAndDataFromHiiPcd (\r
+ IN EFI_GUID *VariableGuid,\r
+ IN UINT16 *VariableName,\r
+ OUT UINTN *VariableSize,\r
+ OUT VOID *VariableData OPTIONAL\r
+ )\r
+{\r
+ BOOLEAN IsPeiDb;\r
+ PCD_DATABASE_INIT *Database;\r
+ UINTN TokenNumber;\r
+ UINT32 LocalTokenNumber;\r
+ UINTN Offset;\r
+ EFI_GUID *GuidTable;\r
+ UINT8 *StringTable;\r
+ VARIABLE_HEAD *VariableHead;\r
+ EFI_GUID *Guid;\r
+ UINT16 *Name;\r
+ UINTN PcdDataSize;\r
+ UINTN Size;\r
+ UINT8 *VaraiableDefaultBuffer;\r
+ STRING_HEAD StringTableIdx;\r
+\r
+ *VariableSize = 0;\r
+\r
+ //\r
+ // Go through PCD database to find out DynamicHii PCDs.\r
+ //\r
+ for (TokenNumber = 1; TokenNumber <= mPcdTotalTokenCount; TokenNumber++) {\r
+ IsPeiDb = (BOOLEAN) ((TokenNumber + 1 < mPeiLocalTokenCount + 1) ? TRUE : FALSE);\r
+ Database = IsPeiDb ? mPcdDatabase.PeiDb: mPcdDatabase.DxeDb;\r
+ LocalTokenNumber = GetLocalTokenNumber (IsPeiDb, TokenNumber);\r
+ if ((LocalTokenNumber & PCD_TYPE_HII) != 0) {\r
+ //\r
+ // Get the Variable Guid and Name pointer.\r
+ //\r
+ Offset = LocalTokenNumber & PCD_DATABASE_OFFSET_MASK;\r
+ VariableHead = (VARIABLE_HEAD *) ((UINT8 *) Database + Offset);\r
+ StringTable = (UINT8 *) ((UINT8 *) Database + Database->StringTableOffset);\r
+ GuidTable = (EFI_GUID *) ((UINT8 *) Database + Database->GuidTableOffset);\r
+ Guid = GuidTable + VariableHead->GuidTableIndex;\r
+ Name = (UINT16*) (StringTable + VariableHead->StringIndex);\r
+ if (CompareGuid (VariableGuid, Guid) && (StrCmp (VariableName, Name) == 0)) {\r
+ //\r
+ // It is the matched DynamicHii PCD.\r
+ //\r
+ PcdDataSize = DxePcdGetSize (TokenNumber);\r
+ Size = VariableHead->Offset + PcdDataSize;\r
+ if (Size > *VariableSize) {\r
+ *VariableSize = Size;\r
+ }\r
+ if (VariableData != NULL) {\r
+ if ((LocalTokenNumber & PCD_TYPE_ALL_SET) == (PCD_TYPE_HII|PCD_TYPE_STRING)) {\r
+ //\r
+ // If a HII type PCD's datum type is VOID*, the DefaultValueOffset is the index of\r
+ // string array in string table.\r
+ //\r
+ StringTableIdx = *(STRING_HEAD *) ((UINT8 *) Database + VariableHead->DefaultValueOffset);\r
+ VaraiableDefaultBuffer = (UINT8 *) (StringTable + StringTableIdx);\r
+ } else {\r
+ VaraiableDefaultBuffer = (UINT8 *) Database + VariableHead->DefaultValueOffset;\r
+ }\r
+ CopyMem ((UINT8 *) VariableData + VariableHead->Offset, VaraiableDefaultBuffer, PcdDataSize);\r
+ }\r
+ }\r
+ }\r
+ }\r
+}\r
+\r
/**\r
Set value for HII-type PCD.\r
\r
\r
@param VariableGuid Guid of variable which stored value of a HII-type PCD.\r
@param VariableName Unicode name of variable which stored value of a HII-type PCD.\r
+ @param SetAttributes Attributes bitmask to set for the variable.\r
@param Data Value want to be set.\r
@param DataSize Size of value\r
@param Offset Value offset of HII-type PCD in variable.\r
SetHiiVariable (\r
IN EFI_GUID *VariableGuid,\r
IN UINT16 *VariableName,\r
+ IN UINT32 SetAttributes,\r
IN CONST VOID *Data,\r
IN UINTN DataSize,\r
IN UINTN Offset\r
//\r
// Patch new PCD's value to offset in given HII variable.\r
//\r
- if (Size >= (DataSize + Offset)) {\r
+ if (Size >= (DataSize + Offset)) {\r
SetSize = Size;\r
} else {\r
SetSize = DataSize + Offset;\r
\r
CopyMem ((UINT8 *)Buffer + Offset, Data, DataSize);\r
\r
+ if (SetAttributes == 0) {\r
+ SetAttributes = Attribute;\r
+ }\r
+\r
Status = gRT->SetVariable (\r
VariableName,\r
VariableGuid,\r
- Attribute,\r
+ SetAttributes,\r
SetSize,\r
Buffer\r
);\r
//\r
// If variable does not exist, a new variable need to be created.\r
//\r
- \r
- Size = Offset + DataSize;\r
- \r
+\r
+ //\r
+ // Get size, allocate buffer and get data.\r
+ //\r
+ GetVariableSizeAndDataFromHiiPcd (VariableGuid, VariableName, &Size, NULL);\r
Buffer = AllocateZeroPool (Size);\r
ASSERT (Buffer != NULL);\r
- \r
+ GetVariableSizeAndDataFromHiiPcd (VariableGuid, VariableName, &Size, Buffer);\r
+\r
+ //\r
+ // Update buffer.\r
+ //\r
CopyMem ((UINT8 *)Buffer + Offset, Data, DataSize);\r
- \r
+\r
+ if (SetAttributes == 0) {\r
+ SetAttributes = EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE;\r
+ }\r
+\r
Status = gRT->SetVariable (\r
VariableName,\r
VariableGuid,\r
- EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
+ SetAttributes,\r
Size,\r
Buffer\r
);\r
}\r
\r
//\r
- // If we drop to here, the value is failed to be written in to variable area\r
- // So, we will save the data in the PCD Database's volatile area.\r
+ // If we drop to here, the value is failed to be written in to variable area.\r
//\r
return Status;\r
}\r
\r
MatchGuidIdx = MatchGuid - GuidTable;\r
\r
- for (Index = 0; Index < mPeiExMapppingTableSize; Index++) {\r
+ for (Index = 0; Index < mPcdDatabase.PeiDb->ExTokenCount; Index++) {\r
if ((ExTokenNumber == ExMap[Index].ExTokenNumber) &&\r
(MatchGuidIdx == ExMap[Index].ExGuidIndex)) {\r
return ExMap[Index].TokenNumber;\r
\r
MatchGuidIdx = MatchGuid - GuidTable;\r
\r
- for (Index = 0; Index < mDxeExMapppingTableSize; Index++) {\r
+ for (Index = 0; Index < mPcdDatabase.DxeDb->ExTokenCount; Index++) {\r
if ((ExTokenNumber == ExMap[Index].ExTokenNumber) &&\r
(MatchGuidIdx == ExMap[Index].ExGuidIndex)) {\r
return ExMap[Index].TokenNumber;\r
return 0;\r
}\r
\r
-/**\r
- Get SKU ID table from PCD database.\r
-\r
- @param LocalTokenNumberTableIdx Index of local token number in token number table.\r
- @param IsPeiDb If TRUE, the pcd entry is initialized in PEI phase,\r
- If FALSE, the pcd entry is initialized in DXE phase.\r
- @return Pointer to SKU ID array table\r
-\r
-**/\r
-SKU_ID *\r
-GetSkuIdArray (\r
- IN UINTN LocalTokenNumberTableIdx,\r
- IN BOOLEAN IsPeiDb\r
- )\r
-{\r
- SKU_HEAD *SkuHead;\r
- UINTN LocalTokenNumber;\r
- UINT8 *Database;\r
-\r
- if (IsPeiDb) {\r
- LocalTokenNumber = *((UINT32 *)((UINT8 *)mPcdDatabase.PeiDb + mPcdDatabase.PeiDb->LocalTokenNumberTableOffset) + LocalTokenNumberTableIdx);\r
- Database = (UINT8 *) mPcdDatabase.PeiDb;\r
- } else {\r
- LocalTokenNumber = *((UINT32 *)((UINT8 *)mPcdDatabase.DxeDb + mPcdDatabase.DxeDb->LocalTokenNumberTableOffset) + LocalTokenNumberTableIdx);\r
- Database = (UINT8 *) mPcdDatabase.DxeDb;\r
- }\r
-\r
- ASSERT ((LocalTokenNumber & PCD_TYPE_SKU_ENABLED) != 0);\r
-\r
- SkuHead = (SKU_HEAD *) ((UINT8 *)Database + (LocalTokenNumber & PCD_DATABASE_OFFSET_MASK));\r
-\r
- return (SKU_ID *) (Database + SkuHead->SkuIdTableOffset);\r
- \r
-}\r
-\r
/**\r
Wrapper function of getting index of PCD entry in size table.\r
\r
UINTN LocalTokenNumber;\r
UINTN Index;\r
UINTN SizeTableIdx;\r
- SKU_ID *SkuIdTable;\r
\r
if (IsPeiDb) {\r
LocalTokenNumberTable = (UINT32 *)((UINT8 *)mPcdDatabase.PeiDb + mPcdDatabase.PeiDb->LocalTokenNumberTableOffset);\r
//\r
SizeTableIdx += 2;\r
} else {\r
- if ((LocalTokenNumber & PCD_TYPE_SKU_ENABLED) == 0) {\r
//\r
// We have only two entry for Non-Sku enabled PCD entry:\r
// 1) MAX SIZE\r
// 2) Current Size\r
//\r
SizeTableIdx += 2;\r
- } else {\r
- //\r
- // We have these entry for SKU enabled PCD entry\r
- // 1) MAX SIZE\r
- // 2) Current Size for each SKU_ID (It is equal to MaxSku).\r
- //\r
- SkuIdTable = GetSkuIdArray (Index, IsPeiDb);\r
- SizeTableIdx += (UINTN)*SkuIdTable + 1;\r
- }\r
}\r
}\r
\r
{\r
INTN SizeTableIdx;\r
UINTN LocalTokenNumber;\r
- SKU_ID *SkuIdTable;\r
SIZE_INFO *SizeTable;\r
- UINTN Index;\r
BOOLEAN IsPeiDb;\r
UINT32 *LocalTokenNumberTable;\r
\r
//\r
return *MaxSize;\r
} else {\r
- if ((LocalTokenNumber & PCD_TYPE_SKU_ENABLED) == 0) {\r
//\r
// We have only two entry for Non-Sku enabled PCD entry:\r
// 1) MAX SIZE\r
// 2) Current Size\r
//\r
return SizeTable[SizeTableIdx + 1];\r
- } else {\r
- //\r
- // We have these entry for SKU enabled PCD entry\r
- // 1) MAX SIZE\r
- // 2) Current Size for each SKU_ID (It is equal to MaxSku).\r
- //\r
- SkuIdTable = GetSkuIdArray (LocalTokenNumberTableIdx, IsPeiDb);\r
- for (Index = 0; Index < SkuIdTable[0]; Index++) {\r
- if (SkuIdTable[1 + Index] == mPcdDatabase.PeiDb->SystemSkuId) {\r
- return SizeTable[SizeTableIdx + 1 + Index];\r
- }\r
- }\r
- return SizeTable[SizeTableIdx + 1];\r
- }\r
}\r
}\r
\r
{\r
INTN SizeTableIdx;\r
UINTN LocalTokenNumber;\r
- SKU_ID *SkuIdTable;\r
SIZE_INFO *SizeTable;\r
- UINTN Index;\r
UINTN MaxSize;\r
BOOLEAN IsPeiDb;\r
UINT32 *LocalTokenNumberTable;\r
return FALSE;\r
} \r
\r
- if ((LocalTokenNumber & PCD_TYPE_SKU_ENABLED) == 0) {\r
- //\r
- // We have only two entry for Non-Sku enabled PCD entry:\r
- // 1) MAX SIZE\r
- // 2) Current Size\r
- //\r
- SizeTable[SizeTableIdx + 1] = (SIZE_INFO) *CurrentSize;\r
- return TRUE;\r
+ //\r
+ // We have only two entry for Non-Sku enabled PCD entry:\r
+ // 1) MAX SIZE\r
+ // 2) Current Size\r
+ //\r
+ SizeTable[SizeTableIdx + 1] = (SIZE_INFO) *CurrentSize;\r
+ return TRUE;\r
+ }\r
+}\r
+\r
+/**\r
+ VariableLock DynamicHiiPcd.\r
+\r
+ @param[in] IsPeiDb If TRUE, the pcd entry is initialized in PEI phase,\r
+ If FALSE, the pcd entry is initialized in DXE phase.\r
+ @param[in] VariableLock Pointer to VariableLockProtocol.\r
+\r
+**/\r
+VOID\r
+VariableLockDynamicHiiPcd (\r
+ IN BOOLEAN IsPeiDb,\r
+ IN EDKII_VARIABLE_LOCK_PROTOCOL *VariableLock\r
+ )\r
+{\r
+ EFI_STATUS Status;\r
+ PCD_DATABASE_INIT *Database;\r
+ UINT32 LocalTokenCount; \r
+ UINTN TokenNumber;\r
+ UINT32 LocalTokenNumber;\r
+ UINTN Offset;\r
+ EFI_GUID *GuidTable;\r
+ UINT8 *StringTable;\r
+ VARIABLE_HEAD *VariableHead;\r
+ EFI_GUID *Guid;\r
+ UINT16 *Name;\r
+\r
+ Database = IsPeiDb ? mPcdDatabase.PeiDb: mPcdDatabase.DxeDb;\r
+ LocalTokenCount = IsPeiDb ? mPeiLocalTokenCount: mDxeLocalTokenCount;\r
+\r
+ //\r
+ // Go through PCD database to find out DynamicHii PCDs.\r
+ //\r
+ for (TokenNumber = 1; TokenNumber <= LocalTokenCount; TokenNumber++) {\r
+ if (IsPeiDb) {\r
+ LocalTokenNumber = GetLocalTokenNumber (TRUE, TokenNumber);\r
} else {\r
+ LocalTokenNumber = GetLocalTokenNumber (FALSE, TokenNumber + mPeiLocalTokenCount);\r
+ }\r
+ if ((LocalTokenNumber & PCD_TYPE_HII) != 0) {\r
+ Offset = LocalTokenNumber & PCD_DATABASE_OFFSET_MASK;\r
+ VariableHead = (VARIABLE_HEAD *) ((UINT8 *) Database + Offset);\r
//\r
- // We have these entry for SKU enabled PCD entry\r
- // 1) MAX SIZE\r
- // 2) Current Size for each SKU_ID (It is equal to MaxSku).\r
+ // Why not to set property by VarCheckProtocol with Attributes and Property directly here?\r
+ // It is because that set property by VarCheckProtocol will indicate the variable to\r
+ // be a system variable, but the unknown max size of the variable is dangerous to\r
+ // the system variable region.\r
//\r
- SkuIdTable = GetSkuIdArray (LocalTokenNumberTableIdx, IsPeiDb);\r
- for (Index = 0; Index < SkuIdTable[0]; Index++) {\r
- if (SkuIdTable[1 + Index] == mPcdDatabase.PeiDb->SystemSkuId) {\r
- SizeTable[SizeTableIdx + 1 + Index] = (SIZE_INFO) *CurrentSize;\r
- return TRUE;\r
- }\r
+ if ((VariableHead->Property & VAR_CHECK_VARIABLE_PROPERTY_READ_ONLY) != 0) {\r
+ //\r
+ // DynamicHii PCD with RO property set in *.dsc.\r
+ //\r
+ StringTable = (UINT8 *) ((UINT8 *) Database + Database->StringTableOffset);\r
+ GuidTable = (EFI_GUID *) ((UINT8 *) Database + Database->GuidTableOffset);\r
+ Guid = GuidTable + VariableHead->GuidTableIndex;\r
+ Name = (UINT16*) (StringTable + VariableHead->StringIndex);\r
+ Status = VariableLock->RequestToLock (VariableLock, Name, Guid);\r
+ ASSERT_EFI_ERROR (Status);\r
}\r
- SizeTable[SizeTableIdx + 1] = (SIZE_INFO) *CurrentSize;\r
- return TRUE;\r
}\r
}\r
}\r
+\r
+/**\r
+ VariableLockProtocol callback\r
+ to lock the variables referenced by DynamicHii PCDs with RO property set in *.dsc.\r
+\r
+ @param[in] Event Event whose notification function is being invoked.\r
+ @param[in] Context Pointer to the notification function's context.\r
+\r
+**/\r
+VOID\r
+EFIAPI\r
+VariableLockCallBack (\r
+ IN EFI_EVENT Event,\r
+ IN VOID *Context\r
+ )\r
+{\r
+ EFI_STATUS Status;\r
+ EDKII_VARIABLE_LOCK_PROTOCOL *VariableLock;\r
+\r
+ Status = gBS->LocateProtocol (&gEdkiiVariableLockProtocolGuid, NULL, (VOID **) &VariableLock);\r
+ if (!EFI_ERROR (Status)) {\r
+ VariableLockDynamicHiiPcd (TRUE, VariableLock);\r
+ VariableLockDynamicHiiPcd (FALSE, VariableLock);\r
+ }\r
+}\r
+\r