[edk2-devel] [platforms/devel-dynamictables-reorg PATCH 05/14] Platform/ARM: Morello,N1Sdp: Move CmRef info to Arch Common

["PierreGondois" <pierre.gondois@arm.com>]

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]
-=-=-=-=-=-=-=-=-=-=-=-