DynamicTablesPkg: FdtHwInfoParserLib: Generate GIC ITS group objects

Add generation of GIC ITS identifier array and group CmObjs.

Signed-off-by: Sarah Walker <[email protected]>

Author: sarah-walker-arm

DynamicTablesPkg/Include/StandardNameSpaceObjects.h

@@ -54,10 +54,18 @@ typedef UINTN CM_OBJECT_TOKEN;
 typedef enum AbstractTokenID {
   ETokenNameSpaceUnknown = 0,
   ETokenNameSpaceSmbios,
+  ETokenNameSpaceFdtHwInfo,
 
   ETokenNameSpaceMax
 } EABSTRACT_TOKEN_ID;
 
+/** The EFDT_HW_INFO_OBJECT_ID enum describes the defined object
+    types for the ETokenNameSpaceFdtHwInfo namespace.
+*/
+typedef enum FdtHwInfoObjectID {
+  EFdtHwInfoIortObject = 0
+} EFDT_HW_INFO_OBJECT_ID;
+
 /** Abstract token generated by table generators
 
   Description of abstract token format

DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/Gic/ArmGicItsParser.c

@@ -92,11 +92,23 @@ GicItsIntcNodeParser (
   This parser expects FdtBranch to be a Gic interrupt-controller node.
   Gic version must be v3 or higher.
   typedef struct CmArmGicItsInfo {
-    UINT32  GicItsId;                         // {Populated}
-    UINT64  PhysicalBaseAddress;              // {Populated}
-    UINT32  ProximityDomain;                  // {default = 0}
+    UINT32           GicItsId;                         // {Populated}
+    UINT64           PhysicalBaseAddress;              // {Populated}
+    UINT32           ProximityDomain;                  // {default = 0}
+    CM_OBJECT_TOKEN  ProximityDomainToken;             // {default = CM_NULL_TOKEN}
   } CM_ARM_GIC_ITS_INFO;
 
+  typedef struct CmArmItsGroupNode {
+    CM_OBJECT_TOKEN    Token;                          // {default = CM_NULL_TOKEN}
+    UINT32             ItsIdCount;                     // {Populated}
+    CM_OBJECT_TOKEN    ItsIdToken;                     // {Populated}
+    UINT32             Identifier;                     // {default = 0}
+  } CM_ARM_ITS_GROUP_NODE;
+
+  typedef struct CmArmGicItsIdentifier {
+    UINT32    ItsId;                                   // {Populated}
+  } CM_ARM_ITS_IDENTIFIER;
+
   A parser parses a Device Tree to populate a specific CmObj type. None,
   one or many CmObj can be created by the parser.
   The created CmObj are then handed to the parser's caller through the
@@ -129,6 +141,10 @@ ArmGicItsInfoParser (
   UINT32               GicItsNodeCount;
   VOID                 *Fdt;
 
+  CM_ARM_ITS_GROUP_NODE  ItsGroupNodeInfo;
+  CM_ARM_ITS_IDENTIFIER  ItsIdentifier;
+  CM_OBJECT_TOKEN        Token;
+
   if (FdtParserHandle == NULL) {
     ASSERT (0);
     return EFI_INVALID_PARAMETER;
@@ -174,6 +190,8 @@ ArmGicItsInfoParser (
   GicItsNode = FdtBranch;
   for (Index = 0; Index < GicItsNodeCount; Index++) {
     ZeroMem (&GicItsInfo, sizeof (CM_ARM_GIC_ITS_INFO));
+    ZeroMem (&ItsGroupNodeInfo, sizeof (CM_ARM_ITS_GROUP_NODE));
+    ZeroMem (&ItsIdentifier, sizeof (CM_ARM_ITS_IDENTIFIER));
 
     Status = FdtGetNextPropNodeInBranch (
                Fdt,
@@ -214,6 +232,38 @@ ArmGicItsInfoParser (
       ASSERT (0);
       return Status;
     }
+
+    ItsIdentifier.ItsId = Index;
+
+    // Add the CmObj to the Configuration Manager.
+    Status = AddSingleCmObj (
+               FdtParserHandle,
+               CREATE_CM_ARM_OBJECT_ID (EArmObjGicItsIdentifierArray),
+               &ItsIdentifier,
+               sizeof (CM_ARM_ITS_IDENTIFIER),
+               &Token
+               );
+    if (EFI_ERROR (Status)) {
+      ASSERT (0);
+      return Status;
+    }
+
+    ItsGroupNodeInfo.ItsIdCount = 1;
+    ItsGroupNodeInfo.ItsIdToken = Token;
+
+    // Add the CmObj to the Configuration Manager.
+    // Abstract token allows the IORT parser to link to this object
+    Status = AddSingleCmObjWithToken (
+               FdtParserHandle,
+               CREATE_CM_ARM_OBJECT_ID (EArmObjItsGroup),
+               &ItsGroupNodeInfo,
+               sizeof (CM_ARM_ITS_GROUP_NODE),
+               CM_ABSTRACT_TOKEN_MAKE (ETokenNameSpaceFdtHwInfo, EFdtHwInfoIortObject, FdtGetPhandle (Fdt, GicItsNode))
+               );
+    if (EFI_ERROR (Status)) {
+      ASSERT (0);
+      return Status;
+    }
   } // for
 
   return Status;

DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/Gic/ArmGicItsParser.h

@@ -16,11 +16,23 @@
   This parser expects FdtBranch to be a Gic interrupt-controller node.
   Gic version must be v3 or higher.
   typedef struct CmArmGicItsInfo {
-    UINT32  GicItsId;                         // {Populated}
-    UINT64  PhysicalBaseAddress;              // {Populated}
-    UINT32  ProximityDomain;                  // {default = 0}
+    UINT32           GicItsId;                         // {Populated}
+    UINT64           PhysicalBaseAddress;              // {Populated}
+    UINT32           ProximityDomain;                  // {default = 0}
+    CM_OBJECT_TOKEN  ProximityDomainToken;             // {default = CM_NULL_TOKEN}
   } CM_ARM_GIC_ITS_INFO;
 
+  typedef struct CmArmItsGroupNode {
+    CM_OBJECT_TOKEN    Token;                          // {default = CM_NULL_TOKEN}
+    UINT32             ItsIdCount;                     // {Populated}
+    CM_OBJECT_TOKEN    ItsIdToken;                     // {Populated}
+    UINT32             Identifier;                     // {default = 0}
+  } CM_ARM_ITS_GROUP_NODE;
+
+  typedef struct CmArmGicItsIdentifier {
+    UINT32    ItsId;                                   // {Populated}
+  } CM_ARM_ITS_IDENTIFIER;
+
   A parser parses a Device Tree to populate a specific CmObj type. None,
   one or many CmObj can be created by the parser.
   The created CmObj are then handed to the parser's caller through the