[edk2-devel] [platforms/devel-dynamictables-reorg PATCH 00/14] Platform: N1Sdp,Morello,NXP: Move DynamicTablesPkg obj to Arch Common

public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed

* [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 00/14] Platform: N1Sdp,Morello,NXP: Move DynamicTablesPkg obj to Arch Common
@ 2024-06-10  9:33 PierreGondois
  2024-06-10  9:33 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 01/14] Platform/ARM: Morello,N1Sdp: Add Arch Common objects handler PierreGondois
                   ` (14 more replies)
  0 siblings, 15 replies; 17+ messages in thread
From: PierreGondois @ 2024-06-10  9:33 UTC (permalink / raw)
  To: devel
  Cc: Pierre Gondois, Sami Mujawar, Pierre Gondois, Yeo Reum Yun,
	Sunil V L, AbdulLateef Attar, Jeshua Smith, Jeff Brasen,
	Girish Mahadevan, Leif Lindholm, Meenakshi Aggarwal

From: Pierre Gondois <pierre.gondois@arm.com>

Patches for the DynamicTablesPkg reorg branches are still sent
through the mailing list for now. A branch with the patches is
available at:
https://github.com/pierregondois/edk2-platforms/pull/new/pg/Morello_N1Sdp_NXP_plat_reorg 

References:
- edk2 reorg branch:
  https://github.com/tianocore/edk2-staging/tree/dynamictables-reorg
- edk2-platforms reorg branch:
  https://github.com/tianocore/edk2-platforms/tree/devel-dynamictables-reorg
- Previous serie for FVP, Juno platforms:
  https://edk2.groups.io/g/devel/message/117001

Other architectures than Arm aim to leverage the DynamicTablesPkg.
The package uses namespaces/domains to split objects IDs. Currently
most of the objects are part of the Arm namespace. Some objects are
generic enough to be re-used by other architectures.

Update the following platforms which use the DynamicTablesPkg
framework/objects:
- Platform/ARM/N1Sdp
- Platform/ARM/Morello
- Platform/NXP/ConfigurationManagerPkg
now that the following platforms have already been updated:
- Juno
- VExpress

Cc: Sami Mujawar <sami.mujawar@arm.com>
Cc: Pierre Gondois <Pierre.Gondois@arm.com>
Cc: Yeo Reum Yun <YeoReum.Yun@arm.com>
Cc: Sunil V L <sunilvl@ventanamicro.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>

Pierre Gondois (14):
  Platform/ARM: Morello,N1Sdp: Add Arch Common objects handler
  Platform/ARM: Morello,N1Sdp: Move Power Mgmt Profile info to Arch
    Common
  Platform/ARM: Morello,N1Sdp: Move Serial Port info to Arch Common
  Platform/ARM: Morello,N1Sdp: Move Fixed Feat Flags info to Arch Common
  Platform/ARM: Morello,N1Sdp: Move CmRef info to Arch Common
  Platform/ARM: Morello,N1Sdp: Move Pci Config Space info to Arch Common
  Platform/ARM: Morello,N1Sdp: Rename GicCToken
  Platform/ARM: Morello,N1Sdp: Move Proc Hierarchy info to Arch Common
  Platform/ARM: Morello,N1Sdp: Move Cache info to Arch Common
  Platform/ARM: N1Sdp: Move Memory Affinity info to Arch Common
  Platform/NXP: Add Arch Common objects handler
  Platform/NXP: Move Power Mgmt Profile info to Arch Common
  Platform/NXP: Move Serial Port info to Arch Common
  Platform/NXP: Move Pci Config Space info to Arch Common

 .../ConfigurationManager.c                    | 216 +++++++++-----
 .../ConfigurationManager.h                    |  20 +-
 .../ConfigurationManagerFvp.c                 |  65 +++-
 .../ConfigurationManagerFvp.h                 |   2 +-
 .../ConfigurationManager.c                    | 281 +++++++++++-------
 .../ConfigurationManager.h                    |  24 +-
 .../ConfigurationManager.c                    | 120 ++++++--
 .../ConfigurationManager.h                    |   7 +-
 8 files changed, 473 insertions(+), 262 deletions(-)

-- 
2.25.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119520): https://edk2.groups.io/g/devel/message/119520
Mute This Topic: https://groups.io/mt/106589338/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-



^ permalink raw reply	[flat|nested] 17+ messages in thread

* [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 01/14] Platform/ARM: Morello,N1Sdp: Add Arch Common objects handler
  2024-06-10  9:33 [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 00/14] Platform: N1Sdp,Morello,NXP: Move DynamicTablesPkg obj to Arch Common PierreGondois
@ 2024-06-10  9:33 ` PierreGondois
  2024-06-10  9:33 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 02/14] Platform/ARM: Morello,N1Sdp: Move Power Mgmt Profile info to Arch Common PierreGondois
                   ` (13 subsequent siblings)
  14 siblings, 0 replies; 17+ messages in thread
From: PierreGondois @ 2024-06-10  9:33 UTC (permalink / raw)
  To: devel; +Cc: Pierre Gondois

From: Pierre Gondois <pierre.gondois@arm.com>

Some DynamicTables objects have been moved from the Arm namespace
to a new Arch Common namespace. Prepare the handling of these objects
in the ConfigurationManagers by adding a function handler for these
objects.

This patch modifies the ConfigurationManager of the following
platforms:
- Morello
- N1Sdp

Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
---
 .../ConfigurationManager.c                    | 57 ++++++++++++++++++-
 .../ConfigurationManagerFvp.c                 | 45 ++++++++++++++-
 .../ConfigurationManager.c                    | 55 +++++++++++++++++-
 3 files changed, 154 insertions(+), 3 deletions(-)

diff --git a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index 7c949812ecef..95fbb997483b 100644
--- a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++ b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -1,7 +1,7 @@
 /** @file
   Configuration Manager Dxe
 
-  Copyright (c) 2021, ARM Limited. All rights reserved.<BR>
+  Copyright (c) 2021 - 2024, Arm Limited. All rights reserved.<BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -764,6 +764,58 @@ GetStandardNameSpaceObject (
   return Status;
 }
 
+/** Return an Arch Common namespace object.
+
+  @param [in]      This        Pointer to the Configuration Manager Protocol.
+  @param [in]      CmObjectId  The Configuration Manager Object ID.
+  @param [in]      Token       An optional token identifying the object. If
+                               unused this must be CM_NULL_TOKEN.
+  @param [in, out] CmObject    Pointer to the Configuration Manager Object
+                               descriptor describing the requested Object.
+
+  @retval EFI_SUCCESS           Success.
+  @retval EFI_INVALID_PARAMETER A parameter is invalid.
+  @retval EFI_NOT_FOUND         The required object information is not found.
+**/
+EFI_STATUS
+EFIAPI
+GetArchCommonNameSpaceObject (
+  IN  CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL  * CONST This,
+  IN  CONST CM_OBJECT_ID                                  CmObjectId,
+  IN  CONST CM_OBJECT_TOKEN                               Token OPTIONAL,
+  IN  OUT   CM_OBJ_DESCRIPTOR                     * CONST CmObject
+  )
+{
+  EFI_STATUS                             Status;
+  EDKII_PLATFORM_REPOSITORY_INFO         *PlatformRepo;
+  EDKII_COMMON_PLATFORM_REPOSITORY_INFO  *CommonPlatRepo;
+
+  if ((This == NULL) || (CmObject == NULL)) {
+    ASSERT (This != NULL);
+    ASSERT (CmObject != NULL);
+    return EFI_INVALID_PARAMETER;
+  }
+
+  Status = EFI_NOT_FOUND;
+  PlatformRepo = This->PlatRepoInfo;
+  CommonPlatRepo = This->PlatRepoInfo->CommonPlatRepoInfo;
+
+  switch (GET_CM_OBJECT_ID (CmObjectId)) {
+    default: {
+      Status = EFI_NOT_FOUND;
+      DEBUG ((
+        DEBUG_INFO,
+        "INFO: Object 0x%x. Status = %r\n",
+        CmObjectId,
+        Status
+        ));
+      break;
+    }
+  } //switch
+
+  return Status;
+}
+
 /** Return an ARM namespace object.
 
   @param [in]      This        Pointer to the Configuration Manager Protocol.
@@ -1057,6 +1109,9 @@ MorelloPlatformGetObject (
     case EObjNameSpaceStandard:
       Status = GetStandardNameSpaceObject (This, CmObjectId, Token, CmObject);
       break;
+    case EObjNameSpaceArchCommon:
+      Status = GetArchCommonNameSpaceObject (This, CmObjectId, Token, CmObject);
+      break;
     case EObjNameSpaceArm:
       Status = GetArmNameSpaceObject (This, CmObjectId, Token, CmObject);
       break;
diff --git a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerFvp.c b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerFvp.c
index 85b0d390598f..32cf5e830fed 100644
--- a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerFvp.c
+++ b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerFvp.c
@@ -1,7 +1,7 @@
 /** @file
   Configuration Manager Dxe
 
-  Copyright (c) 2021, ARM Limited. All rights reserved.<BR>
+  Copyright (c) 2021 - 2024, Arm Limited. All rights reserved.<BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -427,6 +427,49 @@ GetItsGroupInfo (
   return EFI_NOT_FOUND;
 }
 
+
+/** Return platform specific arch common namespace object.
+
+  @param [in]      This        Pointer to the Configuration Manager Protocol.
+  @param [in]      CmObjectId  The Configuration Manager Object ID.
+  @param [in]      Token       An optional token identifying the object. If
+                               unused this must be CM_NULL_TOKEN.
+  @param [in, out] CmObject    Pointer to the Configuration Manager Object
+                               descriptor describing the requested Object.
+
+  @retval EFI_SUCCESS           Success.
+  @retval EFI_INVALID_PARAMETER A parameter is invalid.
+  @retval EFI_NOT_FOUND         The required object information is not found.
+**/
+EFI_STATUS
+EFIAPI
+GetArchCommonNameSpaceObjectPlat (
+  IN  CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL  * CONST This,
+  IN  CONST CM_OBJECT_ID                                  CmObjectId,
+  IN  CONST CM_OBJECT_TOKEN                               Token OPTIONAL,
+  IN  OUT   CM_OBJ_DESCRIPTOR                     * CONST CmObject
+  )
+{
+  EFI_STATUS                            Status;
+  EDKII_FVP_PLATFORM_REPOSITORY_INFO  * PlatformRepo;
+
+  if ((This == NULL) || (CmObject == NULL)) {
+    ASSERT (This != NULL);
+    ASSERT (CmObject != NULL);
+    return EFI_INVALID_PARAMETER;
+  }
+
+  Status = EFI_NOT_FOUND;
+  PlatformRepo = This->PlatRepoInfo->FvpPlatRepoInfo;
+
+  switch (GET_CM_OBJECT_ID (CmObjectId)) {
+      default:
+        break;
+  }
+
+  return Status;
+}
+
 /** Return platform specific ARM namespace object.
 
   @param [in]      This        Pointer to the Configuration Manager Protocol.
diff --git a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index 966a83294c00..99c01297944c 100644
--- a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++ b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -1,7 +1,7 @@
 /** @file
   Configuration Manager Dxe
 
-  Copyright (c) 2021 - 2024, ARM Limited. All rights reserved.<BR>
+  Copyright (c) 2021, ARM Limited. All rights reserved.<BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -1678,6 +1678,56 @@ GetStandardNameSpaceObject (
   return Status;
 }
 
+/** Return an Arch Common namespace object.
+
+  @param [in]      This        Pointer to the Configuration Manager Protocol.
+  @param [in]      CmObjectId  The Configuration Manager Object ID.
+  @param [in]      Token       An optional token identifying the object. If
+                               unused this must be CM_NULL_TOKEN.
+  @param [in, out] CmObject    Pointer to the Configuration Manager Object
+                               descriptor describing the requested Object.
+
+  @retval EFI_SUCCESS           Success.
+  @retval EFI_INVALID_PARAMETER A parameter is invalid.
+  @retval EFI_NOT_FOUND         The required object information is not found.
+**/
+EFI_STATUS
+EFIAPI
+GetArchCommonNameSpaceObject (
+  IN  CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL  * CONST This,
+  IN  CONST CM_OBJECT_ID                                  CmObjectId,
+  IN  CONST CM_OBJECT_TOKEN                               Token OPTIONAL,
+  IN  OUT   CM_OBJ_DESCRIPTOR                     * CONST CmObject
+  )
+{
+  EFI_STATUS                        Status;
+  EDKII_PLATFORM_REPOSITORY_INFO  * PlatformRepo;
+
+  if ((This == NULL) || (CmObject == NULL)) {
+    ASSERT (This != NULL);
+    ASSERT (CmObject != NULL);
+    return EFI_INVALID_PARAMETER;
+  }
+
+  Status = EFI_NOT_FOUND;
+  PlatformRepo = This->PlatRepoInfo;
+
+  switch (GET_CM_OBJECT_ID (CmObjectId)) {
+    default: {
+      Status = EFI_NOT_FOUND;
+      DEBUG ((
+        DEBUG_INFO,
+        "INFO: Object 0x%x. Status = %r\n",
+        CmObjectId,
+        Status
+        ));
+      break;
+    }
+  } //switch
+
+  return Status;
+}
+
 /** Return an ARM namespace object.
 
   @param [in]        This        Pointer to the Configuration Manager Protocol.
@@ -2091,6 +2141,9 @@ N1sdpPlatformGetObject (
     case EObjNameSpaceStandard:
       Status = GetStandardNameSpaceObject (This, CmObjectId, Token, CmObject);
       break;
+    case EObjNameSpaceArchCommon:
+      Status = GetArchCommonNameSpaceObject (This, CmObjectId, Token, CmObject);
+      break;
     case EObjNameSpaceArm:
       Status = GetArmNameSpaceObject (This, CmObjectId, Token, CmObject);
       break;
-- 
2.25.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119521): https://edk2.groups.io/g/devel/message/119521
Mute This Topic: https://groups.io/mt/106589339/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-



^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 02/14] Platform/ARM: Morello,N1Sdp: Move Power Mgmt Profile info to Arch Common
  2024-06-10  9:33 [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 00/14] Platform: N1Sdp,Morello,NXP: Move DynamicTablesPkg obj to Arch Common PierreGondois
  2024-06-10  9:33 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 01/14] Platform/ARM: Morello,N1Sdp: Add Arch Common objects handler PierreGondois
@ 2024-06-10  9:33 ` PierreGondois
  2024-06-10  9:33 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 03/14] Platform/ARM: Morello,N1Sdp: Move Serial Port " PierreGondois
                   ` (12 subsequent siblings)
  14 siblings, 0 replies; 17+ messages in thread
From: PierreGondois @ 2024-06-10  9:33 UTC (permalink / raw)
  To: devel; +Cc: Pierre Gondois

From: Pierre Gondois <pierre.gondois@arm.com>

Some DynamicTables objects have been moved from the Arm namespace
to a new Arch Common namespace. Reflect this change by
renaming/moving the relevant object.

This patch modifies the ConfigurationManager of the following
platforms:
- Morello
- N1Sdp
for the following Arch Common object Id:
- EArchCommonObjPowerManagementProfileInfo

Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
---
 .../ConfigurationManager.c                    | 21 +++++++++---------
 .../ConfigurationManager.h                    |  4 ++--
 .../ConfigurationManager.c                    | 22 +++++++++----------
 .../ConfigurationManager.h                    |  4 ++--
 4 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index 95fbb997483b..098199bbaa58 100644
--- a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++ b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -801,7 +801,17 @@ GetArchCommonNameSpaceObject (
   CommonPlatRepo = This->PlatRepoInfo->CommonPlatRepoInfo;
 
   switch (GET_CM_OBJECT_ID (CmObjectId)) {
-    default: {
+      case EArchCommonObjPowerManagementProfileInfo:
+        Status = HandleCmObject (
+                   CmObjectId,
+                   &CommonPlatRepo->PmProfileInfo,
+                   sizeof (CommonPlatRepo->PmProfileInfo),
+                   1,
+                   CmObject
+                   );
+      break;
+
+      default: {
       Status = EFI_NOT_FOUND;
       DEBUG ((
         DEBUG_INFO,
@@ -875,15 +885,6 @@ GetArmNameSpaceObject (
                    );
       break;
 #endif
-      case EArmObjPowerManagementProfileInfo:
-        Status = HandleCmObject (
-                   CmObjectId,
-                   &CommonPlatRepo->PmProfileInfo,
-                   sizeof (CommonPlatRepo->PmProfileInfo),
-                   1,
-                   CmObject
-                   );
-      break;
 
       case EArmObjGenericTimerInfo:
         Status = HandleCmObject (
diff --git a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
index 09ebc9a84274..2881ed871bd6 100644
--- a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
+++ b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
@@ -1,6 +1,6 @@
 /** @file
 
-  Copyright (c) 2021, ARM Limited. All rights reserved.<BR>
+  Copyright (c) 2021 - 2024, ARM Limited. All rights reserved.<BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -229,7 +229,7 @@ typedef struct CommonPlatformRepositoryInfo {
 #endif
 
   /// Power management profile information
-  CM_ARM_POWER_MANAGEMENT_PROFILE_INFO  PmProfileInfo;
+  CM_ARCH_COMMON_POWER_MANAGEMENT_PROFILE_INFO  PmProfileInfo;
 
   /// GIC CPU interface information
   CM_ARM_GICC_INFO                      GicCInfo[PLAT_CPU_COUNT];
diff --git a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index 99c01297944c..3b72d7705703 100644
--- a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++ b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -1713,7 +1713,17 @@ GetArchCommonNameSpaceObject (
   PlatformRepo = This->PlatRepoInfo;
 
   switch (GET_CM_OBJECT_ID (CmObjectId)) {
-    default: {
+    case EArchCommonObjPowerManagementProfileInfo:
+      Status = HandleCmObject (
+                 CmObjectId,
+                 &PlatformRepo->PmProfileInfo,
+                 sizeof (PlatformRepo->PmProfileInfo),
+                 1,
+                 CmObject
+                 );
+      break;
+
+      default: {
       Status = EFI_NOT_FOUND;
       DEBUG ((
         DEBUG_INFO,
@@ -1818,16 +1828,6 @@ GetArmNameSpaceObject (
                  );
       break;
 
-    case EArmObjPowerManagementProfileInfo:
-      Status = HandleCmObject (
-                 CmObjectId,
-                 &PlatformRepo->PmProfileInfo,
-                 sizeof (PlatformRepo->PmProfileInfo),
-                 1,
-                 CmObject
-                 );
-      break;
-
     case EArmObjGenericTimerInfo:
       Status = HandleCmObject (
                  CmObjectId,
diff --git a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
index ea9cb20ba752..dc15f17eb626 100644
--- a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
+++ b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
@@ -1,6 +1,6 @@
 /** @file
 
-  Copyright (c) 2021-2024, ARM Limited. All rights reserved.<BR>
+  Copyright (c) 2021, ARM Limited. All rights reserved.<BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -232,7 +232,7 @@ typedef struct PlatformRepositoryInfo {
   CM_ARM_FIXED_FEATURE_FLAGS            FixedFeatureFlags;
 
   /// Power management profile information
-  CM_ARM_POWER_MANAGEMENT_PROFILE_INFO  PmProfileInfo;
+  CM_ARCH_COMMON_POWER_MANAGEMENT_PROFILE_INFO  PmProfileInfo;
 
   /// GIC CPU interface information
   CM_ARM_GICC_INFO                      GicCInfo[PLAT_CPU_COUNT * 2];
-- 
2.25.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119522): https://edk2.groups.io/g/devel/message/119522
Mute This Topic: https://groups.io/mt/106589340/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-



^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 03/14] Platform/ARM: Morello,N1Sdp: Move Serial Port info to Arch Common
  2024-06-10  9:33 [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 00/14] Platform: N1Sdp,Morello,NXP: Move DynamicTablesPkg obj to Arch Common PierreGondois
  2024-06-10  9:33 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 01/14] Platform/ARM: Morello,N1Sdp: Add Arch Common objects handler PierreGondois
  2024-06-10  9:33 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 02/14] Platform/ARM: Morello,N1Sdp: Move Power Mgmt Profile info to Arch Common PierreGondois
@ 2024-06-10  9:33 ` PierreGondois
  2024-06-10  9:33 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 04/14] Platform/ARM: Morello,N1Sdp: Move Fixed Feat Flags " PierreGondois
                   ` (11 subsequent siblings)
  14 siblings, 0 replies; 17+ messages in thread
From: PierreGondois @ 2024-06-10  9:33 UTC (permalink / raw)
  To: devel; +Cc: Pierre Gondois

From: Pierre Gondois <pierre.gondois@arm.com>

Some DynamicTables objects have been moved from the Arm namespace
to a new Arch Common namespace. Reflect this change by
renaming/moving the relevant object.

This patch modifies the ConfigurationManager of the following
platforms:
- Morello
- N1Sdp
for the following Arch Common object Id:
- EArchCommonObjConsolePortInfo
- EArchCommonObjSerialDebugPortInfo

Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
---
 .../ConfigurationManager.c                    | 40 +++++++++----------
 .../ConfigurationManager.h                    |  4 +-
 .../ConfigurationManager.c                    | 40 +++++++++----------
 .../ConfigurationManager.h                    |  4 +-
 4 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index 098199bbaa58..b4c0af1307b1 100644
--- a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++ b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -811,6 +811,26 @@ GetArchCommonNameSpaceObject (
                    );
       break;
 
+      case EArchCommonObjConsolePortInfo:
+        Status = HandleCmObject (
+                   CmObjectId,
+                   &CommonPlatRepo->SpcrSerialPort,
+                   sizeof (CommonPlatRepo->SpcrSerialPort),
+                   1,
+                   CmObject
+                   );
+      break;
+
+      case EArchCommonObjSerialDebugPortInfo:
+        Status = HandleCmObject (
+                   CmObjectId,
+                   &CommonPlatRepo->DbgSerialPort,
+                   sizeof (CommonPlatRepo->DbgSerialPort),
+                   1,
+                   CmObject
+                   );
+      break;
+
       default: {
       Status = EFI_NOT_FOUND;
       DEBUG ((
@@ -962,26 +982,6 @@ GetArmNameSpaceObject (
                    );
       break;
 
-      case EArmObjSerialConsolePortInfo:
-        Status = HandleCmObject (
-                   CmObjectId,
-                   &CommonPlatRepo->SpcrSerialPort,
-                   sizeof (CommonPlatRepo->SpcrSerialPort),
-                   1,
-                   CmObject
-                   );
-      break;
-
-      case EArmObjSerialDebugPortInfo:
-        Status = HandleCmObject (
-                   CmObjectId,
-                   &CommonPlatRepo->DbgSerialPort,
-                   sizeof (CommonPlatRepo->DbgSerialPort),
-                   1,
-                   CmObject
-                   );
-      break;
-
       case EArmObjProcHierarchyInfo:
         Status = HandleCmObject (
                    CmObjectId,
diff --git a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
index 2881ed871bd6..2a35494bcc81 100644
--- a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
+++ b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
@@ -255,10 +255,10 @@ typedef struct CommonPlatformRepositoryInfo {
   /** Serial port information for the
       serial port console redirection port
   */
-  CM_ARM_SERIAL_PORT_INFO               SpcrSerialPort;
+  CM_ARCH_COMMON_SERIAL_PORT_INFO       SpcrSerialPort;
 
   /// Serial port information for the DBG2 UART port
-  CM_ARM_SERIAL_PORT_INFO               DbgSerialPort;
+  CM_ARCH_COMMON_SERIAL_PORT_INFO       DbgSerialPort;
 
   // Processor topology information
   CM_ARM_PROC_HIERARCHY_INFO            ProcHierarchyInfo[PLAT_PROC_HIERARCHY_NODE_COUNT];
diff --git a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index 3b72d7705703..21180e8f2d51 100644
--- a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++ b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -1723,6 +1723,26 @@ GetArchCommonNameSpaceObject (
                  );
       break;
 
+    case EArchCommonObjConsolePortInfo:
+      Status = HandleCmObject (
+                 CmObjectId,
+                 &PlatformRepo->SpcrSerialPort,
+                 sizeof (PlatformRepo->SpcrSerialPort),
+                 1,
+                 CmObject
+                 );
+      break;
+
+    case  EArchCommonObjSerialDebugPortInfo:
+      Status = HandleCmObject (
+                 CmObjectId,
+                 &PlatformRepo->DbgSerialPort,
+                 sizeof (PlatformRepo->DbgSerialPort),
+                 1,
+                 CmObject
+                 );
+      break;
+
       default: {
       Status = EFI_NOT_FOUND;
       DEBUG ((
@@ -1904,26 +1924,6 @@ GetArmNameSpaceObject (
                  );
       break;
 
-    case EArmObjSerialConsolePortInfo:
-      Status = HandleCmObject (
-                 CmObjectId,
-                 &PlatformRepo->SpcrSerialPort,
-                 sizeof (PlatformRepo->SpcrSerialPort),
-                 1,
-                 CmObject
-                 );
-      break;
-
-    case  EArmObjSerialDebugPortInfo:
-      Status = HandleCmObject (
-                 CmObjectId,
-                 &PlatformRepo->DbgSerialPort,
-                 sizeof (PlatformRepo->DbgSerialPort),
-                 1,
-                 CmObject
-                 );
-      break;
-
     case EArmObjGicItsInfo:
       Status = HandleCmObject (
                  CmObjectId,
diff --git a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
index dc15f17eb626..cb87b58a68ff 100644
--- a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
+++ b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
@@ -261,10 +261,10 @@ typedef struct PlatformRepositoryInfo {
   /** Serial port information for the
       serial port console redirection port
   */
-  CM_ARM_SERIAL_PORT_INFO               SpcrSerialPort;
+  CM_ARCH_COMMON_SERIAL_PORT_INFO       SpcrSerialPort;
 
   /// Serial port information for the DBG2 UART port
-  CM_ARM_SERIAL_PORT_INFO               DbgSerialPort;
+  CM_ARCH_COMMON_SERIAL_PORT_INFO       DbgSerialPort;
 
   // Processor topology information
   CM_ARM_PROC_HIERARCHY_INFO            ProcHierarchyInfo[PLAT_PROC_HIERARCHY_NODE_COUNT * 2];
-- 
2.25.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119523): https://edk2.groups.io/g/devel/message/119523
Mute This Topic: https://groups.io/mt/106589341/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-



^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 04/14] Platform/ARM: Morello,N1Sdp: Move Fixed Feat Flags info to Arch Common
  2024-06-10  9:33 [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 00/14] Platform: N1Sdp,Morello,NXP: Move DynamicTablesPkg obj to Arch Common PierreGondois
                   ` (2 preceding siblings ...)
  2024-06-10  9:33 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 03/14] Platform/ARM: Morello,N1Sdp: Move Serial Port " PierreGondois
