\r
#include "Service.h"\r
\r
+EFI_LOCK mPcdDatabaseLock = EFI_INITIALIZE_LOCK_VARIABLE(EFI_TPL_CALLBACK);\r
\r
PCD_PROTOCOL mPcdInstance = {\r
DxePcdSetSku,\r
\r
DxeRegisterCallBackOnSet,\r
DxeUnRegisterCallBackOnSet,\r
- DxePcdGetNextToken\r
+ DxePcdGetNextToken,\r
+ DxePcdGetNextTokenSpace\r
};\r
\r
\r
//\r
// Static global to reduce the code size\r
//\r
-static EFI_HANDLE NewHandle = NULL;\r
+static EFI_HANDLE mNewHandle = NULL;\r
\r
EFI_STATUS\r
EFIAPI\r
\r
BuildPcdDxeDataBase ();\r
\r
- //\r
- // BugBug Check if PcdDatabase is already installed.\r
- //\r
- \r
Status = gBS->InstallProtocolInterface (\r
- &NewHandle,\r
+ &mNewHandle,\r
&gPcdProtocolGuid,\r
EFI_NATIVE_INTERFACE,\r
&mPcdInstance\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
+ ASSERT (TokenNumber + 1 < PCD_TOTAL_TOKEN_NUMBER + 1);\r
\r
- IsPeiDb = (BOOLEAN) (TokenNumber < 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) (TokenNumber + 1 < PEI_LOCAL_TOKEN_NUMBER + 1);\r
\r
TokenNumber = IsPeiDb ? TokenNumber : \r
(TokenNumber - PEI_LOCAL_TOKEN_NUMBER);\r
EFI_STATUS\r
EFIAPI\r
DxeRegisterCallBackOnSet (\r
- IN UINTN TokenNumber,\r
IN CONST EFI_GUID *Guid, OPTIONAL\r
+ IN UINTN TokenNumber,\r
IN PCD_PROTOCOL_CALLBACK CallBackFunction\r
)\r
{\r
+ EFI_STATUS Status;\r
+ \r
ASSERT (CallBackFunction != NULL);\r
\r
- return DxeRegisterCallBackWorker (TokenNumber, Guid, CallBackFunction);\r
+ //\r
+ // Aquire lock to prevent reentrance from TPL_CALLBACK level\r
+ //\r
+ EfiAcquireLock (&mPcdDatabaseLock);\r
+\r
+ Status = DxeRegisterCallBackWorker (TokenNumber, Guid, CallBackFunction);\r
+\r
+ EfiReleaseLock (&mPcdDatabaseLock);\r
+ \r
+ return Status;\r
}\r
\r
\r
EFI_STATUS\r
EFIAPI\r
DxeUnRegisterCallBackOnSet (\r
- IN UINTN TokenNumber,\r
IN CONST EFI_GUID *Guid, OPTIONAL\r
+ IN UINTN TokenNumber,\r
IN PCD_PROTOCOL_CALLBACK CallBackFunction\r
)\r
{\r
+ EFI_STATUS Status;\r
+ \r
ASSERT (CallBackFunction != NULL);\r
+\r
+ //\r
+ // Aquire lock to prevent reentrance from TPL_CALLBACK level\r
+ //\r
+ EfiAcquireLock (&mPcdDatabaseLock);\r
+ \r
+ Status = DxeUnRegisterCallBackWorker (TokenNumber, Guid, CallBackFunction);\r
+\r
+ EfiReleaseLock (&mPcdDatabaseLock);\r
\r
- return DxeUnRegisterCallBackWorker (TokenNumber, Guid, CallBackFunction);\r
+ return Status;\r
}\r
\r
\r
IN OUT UINTN *TokenNumber\r
)\r
{\r
- UINTN ExTokenNumber;\r
- \r
+ EFI_STATUS Status;\r
+\r
+ if (!FeaturePcdGet (PcdDxePcdDatabaseTraverseEnabled)) {\r
+ return EFI_UNSUPPORTED;\r
+ }\r
+\r
+ Status = EFI_NOT_FOUND;\r
//\r
// Scan the local token space\r
//\r
if (Guid == NULL) {\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) && (*TokenNumber + 1 < PEI_LOCAL_TOKEN_NUMBER + 1)) ||\r
+ ((*TokenNumber + 1 > (PEI_LOCAL_TOKEN_NUMBER + DXE_NEX_TOKEN_NUMBER + 1)))) {\r
+ return EFI_NOT_FOUND;\r
+ }\r
+ \r
(*TokenNumber)++;\r
- if (*TokenNumber == PCD_INVALID_TOKEN_NUMBER) {\r
- return EFI_SUCCESS;\r
- } else {\r
- if (*TokenNumber >= PEI_NEX_TOKEN_NUMBER &&\r
- *TokenNumber < PEI_LOCAL_TOKEN_NUMBER) {\r
- //\r
- // The first Non-Ex type Token Number for DXE PCD \r
- // database is PEI_LOCAL_TOKEN_NUMBER\r
- //\r
- *TokenNumber = PEI_LOCAL_TOKEN_NUMBER;\r
- return EFI_SUCCESS;\r
- } else if (*TokenNumber >= DXE_NEX_TOKEN_NUMBER + PEI_LOCAL_TOKEN_NUMBER) {\r
- *TokenNumber = PCD_INVALID_TOKEN_NUMBER;\r
- return EFI_SUCCESS;\r
- }\r
+ if ((*TokenNumber + 1 > PEI_NEX_TOKEN_NUMBER + 1) &&\r
+ (*TokenNumber <= PEI_LOCAL_TOKEN_NUMBER)) {\r
+ //\r
+ // The first Non-Ex type Token Number for DXE PCD \r
+ // database is PEI_LOCAL_TOKEN_NUMBER\r
+ //\r
+ *TokenNumber = PEI_LOCAL_TOKEN_NUMBER;\r
+ } else if (*TokenNumber + 1 > DXE_NEX_TOKEN_NUMBER + PEI_LOCAL_TOKEN_NUMBER + 1) {\r
+ *TokenNumber = PCD_INVALID_TOKEN_NUMBER;\r
}\r
+ return EFI_SUCCESS;\r
}\r
\r
- if (PEI_EXMAP_TABLE_EMPTY && PEI_EXMAP_TABLE_EMPTY) {\r
- *TokenNumber = (UINTN) PCD_INVALID_TOKEN_NUMBER;\r
+ if (PEI_EXMAP_TABLE_EMPTY && DXE_EXMAP_TABLE_EMPTY) {\r
+ *TokenNumber = PCD_INVALID_TOKEN_NUMBER;\r
return EFI_NOT_FOUND;\r
}\r
\r
- ExTokenNumber = *TokenNumber;\r
if (!PEI_EXMAP_TABLE_EMPTY) {\r
- ExTokenNumber = ExGetNextTokeNumber (\r
+ Status = ExGetNextTokeNumber (\r
Guid,\r
- ExTokenNumber,\r
+ TokenNumber,\r
mPcdDatabase->PeiDb.Init.GuidTable,\r
sizeof(mPcdDatabase->PeiDb.Init.GuidTable),\r
mPcdDatabase->PeiDb.Init.ExMapTable,\r
);\r
}\r
\r
- if ((ExTokenNumber == PCD_INVALID_TOKEN_NUMBER) &&\r
- !DXE_EXMAP_TABLE_EMPTY\r
- ) {\r
- ExTokenNumber = ExGetNextTokeNumber (\r
+ if (Status == EFI_SUCCESS) {\r
+ return Status;\r
+ }\r
+\r
+ if (!DXE_EXMAP_TABLE_EMPTY) {\r
+ Status = ExGetNextTokeNumber (\r
Guid,\r
- ExTokenNumber,\r
- mPcdDatabase->PeiDb.Init.GuidTable,\r
- sizeof(mPcdDatabase->PeiDb.Init.GuidTable),\r
- mPcdDatabase->PeiDb.Init.ExMapTable,\r
- sizeof(mPcdDatabase->PeiDb.Init.ExMapTable)\r
+ TokenNumber,\r
+ mPcdDatabase->DxeDb.Init.GuidTable,\r
+ sizeof(mPcdDatabase->DxeDb.Init.GuidTable),\r
+ mPcdDatabase->DxeDb.Init.ExMapTable,\r
+ sizeof(mPcdDatabase->DxeDb.Init.ExMapTable)\r
);\r
}\r
\r
- *TokenNumber = ExTokenNumber;\r
-\r
- return EFI_SUCCESS;\r
+ return Status;\r
}\r
\r
\r
TsIdx = 0;\r
OldGuidIndex = ExMapTable[0].ExGuidIndex;\r
DistinctTokenSpace[TsIdx] = &GuidTable[OldGuidIndex];\r
- for (Idx = 1; Idx < PEI_EXMAPPING_TABLE_SIZE; Idx++) {\r
+ for (Idx = 1; Idx < *ExMapTableSize; Idx++) {\r
if (ExMapTable[Idx].ExGuidIndex != OldGuidIndex) {\r
OldGuidIndex = ExMapTable[Idx].ExGuidIndex;\r
DistinctTokenSpace[++TsIdx] = &GuidTable[OldGuidIndex];\r
}\r
}\r
\r
- *ExMapTableSize = TsIdx;\r
+ //\r
+ // The total number of Distinct Token Space\r
+ // is TsIdx + 1 because we use TsIdx as a index\r
+ // to the DistinctTokenSpace[]\r
+ //\r
+ *ExMapTableSize = TsIdx + 1;\r
return DistinctTokenSpace;\r
\r
}\r
\r
-\r
+//\r
+// Just pre-allocate a memory buffer that is big enough to\r
+// host all distinct TokenSpace guid in both\r
+// PEI ExMap and DXE ExMap.\r
+//\r
STATIC EFI_GUID *TmpTokenSpaceBuffer[PEI_EXMAPPING_TABLE_SIZE + DXE_EXMAPPING_TABLE_SIZE] = { 0 };\r
\r
EFI_STATUS\r
EFI_GUID **DxeTokenSpaceTable;\r
BOOLEAN Match;\r
\r
+ if (!FeaturePcdGet (PcdDxePcdDatabaseTraverseEnabled)) {\r
+ return EFI_UNSUPPORTED;\r
+ }\r
+\r
ASSERT (Guid != NULL);\r
\r
if (PEI_EXMAP_TABLE_EMPTY && DXE_EXMAP_TABLE_EMPTY) {\r
}\r
\r
\r
- if (TmpTokenSpaceBuffer[0] != NULL) {\r
+ if (TmpTokenSpaceBuffer[0] == NULL) {\r
PeiTokenSpaceTableSize = 0;\r
\r
if (!PEI_EXMAP_TABLE_EMPTY) {\r
projects / mirror_edk2.git / blobdiff