From: Pierre Gondois <pierre.gond...@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.gond...@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/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