@ 2024-06-10  9:33 ` PierreGondois
  2024-06-10  9:33 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 05/14] Platform/ARM: Morello,N1Sdp: Move CmRef " PierreGondois
                   ` (10 subsequent siblings)
  14 siblings, 0 replies; 17+ messages in thread
From: PierreGondois @ 2024-06-10  9:33 UTC (permalink / raw)
  To: devel; +Cc: Pierre Gondois

From: Pierre Gondois <pierre.gondois@arm.com>

Some DynamicTables objects have been moved from the Arm namespace
to a new Arch Common namespace. Reflect this change by
renaming/moving the relevant object.

This patch modifies the ConfigurationManager of the following
platforms:
- Morello
- N1Sdp
for the following Arch Common object Id:
- EArchCommonObjFixedFeatureFlags

Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
---
 .../ConfigurationManager.c                    | 24 +++++++++----------
 .../ConfigurationManager.h                    |  2 +-
 .../ConfigurationManager.c                    | 20 ++++++++--------
 .../ConfigurationManager.h                    |  2 +-
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index b4c0af1307b1..0eef9ede01cb 100644
--- a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++ b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -831,6 +831,18 @@ GetArchCommonNameSpaceObject (
                    );
       break;
 
+#ifdef HEADLESS_PLATFORM
+      case EArchCommonObjFixedFeatureFlags:
+        Status = HandleCmObject (
+                   CmObjectId,
+                   &CommonPlatRepo->FixedFeatureFlags,
+                   sizeof (CommonPlatRepo->FixedFeatureFlags),
+                   1,
+                   CmObject
+                   );
+      break;
+#endif
+
       default: {
       Status = EFI_NOT_FOUND;
       DEBUG ((
@@ -894,18 +906,6 @@ GetArmNameSpaceObject (
                    );
       break;
 
-#ifdef HEADLESS_PLATFORM
-      case EArmObjFixedFeatureFlags:
-        Status = HandleCmObject (
-                   CmObjectId,
-                   &CommonPlatRepo->FixedFeatureFlags,
-                   sizeof (CommonPlatRepo->FixedFeatureFlags),
-                   1,
-                   CmObject
-                   );
-      break;
-#endif
-
       case EArmObjGenericTimerInfo:
         Status = HandleCmObject (
                    CmObjectId,
diff --git a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
index 2a35494bcc81..c2a34102b584 100644
--- a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
+++ b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
@@ -225,7 +225,7 @@ typedef struct CommonPlatformRepositoryInfo {
 
 #ifdef HEADLESS_PLATFORM
   /// Fixed feature flag information
-  CM_ARM_FIXED_FEATURE_FLAGS            FixedFeatureFlags;
+  CM_ARCH_COMMON_FIXED_FEATURE_FLAGS    FixedFeatureFlags;
 #endif
 
   /// Power management profile information
diff --git a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index 21180e8f2d51..20a0f276a164 100644
--- a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++ b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -1743,6 +1743,16 @@ GetArchCommonNameSpaceObject (
                  );
       break;
 
+    case EArchCommonObjFixedFeatureFlags:
+      Status = HandleCmObject (
+                 CmObjectId,
+                 &PlatformRepo->FixedFeatureFlags,
+                 sizeof (PlatformRepo->FixedFeatureFlags),
+                 1,
+                 CmObject
+                 );
+      break;
+
       default: {
       Status = EFI_NOT_FOUND;
       DEBUG ((
@@ -1838,16 +1848,6 @@ GetArmNameSpaceObject (
                  );
       break;
 
-    case EArmObjFixedFeatureFlags:
-      Status = HandleCmObject (
-                 CmObjectId,
-                 &PlatformRepo->FixedFeatureFlags,
-                 sizeof (PlatformRepo->FixedFeatureFlags),
-                 1,
-                 CmObject
-                 );
-      break;
-
     case EArmObjGenericTimerInfo:
       Status = HandleCmObject (
                  CmObjectId,
diff --git a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
index cb87b58a68ff..0c0e2b5aa43b 100644
--- a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
+++ b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
@@ -229,7 +229,7 @@ typedef struct PlatformRepositoryInfo {
   CM_ARM_BOOT_ARCH_INFO                 BootArchInfo;
 
   /// Fixed feature flag information
-  CM_ARM_FIXED_FEATURE_FLAGS            FixedFeatureFlags;
+  CM_ARCH_COMMON_FIXED_FEATURE_FLAGS    FixedFeatureFlags;
 
   /// Power management profile information
   CM_ARCH_COMMON_POWER_MANAGEMENT_PROFILE_INFO  PmProfileInfo;
-- 
2.25.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119524): https://edk2.groups.io/g/devel/message/119524
Mute This Topic: https://groups.io/mt/106589342/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-



^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 05/14] Platform/ARM: Morello,N1Sdp: Move CmRef info to Arch Common
  2024-06-10  9:33 [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 00/14] Platform: N1Sdp,Morello,NXP: Move DynamicTablesPkg obj to Arch Common PierreGondois
                   ` (3 preceding siblings ...)
  2024-06-10  9:33 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 04/14] Platform/ARM: Morello,N1Sdp: Move Fixed Feat Flags " PierreGondois
@ 2024-06-10  9:33 ` PierreGondois
  2024-06-10  9:33 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 06/14] Platform/ARM: Morello,N1Sdp: Move Pci Config Space " PierreGondois
                   ` (9 subsequent siblings)
  14 siblings, 0 replies; 17+ messages in thread
From: PierreGondois @ 2024-06-10  9:33 UTC (permalink / raw)
  To: devel; +Cc: Pierre Gondois

From: Pierre Gondois <pierre.gondois@arm.com>

Some DynamicTables objects have been moved from the Arm namespace
to a new Arch Common namespace. Reflect this change by
renaming/moving the relevant object.

This patch modifies the ConfigurationManager of the following
platforms:
- Morello
- N1Sdp
for the following Arch Common object Id:
- EArchCommonObjCmRef

Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
---
 .../ConfigurationManager.c                    | 22 +++++++++----------
 .../ConfigurationManager.h                    |  6 ++---
 .../ConfigurationManager.c                    | 22 +++++++++----------
 .../ConfigurationManager.h                    |  6 ++---
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index 0eef9ede01cb..7b6acd854fd3 100644
--- a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++ b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -650,7 +650,7 @@ GetGicCInfo (
   @param [in]      This           Pointer to the Configuration Manager Protocol.
   @param [in]      CmObjectId     The Object ID of the CM object requested
   @param [in]      SearchToken    A unique token for identifying the requested
-                                  CM_ARM_OBJ_REF list.
+                                  CM_ARCH_COMMON_OBJ_REF list.
   @param [in, out] CmObject       Pointer to the Configuration Manager Object
                                   descriptor describing the requested Object.
 
@@ -843,6 +843,16 @@ GetArchCommonNameSpaceObject (
       break;
 #endif
 
+      case EArchCommonObjCmRef:
+        Status = HandleCmObjectSearchPlatformRepo (
+                   This,
+                   CmObjectId,
+                   Token,
+                   GetCmObjRefs,
+                   CmObject
+                   );
+      break;
+
       default: {
       Status = EFI_NOT_FOUND;
       DEBUG ((
@@ -1002,16 +1012,6 @@ GetArmNameSpaceObject (
                    );
       break;
 
-      case EArmObjCmRef:
-        Status = HandleCmObjectSearchPlatformRepo (
-                   This,
-                   CmObjectId,
-                   Token,
-                   GetCmObjRefs,
-                   CmObject
-                   );
-      break;
-
       default: {
         Status = EFI_NOT_FOUND;
         DEBUG ((
diff --git a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
index c2a34102b584..96767e3fe888 100644
--- a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
+++ b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
@@ -267,13 +267,13 @@ typedef struct CommonPlatformRepositoryInfo {
   CM_ARM_CACHE_INFO                     CacheInfo[PLAT_CACHE_COUNT];
 
   // Cluster private resources
-  CM_ARM_OBJ_REF                        ClusterResources[CLUSTER_RESOURCE_COUNT];
+  CM_ARCH_COMMON_OBJ_REF                ClusterResources[CLUSTER_RESOURCE_COUNT];
 
   // Core private resources
-  CM_ARM_OBJ_REF                        CoreResources[CORE_RESOURCE_COUNT];
+  CM_ARCH_COMMON_OBJ_REF                CoreResources[CORE_RESOURCE_COUNT];
 
   // SoC Resources
-  CM_ARM_OBJ_REF                        SocResources[SOC_RESOURCE_COUNT];
+  CM_ARCH_COMMON_OBJ_REF                SocResources[SOC_RESOURCE_COUNT];
 
 } EDKII_COMMON_PLATFORM_REPOSITORY_INFO;
 
diff --git a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index 20a0f276a164..85d5ccfbe85c 100644
--- a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++ b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -1557,7 +1557,7 @@ GetGicCInfo (
   @param [in]        This        Pointer to the Configuration Manager Protocol.
   @param [in]        CmObjectId  The Object ID of the CM object requested
   @param [in]        SearchToken A unique token for identifying the requested
-                                 CM_ARM_OBJ_REF list.
+                                 CM_ARCH_COMMON_OBJ_REF list.
   @param [in, out]   CmObject    Pointer to the Configuration Manager Object
                                  descriptor describing the requested Object.
 
@@ -1753,6 +1753,16 @@ GetArchCommonNameSpaceObject (
                  );
       break;
 
+    case EArchCommonObjCmRef:
+      Status = HandleCmObjectSearchPlatformRepo (
+                 This,
+                 CmObjectId,
+                 Token,
+                 GetCmObjRefs,
+                 CmObject
+                 );
+      break;
+
       default: {
       Status = EFI_NOT_FOUND;
       DEBUG ((
@@ -2013,16 +2023,6 @@ GetArmNameSpaceObject (
                  );
       break;
 
-    case EArmObjCmRef:
-      Status = HandleCmObjectSearchPlatformRepo (
-                 This,
-                 CmObjectId,
-                 Token,
-                 GetCmObjRefs,
-                 CmObject
-                 );
-      break;
-
     case EArmObjPciConfigSpaceInfo:
       Status = HandleCmObject (
                  CmObjectId,
diff --git a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
index 0c0e2b5aa43b..faf6d47ed5f5 100644
--- a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
+++ b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
@@ -273,13 +273,13 @@ typedef struct PlatformRepositoryInfo {
   CM_ARM_CACHE_INFO                     CacheInfo[PLAT_CACHE_COUNT];
 
   // Cluster private resources
-  CM_ARM_OBJ_REF                        ClusterResources[CLUSTER_RESOURCE_COUNT];
+  CM_ARCH_COMMON_OBJ_REF                ClusterResources[CLUSTER_RESOURCE_COUNT];
 
   // Core private resources
-  CM_ARM_OBJ_REF                        CoreResources[CORE_RESOURCE_COUNT];
+  CM_ARCH_COMMON_OBJ_REF                CoreResources[CORE_RESOURCE_COUNT];
 
   // SoC Resources
-  CM_ARM_OBJ_REF                        SocResources[SOC_RESOURCE_COUNT];
+  CM_ARCH_COMMON_OBJ_REF                SocResources[SOC_RESOURCE_COUNT];
 
   /// ITS Group node
   CM_ARM_ITS_GROUP_NODE                 ItsGroupInfo[Its_max];
-- 
2.25.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119525): https://edk2.groups.io/g/devel/message/119525
Mute This Topic: https://groups.io/mt/106589343/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-



^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 06/14] Platform/ARM: Morello,N1Sdp: Move Pci Config Space info to Arch Common
  2024-06-10  9:33 [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 00/14] Platform: N1Sdp,Morello,NXP: Move DynamicTablesPkg obj to Arch Common PierreGondois
                   ` (4 preceding siblings ...)
  2024-06-10  9:33 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 05/14] Platform/ARM: Morello,N1Sdp: Move CmRef " PierreGondois
@ 2024-06-10  9:33 ` PierreGondois
  2024-06-10  9:33 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 07/14] Platform/ARM: Morello,N1Sdp: Rename GicCToken PierreGondois
                   ` (8 subsequent siblings)
  14 siblings, 0 replies; 17+ messages in thread
From: PierreGondois @ 2024-06-10  9:33 UTC (permalink / raw)
  To: devel; +Cc: Pierre Gondois

From: Pierre Gondois <pierre.gondois@arm.com>

Some DynamicTables objects have been moved from the Arm namespace
to a new Arch Common namespace. Reflect this change by
renaming/moving the relevant object.

This patch modifies the ConfigurationManager of the following
platforms:
- Morello
- N1Sdp
for the following Arch Common object Id:
- EArchCommonObjPciConfigSpaceInfo

Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
---
 .../ConfigurationManagerFvp.c                 | 20 ++++++-------
 .../ConfigurationManagerFvp.h                 |  2 +-
 .../ConfigurationManager.c                    | 30 +++++++++++--------
 .../ConfigurationManager.h                    |  2 +-
 4 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerFvp.c b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerFvp.c
index 32cf5e830fed..8d0973ddd8ed 100644
--- a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerFvp.c
+++ b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerFvp.c
@@ -463,6 +463,16 @@ GetArchCommonNameSpaceObjectPlat (
   PlatformRepo = This->PlatRepoInfo->FvpPlatRepoInfo;
 
   switch (GET_CM_OBJECT_ID (CmObjectId)) {
+    case EArchCommonObjPciConfigSpaceInfo:
+      Status = HandleCmObject (
+                 CmObjectId,
+                 PlatformRepo->PciConfigInfo,
+                 sizeof (PlatformRepo->PciConfigInfo),
+                 1,
+                 CmObject
+                 );
+      break;
+
       default:
         break;
   }
@@ -573,16 +583,6 @@ GetArmNameSpaceObjectPlat (
                  );
       break;
 
-    case EArmObjPciConfigSpaceInfo:
-      Status = HandleCmObject (
-                 CmObjectId,
-                 PlatformRepo->PciConfigInfo,
-                 sizeof (PlatformRepo->PciConfigInfo),
-                 1,
-                 CmObject
-                 );
-      break;
-
     default: {
       break;
     }
diff --git a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerFvp.h b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerFvp.h
index 4628b7a879aa..744b6095c16c 100644
--- a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerFvp.h
+++ b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerFvp.h
@@ -56,7 +56,7 @@ typedef struct FvpPlatformRepositoryInfo {
   CM_ARM_ID_MAPPING                     DeviceIdMapping[2][2];
 
   /// PCI configuration space information
-  CM_ARM_PCI_CONFIG_SPACE_INFO          PciConfigInfo[1];
+  CM_ARCH_COMMON_PCI_CONFIG_SPACE_INFO  PciConfigInfo[1];
 
 } EDKII_FVP_PLATFORM_REPOSITORY_INFO;
 
diff --git a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index 85d5ccfbe85c..5713bb578029 100644
--- a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++ b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -1702,6 +1702,7 @@ GetArchCommonNameSpaceObject (
 {
   EFI_STATUS                        Status;
   EDKII_PLATFORM_REPOSITORY_INFO  * PlatformRepo;
+  UINT32                            PciConfigInfoCount;
 
   if ((This == NULL) || (CmObject == NULL)) {
     ASSERT (This != NULL);
@@ -1712,6 +1713,12 @@ GetArchCommonNameSpaceObject (
   Status = EFI_NOT_FOUND;
   PlatformRepo = This->PlatRepoInfo;
 
+  if (PlatformRepo->PlatInfo->MultichipMode == 1) {
+    PciConfigInfoCount = Root_pcie_max;
+  } else {
+    PciConfigInfoCount = Root_pcie_master_chip_max;
+  }
+
   switch (GET_CM_OBJECT_ID (CmObjectId)) {
     case EArchCommonObjPowerManagementProfileInfo:
       Status = HandleCmObject (
@@ -1763,6 +1770,16 @@ GetArchCommonNameSpaceObject (
                  );
       break;
 
+    case EArchCommonObjPciConfigSpaceInfo:
+      Status = HandleCmObject (
+                 CmObjectId,
+                 PlatformRepo->PciConfigInfo,
+                 sizeof (PlatformRepo->PciConfigInfo),
+                 PciConfigInfoCount,
+                 CmObject
+                 );
+      break;
+
       default: {
       Status = EFI_NOT_FOUND;
       DEBUG ((
@@ -1811,7 +1828,6 @@ GetArmNameSpaceObject (
   UINT32                            SmmuV3InfoCount;
   UINT32                            DeviceIdMappingCount;
   UINT32                            RootComplexInfoCount;
-  UINT32                            PciConfigInfoCount;
 
   if ((This == NULL) || (CmObject == NULL)) {
     ASSERT (This != NULL);
@@ -1833,7 +1849,6 @@ GetArmNameSpaceObject (
     SmmuV3InfoCount = Smmuv3info_max;
     DeviceIdMappingCount = Devicemapping_max;
     RootComplexInfoCount = Root_pcie_max;
-    PciConfigInfoCount = Root_pcie_max;
   } else {
     GicRedistCount = 1;
     GicCpuCount = PLAT_CPU_COUNT;
@@ -1844,7 +1859,6 @@ GetArmNameSpaceObject (
     SmmuV3InfoCount = Smmuv3info_master_chip_max;
     DeviceIdMappingCount = Devicemapping_master_chip_max;
     RootComplexInfoCount = Root_pcie_master_chip_max;
-    PciConfigInfoCount = Root_pcie_master_chip_max;
   }
 
   switch (GET_CM_OBJECT_ID (CmObjectId)) {
@@ -2023,16 +2037,6 @@ GetArmNameSpaceObject (
                  );
       break;
 
-    case EArmObjPciConfigSpaceInfo:
-      Status = HandleCmObject (
-                 CmObjectId,
-                 PlatformRepo->PciConfigInfo,
-                 sizeof (PlatformRepo->PciConfigInfo),
-                 PciConfigInfoCount,
-                 CmObject
-                 );
-      break;
-
     case EArmObjMemoryAffinityInfo:
       Status = HandleCmObject (
                  CmObjectId,
diff --git a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
index faf6d47ed5f5..93ec3c42565b 100644
--- a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
+++ b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
@@ -297,7 +297,7 @@ typedef struct PlatformRepositoryInfo {
   CM_ARM_ID_MAPPING                     DeviceIdMapping[Devicemapping_max][2];
 
   /// PCI configuration space information
-  CM_ARM_PCI_CONFIG_SPACE_INFO          PciConfigInfo[Root_pcie_max];
+  CM_ARCH_COMMON_PCI_CONFIG_SPACE_INFO  PciConfigInfo[Root_pcie_max];
 
   /// Memory Affinity Info
   CM_ARM_MEMORY_AFFINITY_INFO           MemAffInfo[DDR_REGION_COUNT];
-- 
2.25.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119526): https://edk2.groups.io/g/devel/message/119526
Mute This Topic: https://groups.io/mt/106589344/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-



^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 07/14] Platform/ARM: Morello,N1Sdp: Rename GicCToken
  2024-06-10  9:33 [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 00/14] Platform: N1Sdp,Morello,NXP: Move DynamicTablesPkg obj to Arch Common PierreGondois
                   ` (5 preceding siblings ...)
  2024-06-10  9:33 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 06/14] Platform/ARM: Morello,N1Sdp: Move Pci Config Space " PierreGondois
@ 2024-06-10  9:33 ` PierreGondois
  2024-06-10  9:33 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 08/14] Platform/ARM: Morello,N1Sdp: Move Proc Hierarchy info to Arch Common PierreGondois
                   ` (7 subsequent siblings)
  14 siblings, 0 replies; 17+ messages in thread
From: PierreGondois @ 2024-06-10  9:33 UTC (permalink / raw)
  To: devel; +Cc: Pierre Gondois, Pierre Gondois

From: Pierre Gondois <pierre.gondois@arm.com>

Some DynamicTables objects have been moved from the Arm namespace
to a new Arch Common namespace. The following field:
  (struct CmArchCommonProcHierarchyInfo).GicCToken
was renamed to 'AcpiIdObjectToken'. Reflect this change in the
edk2-platforms repository.

This patch modifies the ConfigurationManager of the following
platforms:
- Morello
- N1Sdp

Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
 .../ConfigurationManager.c                    | 14 +++++-----
 .../ConfigurationManager.c                    | 28 +++++++++----------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index 7b6acd854fd3..640fdde96e2a 100644
--- a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++ b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -172,7 +172,7 @@ EDKII_COMMON_PLATFORM_REPOSITORY_INFO CommonPlatformInfo = {
       ),
       // CM_OBJECT_TOKEN  ParentToken
       CM_NULL_TOKEN,
-      // CM_OBJECT_TOKEN  GicCToken
+      // CM_OBJECT_TOKEN  AcpiIdObjectToken
       CM_NULL_TOKEN,
       // UINT32  NoOfPrivateResources
       SOC_RESOURCE_COUNT,
@@ -194,7 +194,7 @@ EDKII_COMMON_PLATFORM_REPOSITORY_INFO CommonPlatformInfo = {
       ),
       // CM_OBJECT_TOKEN  ParentToken
       REFERENCE_TOKEN (ProcHierarchyInfo[0]), // -> Package
-      // CM_OBJECT_TOKEN  GicCToken
+      // CM_OBJECT_TOKEN  AcpiIdObjectToken
       CM_NULL_TOKEN,
       // UINT32  NoOfPrivateResources
       CLUSTER_RESOURCE_COUNT,
@@ -215,7 +215,7 @@ EDKII_COMMON_PLATFORM_REPOSITORY_INFO CommonPlatformInfo = {
       ),
       // CM_OBJECT_TOKEN  ParentToken
       REFERENCE_TOKEN (ProcHierarchyInfo[0]), // -> Package
-      // CM_OBJECT_TOKEN  GicCToken
+      // CM_OBJECT_TOKEN  AcpiIdObjectToken
       CM_NULL_TOKEN,
       // UINT32  NoOfPrivateResources
       CLUSTER_RESOURCE_COUNT,
@@ -236,7 +236,7 @@ EDKII_COMMON_PLATFORM_REPOSITORY_INFO CommonPlatformInfo = {
       ),
       // CM_OBJECT_TOKEN  ParentToken
       REFERENCE_TOKEN (ProcHierarchyInfo[1]), // -> 'cluster in Cluster0
-      // CM_OBJECT_TOKEN  GicCToken
+      // CM_OBJECT_TOKEN  AcpiIdObjectToken
       REFERENCE_TOKEN (GicCInfo[0]),
       // UINT32  NoOfPrivateResources
       CORE_RESOURCE_COUNT,
@@ -257,7 +257,7 @@ EDKII_COMMON_PLATFORM_REPOSITORY_INFO CommonPlatformInfo = {
       ),
       // CM_OBJECT_TOKEN  ParentToken
       REFERENCE_TOKEN (ProcHierarchyInfo[1]), // -> 'cluster in Cluster0
-      // CM_OBJECT_TOKEN  GicCToken
+      // CM_OBJECT_TOKEN  AcpiIdObjectToken
       REFERENCE_TOKEN (GicCInfo[1]),
       // UINT32  NoOfPrivateResources
       CORE_RESOURCE_COUNT,
@@ -278,7 +278,7 @@ EDKII_COMMON_PLATFORM_REPOSITORY_INFO CommonPlatformInfo = {
       ),
       // CM_OBJECT_TOKEN  ParentToken
       REFERENCE_TOKEN (ProcHierarchyInfo[2]), // -> 'cluster in Cluster1
-      // CM_OBJECT_TOKEN  GicCToken
+      // CM_OBJECT_TOKEN  AcpiIdObjectToken
       REFERENCE_TOKEN (GicCInfo[2]),
       // UINT32  NoOfPrivateResources
       CORE_RESOURCE_COUNT,
@@ -300,7 +300,7 @@ EDKII_COMMON_PLATFORM_REPOSITORY_INFO CommonPlatformInfo = {
       ),
       // CM_OBJECT_TOKEN  ParentToken
       REFERENCE_TOKEN (ProcHierarchyInfo[2]), // -> 'cluster in Cluster1
-      // CM_OBJECT_TOKEN  GicCToken
+      // CM_OBJECT_TOKEN  AcpiIdObjectToken
       REFERENCE_TOKEN (GicCInfo[3]),
       // UINT32  NoOfPrivateResources
       CORE_RESOURCE_COUNT,
diff --git a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index 5713bb578029..c23fa78038fa 100644
--- a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++ b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -341,7 +341,7 @@ EDKII_PLATFORM_REPOSITORY_INFO N1sdpRepositoryInfo = {
       ),
       // CM_OBJECT_TOKEN  ParentToken
       CM_NULL_TOKEN,
-      // CM_OBJECT_TOKEN  GicCToken
+      // CM_OBJECT_TOKEN  AcpiIdObjectToken
       CM_NULL_TOKEN,
       // UINT32  NoOfPrivateResources
       SOC_RESOURCE_COUNT,
@@ -362,7 +362,7 @@ EDKII_PLATFORM_REPOSITORY_INFO N1sdpRepositoryInfo = {
       ),
       // CM_OBJECT_TOKEN  ParentToken
       REFERENCE_TOKEN (ProcHierarchyInfo[0]), // -> Package
-      // CM_OBJECT_TOKEN  GicCToken
+      // CM_OBJECT_TOKEN  AcpiIdObjectToken
       CM_NULL_TOKEN,
       // UINT32  NoOfPrivateResources
       CLUSTER_RESOURCE_COUNT,
@@ -383,7 +383,7 @@ EDKII_PLATFORM_REPOSITORY_INFO N1sdpRepositoryInfo = {
       ),
       // CM_OBJECT_TOKEN  ParentToken
       REFERENCE_TOKEN (ProcHierarchyInfo[0]), // -> Package
-      // CM_OBJECT_TOKEN  GicCToken
+      // CM_OBJECT_TOKEN  AcpiIdObjectToken
       CM_NULL_TOKEN,
       // UINT32  NoOfPrivateResources
       CLUSTER_RESOURCE_COUNT,
@@ -404,7 +404,7 @@ EDKII_PLATFORM_REPOSITORY_INFO N1sdpRepositoryInfo = {
       ),
       // CM_OBJECT_TOKEN  ParentToken
       REFERENCE_TOKEN (ProcHierarchyInfo[1]), // -> 'cluster in Cluster0
-      // CM_OBJECT_TOKEN  GicCToken
+      // CM_OBJECT_TOKEN  AcpiIdObjectToken
       REFERENCE_TOKEN (GicCInfo[0]),
       // UINT32  NoOfPrivateResources
       CORE_RESOURCE_COUNT,
@@ -425,7 +425,7 @@ EDKII_PLATFORM_REPOSITORY_INFO N1sdpRepositoryInfo = {
       ),
       // CM_OBJECT_TOKEN  ParentToken
       REFERENCE_TOKEN (ProcHierarchyInfo[1]), // -> 'cluster in Cluster0
-      // CM_OBJECT_TOKEN  GicCToken
+      // CM_OBJECT_TOKEN  AcpiIdObjectToken
       REFERENCE_TOKEN (GicCInfo[1]),
       // UINT32  NoOfPrivateResources
       CORE_RESOURCE_COUNT,
@@ -446,7 +446,7 @@ EDKII_PLATFORM_REPOSITORY_INFO N1sdpRepositoryInfo = {
       ),
       // CM_OBJECT_TOKEN  ParentToken
       REFERENCE_TOKEN (ProcHierarchyInfo[2]), // -> 'cluster in Cluster1
-      // CM_OBJECT_TOKEN  GicCToken
+      // CM_OBJECT_TOKEN  AcpiIdObjectToken
       REFERENCE_TOKEN (GicCInfo[2]),
       // UINT32  NoOfPrivateResources
       CORE_RESOURCE_COUNT,
@@ -467,7 +467,7 @@ EDKII_PLATFORM_REPOSITORY_INFO N1sdpRepositoryInfo = {
       ),
       // CM_OBJECT_TOKEN  ParentToken
       REFERENCE_TOKEN (ProcHierarchyInfo[2]), // -> 'cluster in Cluster1
-      // CM_OBJECT_TOKEN  GicCToken
+      // CM_OBJECT_TOKEN  AcpiIdObjectToken
       REFERENCE_TOKEN (GicCInfo[3]),
       // UINT32  NoOfPrivateResources
       CORE_RESOURCE_COUNT,
@@ -489,7 +489,7 @@ EDKII_PLATFORM_REPOSITORY_INFO N1sdpRepositoryInfo = {
       ),
       // CM_OBJECT_TOKEN  ParentToken
       CM_NULL_TOKEN,
-      // CM_OBJECT_TOKEN  GicCToken
+      // CM_OBJECT_TOKEN  AcpiIdObjectToken
       CM_NULL_TOKEN,
       // UINT32  NoOfPrivateResources
       SOC_RESOURCE_COUNT,
@@ -510,7 +510,7 @@ EDKII_PLATFORM_REPOSITORY_INFO N1sdpRepositoryInfo = {
       ),
       // CM_OBJECT_TOKEN  ParentToken
       REFERENCE_TOKEN (ProcHierarchyInfo[7]), // -> Package
-      // CM_OBJECT_TOKEN  GicCToken
+      // CM_OBJECT_TOKEN  AcpiIdObjectToken
       CM_NULL_TOKEN,
       // UINT32  NoOfPrivateResources
       CLUSTER_RESOURCE_COUNT,
@@ -531,7 +531,7 @@ EDKII_PLATFORM_REPOSITORY_INFO N1sdpRepositoryInfo = {
       ),
       // CM_OBJECT_TOKEN  ParentToken
       REFERENCE_TOKEN (ProcHierarchyInfo[7]), // -> Package
-      // CM_OBJECT_TOKEN  GicCToken
+      // CM_OBJECT_TOKEN  AcpiIdObjectToken
       CM_NULL_TOKEN,
       // UINT32  NoOfPrivateResources
       CLUSTER_RESOURCE_COUNT,
@@ -552,7 +552,7 @@ EDKII_PLATFORM_REPOSITORY_INFO N1sdpRepositoryInfo = {
       ),
       // CM_OBJECT_TOKEN  ParentToken
       REFERENCE_TOKEN (ProcHierarchyInfo[8]), // -> 'cluster in Cluster0
-      // CM_OBJECT_TOKEN  GicCToken
+      // CM_OBJECT_TOKEN  AcpiIdObjectToken
       REFERENCE_TOKEN (GicCInfo[4]),
       // UINT32  NoOfPrivateResources
       CORE_RESOURCE_COUNT,
@@ -573,7 +573,7 @@ EDKII_PLATFORM_REPOSITORY_INFO N1sdpRepositoryInfo = {
       ),
       // CM_OBJECT_TOKEN  ParentToken
       REFERENCE_TOKEN (ProcHierarchyInfo[8]), // -> 'cluster in Cluster0
-      // CM_OBJECT_TOKEN  GicCToken
+      // CM_OBJECT_TOKEN  AcpiIdObjectToken
       REFERENCE_TOKEN (GicCInfo[5]),
       // UINT32  NoOfPrivateResources
       CORE_RESOURCE_COUNT,
@@ -594,7 +594,7 @@ EDKII_PLATFORM_REPOSITORY_INFO N1sdpRepositoryInfo = {
       ),
       // CM_OBJECT_TOKEN  ParentToken
       REFERENCE_TOKEN (ProcHierarchyInfo[9]), // -> 'cluster in Cluster1
-      // CM_OBJECT_TOKEN  GicCToken
+      // CM_OBJECT_TOKEN  AcpiIdObjectToken
       REFERENCE_TOKEN (GicCInfo[6]),
       // UINT32  NoOfPrivateResources
       CORE_RESOURCE_COUNT,
@@ -615,7 +615,7 @@ EDKII_PLATFORM_REPOSITORY_INFO N1sdpRepositoryInfo = {
       ),
       // CM_OBJECT_TOKEN  ParentToken
       REFERENCE_TOKEN (ProcHierarchyInfo[9]), // -> 'cluster in Cluster1
-      // CM_OBJECT_TOKEN  GicCToken
+      // CM_OBJECT_TOKEN  AcpiIdObjectToken
       REFERENCE_TOKEN (GicCInfo[7]),
       // UINT32  NoOfPrivateResources
       CORE_RESOURCE_COUNT,
-- 
2.25.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119527): https://edk2.groups.io/g/devel/message/119527
Mute This Topic: https://groups.io/mt/106589345/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-



^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 08/14] Platform/ARM: Morello,N1Sdp: Move Proc Hierarchy info to Arch Common
  2024-06-10  9:33 [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 00/14] Platform: N1Sdp,Morello,NXP: Move DynamicTablesPkg obj to Arch Common PierreGondois
                   ` (6 preceding siblings ...)
  2024-06-10  9:33 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 07/14] Platform/ARM: Morello,N1Sdp: Rename GicCToken PierreGondois
@ 2024-06-10  9:33 ` PierreGondois
  2024-06-10  9:34 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 09/14] Platform/ARM: Morello,N1Sdp: Move Cache " PierreGondois
                   ` (6 subsequent siblings)
  14 siblings, 0 replies; 17+ messages in thread
From: PierreGondois @ 2024-06-10  9:33 UTC (permalink / raw)
  To: devel; +Cc: Pierre Gondois, Pierre Gondois

From: Pierre Gondois <pierre.gondois@arm.com>

Some DynamicTables objects have been moved from the Arm namespace
to a new Arch Common namespace. Reflect this change by
renaming/moving the relevant object.

This patch modifies the ConfigurationManager of the following
platforms:
- Morello
- N1Sdp
for the following Arch Common object Id:
- EArchCommonObjProcHierarchyInfo

Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
 .../ConfigurationManager.c                    | 20 +++++++-------
 .../ConfigurationManager.h                    |  2 +-
 .../ConfigurationManager.c                    | 26 +++++++++----------
 .../ConfigurationManager.h                    |  2 +-
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index 640fdde96e2a..21e5a742345a 100644
--- a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++ b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -853,6 +853,16 @@ GetArchCommonNameSpaceObject (
                    );
       break;
 
+      case EArchCommonObjProcHierarchyInfo:
+        Status = HandleCmObject (
+                   CmObjectId,
+                   CommonPlatRepo->ProcHierarchyInfo,
+                   sizeof (CommonPlatRepo->ProcHierarchyInfo),
+                   PLAT_PROC_HIERARCHY_NODE_COUNT,
+                   CmObject
+                   );
+      break;
+
       default: {
       Status = EFI_NOT_FOUND;
       DEBUG ((
@@ -992,16 +1002,6 @@ GetArmNameSpaceObject (
                    );
       break;
 
-      case EArmObjProcHierarchyInfo:
-        Status = HandleCmObject (
-                   CmObjectId,
-                   CommonPlatRepo->ProcHierarchyInfo,
-                   sizeof (CommonPlatRepo->ProcHierarchyInfo),
-                   PLAT_PROC_HIERARCHY_NODE_COUNT,
-                   CmObject
-                   );
-      break;
-
       case EArmObjCacheInfo:
         Status = HandleCmObject (
                    CmObjectId,
diff --git a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
index 96767e3fe888..df50b860c9a2 100644
--- a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
+++ b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
@@ -261,7 +261,7 @@ typedef struct CommonPlatformRepositoryInfo {
   CM_ARCH_COMMON_SERIAL_PORT_INFO       DbgSerialPort;
 
   // Processor topology information
-  CM_ARM_PROC_HIERARCHY_INFO            ProcHierarchyInfo[PLAT_PROC_HIERARCHY_NODE_COUNT];
+  CM_ARCH_COMMON_PROC_HIERARCHY_INFO    ProcHierarchyInfo[PLAT_PROC_HIERARCHY_NODE_COUNT];
 
   // Cache information
   CM_ARM_CACHE_INFO                     CacheInfo[PLAT_CACHE_COUNT];
diff --git a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index c23fa78038fa..5c7a65afb43c 100644
--- a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++ b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -1703,6 +1703,7 @@ GetArchCommonNameSpaceObject (
   EFI_STATUS                        Status;
   EDKII_PLATFORM_REPOSITORY_INFO  * PlatformRepo;
   UINT32                            PciConfigInfoCount;
+  UINT32                            ProcHierarchyInfoCount;
 
   if ((This == NULL) || (CmObject == NULL)) {
     ASSERT (This != NULL);
@@ -1715,8 +1716,10 @@ GetArchCommonNameSpaceObject (
 
   if (PlatformRepo->PlatInfo->MultichipMode == 1) {
     PciConfigInfoCount = Root_pcie_max;
+    ProcHierarchyInfoCount = PLAT_PROC_HIERARCHY_NODE_COUNT * 2;
   } else {
     PciConfigInfoCount = Root_pcie_master_chip_max;
+    ProcHierarchyInfoCount = PLAT_PROC_HIERARCHY_NODE_COUNT;
   }
 
   switch (GET_CM_OBJECT_ID (CmObjectId)) {
@@ -1780,6 +1783,16 @@ GetArchCommonNameSpaceObject (
                  );
       break;
 
+    case EArchCommonObjProcHierarchyInfo:
+      Status = HandleCmObject (
+                 CmObjectId,
+                 PlatformRepo->ProcHierarchyInfo,
+                 sizeof (PlatformRepo->ProcHierarchyInfo),
+                 ProcHierarchyInfoCount,
+                 CmObject
+                 );
+      break;
+
       default: {
       Status = EFI_NOT_FOUND;
       DEBUG ((
@@ -1821,7 +1834,6 @@ GetArmNameSpaceObject (
   EDKII_PLATFORM_REPOSITORY_INFO  * PlatformRepo;
   UINT32                            GicRedistCount;
   UINT32                            GicCpuCount;
-  UINT32                            ProcHierarchyInfoCount;
   UINT32                            GicItsInfoCount;
   UINT32                            ItsGroupInfoCount;
   UINT32                            ItsIdentifierArrayCount;
@@ -1842,7 +1854,6 @@ GetArmNameSpaceObject (
   if (PlatformRepo->PlatInfo->MultichipMode == 1) {
     GicRedistCount = 2;
     GicCpuCount = PLAT_CPU_COUNT * 2;
-    ProcHierarchyInfoCount = PLAT_PROC_HIERARCHY_NODE_COUNT * 2;
     GicItsInfoCount = Its_max;
     ItsGroupInfoCount = Its_max;
     ItsIdentifierArrayCount = Its_max;
@@ -1852,7 +1863,6 @@ GetArmNameSpaceObject (
   } else {
     GicRedistCount = 1;
     GicCpuCount = PLAT_CPU_COUNT;
-    ProcHierarchyInfoCount = PLAT_PROC_HIERARCHY_NODE_COUNT;
     GicItsInfoCount = Its_master_chip_max;
     ItsGroupInfoCount = Its_master_chip_max;
     ItsIdentifierArrayCount = Its_master_chip_max;
@@ -2017,16 +2027,6 @@ GetArmNameSpaceObject (
                  );
       break;
 
-    case EArmObjProcHierarchyInfo:
-      Status = HandleCmObject (
-                 CmObjectId,
-                 PlatformRepo->ProcHierarchyInfo,
-                 sizeof (PlatformRepo->ProcHierarchyInfo),
-                 ProcHierarchyInfoCount,
-                 CmObject
-                 );
-      break;
-
     case EArmObjCacheInfo:
       Status = HandleCmObject (
                  CmObjectId,
diff --git a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
index 93ec3c42565b..54b0483d43ec 100644
--- a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
+++ b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
@@ -267,7 +267,7 @@ typedef struct PlatformRepositoryInfo {
   CM_ARCH_COMMON_SERIAL_PORT_INFO       DbgSerialPort;
 
   // Processor topology information
-  CM_ARM_PROC_HIERARCHY_INFO            ProcHierarchyInfo[PLAT_PROC_HIERARCHY_NODE_COUNT * 2];
+  CM_ARCH_COMMON_PROC_HIERARCHY_INFO    ProcHierarchyInfo[PLAT_PROC_HIERARCHY_NODE_COUNT * 2];
 
   // Cache information
   CM_ARM_CACHE_INFO                     CacheInfo[PLAT_CACHE_COUNT];
-- 
2.25.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119528): https://edk2.groups.io/g/devel/message/119528
Mute This Topic: https://groups.io/mt/106589346/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-



^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 09/14] Platform/ARM: Morello,N1Sdp: Move Cache info to Arch Common
  2024-06-10  9:33 [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 00/14] Platform: N1Sdp,Morello,NXP: Move DynamicTablesPkg obj to Arch Common PierreGondois
                   ` (7 preceding siblings ...)
  2024-06-10  9:33 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 08/14] Platform/ARM: Morello,N1Sdp: Move Proc Hierarchy info to Arch Common PierreGondois
@ 2024-06-10  9:34 ` PierreGondois
  2024-06-10  9:34 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 10/14] Platform/ARM: N1Sdp: Move Memory Affinity " PierreGondois
                   ` (5 subsequent siblings)
  14 siblings, 0 replies; 17+ messages in thread
From: PierreGondois @ 2024-06-10  9:34 UTC (permalink / raw)
  To: devel; +Cc: Pierre Gondois, Pierre Gondois

From: Pierre Gondois <pierre.gondois@arm.com>

Some DynamicTables objects have been moved from the Arm namespace
to a new Arch Common namespace. Reflect this change by
renaming/moving the relevant object.

This patch modifies the ConfigurationManager of the following
platforms:
- Morello
- N1Sdp
for the following Arch Common object Id:
- EArchCommonObjCacheInfo

Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
 .../ConfigurationManager.c                    | 20 +++++++++----------
 .../ConfigurationManager.h                    |  2 +-
 .../ConfigurationManager.c                    | 20 +++++++++----------
 .../ConfigurationManager.h                    |  2 +-
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index 21e5a742345a..d3624462aa8a 100644
--- a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++ b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -863,6 +863,16 @@ GetArchCommonNameSpaceObject (
                    );
       break;
 
+      case EArchCommonObjCacheInfo:
+        Status = HandleCmObject (
+                   CmObjectId,
+                   CommonPlatRepo->CacheInfo,
+                   sizeof (CommonPlatRepo->CacheInfo),
+                   ARRAY_SIZE (CommonPlatRepo->CacheInfo),
+                   CmObject
+                   );
+      break;
+
       default: {
       Status = EFI_NOT_FOUND;
       DEBUG ((
@@ -1002,16 +1012,6 @@ GetArmNameSpaceObject (
                    );
       break;
 
-      case EArmObjCacheInfo:
-        Status = HandleCmObject (
-                   CmObjectId,
-                   CommonPlatRepo->CacheInfo,
-                   sizeof (CommonPlatRepo->CacheInfo),
-                   ARRAY_SIZE (CommonPlatRepo->CacheInfo),
-                   CmObject
-                   );
-      break;
-
       default: {
         Status = EFI_NOT_FOUND;
         DEBUG ((
diff --git a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
index df50b860c9a2..7b219083bcca 100644
--- a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
+++ b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
@@ -264,7 +264,7 @@ typedef struct CommonPlatformRepositoryInfo {
   CM_ARCH_COMMON_PROC_HIERARCHY_INFO    ProcHierarchyInfo[PLAT_PROC_HIERARCHY_NODE_COUNT];
 
   // Cache information
-  CM_ARM_CACHE_INFO                     CacheInfo[PLAT_CACHE_COUNT];
+  CM_ARCH_COMMON_CACHE_INFO             CacheInfo[PLAT_CACHE_COUNT];
 
   // Cluster private resources
   CM_ARCH_COMMON_OBJ_REF                ClusterResources[CLUSTER_RESOURCE_COUNT];
diff --git a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index 5c7a65afb43c..d90d81bffa9f 100644
--- a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++ b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -1793,6 +1793,16 @@ GetArchCommonNameSpaceObject (
                  );
       break;
 
+    case EArchCommonObjCacheInfo:
+      Status = HandleCmObject (
+                 CmObjectId,
+                 PlatformRepo->CacheInfo,
+                 sizeof (PlatformRepo->CacheInfo),
+                 ARRAY_SIZE (PlatformRepo->CacheInfo),
+                 CmObject
+                 );
+      break;
+
       default: {
       Status = EFI_NOT_FOUND;
       DEBUG ((
@@ -2027,16 +2037,6 @@ GetArmNameSpaceObject (
                  );
       break;
 
-    case EArmObjCacheInfo:
-      Status = HandleCmObject (
-                 CmObjectId,
-                 PlatformRepo->CacheInfo,
-                 sizeof (PlatformRepo->CacheInfo),
-                 ARRAY_SIZE (PlatformRepo->CacheInfo),
-                 CmObject
-                 );
-      break;
-
     case EArmObjMemoryAffinityInfo:
       Status = HandleCmObject (
                  CmObjectId,
diff --git a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
index 54b0483d43ec..8a8e6e6c99a1 100644
--- a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
+++ b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
@@ -270,7 +270,7 @@ typedef struct PlatformRepositoryInfo {
   CM_ARCH_COMMON_PROC_HIERARCHY_INFO    ProcHierarchyInfo[PLAT_PROC_HIERARCHY_NODE_COUNT * 2];
 
   // Cache information
-  CM_ARM_CACHE_INFO                     CacheInfo[PLAT_CACHE_COUNT];
+  CM_ARCH_COMMON_CACHE_INFO             CacheInfo[PLAT_CACHE_COUNT];
 
   // Cluster private resources
   CM_ARCH_COMMON_OBJ_REF                ClusterResources[CLUSTER_RESOURCE_COUNT];
-- 
2.25.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119529): https://edk2.groups.io/g/devel/message/119529
Mute This Topic: https://groups.io/mt/106589347/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-



^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 10/14] Platform/ARM: N1Sdp: Move Memory Affinity info to Arch Common
  2024-06-10  9:33 [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 00/14] Platform: N1Sdp,Morello,NXP: Move DynamicTablesPkg obj to Arch Common PierreGondois
                   ` (8 preceding siblings ...)
  2024-06-10  9:34 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 09/14] Platform/ARM: Morello,N1Sdp: Move Cache " PierreGondois
@ 2024-06-10  9:34 ` PierreGondois
  2024-06-10  9:34 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 11/14] Platform/NXP: Add Arch Common objects handler PierreGondois
                   ` (4 subsequent siblings)
  14 siblings, 0 replies; 17+ messages in thread
From: PierreGondois @ 2024-06-10  9:34 UTC (permalink / raw)
  To: devel; +Cc: Pierre Gondois, Pierre Gondois

From: Pierre Gondois <pierre.gondois@arm.com>

Some DynamicTables objects have been moved from the Arm namespace
to a new Arch Common namespace. Reflect this change by
renaming/moving the relevant object.

This patch modifies the ConfigurationManager of the following
platforms:
- N1Sdp
for the following Arch Common object Id:
- EArmObjMemoryAffinityInfo

Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
 .../ConfigurationManager.c                    | 20 +++++++++----------
 .../ConfigurationManager.h                    |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index d90d81bffa9f..20aa3bcec217 100644
--- a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++ b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -1803,6 +1803,16 @@ GetArchCommonNameSpaceObject (
                  );
       break;
 
+    case EArchCommonObjMemoryAffinityInfo:
+      Status = HandleCmObject (
+                 CmObjectId,
+                 PlatformRepo->MemAffInfo,
+                 sizeof (PlatformRepo->MemAffInfo),
+                 ARRAY_SIZE (PlatformRepo->MemAffInfo),
+                 CmObject
+                 );
+      break;
+
       default: {
       Status = EFI_NOT_FOUND;
       DEBUG ((
@@ -2037,16 +2047,6 @@ GetArmNameSpaceObject (
                  );
       break;
 
-    case EArmObjMemoryAffinityInfo:
-      Status = HandleCmObject (
-                 CmObjectId,
-                 PlatformRepo->MemAffInfo,
-                 sizeof (PlatformRepo->MemAffInfo),
-                 ARRAY_SIZE (PlatformRepo->MemAffInfo),
-                 CmObject
-                 );
-      break;
-
     default: {
       Status = EFI_NOT_FOUND;
       DEBUG ((
diff --git a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
index 8a8e6e6c99a1..6713e9211fb3 100644
--- a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
+++ b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
@@ -300,7 +300,7 @@ typedef struct PlatformRepositoryInfo {
   CM_ARCH_COMMON_PCI_CONFIG_SPACE_INFO  PciConfigInfo[Root_pcie_max];
 
   /// Memory Affinity Info
-  CM_ARM_MEMORY_AFFINITY_INFO           MemAffInfo[DDR_REGION_COUNT];
+  CM_ARCH_COMMON_MEMORY_AFFINITY_INFO   MemAffInfo[DDR_REGION_COUNT];
 
   /// N1Sdp Platform Info
   NEOVERSEN1SOC_PLAT_INFO               *PlatInfo;
-- 
2.25.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119530): https://edk2.groups.io/g/devel/message/119530
Mute This Topic: https://groups.io/mt/106589348/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-



^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 11/14] Platform/NXP: Add Arch Common objects handler
  2024-06-10  9:33 [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 00/14] Platform: N1Sdp,Morello,NXP: Move DynamicTablesPkg obj to Arch Common PierreGondois
                   ` (9 preceding siblings ...)
  2024-06-10  9:34 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 10/14] Platform/ARM: N1Sdp: Move Memory Affinity " PierreGondois
@ 2024-06-10  9:34 ` PierreGondois
  2024-06-11 13:33   ` Sami Mujawar
  2024-06-10  9:34 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 12/14] Platform/NXP: Move Power Mgmt Profile info to Arch Common PierreGondois
                   ` (3 subsequent siblings)
  14 siblings, 1 reply; 17+ messages in thread
From: PierreGondois @ 2024-06-10  9:34 UTC (permalink / raw)
  To: devel; +Cc: Pierre Gondois

From: Pierre Gondois <pierre.gondois@arm.com>

Some DynamicTables objects have been moved from the Arm namespace
to a new Arch Common namespace. Prepare the handling of these objects
in the ConfigurationManagers by adding a function handler for these
objects.

This patch modifies the ConfigurationManager of the NXP
platforms.

Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
---
 .../ConfigurationManager.c                    | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/Platform/NXP/ConfigurationManagerPkg/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/NXP/ConfigurationManagerPkg/ConfigurationManagerDxe/ConfigurationManager.c
index 80ce8412c47a..b5ad69cc9632 100644
--- a/Platform/NXP/ConfigurationManagerPkg/ConfigurationManagerDxe/ConfigurationManager.c
+++ b/Platform/NXP/ConfigurationManagerPkg/ConfigurationManagerDxe/ConfigurationManager.c
@@ -3,6 +3,7 @@
 
   Copyright 2020 NXP
   Copyright 2020 Puresoftware Ltd
+  Copyright (c) 2024, Arm Limited. All rights reserved.<BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -472,6 +473,56 @@ GetStandardNameSpaceObject (
   return Status;
 }
 
+/** Return an Arch Common namespace object.
+
+  @param [in]      This        Pointer to the Configuration Manager Protocol.
+  @param [in]      CmObjectId  The Configuration Manager Object ID.
+  @param [in]      Token       An optional token identifying the object. If
+                               unused this must be CM_NULL_TOKEN.
+  @param [in, out] CmObject    Pointer to the Configuration Manager Object
+                               descriptor describing the requested Object.
+
+  @retval EFI_SUCCESS           Success.
+  @retval EFI_INVALID_PARAMETER A parameter is invalid.
+  @retval EFI_NOT_FOUND         The required object information is not found.
+**/
+EFI_STATUS
+EFIAPI
+GetArchCommonNameSpaceObject (
+  IN  CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL  * CONST This,
+  IN  CONST CM_OBJECT_ID                                  CmObjectId,
+  IN  CONST CM_OBJECT_TOKEN                               Token OPTIONAL,
+  IN  OUT   CM_OBJ_DESCRIPTOR                     * CONST CmObject
+  )
+{
+  EFI_STATUS                        Status;
+  EDKII_PLATFORM_REPOSITORY_INFO  * PlatformRepo;
+
+  if ((This == NULL) || (CmObject == NULL)) {
+    ASSERT (This != NULL);
+    ASSERT (CmObject != NULL);
+    return EFI_INVALID_PARAMETER;
+  }
+
+  Status = EFI_NOT_FOUND;
+  PlatformRepo = This->PlatRepoInfo;
+
+  switch (GET_CM_OBJECT_ID (CmObjectId)) {
+    default: {
+      Status = EFI_NOT_FOUND;
+      DEBUG ((
+        DEBUG_INFO,
+        "INFO: Object 0x%x. Status = %r\n",
+        CmObjectId,
+        Status
+        ));
+      break;
+    }
+  } //switch
+
+  return Status;
+}
+
 /** Return an ARM namespace object.
 
   @param [in]      This        Pointer to the Configuration Manager Protocol.
@@ -733,6 +784,9 @@ FslPlatformGetObject (
     case EObjNameSpaceStandard:
       Status = GetStandardNameSpaceObject (This, CmObjectId, Token, CmObject);
       break;
+    case EObjNameSpaceArchCommon:
+      Status = GetArchCommonNameSpaceObject (This, CmObjectId, Token, CmObject);
+      break;
     case EObjNameSpaceArm:
       Status = GetArmNameSpaceObject (This, CmObjectId, Token, CmObject);
       break;
-- 
2.25.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119531): https://edk2.groups.io/g/devel/message/119531
Mute This Topic: https://groups.io/mt/106589349/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-



^ permalink raw reply related	[flat|nested] 17+ messages in thread

* Re: [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 11/14] Platform/NXP: Add Arch Common objects handler
  2024-06-10  9:34 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 11/14] Platform/NXP: Add Arch Common objects handler PierreGondois
@ 2024-06-11 13:33   ` Sami Mujawar
  0 siblings, 0 replies; 17+ messages in thread
From: Sami Mujawar @ 2024-06-11 13:33 UTC (permalink / raw)
  To: devel@edk2.groups.io, Pierre Gondois, Leif Lindholm,
	Meenakshi Aggarwal (meenakshi.aggarwal@nxp.com), nd

Hi Leif, Meenakshi,

Is it possible to provide feedback for the patches 11 - 14 in this series (links below), please?
  https://edk2.groups.io/g/devel/message/119531
  https://edk2.groups.io/g/devel/message/119532
  https://edk2.groups.io/g/devel/message/119533
  https://edk2.groups.io/g/devel/message/119534

Regards,

Sami Mujawar

On 10/06/2024, 10:47, "devel@edk2.groups.io <mailto:devel@edk2.groups.io> on behalf of PierreGondois via groups.io" <devel@edk2.groups.io <mailto:devel@edk2.groups.io> on behalf of pierre.gondois=arm.com@groups.io <mailto:arm.com@groups.io>> wrote:


From: Pierre Gondois <pierre.gondois@arm.com <mailto:pierre.gondois@arm.com>>


Some DynamicTables objects have been moved from the Arm namespace
to a new Arch Common namespace. Prepare the handling of these objects
in the ConfigurationManagers by adding a function handler for these
objects.


This patch modifies the ConfigurationManager of the NXP
platforms.


Signed-off-by: Pierre Gondois <pierre.gondois@arm.com <mailto:pierre.gondois@arm.com>>
---
.../ConfigurationManager.c | 54 +++++++++++++++++++
1 file changed, 54 insertions(+)


diff --git a/Platform/NXP/ConfigurationManagerPkg/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/NXP/ConfigurationManagerPkg/ConfigurationManagerDxe/ConfigurationManager.c
index 80ce8412c47a..b5ad69cc9632 100644
--- a/Platform/NXP/ConfigurationManagerPkg/ConfigurationManagerDxe/ConfigurationManager.c
+++ b/Platform/NXP/ConfigurationManagerPkg/ConfigurationManagerDxe/ConfigurationManager.c
@@ -3,6 +3,7 @@


Copyright 2020 NXP
Copyright 2020 Puresoftware Ltd
+ Copyright (c) 2024, Arm Limited. All rights reserved.<BR>


SPDX-License-Identifier: BSD-2-Clause-Patent


@@ -472,6 +473,56 @@ GetStandardNameSpaceObject (
return Status;
}


+/** Return an Arch Common namespace object.
+
+ @param [in] This Pointer to the Configuration Manager Protocol.
+ @param [in] CmObjectId The Configuration Manager Object ID.
+ @param [in] Token An optional token identifying the object. If
+ unused this must be CM_NULL_TOKEN.
+ @param [in, out] CmObject Pointer to the Configuration Manager Object
+ descriptor describing the requested Object.
+
+ @retval EFI_SUCCESS Success.
+ @retval EFI_INVALID_PARAMETER A parameter is invalid.
+ @retval EFI_NOT_FOUND The required object information is not found.
+**/
+EFI_STATUS
+EFIAPI
+GetArchCommonNameSpaceObject (
+ IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL * CONST This,
+ IN CONST CM_OBJECT_ID CmObjectId,
+ IN CONST CM_OBJECT_TOKEN Token OPTIONAL,
+ IN OUT CM_OBJ_DESCRIPTOR * CONST CmObject
+ )
+{
+ EFI_STATUS Status;
+ EDKII_PLATFORM_REPOSITORY_INFO * PlatformRepo;
+
+ if ((This == NULL) || (CmObject == NULL)) {
+ ASSERT (This != NULL);
+ ASSERT (CmObject != NULL);
+ return EFI_INVALID_PARAMETER;
+ }
+
+ Status = EFI_NOT_FOUND;
+ PlatformRepo = This->PlatRepoInfo;
+
+ switch (GET_CM_OBJECT_ID (CmObjectId)) {
+ default: {
+ Status = EFI_NOT_FOUND;
+ DEBUG ((
+ DEBUG_INFO,
+ "INFO: Object 0x%x. Status = %r\n",
+ CmObjectId,
+ Status
+ ));
+ break;
+ }
+ } //switch
+
+ return Status;
+}
+
/** Return an ARM namespace object.


@param [in] This Pointer to the Configuration Manager Protocol.
@@ -733,6 +784,9 @@ FslPlatformGetObject (
case EObjNameSpaceStandard:
Status = GetStandardNameSpaceObject (This, CmObjectId, Token, CmObject);
break;
+ case EObjNameSpaceArchCommon:
+ Status = GetArchCommonNameSpaceObject (This, CmObjectId, Token, CmObject);
+ break;
case EObjNameSpaceArm:
Status = GetArmNameSpaceObject (This, CmObjectId, Token, CmObject);
break;
--
2.25.1






-=-=-=-=-=-=
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119531): https://edk2.groups.io/g/devel/message/119531 <https://edk2.groups.io/g/devel/message/119531>
Mute This Topic: https://groups.io/mt/106589349/1779659 <https://groups.io/mt/106589349/1779659>
Group Owner: devel+owner@edk2.groups.io <mailto:devel+owner@edk2.groups.io>
Unsubscribe: https://edk2.groups.io/g/devel/unsub <https://edk2.groups.io/g/devel/unsub> [sami.mujawar@arm.com <mailto:sami.mujawar@arm.com>]
-=-=-=-=-=-=







IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119548): https://edk2.groups.io/g/devel/message/119548
Mute This Topic: https://groups.io/mt/106589349/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-



^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 12/14] Platform/NXP: Move Power Mgmt Profile info to Arch Common
  2024-06-10  9:33 [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 00/14] Platform: N1Sdp,Morello,NXP: Move DynamicTablesPkg obj to Arch Common PierreGondois
                   ` (10 preceding siblings ...)
  2024-06-10  9:34 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 11/14] Platform/NXP: Add Arch Common objects handler PierreGondois
@ 2024-06-10  9:34 ` PierreGondois
  2024-06-10  9:34 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 13/14] Platform/NXP: Move Serial Port " PierreGondois
                   ` (2 subsequent siblings)
  14 siblings, 0 replies; 17+ messages in thread
From: PierreGondois @ 2024-06-10  9:34 UTC (permalink / raw)
  To: devel; +Cc: Pierre Gondois

From: Pierre Gondois <pierre.gondois@arm.com>

Some DynamicTables objects have been moved from the Arm namespace
to a new Arch Common namespace. Reflect this change by
renaming/moving the relevant object.

This patch modifies the ConfigurationManager of the NXP
platforms for the following Arch Common object Id:
- EArchCommonObjPowerManagementProfileInfo

Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
---
 .../ConfigurationManager.c                    | 22 +++++++++----------
 .../ConfigurationManager.h                    |  3 ++-
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Platform/NXP/ConfigurationManagerPkg/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/NXP/ConfigurationManagerPkg/ConfigurationManagerDxe/ConfigurationManager.c
index b5ad69cc9632..6de0c768e880 100644
--- a/Platform/NXP/ConfigurationManagerPkg/ConfigurationManagerDxe/ConfigurationManager.c
+++ b/Platform/NXP/ConfigurationManagerPkg/ConfigurationManagerDxe/ConfigurationManager.c
@@ -508,7 +508,17 @@ GetArchCommonNameSpaceObject (
   PlatformRepo = This->PlatRepoInfo;
 
   switch (GET_CM_OBJECT_ID (CmObjectId)) {
-    default: {
+    case EArchCommonObjPowerManagementProfileInfo:
+      Status = HandleCmObject (
+                 CmObjectId,
+                 &PlatformRepo->PmProfileInfo,
+                 sizeof (PlatformRepo->PmProfileInfo),
+                 1,
+                 CmObject
+                 );
+      break;
+
+      default: {
       Status = EFI_NOT_FOUND;
       DEBUG ((
         DEBUG_INFO,
@@ -567,16 +577,6 @@ GetArmNameSpaceObject (
                  );
       break;
 
-    case EArmObjPowerManagementProfileInfo:
-      Status = HandleCmObject (
-                 CmObjectId,
-                 &PlatformRepo->PmProfileInfo,
-                 sizeof (PlatformRepo->PmProfileInfo),
-                 1,
-                 CmObject
-                 );
-      break;
-
     case EArmObjGenericTimerInfo:
       Status = HandleCmObject (
                  CmObjectId,
diff --git a/Platform/NXP/ConfigurationManagerPkg/ConfigurationManagerDxe/ConfigurationManager.h b/Platform/NXP/ConfigurationManagerPkg/ConfigurationManagerDxe/ConfigurationManager.h
index 0c7dd411f44c..c276ba048999 100644
--- a/Platform/NXP/ConfigurationManagerPkg/ConfigurationManagerDxe/ConfigurationManager.h
+++ b/Platform/NXP/ConfigurationManagerPkg/ConfigurationManagerDxe/ConfigurationManager.h
@@ -3,6 +3,7 @@
 
   Copyright 2020 NXP
   Copyright 2020 Puresoftware Ltd
+  Copyright (c) 2024, Arm Limited. All rights reserved.<BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -80,7 +81,7 @@ typedef struct PlatformRepositoryInfo {
   CM_ARM_BOOT_ARCH_INFO                     BootArchInfo;
 
   /// Power management profile information
-  CM_ARM_POWER_MANAGEMENT_PROFILE_INFO      PmProfileInfo;
+  CM_ARCH_COMMON_POWER_MANAGEMENT_PROFILE_INFO  PmProfileInfo;
 
   /// Generic timer information
   CM_ARM_GENERIC_TIMER_INFO                 GenericTimerInfo;
-- 
2.25.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119532): https://edk2.groups.io/g/devel/message/119532
Mute This Topic: https://groups.io/mt/106589350/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-



^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 13/14] Platform/NXP: Move Serial Port info to Arch Common
  2024-06-10  9:33 [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 00/14] Platform: N1Sdp,Morello,NXP: Move DynamicTablesPkg obj to Arch Common PierreGondois
                   ` (11 preceding siblings ...)
  2024-06-10  9:34 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 12/14] Platform/NXP: Move Power Mgmt Profile info to Arch Common PierreGondois
@ 2024-06-10  9:34 ` PierreGondois
  2024-06-10  9:34 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 14/14] Platform/NXP: Move Pci Config Space " PierreGondois
  2024-06-11 13:29 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 00/14] Platform: N1Sdp,Morello,NXP: Move DynamicTablesPkg obj " Sami Mujawar
  14 siblings, 0 replies; 17+ messages in thread
From: PierreGondois @ 2024-06-10  9:34 UTC (permalink / raw)
  To: devel; +Cc: Pierre Gondois, Pierre Gondois

From: Pierre Gondois <pierre.gondois@arm.com>

Some DynamicTables objects have been moved from the Arm namespace
to a new Arch Common namespace. Reflect this change by
renaming/moving the relevant object.

This patch modifies the ConfigurationManager of the NXP
platforms for the following Arch Common object Id:
- EArchCommonObjConsolePortInfo
- EArchCommonObjSerialDebugPortInfo

Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
 .../ConfigurationManager.c                    | 20 +++++++++----------
 .../ConfigurationManager.h                    |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Platform/NXP/ConfigurationManagerPkg/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/NXP/ConfigurationManagerPkg/ConfigurationManagerDxe/ConfigurationManager.c
index 6de0c768e880..d1e02cacafa7 100644
--- a/Platform/NXP/ConfigurationManagerPkg/ConfigurationManagerDxe/ConfigurationManager.c
+++ b/Platform/NXP/ConfigurationManagerPkg/ConfigurationManagerDxe/ConfigurationManager.c
@@ -518,6 +518,16 @@ GetArchCommonNameSpaceObject (
                  );
       break;
 
+    case EArchCommonObjConsolePortInfo:
+      Status = HandleCmObject (
+                 CmObjectId,
+                 &PlatformRepo->SpcrSerialPort,
+                 sizeof (PlatformRepo->SpcrSerialPort),
+                 1,
+                 CmObject
+                 );
+      break;
+
       default: {
       Status = EFI_NOT_FOUND;
       DEBUG ((
@@ -663,16 +673,6 @@ GetArmNameSpaceObject (
                  );
       break;
 
-    case EArmObjSerialConsolePortInfo:
-      Status = HandleCmObject (
-                 CmObjectId,
-                 &PlatformRepo->SpcrSerialPort,
-                 sizeof (PlatformRepo->SpcrSerialPort),
-                 1,
-                 CmObject
-                 );
-      break;
-
     case EArmObjPciConfigSpaceInfo:
       Status = HandleCmObjectRefByToken (
                  This,
diff --git a/Platform/NXP/ConfigurationManagerPkg/ConfigurationManagerDxe/ConfigurationManager.h b/Platform/NXP/ConfigurationManagerPkg/ConfigurationManagerDxe/ConfigurationManager.h
index c276ba048999..494adbc775da 100644
--- a/Platform/NXP/ConfigurationManagerPkg/ConfigurationManagerDxe/ConfigurationManager.h
+++ b/Platform/NXP/ConfigurationManagerPkg/ConfigurationManagerDxe/ConfigurationManager.h
@@ -111,7 +111,7 @@ typedef struct PlatformRepositoryInfo {
   CM_ARM_PCI_CONFIG_SPACE_INFO              PciConfigInfo[PLAT_PCI_CONFG_COUNT];
 
   /// Serial port information for serial port console redirection port
-  CM_ARM_SERIAL_PORT_INFO                   SpcrSerialPort;
+  CM_ARCH_COMMON_SERIAL_PORT_INFO           SpcrSerialPort;
 
   /// Fsl Board Revision
   UINT32                                    FslBoardRevision;
-- 
2.25.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119533): https://edk2.groups.io/g/devel/message/119533
Mute This Topic: https://groups.io/mt/106589351/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-



^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 14/14] Platform/NXP: Move Pci Config Space info to Arch Common
  2024-06-10  9:33 [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 00/14] Platform: N1Sdp,Morello,NXP: Move DynamicTablesPkg obj to Arch Common PierreGondois
                   ` (12 preceding siblings ...)
  2024-06-10  9:34 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 13/14] Platform/NXP: Move Serial Port " PierreGondois
@ 2024-06-10  9:34 ` PierreGondois
  2024-06-11 13:29 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 00/14] Platform: N1Sdp,Morello,NXP: Move DynamicTablesPkg obj " Sami Mujawar
  14 siblings, 0 replies; 17+ messages in thread
From: PierreGondois @ 2024-06-10  9:34 UTC (permalink / raw)
  To: devel; +Cc: Pierre Gondois

From: Pierre Gondois <pierre.gondois@arm.com>

Some DynamicTables objects have been moved from the Arm namespace
to a new Arch Common namespace. Reflect this change by
renaming/moving the relevant object.

This patch modifies the ConfigurationManager of the NXP
platforms for the following Arch Common object Id:
- EArchCommonObjPciConfigSpaceInfo

Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
---
 .../ConfigurationManager.c                    | 26 +++++++++----------
 .../ConfigurationManager.h                    |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Platform/NXP/ConfigurationManagerPkg/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/NXP/ConfigurationManagerPkg/ConfigurationManagerDxe/ConfigurationManager.c
index d1e02cacafa7..dc872c765d88 100644
--- a/Platform/NXP/ConfigurationManagerPkg/ConfigurationManagerDxe/ConfigurationManager.c
+++ b/Platform/NXP/ConfigurationManagerPkg/ConfigurationManagerDxe/ConfigurationManager.c
@@ -528,6 +528,19 @@ GetArchCommonNameSpaceObject (
                  );
       break;
 
+    case EArchCommonObjPciConfigSpaceInfo:
+      Status = HandleCmObjectRefByToken (
+                 This,
+                 CmObjectId,
+                 PlatformRepo->PciConfigInfo,
+                 sizeof (PlatformRepo->PciConfigInfo),
+                 ARRAY_SIZE (PlatformRepo->PciConfigInfo),
+                 Token,
+                 GetPciConfigInfo,
+                 CmObject
+                 );
+      break;
+
       default: {
       Status = EFI_NOT_FOUND;
       DEBUG ((
@@ -673,19 +686,6 @@ GetArmNameSpaceObject (
                  );
       break;
 
-    case EArmObjPciConfigSpaceInfo:
-      Status = HandleCmObjectRefByToken (
-                 This,
-                 CmObjectId,
-                 PlatformRepo->PciConfigInfo,
-                 sizeof (PlatformRepo->PciConfigInfo),
-                 ARRAY_SIZE (PlatformRepo->PciConfigInfo),
-                 Token,
-                 GetPciConfigInfo,
-                 CmObject
-                 );
-      break;
-
     default: {
       Status = EFI_NOT_FOUND;
       DEBUG ((
diff --git a/Platform/NXP/ConfigurationManagerPkg/ConfigurationManagerDxe/ConfigurationManager.h b/Platform/NXP/ConfigurationManagerPkg/ConfigurationManagerDxe/ConfigurationManager.h
index 494adbc775da..88a26879f766 100644
--- a/Platform/NXP/ConfigurationManagerPkg/ConfigurationManagerDxe/ConfigurationManager.h
+++ b/Platform/NXP/ConfigurationManagerPkg/ConfigurationManagerDxe/ConfigurationManager.h
@@ -108,7 +108,7 @@ typedef struct PlatformRepositoryInfo {
   CM_ARM_GIC_ITS_INFO                       GicItsInfo;
 
   /// PCI configuration space information
-  CM_ARM_PCI_CONFIG_SPACE_INFO              PciConfigInfo[PLAT_PCI_CONFG_COUNT];
+  CM_ARCH_COMMON_PCI_CONFIG_SPACE_INFO      PciConfigInfo[PLAT_PCI_CONFG_COUNT];
 
   /// Serial port information for serial port console redirection port
   CM_ARCH_COMMON_SERIAL_PORT_INFO           SpcrSerialPort;
-- 
2.25.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119534): https://edk2.groups.io/g/devel/message/119534
Mute This Topic: https://groups.io/mt/106589352/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-



^ permalink raw reply related	[flat|nested] 17+ messages in thread

* Re: [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 00/14] Platform: N1Sdp,Morello,NXP: Move DynamicTablesPkg obj to Arch Common
  2024-06-10  9:33 [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 00/14] Platform: N1Sdp,Morello,NXP: Move DynamicTablesPkg obj to Arch Common PierreGondois
                   ` (13 preceding siblings ...)
  2024-06-10  9:34 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 14/14] Platform/NXP: Move Pci Config Space " PierreGondois
@ 2024-06-11 13:29 ` Sami Mujawar
  14 siblings, 0 replies; 17+ messages in thread
From: Sami Mujawar @ 2024-06-11 13:29 UTC (permalink / raw)
  To: Pierre Gondois, devel@edk2.groups.io
  Cc: Yeo Reum Yun, Sunil V L, AbdulLateef Attar, Jeshua Smith,
	Jeff Brasen (jbrasen@nvidia.com), Girish Mahadevan, Leif Lindholm,
	Meenakshi Aggarwal (meenakshi.aggarwal@nxp.com), nd

Hi Pierre,

Thank you for this patch series.

These changes look good to me.

For this series,

Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>

Regards,

Sami Mujawar

On 10/06/2024, 10:34, "Pierre.Gondois@arm.com <mailto:Pierre.Gondois@arm.com>" <Pierre.Gondois@arm.com <mailto:Pierre.Gondois@arm.com>> wrote:


From: Pierre Gondois <pierre.gondois@arm.com <mailto:pierre.gondois@arm.com>>


Patches for the DynamicTablesPkg reorg branches are still sent
through the mailing list for now. A branch with the patches is
available at:
https://github.com/pierregondois/edk2-platforms/pull/new/pg/Morello_N1Sdp_NXP_plat_reorg <https://github.com/pierregondois/edk2-platforms/pull/new/pg/Morello_N1Sdp_NXP_plat_reorg> 


References:
- edk2 reorg branch:
https://github.com/tianocore/edk2-staging/tree/dynamictables-reorg <https://github.com/tianocore/edk2-staging/tree/dynamictables-reorg>
- edk2-platforms reorg branch:
https://github.com/tianocore/edk2-platforms/tree/devel-dynamictables-reorg <https://github.com/tianocore/edk2-platforms/tree/devel-dynamictables-reorg>
- Previous serie for FVP, Juno platforms:
https://edk2.groups.io/g/devel/message/117001 <https://edk2.groups.io/g/devel/message/117001>


Other architectures than Arm aim to leverage the DynamicTablesPkg.
The package uses namespaces/domains to split objects IDs. Currently
most of the objects are part of the Arm namespace. Some objects are
generic enough to be re-used by other architectures.


Update the following platforms which use the DynamicTablesPkg
framework/objects:
- Platform/ARM/N1Sdp
- Platform/ARM/Morello
- Platform/NXP/ConfigurationManagerPkg
now that the following platforms have already been updated:
- Juno
- VExpress


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


Pierre Gondois (14):
Platform/ARM: Morello,N1Sdp: Add Arch Common objects handler
Platform/ARM: Morello,N1Sdp: Move Power Mgmt Profile info to Arch
Common
Platform/ARM: Morello,N1Sdp: Move Serial Port info to Arch Common
Platform/ARM: Morello,N1Sdp: Move Fixed Feat Flags info to Arch Common
Platform/ARM: Morello,N1Sdp: Move CmRef info to Arch Common
Platform/ARM: Morello,N1Sdp: Move Pci Config Space info to Arch Common
Platform/ARM: Morello,N1Sdp: Rename GicCToken
Platform/ARM: Morello,N1Sdp: Move Proc Hierarchy info to Arch Common
Platform/ARM: Morello,N1Sdp: Move Cache info to Arch Common
Platform/ARM: N1Sdp: Move Memory Affinity info to Arch Common
Platform/NXP: Add Arch Common objects handler
Platform/NXP: Move Power Mgmt Profile info to Arch Common
Platform/NXP: Move Serial Port info to Arch Common
Platform/NXP: Move Pci Config Space info to Arch Common


.../ConfigurationManager.c | 216 +++++++++-----
.../ConfigurationManager.h | 20 +-
.../ConfigurationManagerFvp.c | 65 +++-
.../ConfigurationManagerFvp.h | 2 +-
.../ConfigurationManager.c | 281 +++++++++++-------
.../ConfigurationManager.h | 24 +-
.../ConfigurationManager.c | 120 ++++++--
.../ConfigurationManager.h | 7 +-
8 files changed, 473 insertions(+), 262 deletions(-)


-- 
2.25.1







-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119547): https://edk2.groups.io/g/devel/message/119547
Mute This Topic: https://groups.io/mt/106589338/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-



^ permalink raw reply	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2024-06-11 13:34 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-10  9:33 [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 00/14] Platform: N1Sdp,Morello,NXP: Move DynamicTablesPkg obj to Arch Common PierreGondois
2024-06-10  9:33 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 01/14] Platform/ARM: Morello,N1Sdp: Add Arch Common objects handler PierreGondois
2024-06-10  9:33 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 02/14] Platform/ARM: Morello,N1Sdp: Move Power Mgmt Profile info to Arch Common PierreGondois
2024-06-10  9:33 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 03/14] Platform/ARM: Morello,N1Sdp: Move Serial Port " PierreGondois
2024-06-10  9:33 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 04/14] Platform/ARM: Morello,N1Sdp: Move Fixed Feat Flags " PierreGondois
2024-06-10  9:33 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 05/14] Platform/ARM: Morello,N1Sdp: Move CmRef " PierreGondois
2024-06-10  9:33 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 06/14] Platform/ARM: Morello,N1Sdp: Move Pci Config Space " PierreGondois
2024-06-10  9:33 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 07/14] Platform/ARM: Morello,N1Sdp: Rename GicCToken PierreGondois
2024-06-10  9:33 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 08/14] Platform/ARM: Morello,N1Sdp: Move Proc Hierarchy info to Arch Common PierreGondois
2024-06-10  9:34 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 09/14] Platform/ARM: Morello,N1Sdp: Move Cache " PierreGondois
2024-06-10  9:34 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 10/14] Platform/ARM: N1Sdp: Move Memory Affinity " PierreGondois
2024-06-10  9:34 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 11/14] Platform/NXP: Add Arch Common objects handler PierreGondois
2024-06-11 13:33   ` Sami Mujawar
2024-06-10  9:34 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 12/14] Platform/NXP: Move Power Mgmt Profile info to Arch Common PierreGondois
2024-06-10  9:34 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 13/14] Platform/NXP: Move Serial Port " PierreGondois
2024-06-10  9:34 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 14/14] Platform/NXP: Move Pci Config Space " PierreGondois
2024-06-11 13:29 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 00/14] Platform: N1Sdp,Morello,NXP: Move DynamicTablesPkg obj " Sami Mujawar

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox