diff options
| author | Sami Mujawar <sami.mujawar@arm.com> | 2024-03-11 11:00:57 +0000 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2024-07-29 13:44:55 +0000 |
| commit | 71b0e9decb9a8e8620e086465ca449c033438818 (patch) | |
| tree | 3a5a4e8eb882ac1f6907399f726716cd808965c6 /DynamicTablesPkg/Include | |
| parent | 11dcf74d4240c5627d88a627c671037b0faf1cb8 (diff) | |
| download | edk2-71b0e9decb9a8e8620e086465ca449c033438818.tar.gz | |
DynamicTablesPkg: Move Mem Affinity Info to Arch Common
Move the Memory Affinity Info object from Arm Namespace to the
Arch Common namespace.
Correspondingly also update the following modules to reflect the
changes introduced by the move:
- SRAT generator
- ConfigurationManagerObjectParser
- Dynamic Plat Repo TokenFixer map.
Cc: Pierre Gondois <Pierre.Gondois@arm.com>
Cc: Yeo Reum Yun <YeoReum.Yun@arm.com>
Cc: AbdulLateef Attar <AbdulLateef.Attar@amd.com>
Cc: Jeshua Smith <jeshuas@nvidia.com>
Cc: Jeff Brasen <jbrasen@nvidia.com>
Cc: Girish Mahadevan <gmahadevan@nvidia.com>
Cc: Leif Lindholm <quic_llindhol@quicinc.com>
Cc: Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>
Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
Reviewed-by: Sunil V L <sunilvl@ventanamicro.com>
Diffstat (limited to 'DynamicTablesPkg/Include')
| -rw-r--r-- | DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h | 19 | ||||
| -rw-r--r-- | DynamicTablesPkg/Include/ArmNameSpaceObjects.h | 51 |
2 files changed, 35 insertions, 35 deletions
diff --git a/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h b/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h index 429505b650..86d751bdfa 100644 --- a/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h +++ b/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h @@ -31,6 +31,7 @@ typedef enum ArchCommonObjectID { EArchCommonObjPciConfigSpaceInfo, ///< 8 - PCI Configuration Space Info
EArchCommonObjPciAddressMapInfo, ///< 9 - Pci Address Map Info
EArchCommonObjPciInterruptMapInfo, ///< 10 - Pci Interrupt Map Info
+ EArchCommonObjMemoryAffinityInfo, ///< 11 - Memory Affinity Info
EArchCommonObjMax
} EARCH_COMMON_OBJECT_ID;
@@ -223,6 +224,24 @@ typedef struct CmArchCommonPciInterruptMapInfo { CM_ARCH_COMMON_GENERIC_INTERRUPT IntcInterrupt;
} CM_ARCH_COMMON_PCI_INTERRUPT_MAP_INFO;
+/** A structure that describes the Memory Affinity Structure (Type 1) in SRAT
+
+ ID: EArchCommonObjMemoryAffinityInfo
+*/
+typedef struct CmArchCommonMemoryAffinityInfo {
+ /// The proximity domain to which the "range of memory" belongs.
+ UINT32 ProximityDomain;
+
+ /// Base Address
+ UINT64 BaseAddress;
+
+ /// Length
+ UINT64 Length;
+
+ /// Flags
+ UINT32 Flags;
+} CM_ARCH_COMMON_MEMORY_AFFINITY_INFO;
+
#pragma pack()
#endif // ARCH_COMMON_NAMESPACE_OBJECTS_H_
diff --git a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h index 5d7c84f51d..7905152114 100644 --- a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h +++ b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h @@ -50,23 +50,22 @@ typedef enum ArmObjectID { EArmObjSmmuInterruptArray, ///< 19 - SMMU Interrupt Array
EArmObjProcHierarchyInfo, ///< 20 - Processor Hierarchy Info
EArmObjCacheInfo, ///< 21 - Cache Info
- EArmObjMemoryAffinityInfo, ///< 22 - Memory Affinity Info
- EArmObjDeviceHandleAcpi, ///< 23 - Device Handle Acpi
- EArmObjDeviceHandlePci, ///< 24 - Device Handle Pci
- EArmObjGenericInitiatorAffinityInfo, ///< 25 - Generic Initiator Affinity
- EArmObjCmn600Info, ///< 26 - CMN-600 Info
- EArmObjLpiInfo, ///< 27 - Lpi Info
- EArmObjRmr, ///< 28 - Reserved Memory Range Node
- EArmObjMemoryRangeDescriptor, ///< 29 - Memory Range Descriptor
- EArmObjCpcInfo, ///< 30 - Continuous Performance Control Info
- EArmObjPccSubspaceType0Info, ///< 31 - Pcc Subspace Type 0 Info
- EArmObjPccSubspaceType1Info, ///< 32 - Pcc Subspace Type 2 Info
- EArmObjPccSubspaceType2Info, ///< 33 - Pcc Subspace Type 2 Info
- EArmObjPccSubspaceType3Info, ///< 34 - Pcc Subspace Type 3 Info
- EArmObjPccSubspaceType4Info, ///< 35 - Pcc Subspace Type 4 Info
- EArmObjPccSubspaceType5Info, ///< 36 - Pcc Subspace Type 5 Info
- EArmObjEtInfo, ///< 37 - Embedded Trace Extension/Module Info
- EArmObjPsdInfo, ///< 38 - P-State Dependency (PSD) Info
+ EArmObjDeviceHandleAcpi, ///< 22 - Device Handle Acpi
+ EArmObjDeviceHandlePci, ///< 23 - Device Handle Pci
+ EArmObjGenericInitiatorAffinityInfo, ///< 24 - Generic Initiator Affinity
+ EArmObjCmn600Info, ///< 25 - CMN-600 Info
+ EArmObjLpiInfo, ///< 26 - Lpi Info
+ EArmObjRmr, ///< 27 - Reserved Memory Range Node
+ EArmObjMemoryRangeDescriptor, ///< 28 - Memory Range Descriptor
+ EArmObjCpcInfo, ///< 29 - Continuous Performance Control Info
+ EArmObjPccSubspaceType0Info, ///< 30 - Pcc Subspace Type 0 Info
+ EArmObjPccSubspaceType1Info, ///< 31 - Pcc Subspace Type 2 Info
+ EArmObjPccSubspaceType2Info, ///< 32 - Pcc Subspace Type 2 Info
+ EArmObjPccSubspaceType3Info, ///< 33 - Pcc Subspace Type 3 Info
+ EArmObjPccSubspaceType4Info, ///< 34 - Pcc Subspace Type 4 Info
+ EArmObjPccSubspaceType5Info, ///< 35 - Pcc Subspace Type 5 Info
+ EArmObjEtInfo, ///< 36 - Embedded Trace Extension/Module Info
+ EArmObjPsdInfo, ///< 37 - P-State Dependency (PSD) Info
EArmObjMax
} EARM_OBJECT_ID;
@@ -721,24 +720,6 @@ typedef struct CmArmCacheInfo { UINT32 CacheId;
} CM_ARM_CACHE_INFO;
-/** A structure that describes the Memory Affinity Structure (Type 1) in SRAT
-
- ID: EArmObjMemoryAffinityInfo
-*/
-typedef struct CmArmMemoryAffinityInfo {
- /// The proximity domain to which the "range of memory" belongs.
- UINT32 ProximityDomain;
-
- /// Base Address
- UINT64 BaseAddress;
-
- /// Length
- UINT64 Length;
-
- /// Flags
- UINT32 Flags;
-} CM_ARM_MEMORY_AFFINITY_INFO;
-
/** A structure that describes the ACPI Device Handle (Type 0) in the
Generic Initiator Affinity structure in SRAT
|