sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DynamicTablesPkg: Update CmObjParser for IORT Rev E.d

Browse Source 
commit de200b7e2c ("DynamicTablesPkg: Update ArmNameSpaceObjects for
IORT Rev E.d")
adds new CmObj structures and fields to the ArmNameSpaceObjects.
Update the CmObjectParser accordingly.

Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
This commit is contained in:
Pierre Gondois
2022-10-10 11:20:47 +02:00
committed by mergify[bot]
parent 48c6e7dbcd
commit 44b7a856f0
1 changed files with 45 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c
View File

@ -183,21 +183,23 @@ STATIC CONST CM_OBJ_PARSER CmArmFixedFeatureFlagsParser[] = {
STATIC CONST CM_OBJ_PARSER CmArmItsGroupNodeParser[] = { STATIC CONST CM_OBJ_PARSER CmArmItsGroupNodeParser[] = {
{ "Token", sizeof (CM_OBJECT_TOKEN), "0x%p", NULL }, { "Token", sizeof (CM_OBJECT_TOKEN), "0x%p", NULL },
{ "ItsIdCount", 4, "0x%x", NULL }, { "ItsIdCount", 4, "0x%x", NULL },
{ "ItsIdToken", sizeof (CM_OBJECT_TOKEN), "0x%p", NULL } { "ItsIdToken", sizeof (CM_OBJECT_TOKEN), "0x%p", NULL },
{ "Identifier", 4, "0x%x", NULL },
}; };
/** A parser for EArmObjNamedComponent. /** A parser for EArmObjNamedComponent.
*/ */
STATIC CONST CM_OBJ_PARSER CmArmNamedComponentNodeParser[] = { STATIC CONST CM_OBJ_PARSER CmArmNamedComponentNodeParser[] = {
{ "Token", sizeof (CM_OBJECT_TOKEN), "0x%p", NULL }, { "Token", sizeof (CM_OBJECT_TOKEN), "0x%p", NULL },
{ "IdMappingCount", 4, "0x%x", NULL }, { "IdMappingCount", 4, "0x%x", NULL },
{ "IdMappingToken", sizeof (CM_OBJECT_TOKEN), "0x%p", NULL }, { "IdMappingToken", sizeof (CM_OBJECT_TOKEN), "0x%p", NULL },
{ "Flags", 4, "0x%x", NULL }, { "Flags", 4, "0x%x", NULL },
{ "CacheCoherent", 4, "0x%x", NULL }, { "CacheCoherent", 4, "0x%x", NULL },
{ "AllocationHints", 1, "0x%x", NULL }, { "AllocationHints", 1, "0x%x", NULL },
{ "MemoryAccessFlags", 1, "0x%x", NULL }, { "MemoryAccessFlags", 1, "0x%x", NULL },
{ "AddressSizeLimit", 1, "0x%x", NULL }, { "AddressSizeLimit", 1, "0x%x", NULL },
{ "ObjectName", sizeof (CHAR8 *), "%a", NULL } { "ObjectName", sizeof (CHAR8 *), NULL, PrintString },
{ "Identifier", 4, "0x%x", NULL },
}; };
/** A parser for EArmObjRootComplex. /** A parser for EArmObjRootComplex.
@ -211,7 +213,10 @@ STATIC CONST CM_OBJ_PARSER CmArmRootComplexNodeParser[] = {
{ "MemoryAccessFlags", 1, "0x%x", NULL }, { "MemoryAccessFlags", 1, "0x%x", NULL },
{ "AtsAttribute", 4, "0x%x", NULL }, { "AtsAttribute", 4, "0x%x", NULL },
{ "PciSegmentNumber", 4, "0x%x", NULL }, { "PciSegmentNumber", 4, "0x%x", NULL },
{ "MemoryAddressSize", 1, "0x%x", NULL } { "MemoryAddressSize", 1, "0x%x", NULL },
{ "PasidCapabilities", 2, "0x%x", NULL },
{ "Flags", 4, "0x%x", NULL },
{ "Identifier", 4, "0x%x", NULL },
}; };
/** A parser for EArmObjSmmuV1SmmuV2. /** A parser for EArmObjSmmuV1SmmuV2.
@ -231,7 +236,8 @@ STATIC CONST CM_OBJ_PARSER CmArmSmmuV1SmmuV2NodeParser[] = {
{ "SMMU_NSgIrpt", 4, "0x%x", NULL }, { "SMMU_NSgIrpt", 4, "0x%x", NULL },
{ "SMMU_NSgIrptFlags", 4, "0x%x", NULL }, { "SMMU_NSgIrptFlags", 4, "0x%x", NULL },
{ "SMMU_NSgCfgIrpt", 4, "0x%x", NULL }, { "SMMU_NSgCfgIrpt", 4, "0x%x", NULL },
{ "SMMU_NSgCfgIrptFlags", 4, "0x%x", NULL } { "SMMU_NSgCfgIrptFlags", 4, "0x%x", NULL },
{ "Identifier", 4, "0x%x", NULL },
}; };
/** A parser for EArmObjSmmuV3. /** A parser for EArmObjSmmuV3.
@ -249,7 +255,8 @@ STATIC CONST CM_OBJ_PARSER CmArmSmmuV3NodeParser[] = {
{ "GerrInterrupt", 4, "0x%x", NULL }, { "GerrInterrupt", 4, "0x%x", NULL },
{ "SyncInterrupt", 4, "0x%x", NULL }, { "SyncInterrupt", 4, "0x%x", NULL },
{ "ProximityDomain", 4, "0x%x", NULL }, { "ProximityDomain", 4, "0x%x", NULL },
{ "DeviceIdMappingIndex", 4, "0x%x", NULL } { "DeviceIdMappingIndex", 4, "0x%x", NULL },
{ "Identifier", 4, "0x%x", NULL },
}; };
/** A parser for EArmObjPmcg. /** A parser for EArmObjPmcg.
@ -261,7 +268,8 @@ STATIC CONST CM_OBJ_PARSER CmArmPmcgNodeParser[] = {
{ "BaseAddress", 8, "0x%llx", NULL }, { "BaseAddress", 8, "0x%llx", NULL },
{ "OverflowInterrupt", 4, "0x%x", NULL }, { "OverflowInterrupt", 4, "0x%x", NULL },
{ "Page1BaseAddress", 8, "0x%llx", NULL }, { "Page1BaseAddress", 8, "0x%llx", NULL },
{ "ReferenceToken", sizeof (CM_OBJECT_TOKEN), "0x%p", NULL } { "ReferenceToken", sizeof (CM_OBJECT_TOKEN), "0x%p", NULL },
{ "Identifier", 4, "0x%x", NULL },
}; };
/** A parser for EArmObjGicItsIdentifierArray. /** A parser for EArmObjGicItsIdentifierArray.
@ -432,6 +440,25 @@ STATIC CONST CM_OBJ_PARSER CmPciInterruptMapInfoParser[] = {
ARRAY_SIZE (CmArmGenericInterruptParser) }, ARRAY_SIZE (CmArmGenericInterruptParser) },
}; };
/** A parser for EArmObjRmr.
*/
STATIC CONST CM_OBJ_PARSER CmArmRmrInfoParser[] = {
{ "Token", sizeof (CM_OBJECT_TOKEN), "0x%p", NULL },
{ "IdMappingCount", 4, "0x%x", NULL },
{ "IdMappingToken", sizeof (CM_OBJECT_TOKEN), "0x%p", NULL },
{ "Identifier", 4, "0x%x", NULL },
{ "Flags", 4, "0x%x", NULL },
{ "MemRangeDescCount", 4, "0x%x", NULL },
{ "MemRangeDescToken", sizeof (CM_OBJECT_TOKEN), "0x%p", NULL },
};
/** A parser for EArmObjMemoryRangeDescriptor.
*/
STATIC CONST CM_OBJ_PARSER CmArmMemoryRangeDescriptorInfoParser[] = {
{ "BaseAddress", 8, "0x%llx", NULL },
{ "Length", 8, "0x%llx", NULL },
};
/** A parser for EArmObjCpcInfo. /** A parser for EArmObjCpcInfo.
*/ */
STATIC CONST CM_OBJ_PARSER CmArmCpcInfoParser[] = { STATIC CONST CM_OBJ_PARSER CmArmCpcInfoParser[] = {
@ -588,6 +615,10 @@ STATIC CONST CM_OBJ_PARSER_ARRAY ArmNamespaceObjectParser[] = {
ARRAY_SIZE (CmArmPciAddressMapInfoParser) }, ARRAY_SIZE (CmArmPciAddressMapInfoParser) },
{ "EArmObjPciInterruptMapInfo", CmPciInterruptMapInfoParser, { "EArmObjPciInterruptMapInfo", CmPciInterruptMapInfoParser,
ARRAY_SIZE (CmPciInterruptMapInfoParser) }, ARRAY_SIZE (CmPciInterruptMapInfoParser) },
{ "EArmObjRmr", CmArmRmrInfoParser,
ARRAY_SIZE (CmArmRmrInfoParser) },
{ "EArmObjMemoryRangeDescriptor", CmArmMemoryRangeDescriptorInfoParser,
ARRAY_SIZE (CmArmMemoryRangeDescriptorInfoParser) },
{ "EArmObjCpcInfo", CmArmCpcInfoParser, { "EArmObjCpcInfo", CmArmCpcInfoParser,
ARRAY_SIZE (CmArmCpcInfoParser) }, ARRAY_SIZE (CmArmCpcInfoParser) },
{ "EArmObjMax", NULL, 0 }, { "EArmObjMax", NULL, 0 },