DynamicTablesPkg: Move LPI info object to Arch Common

Move the LPI info object from Arm Namespace to the
Arch Common namespace.

Correspondingly also update the following modules to reflect the
changes introduced by the move:
 - SSDT Cpu Topology 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>

4 files changed, 30 insertions, 30 deletions

diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCpuTopologyLibArm/SsdtCpuTopologyGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCpuTopologyLibArm/SsdtCpuTopologyGenerator.c
index 5240ff52d8..bfc3f2eb30 100644
--- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCpuTopologyLibArm/SsdtCpuTopologyGenerator.c
+++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCpuTopologyLibArm/SsdtCpuTopologyGenerator.c
@@ -40,7 +40,7 @@ Requirements:
   - EArmObjGicCInfo

   - EArmObjProcHierarchyInfo (OPTIONAL) along with

   - EArchCommonObjCmRef (OPTIONAL)

-  - EArmObjLpiInfo (OPTIONAL)

+  - EArchCommonObjLpiInfo (OPTIONAL)

   - GetEArmObjEtInfo (OPTIONAL)

   - EArmObjPsdInfo (OPTIONAL)

 */

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

 */

 GET_OBJECT_LIST (

-  EObjNameSpaceArm,

-  EArmObjLpiInfo,

-  CM_ARM_LPI_INFO

+  EObjNameSpaceArchCommon,

+  EArchCommonObjLpiInfo,

+  CM_ARCH_COMMON_LPI_INFO

   );

 

 /**

@@ -118,7 +118,7 @@ GET_OBJECT_LIST (
 

   One entry should be allocated for each CM_ARM_PROC_HIERARCHY_INFO

   structure of the platform. The TokenTable allows to have a mapping:

-  Index <-> CM_OBJECT_TOKEN (to CM_ARM_LPI_INFO structures).

+  Index <-> CM_OBJECT_TOKEN (to CM_ARCH_COMMON_LPI_INFO structures).

 

   There will always be less sets of Lpi states (CM_ARCH_COMMON_OBJ_REF)

   than the number of cpus/clusters (CM_ARM_PROC_HIERARCHY_INFO).

@@ -696,12 +696,12 @@ GenerateLpiStates (
   UINT32  Index;

   UINT32  LastIndex;

 

-  AML_OBJECT_NODE_HANDLE  LpiNode;

-  CM_ARCH_COMMON_OBJ_REF  *LpiRefInfo;

-  UINT32                  LpiRefInfoCount;

-  UINT32                  LpiRefIndex;

-  CM_ARM_LPI_INFO         *LpiInfo;

-  CHAR8                   AslName[AML_NAME_SEG_SIZE + 1];

+  AML_OBJECT_NODE_HANDLE   LpiNode;

+  CM_ARCH_COMMON_OBJ_REF   *LpiRefInfo;

+  UINT32                   LpiRefInfoCount;

+  UINT32                   LpiRefIndex;

+  CM_ARCH_COMMON_LPI_INFO  *LpiInfo;

+  CHAR8                    AslName[AML_NAME_SEG_SIZE + 1];

 

   ASSERT (Generator != NULL);

   ASSERT (Generator->TokenTable.Table != NULL);

@@ -739,8 +739,9 @@ GenerateLpiStates (
     }

 

     for (LpiRefIndex = 0; LpiRefIndex < LpiRefInfoCount; LpiRefIndex++) {

-      // For each CM_ARM_LPI_INFO referenced by the token, add an Lpi state.

-      Status = GetEArmObjLpiInfo (

+      // For each CM_ARCH_COMMON_LPI_INFO referenced by the token,

+      // add an Lpi state.

+      Status = GetEArchCommonObjLpiInfo (

                  CfgMgrProtocol,

                  LpiRefInfo[LpiRefIndex].ReferenceToken,

                  &LpiInfo,

diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCpuTopologyLibArm/SsdtCpuTopologyGenerator.h b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCpuTopologyLibArm/SsdtCpuTopologyGenerator.h
index d6561e33da..889711789f 100644
--- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCpuTopologyLibArm/SsdtCpuTopologyGenerator.h
+++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCpuTopologyLibArm/SsdtCpuTopologyGenerator.h
@@ -70,7 +70,7 @@
 /** A structure used to handle the Lpi structures referencing.

 

   A CM_ARM_PROC_HIERARCHY_INFO structure references a CM_ARCH_COMMON_OBJ_REF.

-  This CM_ARCH_COMMON_OBJ_REF references CM_ARM_LPI_INFO structures.

+  This CM_ARCH_COMMON_OBJ_REF references CM_ARCH_COMMON_LPI_INFO structures.

 

   Example:

   (Cpu0)                                   (Cpu1)

@@ -86,7 +86,7 @@
               |                                       |

               v                                       v

   (A first Lpi state)                       (A second Lpi state)

-  CM_ARM_LPI_INFO[0]                        CM_ARM_LPI_INFO[1]

+  CM_ARCH_COMMON_LPI_INFO[0]                        CM_ARCH_COMMON_LPI_INFO[1]

 

   Here, Cpu0 and Cpu1 have the same Lpi states. Both CM_ARM_PROC_HIERARCHY_INFO

   structures reference the same CM_ARCH_COMMON_OBJ_REF. An entry is created in the

@@ -118,7 +118,7 @@
 */

 typedef struct TokenTable {

   /// TokenTable, a table allowing to map:

-  /// Index <-> CM_OBJECT_TOKEN (to CM_ARM_LPI_INFO structures).

+  /// Index <-> CM_OBJECT_TOKEN (to CM_ARCH_COMMON_LPI_INFO structures).

   CM_OBJECT_TOKEN    *Table;

 

   /// Last used index of the TokenTable.

diff --git a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c
index 5f3e9f5fdc..de3338d108 100644
--- a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c
+++ b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c
@@ -166,18 +166,17 @@ CM_OBJECT_TOKEN_FIXER  TokenFixer[EArmObjMax] = {
   TokenFixerNotImplemented,         ///< 20 - Processor Hierarchy Info

   TokenFixerNotImplemented,         ///< 21 - Cache 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,                             ///< 23 - Reserved Memory Range Node

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

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

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

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

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

-  NULL,                             ///< 29 - Pcc Subspace Type 2 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

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

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

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

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

+  NULL                              ///< 33 - 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 732454da8f..050cd04d09 100644
--- a/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c
+++ b/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c
@@ -417,9 +417,9 @@ STATIC CONST CM_OBJ_PARSER  AcpiGenericAddressParser[] = {
   { "Address",           8, "0x%llx", NULL },

 };

 

-/** A parser for EArmObjLpiInfo.

+/** A parser for EArchCommonObjLpiInfo.

 */

-STATIC CONST CM_OBJ_PARSER  CmArmLpiInfoParser[] = {

+STATIC CONST CM_OBJ_PARSER  CmArchCommonLpiInfoParser[] = {

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

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

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

@@ -685,6 +685,7 @@ STATIC CONST CM_OBJ_PARSER_ARRAY  ArchCommonNamespaceObjectParser[] = {
   CM_PARSER_ADD_OBJECT (EArchCommonObjDeviceHandleAcpi,            CmArchCommonDeviceHandleAcpiParser),

   CM_PARSER_ADD_OBJECT (EArchCommonObjDeviceHandlePci,             CmArchCommonDeviceHandlePciParser),

   CM_PARSER_ADD_OBJECT (EArchCommonObjGenericInitiatorAffinityInfo,CmArchCommonGenericInitiatorAffinityInfoParser),

+  CM_PARSER_ADD_OBJECT (EArchCommonObjLpiInfo,                     CmArchCommonLpiInfoParser),

   CM_PARSER_ADD_OBJECT_RESERVED (EArchCommonObjMax)

 };

 

@@ -714,7 +715,6 @@ STATIC CONST CM_OBJ_PARSER_ARRAY  ArmNamespaceObjectParser[] = {
   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),