summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Gondois <pierre.gondois@arm.com>2022-10-10 11:20:50 +0200
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2022-10-31 12:32:32 +0000
commit2ef32f914a44eb8670c8c6166831b09b578cf5e6 (patch)
tree20be6b26d801443a093d7bce045f75bb96cc04fe
parenta64cc43552c067bc8ef475540286110a36ba5b80 (diff)
downloadedk2-2ef32f914a44eb8670c8c6166831b09b578cf5e6.zip
edk2-2ef32f914a44eb8670c8c6166831b09b578cf5e6.tar.gz
edk2-2ef32f914a44eb8670c8c6166831b09b578cf5e6.tar.bz2
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>
-rw-r--r--DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c24
1 files changed, 13 insertions, 11 deletions
diff --git a/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c b/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c
index 45e3a0f..467b307 100644
--- 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 },
{ "GicCToken", sizeof (CM_OBJECT_TOKEN), "0x%p", NULL },
{ "NoOfPrivateResources", 4, "0x%x", NULL },
- { "PrivateResourcesArrayToken", sizeof (CM_OBJECT_TOKEN), "0x%p", NULL }
+ { "PrivateResourcesArrayToken", sizeof (CM_OBJECT_TOKEN), "0x%p", NULL },
+ { "LpiToken", sizeof (CM_OBJECT_TOKEN), "0x%p", NULL },
};
/** A parser for EArmObjCacheInfo.
@@ -315,7 +316,8 @@ STATIC CONST CM_OBJ_PARSER CmArmCacheInfoParser[] = {
{ "NumberOfSets", 4, "0x%x", NULL },
{ "Associativity", 4, "0x%x", NULL },
{ "Attributes", 1, "0x%x", NULL },
- { "LineSize", 2, "0x%x", NULL }
+ { "LineSize", 2, "0x%x", NULL },
+ { "CacheId", 4, "0x%x", NULL },
};
/** A parser for EArmObjProcNodeIdInfo.
@@ -400,14 +402,14 @@ STATIC CONST CM_OBJ_PARSER AcpiGenericAddressParser[] = {
/** A parser for EArmObjLpiInfo.
*/
STATIC CONST CM_OBJ_PARSER CmArmLpiInfoParser[] = {
- { "MinResidency", 4, "0x%x", NULL },
- { "WorstCaseWakeLatency", 4, "0x%x", NULL },
- { "Flags", 4, "0x%x", NULL },
- { "ArchFlags", 4, "0x%x", NULL },
- { "ResCntFreq", 4, "0x%x", NULL },
- { "EnableParentState", 4, "0x%x", NULL },
- { "IsInteger", 1, "%d", NULL },
- { "IntegerEntryMethod", 8, "0x%llx", NULL },
+ { "MinResidency", 4, "0x%x", NULL },
+ { "WorstCaseWakeLatency", 4, "0x%x", NULL },
+ { "Flags", 4, "0x%x", NULL },
+ { "ArchFlags", 4, "0x%x", NULL },
+ { "ResCntFreq", 4, "0x%x", NULL },
+ { "EnableParentState", 4, "0x%x", NULL },
+ { "IsInteger", 1, "%d", NULL },
+ { "IntegerEntryMethod", 8, "0x%llx", NULL },
{ "RegisterEntryMethod", sizeof (EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE),
NULL, NULL, AcpiGenericAddressParser,
ARRAY_SIZE (AcpiGenericAddressParser) },
@@ -417,7 +419,7 @@ STATIC CONST CM_OBJ_PARSER CmArmLpiInfoParser[] = {
{ "UsageCounterRegister", sizeof (EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE),
NULL, NULL, AcpiGenericAddressParser,
ARRAY_SIZE (AcpiGenericAddressParser) },
- { "StateName", 16, "0x%a", NULL },
+ { "StateName", 16, NULL, PrintString },
};
/** A parser for EArmObjPciAddressMapInfo.