DynamicTablesPkg: Update CmObjParser for IORT Rev E.d

[mirror_edk2.git] / DynamicTablesPkg / Library / Common / TableHelperLib / ConfigurationManagerObjectParser.c

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