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: - EArchCommonObjPsdInfo 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 c63b8bc68d3f..01b78b682ad0 100644 --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c @@ -1355,7 +1355,7 @@ GetPciInterruptMapInfo ( @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_PSD_INFO object. @param [in, out] CmObject Pointer to the Configuration Manager Object descriptor describing the requested Object. @@ -1775,6 +1775,19 @@ GetArchCommonNameSpaceObject ( ); break; + case EArchCommonObjPsdInfo: + Status = HandleCmObjectRefByToken ( + This, + CmObjectId, + PlatformRepo->PsdInfo, + sizeof (PlatformRepo->PsdInfo), + ARRAY_SIZE (PlatformRepo->PsdInfo), + Token, + GetPsdInfo, + CmObject + ); + break; + default: { Status = EFI_NOT_FOUND; DEBUG (( @@ -1923,19 +1936,6 @@ GetArmNameSpaceObject ( ); break; - case EArmObjPsdInfo: - Status = HandleCmObjectRefByToken ( - This, - CmObjectId, - PlatformRepo->PsdInfo, - sizeof (PlatformRepo->PsdInfo), - ARRAY_SIZE (PlatformRepo->PsdInfo), - Token, - GetPsdInfo, - CmObject - ); - break; - default: { Status = EFI_NOT_FOUND; DEBUG (( diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h index 9a12a7807d1c..e28e0f16b09a 100644 --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h @@ -301,7 +301,7 @@ typedef struct PlatformRepositoryInfo { CM_ARCH_COMMON_OBJ_REF CoresLpiRef[CORES_LPI_STATE_COUNT]; // Power domains - CM_ARM_PSD_INFO PsdInfo[PSD_DOMAIN_COUNT]; + CM_ARCH_COMMON_PSD_INFO PsdInfo[PSD_DOMAIN_COUNT]; // // Dynamically populated fields from here. -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#117015): https://edk2.groups.io/g/devel/message/117015 Mute This Topic: https://groups.io/mt/105069951/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-