DynamicTablesPkg: Move Generic Initiator affinity info to Arch Common

Move the Generic Initiator affinity info object from Arm Namespace to
the Arch Common namespace.

Correspondingly also update the following modules to reflect the
changes introduced by the move:
 - SRAT generator
 - ConfigurationManagerObjectParser
 - Dynamic Plat Repo TokenFixer map.

Cc: Pierre Gondois <Pierre.Gondois@arm.com>
Cc: Yeo Reum Yun <YeoReum.Yun@arm.com>
Cc: AbdulLateef Attar <AbdulLateef.Attar@amd.com>
Cc: Jeshua Smith <jeshuas@nvidia.com>
Cc: Jeff Brasen <jbrasen@nvidia.com>
Cc: Girish Mahadevan <gmahadevan@nvidia.com>
Cc: Leif Lindholm <quic_llindhol@quicinc.com>
Cc: Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>
Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
Reviewed-by: Sunil V L <sunilvl@ventanamicro.com>

6 files changed, 118 insertions, 119 deletions

diff --git a/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h b/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h
index 230d0bc334..b70c327d46 100644
--- a/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h
+++ b/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h
@@ -34,6 +34,7 @@ typedef enum ArchCommonObjectID {
   EArchCommonObjMemoryAffinityInfo,             ///< 11 - Memory Affinity Info

   EArchCommonObjDeviceHandleAcpi,               ///< 12 - Device Handle Acpi

   EArchCommonObjDeviceHandlePci,                ///< 13 - Device Handle Pci

+  EArchCommonObjGenericInitiatorAffinityInfo,   ///< 14 - Generic Initiator Affinity

   EArchCommonObjMax

 } EARCH_COMMON_OBJECT_ID;

 

@@ -276,6 +277,24 @@ typedef struct CmArchCommonDeviceHandlePci {
   UINT8     FunctionNumber;

 } CM_ARCH_COMMON_DEVICE_HANDLE_PCI;

 

+/** A structure that describes the Generic Initiator Affinity structure in SRAT

+

+    ID: EArchCommonObjGenericInitiatorAffinityInfo

+*/

+typedef struct CmArchCommonGenericInitiatorAffinityInfo {

+  /// The proximity domain to which the generic initiator belongs.

+  UINT32             ProximityDomain;

+

+  /// Flags

+  UINT32             Flags;

+

+  /// Device Handle Type

+  UINT8              DeviceHandleType;

+

+  /// Reference Token for the Device Handle

+  CM_OBJECT_TOKEN    DeviceHandleToken;

+} CM_ARCH_COMMON_GENERIC_INITIATOR_AFFINITY_INFO;

+

 #pragma pack()

 

 #endif // ARCH_COMMON_NAMESPACE_OBJECTS_H_

