From fbbbd984998d83cf6b69e9291336aefbac23396c Mon Sep 17 00:00:00 2001 From: Sami Mujawar Date: Tue, 31 Oct 2023 14:50:43 +0000 Subject: [PATCH] DynamicTablesPkg: Fix assert in CmObject parser The patch "f81ee47513e5 DynamicTablesPkg: Add an ET info object parser" updates the Configuration Manager object parser to add support for parsing CM_ARM_ET_INFO object. However, the GicC info structure also has an ET Reference token that points to the CM_ARM_ET_INFO object. Therefore, update the GICC info object parser to add an entry to parse the ET reference token. Without this change an assert stating that the RemainingSize != 0 will be triggered. Signed-off-by: Sami Mujawar Reviewed-by: levi.yun --- .../Common/TableHelperLib/ConfigurationManagerObjectParser.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c b/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c index 127675d4ce..ce494816ed 100644 --- a/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c +++ b/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c @@ -84,7 +84,8 @@ STATIC CONST CM_OBJ_PARSER CmArmGicCInfoParser[] = { { "ClockDomain", 4, "0x%x", NULL }, { "AffinityFlags", 4, "0x%x", NULL }, { "CpcToken", sizeof (CM_OBJECT_TOKEN), "0x%p", NULL }, - { "TRBEInterrupt", 2, "0x%x", NULL } + { "TRBEInterrupt", 2, "0x%x", NULL }, + { "EtToken", sizeof (CM_OBJECT_TOKEN), "0x%p", NULL } }; /** A parser for EArmObjGicDInfo.