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