DynamicTablesPkg: Fix wrong/missing fields in CmObjParser

Add missing fields to the following CmObjParser objects:
- EArmObjGicDInfo
- EArmObjCacheInfo
and fix wrong formatting of:
- EArmObjLpiInfo

Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>

diff --git a/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c b/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c
index 45e3a0f4ab598025c1aaf08dd82d9cf5017fd14a..467b3072bfc89c61ed2e406424319e00541e72a8 100644 (file)
--- a/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c
+++ b/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c
@@ -303,7 +303,8 @@ STATIC CONST CM_OBJ_PARSER  CmArmProcHierarchyInfoParser[] = {
   { "ParentToken",                sizeof (CM_OBJECT_TOKEN), "0x%p", NULL },\r
   { "GicCToken",                  sizeof (CM_OBJECT_TOKEN), "0x%p", NULL },\r
   { "NoOfPrivateResources",       4,                        "0x%x", NULL },\r
-  { "PrivateResourcesArrayToken", sizeof (CM_OBJECT_TOKEN), "0x%p", NULL }\r
+  { "PrivateResourcesArrayToken", sizeof (CM_OBJECT_TOKEN), "0x%p", NULL },\r
+  { "LpiToken",                   sizeof (CM_OBJECT_TOKEN), "0x%p", NULL },\r
 };\r
 \r
 /** A parser for EArmObjCacheInfo.\r
@@ -315,7 +316,8 @@ STATIC CONST CM_OBJ_PARSER  CmArmCacheInfoParser[] = {
   { "NumberOfSets",          4,                        "0x%x", NULL },\r
   { "Associativity",         4,                        "0x%x", NULL },\r
   { "Attributes",            1,                        "0x%x", NULL },\r
-  { "LineSize",              2,                        "0x%x", NULL }\r
+  { "LineSize",              2,                        "0x%x", NULL },\r
+  { "CacheId",               4,                        "0x%x", NULL },\r
 };\r
 \r
 /** A parser for EArmObjProcNodeIdInfo.\r
@@ -400,14 +402,14 @@ STATIC CONST CM_OBJ_PARSER  AcpiGenericAddressParser[] = {
 /** A parser for EArmObjLpiInfo.\r
 */\r
 STATIC CONST CM_OBJ_PARSER  CmArmLpiInfoParser[] = {\r
-  { "MinResidency",             4,                                               "0x%x",   NULL },\r
-  { "WorstCaseWakeLatency",     4,                                               "0x%x",   NULL },\r
-  { "Flags",                    4,                                               "0x%x",   NULL },\r
-  { "ArchFlags",                4,                                               "0x%x",   NULL },\r
-  { "ResCntFreq",               4,                                               "0x%x",   NULL },\r
-  { "EnableParentState",        4,                                               "0x%x",   NULL },\r
-  { "IsInteger",                1,                                               "%d",     NULL },\r
-  { "IntegerEntryMethod",       8,                                               "0x%llx", NULL },\r
+  { "MinResidency",             4,                                               "0x%x",   NULL        },\r
+  { "WorstCaseWakeLatency",     4,                                               "0x%x",   NULL        },\r
+  { "Flags",                    4,                                               "0x%x",   NULL        },\r
+  { "ArchFlags",                4,                                               "0x%x",   NULL        },\r
+  { "ResCntFreq",               4,                                               "0x%x",   NULL        },\r
+  { "EnableParentState",        4,                                               "0x%x",   NULL        },\r
+  { "IsInteger",                1,                                               "%d",     NULL        },\r
+  { "IntegerEntryMethod",       8,                                               "0x%llx", NULL        },\r
   { "RegisterEntryMethod",      sizeof (EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE),\r
     NULL, NULL, AcpiGenericAddressParser,\r
     ARRAY_SIZE (AcpiGenericAddressParser) },\r
@@ -417,7 +419,7 @@ STATIC CONST CM_OBJ_PARSER  CmArmLpiInfoParser[] = {
   { "UsageCounterRegister",     sizeof (EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE),\r
     NULL, NULL, AcpiGenericAddressParser,\r
     ARRAY_SIZE (AcpiGenericAddressParser) },\r
-  { "StateName",                16,                                              "0x%a",   NULL },\r
+  { "StateName",                16,                                              NULL,     PrintString },\r
 };\r
 \r
 /** A parser for EArmObjPciAddressMapInfo.\r