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:
- Juno
for the following Arch Common object Id:
- EArchCommonObjPciInterruptMapInfo
Cc: Sami Mujawar <sami.muja...@arm.com>
Cc: Pierre Gondois <pierre.gond...@arm.com>
Cc: Yeo Reum Yun <yeoreum....@arm.com>
Cc: AbdulLateef Attar <abdullateef.at...@amd.com>
Cc: Jeshua Smith <jesh...@nvidia.com>
Cc: Jeff Brasen <jbra...@nvidia.com>
Cc: Girish Mahadevan <gmahade...@nvidia.com>
Cc: Leif Lindholm <quic_llind...@quicinc.com>
Cc: Meenakshi Aggarwal <meenakshi.aggar...@nxp.com>
Signed-off-by: Pierre Gondois <pierre.gond...@arm.com>
---
.../ConfigurationManager.c | 28 +++++++++----------
.../ConfigurationManager.h | 2 +-
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git
a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index 8d3af29e9287..f720d826813c 100644
---
a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++
b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -1306,7 +1306,7 @@ GetPciAddressMapInfo (
@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_PCI_INTERRUPT_MAP_INFO object.
+ CM_ARCH_COMMON_PCI_INTERRUPT_MAP_INFO object.
@param [in, out] CmObject Pointer to the Configuration Manager Object
descriptor describing the requested Object.
@@ -1716,6 +1716,19 @@ GetArchCommonNameSpaceObject (
);
break;
+ case EArchCommonObjPciInterruptMapInfo:
+ Status = HandleCmObjectRefByToken (
+ This,
+ CmObjectId,
+ PlatformRepo->PciInterruptMapInfo,
+ sizeof (PlatformRepo->PciInterruptMapInfo),
+ ARRAY_SIZE (PlatformRepo->PciInterruptMapInfo),
+ Token,
+ GetPciInterruptMapInfo,
+ CmObject
+ );
+ break;
+
default: {
Status = EFI_NOT_FOUND;
DEBUG ((
@@ -1897,19 +1910,6 @@ GetArmNameSpaceObject (
);
break;
- case EArmObjPciInterruptMapInfo:
- Status = HandleCmObjectRefByToken (
- This,
- CmObjectId,
- PlatformRepo->PciInterruptMapInfo,
- sizeof (PlatformRepo->PciInterruptMapInfo),
- ARRAY_SIZE (PlatformRepo->PciInterruptMapInfo),
- Token,
- GetPciInterruptMapInfo,
- CmObject
- );
- break;
-
case EArmObjPsdInfo:
Status = HandleCmObjectRefByToken (
This,
diff --git
a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
index 7a64095a235d..c229c18209fe 100644
---
a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
+++
b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
@@ -268,7 +268,7 @@ typedef struct PlatformRepositoryInfo {
CM_ARCH_COMMON_OBJ_REF
PciInterruptMapRef[PCI_INTERRUPT_MAP_COUNT];
// PCI device legacy interrupts mapping information
- CM_ARM_PCI_INTERRUPT_MAP_INFO
PciInterruptMapInfo[PCI_INTERRUPT_MAP_COUNT];
+ CM_ARCH_COMMON_PCI_INTERRUPT_MAP_INFO
PciInterruptMapInfo[PCI_INTERRUPT_MAP_COUNT];
/// GIC MSI Frame information
CM_ARM_GIC_MSI_FRAME_INFO GicMsiFrameInfo;
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#117009): https://edk2.groups.io/g/devel/message/117009
Mute This Topic: https://groups.io/mt/105069944/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
