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: - EArchCommonObjCmRef Cc: Sami Mujawar <[email protected]> Cc: Pierre Gondois <[email protected]> Cc: Yeo Reum Yun <[email protected]> Cc: AbdulLateef Attar <[email protected]> Cc: Jeshua Smith <[email protected]> Cc: Jeff Brasen <[email protected]> Cc: Girish Mahadevan <[email protected]> Cc: Leif Lindholm <[email protected]> Cc: Meenakshi Aggarwal <[email protected]> Signed-off-by: Pierre Gondois <[email protected]> --- .../ConfigurationManager.c | 22 +++++++++---------- .../ConfigurationManager.h | 16 +++++++------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c index 813e420a4740..65506f0514a8 100644 --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c @@ -1454,7 +1454,7 @@ GetCpcInfo ( @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. @@ -1678,6 +1678,16 @@ GetArchCommonNameSpaceObject ( ); break; + case EArchCommonObjCmRef: + Status = HandleCmObjectSearchPlatformRepo ( + This, + CmObjectId, + Token, + GetCmObjRefs, + CmObject + ); + break; + default: { Status = EFI_NOT_FOUND; DEBUG (( @@ -1846,16 +1856,6 @@ GetArmNameSpaceObject ( ); break; - case EArmObjCmRef: - Status = HandleCmObjectSearchPlatformRepo ( - This, - CmObjectId, - Token, - GetCmObjRefs, - CmObject - ); - break; - case EArmObjPciConfigSpaceInfo: if (PlatformRepo->JunoRevision != JUNO_REVISION_R0) { Status = HandleCmObject ( diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h index 72b035e1421f..e3a50edcc0b3 100644 --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h @@ -259,13 +259,13 @@ typedef struct PlatformRepositoryInfo { CM_ARM_PCI_CONFIG_SPACE_INFO PciConfigInfo; // PCI address-range mapping references - CM_ARM_OBJ_REF PciAddressMapRef[PCI_ADDRESS_MAP_COUNT]; + CM_ARCH_COMMON_OBJ_REF PciAddressMapRef[PCI_ADDRESS_MAP_COUNT]; // PCI address-range mapping information CM_ARM_PCI_ADDRESS_MAP_INFO PciAddressMapInfo[PCI_ADDRESS_MAP_COUNT]; // PCI device legacy interrupts mapping references - CM_ARM_OBJ_REF PciInterruptMapRef[PCI_INTERRUPT_MAP_COUNT]; + 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]; @@ -280,25 +280,25 @@ typedef struct PlatformRepositoryInfo { CM_ARM_CACHE_INFO CacheInfo[PLAT_CACHE_COUNT]; // 'big' cluster private resources - CM_ARM_OBJ_REF BigClusterResources[BIG_CLUSTER_RESOURCE_COUNT]; + CM_ARCH_COMMON_OBJ_REF BigClusterResources[BIG_CLUSTER_RESOURCE_COUNT]; // 'big' core private resources - CM_ARM_OBJ_REF BigCoreResources[BIG_CORE_RESOURCE_COUNT]; + CM_ARCH_COMMON_OBJ_REF BigCoreResources[BIG_CORE_RESOURCE_COUNT]; // 'LITTLE' cluster private resources - CM_ARM_OBJ_REF LittleClusterResources[LITTLE_CLUSTER_RESOURCE_COUNT]; + CM_ARCH_COMMON_OBJ_REF LittleClusterResources[LITTLE_CLUSTER_RESOURCE_COUNT]; // 'LITTLE' core private resources - CM_ARM_OBJ_REF LittleCoreResources[LITTLE_CORE_RESOURCE_COUNT]; + CM_ARCH_COMMON_OBJ_REF LittleCoreResources[LITTLE_CORE_RESOURCE_COUNT]; // Low Power Idle state information (LPI) for all cores/clusters CM_ARM_LPI_INFO LpiInfo[LPI_STATE_COUNT]; // Clusters Low Power Idle state references (LPI) - CM_ARM_OBJ_REF ClustersLpiRef[CLUSTERS_LPI_STATE_COUNT]; + CM_ARCH_COMMON_OBJ_REF ClustersLpiRef[CLUSTERS_LPI_STATE_COUNT]; // Cores Low Power Idle state references (LPI) - CM_ARM_OBJ_REF CoresLpiRef[CORES_LPI_STATE_COUNT]; + CM_ARCH_COMMON_OBJ_REF CoresLpiRef[CORES_LPI_STATE_COUNT]; // Power domains CM_ARM_PSD_INFO PsdInfo[PSD_DOMAIN_COUNT]; -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#117006): https://edk2.groups.io/g/devel/message/117006 Mute This Topic: https://groups.io/mt/105069940/21656 Group Owner: [email protected] Unsubscribe: https://edk2.groups.io/g/devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
