diff options
| author | Sami Mujawar <sami.mujawar@arm.com> | 2024-03-11 11:08:56 +0000 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2024-07-29 13:44:55 +0000 |
| commit | 0ca10ddc0f94060ec8efcf14464336ba6946aafe (patch) | |
| tree | bbf132bc59456697706977a89bb9461dce134f65 /DynamicTablesPkg/Include | |
| parent | 71b0e9decb9a8e8620e086465ca449c033438818 (diff) | |
| download | edk2-0ca10ddc0f94060ec8efcf14464336ba6946aafe.tar.gz | |
DynamicTablesPkg: Move ACPI device Handle object to Arch Common
Move the ACPI device Handle 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 | 14 | ||||
| -rw-r--r-- | DynamicTablesPkg/Include/ArmNameSpaceObjects.h | 44 |
2 files changed, 29 insertions, 29 deletions
diff --git a/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h b/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h index 86d751bdfa..0b450e8f99 100644 --- a/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h +++ b/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h @@ -32,6 +32,7 @@ typedef enum ArchCommonObjectID { EArchCommonObjPciAddressMapInfo, ///< 9 - Pci Address Map Info
EArchCommonObjPciInterruptMapInfo, ///< 10 - Pci Interrupt Map Info
EArchCommonObjMemoryAffinityInfo, ///< 11 - Memory Affinity Info
+ EArchCommonObjDeviceHandleAcpi, ///< 12 - Device Handle Acpi
EArchCommonObjMax
} EARCH_COMMON_OBJECT_ID;
@@ -242,6 +243,19 @@ typedef struct CmArchCommonMemoryAffinityInfo { UINT32 Flags;
} CM_ARCH_COMMON_MEMORY_AFFINITY_INFO;
+/** A structure that describes the ACPI Device Handle (Type 0) in the
+ Generic Initiator Affinity structure in SRAT
+
+ ID: EArchCommonObjDeviceHandleAcpi
+*/
+typedef struct CmArchCommonDeviceHandleAcpi {
+ /// Hardware ID
+ UINT64 Hid;
+
+ /// Unique Id
+ UINT32 Uid;
+} CM_ARCH_COMMON_DEVICE_HANDLE_ACPI;
+
#pragma pack()
#endif // ARCH_COMMON_NAMESPACE_OBJECTS_H_
diff --git a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h index 7905152114..64c5f26772 100644 --- a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h +++ b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h @@ -50,22 +50,21 @@ typedef enum ArmObjectID { EArmObjSmmuInterruptArray, ///< 19 - SMMU Interrupt Array
EArmObjProcHierarchyInfo, ///< 20 - Processor Hierarchy Info
EArmObjCacheInfo, ///< 21 - Cache 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
+ EArmObjDeviceHandlePci, ///< 22 - Device Handle Pci
+ EArmObjGenericInitiatorAffinityInfo, ///< 23 - Generic Initiator Affinity
+ EArmObjCmn600Info, ///< 24 - CMN-600 Info
+ EArmObjLpiInfo, ///< 25 - Lpi Info
+ EArmObjRmr, ///< 26 - Reserved Memory Range Node
+ EArmObjMemoryRangeDescriptor, ///< 27 - Memory Range Descriptor
+ EArmObjCpcInfo, ///< 28 - Continuous Performance Control Info
+ EArmObjPccSubspaceType0Info, ///< 29 - Pcc Subspace Type 0 Info
+ EArmObjPccSubspaceType1Info, ///< 30 - Pcc Subspace Type 2 Info
+ EArmObjPccSubspaceType2Info, ///< 31 - Pcc Subspace Type 2 Info
+ EArmObjPccSubspaceType3Info, ///< 32 - Pcc Subspace Type 3 Info
+ EArmObjPccSubspaceType4Info, ///< 33 - Pcc Subspace Type 4 Info
+ EArmObjPccSubspaceType5Info, ///< 34 - Pcc Subspace Type 5 Info
+ EArmObjEtInfo, ///< 35 - Embedded Trace Extension/Module Info
+ EArmObjPsdInfo, ///< 36 - P-State Dependency (PSD) Info
EArmObjMax
} EARM_OBJECT_ID;
@@ -720,19 +719,6 @@ typedef struct CmArmCacheInfo { UINT32 CacheId;
} CM_ARM_CACHE_INFO;
-/** A structure that describes the ACPI Device Handle (Type 0) in the
- Generic Initiator Affinity structure in SRAT
-
- ID: EArmObjDeviceHandleAcpi
-*/
-typedef struct CmArmDeviceHandleAcpi {
- /// Hardware ID
- UINT64 Hid;
-
- /// Unique Id
- UINT32 Uid;
-} CM_ARM_DEVICE_HANDLE_ACPI;
-
/** A structure that describes the PCI Device Handle (Type 1) in the
Generic Initiator Affinity structure in SRAT
|