diff --git a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h
index 05691e6fcf..ddf886a53d 100644
--- a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h
+++ b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h
@@ -50,20 +50,19 @@ typedef enum ArmObjectID {
   EArmObjSmmuInterruptArray,                                   ///< 19 - SMMU Interrupt Array

   EArmObjProcHierarchyInfo,                                    ///< 20 - Processor Hierarchy Info

   EArmObjCacheInfo,                                            ///< 21 - Cache Info

-  EArmObjGenericInitiatorAffinityInfo,                         ///< 22 - Generic Initiator Affinity

-  EArmObjCmn600Info,                                           ///< 23 - CMN-600 Info

-  EArmObjLpiInfo,                                              ///< 24 - Lpi Info

-  EArmObjRmr,                                                  ///< 25 - Reserved Memory Range Node

-  EArmObjMemoryRangeDescriptor,                                ///< 26 - Memory Range Descriptor

-  EArmObjCpcInfo,                                              ///< 27 - Continuous Performance Control Info

-  EArmObjPccSubspaceType0Info,                                 ///< 28 - Pcc Subspace Type 0 Info

-  EArmObjPccSubspaceType1Info,                                 ///< 29 - Pcc Subspace Type 2 Info

-  EArmObjPccSubspaceType2Info,                                 ///< 30 - Pcc Subspace Type 2 Info

-  EArmObjPccSubspaceType3Info,                                 ///< 31 - Pcc Subspace Type 3 Info

-  EArmObjPccSubspaceType4Info,                                 ///< 32 - Pcc Subspace Type 4 Info

-  EArmObjPccSubspaceType5Info,                                 ///< 33 - Pcc Subspace Type 5 Info

-  EArmObjEtInfo,                                               ///< 34 - Embedded Trace Extension/Module Info

-  EArmObjPsdInfo,                                              ///< 35 - P-State Dependency (PSD) Info

+  EArmObjCmn600Info,                                           ///< 22 - CMN-600 Info

+  EArmObjLpiInfo,                                              ///< 23 - Lpi Info

+  EArmObjRmr,                                                  ///< 24 - Reserved Memory Range Node

+  EArmObjMemoryRangeDescriptor,                                ///< 25 - Memory Range Descriptor

+  EArmObjCpcInfo,                                              ///< 26 - Continuous Performance Control Info

+  EArmObjPccSubspaceType0Info,                                 ///< 27 - Pcc Subspace Type 0 Info

+  EArmObjPccSubspaceType1Info,                                 ///< 28 - Pcc Subspace Type 2 Info

+  EArmObjPccSubspaceType2Info,                                 ///< 29 - Pcc Subspace Type 2 Info

+  EArmObjPccSubspaceType3Info,                                 ///< 30 - Pcc Subspace Type 3 Info

+  EArmObjPccSubspaceType4Info,                                 ///< 31 - Pcc Subspace Type 4 Info

+  EArmObjPccSubspaceType5Info,                                 ///< 32 - Pcc Subspace Type 5 Info

+  EArmObjEtInfo,                                               ///< 33 - Embedded Trace Extension/Module Info

+  EArmObjPsdInfo,                                              ///< 34 - P-State Dependency (PSD) Info

   EArmObjMax

 } EARM_OBJECT_ID;

 

@@ -718,24 +717,6 @@ typedef struct CmArmCacheInfo {
   UINT32             CacheId;

 } CM_ARM_CACHE_INFO;

 

-/** A structure that describes the Generic Initiator Affinity structure in SRAT

-

-    ID: EArmObjGenericInitiatorAffinityInfo

-*/

-typedef struct CmArmGenericInitiatorAffinityInfo {

-  /// The proximity domain to which the generic initiator belongs.

-  UINT32             ProximityDomain;

-

-  /// Flags

-  UINT32             Flags;

-

-  /// Device Handle Type

-  UINT8              DeviceHandleType;

-

-  /// Reference Token for the Device Handle

-  CM_OBJECT_TOKEN    DeviceHandleToken;

-} CM_ARM_GENERIC_INITIATOR_AFFINITY_INFO;

-

 /** A structure that describes the CMN-600 hardware.

 

     ID: EArmObjCmn600Info

diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSratLibArm/SratGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSratLibArm/SratGenerator.c
index 66fefc80f5..48c9970a71 100644
--- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSratLibArm/SratGenerator.c
+++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSratLibArm/SratGenerator.c
@@ -33,7 +33,7 @@
     - EArmObjGicCInfo (REQUIRED)

     - EArmObjGicItsInfo (OPTIONAL)

     - EArchCommonObjMemoryAffinityInfo (OPTIONAL)

-    - EArmObjGenericInitiatorAffinityInfo (OPTIONAL)

+    - EArchCommonObjGenericInitiatorAffinityInfo (OPTIONAL)

     - EArchCommonObjDeviceHandleAcpi (OPTIONAL)

     - EArchCommonObjDeviceHandlePci (OPTIONAL)

 */

