DynamicTablesPkg: Move PCC Type1 info to Arch Common

Move the PCC Subspace Type1 info object from Arm Namespace to
the Arch Common namespace.

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

1 files changed, 9 insertions, 9 deletions

diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiPcctLibArm/PcctGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiPcctLibArm/PcctGenerator.c
index 575ab31f7f..183d8cd221 100644
--- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiPcctLibArm/PcctGenerator.c
+++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiPcctLibArm/PcctGenerator.c
@@ -30,7 +30,7 @@ Requirements:
   The following Configuration Manager Object(s) are required by

   this Generator:

   - EArchCommonObjPccSubspaceType0Info

-  - EArmObjPccSubspaceType1Info

+  - EArchCommonObjPccSubspaceType1Info

   - EArmObjPccSubspaceType2Info

   - EArmObjPccSubspaceType3Info

   - EArmObjPccSubspaceType4Info

@@ -50,9 +50,9 @@ GET_OBJECT_LIST (
     Subspace of Type 1 Information from the Configuration Manager.

 */

 GET_OBJECT_LIST (

-  EObjNameSpaceArm,

-  EArmObjPccSubspaceType1Info,

-  CM_ARM_PCC_SUBSPACE_TYPE1_INFO

+  EObjNameSpaceArchCommon,

+  EArchCommonObjPccSubspaceType1Info,

+  CM_ARCH_COMMON_PCC_SUBSPACE_TYPE1_INFO

   );

 

 /** This macro expands to a function that retrieves the PCC

@@ -248,7 +248,7 @@ MapPccSubspaceId (
       break;

 

     case EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_1_HW_REDUCED_COMMUNICATIONS:

-      CmObjSize = sizeof (CM_ARM_PCC_SUBSPACE_TYPE1_INFO);

+      CmObjSize = sizeof (CM_ARCH_COMMON_PCC_SUBSPACE_TYPE1_INFO);

       break;

 

     case EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_2_HW_REDUCED_COMMUNICATIONS:

@@ -358,7 +358,7 @@ STATIC
 EFI_STATUS

 EFIAPI

 AddSubspaceStructType1 (

-  IN  CM_ARM_PCC_SUBSPACE_TYPE1_INFO                          *PccCmObj,

+  IN  CM_ARCH_COMMON_PCC_SUBSPACE_TYPE1_INFO                  *PccCmObj,

   IN  EFI_ACPI_6_4_PCCT_SUBSPACE_1_HW_REDUCED_COMMUNICATIONS  *PccAcpi

   )

 {

@@ -716,7 +716,7 @@ PopulatePcctTable (
 

       case EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_1_HW_REDUCED_COMMUNICATIONS:

         Status = AddSubspaceStructType1 (

-                   (CM_ARM_PCC_SUBSPACE_TYPE1_INFO *)CurrentPccSubspace,

+                   (CM_ARCH_COMMON_PCC_SUBSPACE_TYPE1_INFO *)CurrentPccSubspace,

                    (EFI_ACPI_6_4_PCCT_SUBSPACE_1_HW_REDUCED_COMMUNICATIONS *)PccBuffer

                    );

 

@@ -826,7 +826,7 @@ BuildPcctTable (
 

   CM_ARCH_COMMON_PCC_SUBSPACE_TYPE0_INFO  *PccType0;

   UINT32                                  PccType0Count;

-  CM_ARM_PCC_SUBSPACE_TYPE1_INFO          *PccType1;

+  CM_ARCH_COMMON_PCC_SUBSPACE_TYPE1_INFO  *PccType1;

   UINT32                                  PccType1Count;

   CM_ARM_PCC_SUBSPACE_TYPE2_INFO          *PccType2;

   UINT32                                  PccType2Count;

@@ -876,7 +876,7 @@ BuildPcctTable (
     goto error_handler;

   }

 

-  Status = GetEArmObjPccSubspaceType1Info (

+  Status = GetEArchCommonObjPccSubspaceType1Info (

              CfgMgrProtocol,

              CM_NULL_TOKEN,

              &PccType1,