@@ -72,9 +72,9 @@ GET_OBJECT_LIST (
   information from the Configuration Manager.

 */

 GET_OBJECT_LIST (

-  EObjNameSpaceArm,

-  EArmObjGenericInitiatorAffinityInfo,

-  CM_ARM_GENERIC_INITIATOR_AFFINITY_INFO

+  EObjNameSpaceArchCommon,

+  EArchCommonObjGenericInitiatorAffinityInfo,

+  CM_ARCH_COMMON_GENERIC_INITIATOR_AFFINITY_INFO

   );

 

 /**

@@ -295,7 +295,7 @@ AddGenericInitiatorAffinity (
   IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL         *CONST  CfgMgrProtocol,

   IN EFI_ACPI_6_3_SYSTEM_RESOURCE_AFFINITY_TABLE_HEADER *CONST  Srat,

   IN CONST UINT32                                               GenInitAffOff,

-  IN CONST CM_ARM_GENERIC_INITIATOR_AFFINITY_INFO               *GenInitAffInfo,

+  IN CONST CM_ARCH_COMMON_GENERIC_INITIATOR_AFFINITY_INFO       *GenInitAffInfo,

   IN       UINT32                                               GenInitAffCount

   )

 {

@@ -465,10 +465,10 @@ BuildSratTable (
   UINT32  MemAffOffset;

   UINT32  GenInitiatorAffOffset;

 

-  CM_ARM_GICC_INFO                        *GicCInfo;

-  CM_ARM_GIC_ITS_INFO                     *GicItsInfo;

-  CM_ARCH_COMMON_MEMORY_AFFINITY_INFO     *MemAffInfo;

-  CM_ARM_GENERIC_INITIATOR_AFFINITY_INFO  *GenInitiatorAffInfo;

+  CM_ARM_GICC_INFO                                *GicCInfo;

+  CM_ARM_GIC_ITS_INFO                             *GicItsInfo;

+  CM_ARCH_COMMON_MEMORY_AFFINITY_INFO             *MemAffInfo;

+  CM_ARCH_COMMON_GENERIC_INITIATOR_AFFINITY_INFO  *GenInitiatorAffInfo;

 

   EFI_ACPI_6_3_SYSTEM_RESOURCE_AFFINITY_TABLE_HEADER  *Srat;

 

@@ -552,7 +552,7 @@ BuildSratTable (
     goto error_handler;

   }

 

-  Status = GetEArmObjGenericInitiatorAffinityInfo (

+  Status = GetEArchCommonObjGenericInitiatorAffinityInfo (

              CfgMgrProtocol,

              CM_NULL_TOKEN,

              &GenInitiatorAffInfo,

diff --git a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c
index d5ee9317e6..5f3e9f5fdc 100644
--- a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c
+++ b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c
@@ -165,20 +165,19 @@ CM_OBJECT_TOKEN_FIXER  TokenFixer[EArmObjMax] = {
   NULL,                             ///< 19 - SMMU Interrupt Array

   TokenFixerNotImplemented,         ///< 20 - Processor Hierarchy Info

   TokenFixerNotImplemented,         ///< 21 - Cache Info

-  NULL,                             ///< 22 - Generic Initiator Affinity

-  NULL,                             ///< 23 - CMN-600 Info

-  NULL,                             ///< 24 - Lpi Info

-  NULL,                             ///< 25 - Reserved Memory Range Node

-  NULL,                             ///< 26 - Memory Range Descriptor

-  NULL,                             ///< 27 - Continuous Performance Control Info

-  NULL,                             ///< 28 - Pcc Subspace Type 0 Info

+  NULL,                             ///< 22 - CMN-600 Info

+  NULL,                             ///< 23 - Lpi Info

+  NULL,                             ///< 24 - Reserved Memory Range Node

+  NULL,                             ///< 25 - Memory Range Descriptor

+  NULL,                             ///< 26 - Continuous Performance Control Info

+  NULL,                             ///< 27 - Pcc Subspace Type 0 Info

+  NULL,                             ///< 28 - Pcc Subspace Type 2 Info

   NULL,                             ///< 29 - Pcc Subspace Type 2 Info

-  NULL,                             ///< 30 - Pcc Subspace Type 2 Info

-  NULL,                             ///< 31 - Pcc Subspace Type 3 Info

-  NULL,                             ///< 32 - Pcc Subspace Type 4 Info

-  NULL,                             ///< 33 - Pcc Subspace Type 5 Info

-  NULL,                             ///< 34 - Embedded Trace Extension/Module Info

-  NULL                              ///< 35 - P-State Dependency (PSD) Info

+  NULL,                             ///< 30 - Pcc Subspace Type 3 Info

+  NULL,                             ///< 31 - Pcc Subspace Type 4 Info

+  NULL,                             ///< 32 - Pcc Subspace Type 5 Info

+  NULL,                             ///< 33 - Embedded Trace Extension/Module Info

+  NULL                              ///< 34 - P-State Dependency (PSD) Info

 };

 

 /** CmObj token fixer.

diff --git a/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c b/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c
index 4b4965dfb0..732454da8f 100644
--- a/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c
+++ b/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c
@@ -381,9 +381,9 @@ STATIC CONST CM_OBJ_PARSER  CmArchCommonDeviceHandlePciParser[] = {
   { "FunctionNumber", 1, "0x%x", NULL }

 };

 

-/** A parser for EArmObjGenericInitiatorAffinityInfo.

+/** A parser for EArchCommonObjGenericInitiatorAffinityInfo.

 */

-STATIC CONST CM_OBJ_PARSER  CmArmGenericInitiatorAffinityInfoParser[] = {

+STATIC CONST CM_OBJ_PARSER  CmArchCommonGenericInitiatorAffinityInfoParser[] = {

   { "ProximityDomain",   4,                        "0x%x", NULL },

   { "Flags",             4,                        "0x%x", NULL },

   { "DeviceHandleType",  1,                        "0x%x", NULL },

@@ -671,19 +671,20 @@ STATIC CONST CM_OBJ_PARSER  CmArmPsdInfoParser[] = {
 */

 STATIC CONST CM_OBJ_PARSER_ARRAY  ArchCommonNamespaceObjectParser[] = {

   CM_PARSER_ADD_OBJECT_RESERVED (EArchCommonObjReserved),

-  CM_PARSER_ADD_OBJECT (EArchCommonObjPowerManagementProfileInfo,CmArchCommonPowerManagementProfileInfoParser),

-  CM_PARSER_ADD_OBJECT (EArchCommonObjSerialPortInfo,            CmArchCommonSerialPortInfoParser),

-  CM_PARSER_ADD_OBJECT (EArchCommonObjConsolePortInfo,           CmArchCommonSerialPortInfoParser),

-  CM_PARSER_ADD_OBJECT (EArchCommonObjSerialDebugPortInfo,       CmArchCommonSerialPortInfoParser),

-  CM_PARSER_ADD_OBJECT (EArchCommonObjHypervisorVendorIdentity,  CmArchCommonHypervisorVendorIdentityParser),

-  CM_PARSER_ADD_OBJECT (EArchCommonObjFixedFeatureFlags,         CmArchCommonFixedFeatureFlagsParser),

-  CM_PARSER_ADD_OBJECT (EArchCommonObjCmRef,                     CmArchCommonObjRefParser),

-  CM_PARSER_ADD_OBJECT (EArchCommonObjPciConfigSpaceInfo,        CmArchCommonPciConfigSpaceInfoParser),

-  CM_PARSER_ADD_OBJECT (EArchCommonObjPciAddressMapInfo,         CmArchCommonPciAddressMapInfoParser),

-  CM_PARSER_ADD_OBJECT (EArchCommonObjPciInterruptMapInfo,       CmArchCommonPciInterruptMapInfoParser),

-  CM_PARSER_ADD_OBJECT (EArchCommonObjMemoryAffinityInfo,        CmArchCommonMemoryAffinityInfoParser),

-  CM_PARSER_ADD_OBJECT (EArchCommonObjDeviceHandleAcpi,          CmArchCommonDeviceHandleAcpiParser),

-  CM_PARSER_ADD_OBJECT (EArchCommonObjDeviceHandlePci,           CmArchCommonDeviceHandlePciParser),

+  CM_PARSER_ADD_OBJECT (EArchCommonObjPowerManagementProfileInfo,  CmArchCommonPowerManagementProfileInfoParser),

+  CM_PARSER_ADD_OBJECT (EArchCommonObjSerialPortInfo,              CmArchCommonSerialPortInfoParser),

+  CM_PARSER_ADD_OBJECT (EArchCommonObjConsolePortInfo,             CmArchCommonSerialPortInfoParser),

+  CM_PARSER_ADD_OBJECT (EArchCommonObjSerialDebugPortInfo,         CmArchCommonSerialPortInfoParser),

+  CM_PARSER_ADD_OBJECT (EArchCommonObjHypervisorVendorIdentity,    CmArchCommonHypervisorVendorIdentityParser),

+  CM_PARSER_ADD_OBJECT (EArchCommonObjFixedFeatureFlags,           CmArchCommonFixedFeatureFlagsParser),

+  CM_PARSER_ADD_OBJECT (EArchCommonObjCmRef,                       CmArchCommonObjRefParser),

+  CM_PARSER_ADD_OBJECT (EArchCommonObjPciConfigSpaceInfo,          CmArchCommonPciConfigSpaceInfoParser),

+  CM_PARSER_ADD_OBJECT (EArchCommonObjPciAddressMapInfo,           CmArchCommonPciAddressMapInfoParser),

+  CM_PARSER_ADD_OBJECT (EArchCommonObjPciInterruptMapInfo,         CmArchCommonPciInterruptMapInfoParser),

+  CM_PARSER_ADD_OBJECT (EArchCommonObjMemoryAffinityInfo,          CmArchCommonMemoryAffinityInfoParser),

+  CM_PARSER_ADD_OBJECT (EArchCommonObjDeviceHandleAcpi,            CmArchCommonDeviceHandleAcpiParser),

+  CM_PARSER_ADD_OBJECT (EArchCommonObjDeviceHandlePci,             CmArchCommonDeviceHandlePciParser),

+  CM_PARSER_ADD_OBJECT (EArchCommonObjGenericInitiatorAffinityInfo,CmArchCommonGenericInitiatorAffinityInfoParser),

   CM_PARSER_ADD_OBJECT_RESERVED (EArchCommonObjMax)

 };

 

@@ -691,41 +692,40 @@ STATIC CONST CM_OBJ_PARSER_ARRAY  ArchCommonNamespaceObjectParser[] = {
 */

 STATIC CONST CM_OBJ_PARSER_ARRAY  ArmNamespaceObjectParser[] = {

   CM_PARSER_ADD_OBJECT_RESERVED (EArmObjReserved),

-  CM_PARSER_ADD_OBJECT (EArmObjBootArchInfo,                CmArmBootArchInfoParser),

-  CM_PARSER_ADD_OBJECT (EArmObjGicCInfo,                    CmArmGicCInfoParser),

-  CM_PARSER_ADD_OBJECT (EArmObjGicDInfo,                    CmArmGicDInfoParser),

-  CM_PARSER_ADD_OBJECT (EArmObjGicMsiFrameInfo,             CmArmGicMsiFrameInfoParser),

-  CM_PARSER_ADD_OBJECT (EArmObjGicRedistributorInfo,        CmArmGicRedistInfoParser),

-  CM_PARSER_ADD_OBJECT (EArmObjGicItsInfo,                  CmArmGicItsInfoParser),

-  CM_PARSER_ADD_OBJECT (EArmObjGenericTimerInfo,            CmArmGenericTimerInfoParser),

-  CM_PARSER_ADD_OBJECT (EArmObjPlatformGTBlockInfo,         CmArmGTBlockInfoParser),

-  CM_PARSER_ADD_OBJECT (EArmObjGTBlockTimerFrameInfo,       CmArmGTBlockTimerFrameInfoParser),

-  CM_PARSER_ADD_OBJECT (EArmObjPlatformGenericWatchdogInfo, CmArmGenericWatchdogInfoParser),

-  CM_PARSER_ADD_OBJECT (EArmObjItsGroup,                    CmArmItsGroupNodeParser),

-  CM_PARSER_ADD_OBJECT (EArmObjNamedComponent,              CmArmNamedComponentNodeParser),

-  CM_PARSER_ADD_OBJECT (EArmObjRootComplex,                 CmArmRootComplexNodeParser),

-  CM_PARSER_ADD_OBJECT (EArmObjSmmuV1SmmuV2,                CmArmSmmuV1SmmuV2NodeParser),

-  CM_PARSER_ADD_OBJECT (EArmObjSmmuV3,                      CmArmSmmuV3NodeParser),

-  CM_PARSER_ADD_OBJECT (EArmObjPmcg,                        CmArmPmcgNodeParser),

-  CM_PARSER_ADD_OBJECT (EArmObjGicItsIdentifierArray,       CmArmGicItsIdentifierParser),

-  CM_PARSER_ADD_OBJECT (EArmObjIdMappingArray,              CmArmIdMappingParser),

-  CM_PARSER_ADD_OBJECT (EArmObjSmmuInterruptArray,          CmArchCommonGenericInterruptParser),

-  CM_PARSER_ADD_OBJECT (EArmObjProcHierarchyInfo,           CmArmProcHierarchyInfoParser),

-  CM_PARSER_ADD_OBJECT (EArmObjCacheInfo,                   CmArmCacheInfoParser),

-  CM_PARSER_ADD_OBJECT (EArmObjGenericInitiatorAffinityInfo,CmArmGenericInitiatorAffinityInfoParser),

-  CM_PARSER_ADD_OBJECT (EArmObjCmn600Info,                  CmArmCmn600InfoParser),

-  CM_PARSER_ADD_OBJECT (EArmObjLpiInfo,                     CmArmLpiInfoParser),

-  CM_PARSER_ADD_OBJECT (EArmObjRmr,                         CmArmRmrInfoParser),

-  CM_PARSER_ADD_OBJECT (EArmObjMemoryRangeDescriptor,       CmArmMemoryRangeDescriptorInfoParser),

-  CM_PARSER_ADD_OBJECT (EArmObjCpcInfo,                     CmArmCpcInfoParser),

-  CM_PARSER_ADD_OBJECT (EArmObjPccSubspaceType0Info,        CmArmPccSubspaceType0InfoParser),

-  CM_PARSER_ADD_OBJECT (EArmObjPccSubspaceType1Info,        CmArmPccSubspaceType1InfoParser),

-  CM_PARSER_ADD_OBJECT (EArmObjPccSubspaceType2Info,        CmArmPccSubspaceType2InfoParser),

-  CM_PARSER_ADD_OBJECT (EArmObjPccSubspaceType3Info,        CmArmPccSubspaceType34InfoParser),

-  CM_PARSER_ADD_OBJECT (EArmObjPccSubspaceType4Info,        CmArmPccSubspaceType34InfoParser),

-  CM_PARSER_ADD_OBJECT (EArmObjPccSubspaceType5Info,        CmArmPccSubspaceType5InfoParser),

-  CM_PARSER_ADD_OBJECT (EArmObjEtInfo,                      CmArmEtInfo),

-  CM_PARSER_ADD_OBJECT (EArmObjPsdInfo,                     CmArmPsdInfoParser),

+  CM_PARSER_ADD_OBJECT (EArmObjBootArchInfo,               CmArmBootArchInfoParser),

+  CM_PARSER_ADD_OBJECT (EArmObjGicCInfo,                   CmArmGicCInfoParser),

+  CM_PARSER_ADD_OBJECT (EArmObjGicDInfo,                   CmArmGicDInfoParser),

+  CM_PARSER_ADD_OBJECT (EArmObjGicMsiFrameInfo,            CmArmGicMsiFrameInfoParser),

+  CM_PARSER_ADD_OBJECT (EArmObjGicRedistributorInfo,       CmArmGicRedistInfoParser),

+  CM_PARSER_ADD_OBJECT (EArmObjGicItsInfo,                 CmArmGicItsInfoParser),

+  CM_PARSER_ADD_OBJECT (EArmObjGenericTimerInfo,           CmArmGenericTimerInfoParser),

+  CM_PARSER_ADD_OBJECT (EArmObjPlatformGTBlockInfo,        CmArmGTBlockInfoParser),

+  CM_PARSER_ADD_OBJECT (EArmObjGTBlockTimerFrameInfo,      CmArmGTBlockTimerFrameInfoParser),

+  CM_PARSER_ADD_OBJECT (EArmObjPlatformGenericWatchdogInfo,CmArmGenericWatchdogInfoParser),

+  CM_PARSER_ADD_OBJECT (EArmObjItsGroup,                   CmArmItsGroupNodeParser),

+  CM_PARSER_ADD_OBJECT (EArmObjNamedComponent,             CmArmNamedComponentNodeParser),

+  CM_PARSER_ADD_OBJECT (EArmObjRootComplex,                CmArmRootComplexNodeParser),

+  CM_PARSER_ADD_OBJECT (EArmObjSmmuV1SmmuV2,               CmArmSmmuV1SmmuV2NodeParser),

+  CM_PARSER_ADD_OBJECT (EArmObjSmmuV3,                     CmArmSmmuV3NodeParser),

+  CM_PARSER_ADD_OBJECT (EArmObjPmcg,                       CmArmPmcgNodeParser),

+  CM_PARSER_ADD_OBJECT (EArmObjGicItsIdentifierArray,      CmArmGicItsIdentifierParser),

+  CM_PARSER_ADD_OBJECT (EArmObjIdMappingArray,             CmArmIdMappingParser),

+  CM_PARSER_ADD_OBJECT (EArmObjSmmuInterruptArray,         CmArchCommonGenericInterruptParser),

+  CM_PARSER_ADD_OBJECT (EArmObjProcHierarchyInfo,          CmArmProcHierarchyInfoParser),

+  CM_PARSER_ADD_OBJECT (EArmObjCacheInfo,                  CmArmCacheInfoParser),

+  CM_PARSER_ADD_OBJECT (EArmObjCmn600Info,                 CmArmCmn600InfoParser),

+  CM_PARSER_ADD_OBJECT (EArmObjLpiInfo,                    CmArmLpiInfoParser),

+  CM_PARSER_ADD_OBJECT (EArmObjRmr,                        CmArmRmrInfoParser),

+  CM_PARSER_ADD_OBJECT (EArmObjMemoryRangeDescriptor,      CmArmMemoryRangeDescriptorInfoParser),

+  CM_PARSER_ADD_OBJECT (EArmObjCpcInfo,                    CmArmCpcInfoParser),

+  CM_PARSER_ADD_OBJECT (EArmObjPccSubspaceType0Info,       CmArmPccSubspaceType0InfoParser),

+  CM_PARSER_ADD_OBJECT (EArmObjPccSubspaceType1Info,       CmArmPccSubspaceType1InfoParser),

+  CM_PARSER_ADD_OBJECT (EArmObjPccSubspaceType2Info,       CmArmPccSubspaceType2InfoParser),

+  CM_PARSER_ADD_OBJECT (EArmObjPccSubspaceType3Info,       CmArmPccSubspaceType34InfoParser),

+  CM_PARSER_ADD_OBJECT (EArmObjPccSubspaceType4Info,       CmArmPccSubspaceType34InfoParser),

+  CM_PARSER_ADD_OBJECT (EArmObjPccSubspaceType5Info,       CmArmPccSubspaceType5InfoParser),

+  CM_PARSER_ADD_OBJECT (EArmObjEtInfo,                     CmArmEtInfo),

+  CM_PARSER_ADD_OBJECT (EArmObjPsdInfo,                    CmArmPsdInfoParser),

   CM_PARSER_ADD_OBJECT_RESERVED (EArmObjMax)

 };

 

diff --git a/DynamicTablesPkg/Readme.md b/DynamicTablesPkg/Readme.md
index 9c7738983d..303f859865 100644
--- a/DynamicTablesPkg/Readme.md
+++ b/DynamicTablesPkg/Readme.md
@@ -462,20 +462,19 @@ The CM_OBJECT_ID type is used to identify the Configuration Manager
 |  19   | SMMU Interrupt Array                      | |

 |  20   | Processor Hierarchy Info                  | Move to Arch Common NS |

 |  21   | Cache Info                                | Move to Arch Common NS |

-|  22   | Generic Initiator Affinity Info           | Move to Arch Common NS |

-|  23   | CMN 600 Info                              | |

-|  24   | Low Power Idle State Info                 | Move to Arch Common NS |

-|  25   | Reserved Memory Range Node                | |

-|  26   | Memory Range Descriptor                   | |

-|  27   | Continuous Performance Control Info       | Move to Arch Common NS |

-|  28   | Pcc Subspace Type 0 Info                  | Move to Arch Common NS |

-|  29   | Pcc Subspace Type 1 Info                  | Move to Arch Common NS |

-|  30   | Pcc Subspace Type 2 Info                  | Move to Arch Common NS |

-|  31   | Pcc Subspace Type 3 Info                  | Move to Arch Common NS |

-|  32   | Pcc Subspace Type 4 Info                  | Move to Arch Common NS |

-|  33   | Pcc Subspace Type 5 Info                  | Move to Arch Common NS |

-|  34   | Embedded Trace Extension/Module Info      | |

-|  35   | P-State Dependency (PSD) Info             | Move to Arch Common NS |

+|  22   | CMN 600 Info                              | |

+|  23   | Low Power Idle State Info                 | Move to Arch Common NS |

+|  24   | Reserved Memory Range Node                | |

+|  25   | Memory Range Descriptor                   | |

+|  26   | Continuous Performance Control Info       | Move to Arch Common NS |

+|  27   | Pcc Subspace Type 0 Info                  | Move to Arch Common NS |

+|  28   | Pcc Subspace Type 1 Info                  | Move to Arch Common NS |

+|  29   | Pcc Subspace Type 2 Info                  | Move to Arch Common NS |

+|  30   | Pcc Subspace Type 3 Info                  | Move to Arch Common NS |

+|  31   | Pcc Subspace Type 4 Info                  | Move to Arch Common NS |

+|  32   | Pcc Subspace Type 5 Info                  | Move to Arch Common NS |

+|  33   | Embedded Trace Extension/Module Info      | |

+|  34   | P-State Dependency (PSD) Info             | Move to Arch Common NS |

 |  `*`  | All other values are reserved.            | |

 

 #### Object ID's in the Arch Common Namespace:

@@ -496,4 +495,5 @@ The CM_OBJECT_ID type is used to identify the Configuration Manager
 |  11   | Memory Affinity Info              | |

 |  12   | Device Handle Acpi                | |

 |  13   | Device Handle PCI                 | |

+|  14   | Generic Initiator Affinity Info   | |

 |  `*`  | All other values are reserved.    | |