summaryrefslogtreecommitdiffstats
path: root/DynamicTablesPkg/Include
diff options
context:
space:
mode:
authorSami Mujawar <sami.mujawar@arm.com>2024-03-06 11:00:12 +0000
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2024-07-29 13:44:55 +0000
commit8e9ece12343d54c261888d5ee47d56921080705d (patch)
treef1b692e2f236fff5d0ba1d260bb02d328127857a /DynamicTablesPkg/Include
parent87a53216e7ddce449c76f80d52db6a60fa3d1079 (diff)
downloadedk2-8e9ece12343d54c261888d5ee47d56921080705d.tar.gz
DynamicTablesPkg: Move FADT Fixed Features Flags to Arch Common
Move FADT Fixed Features Flags object from Arm Namespace to the Arch Common namespace. Correspondingly also update the following modules to reflect the changes introduced by the move: - FADT 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.h11
-rw-r--r--DynamicTablesPkg/Include/ArmNameSpaceObjects.h73
2 files changed, 42 insertions, 42 deletions
diff --git a/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h b/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h
index 401a24b6a5..1030488f45 100644
--- a/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h
+++ b/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h
@@ -26,6 +26,7 @@ typedef enum ArchCommonObjectID {
EArchCommonObjConsolePortInfo, ///< 3 - Serial Console Port Info
EArchCommonObjSerialDebugPortInfo, ///< 4 - Serial Debug Port Info
EArchCommonObjHypervisorVendorIdentity, ///< 5 - Hypervisor Vendor Id
+ EArchCommonObjFixedFeatureFlags, ///< 6 - Fixed feature flags for FADT
EArchCommonObjMax
} EARCH_COMMON_OBJECT_ID;
@@ -86,6 +87,16 @@ typedef struct CmArchCommonHypervisorVendorIdentity {
UINT64 HypervisorVendorId;
} CM_ARCH_COMMON_HYPERVISOR_VENDOR_ID;
+/** A structure that describes the
+ Fixed feature flags for the Platform.
+
+ ID: EArchCommonObjFixedFeatureFlags
+*/
+typedef struct CmArchCommonFixedFeatureFlags {
+ /// The Fixed feature flags
+ UINT32 Flags;
+} CM_ARCH_COMMON_FIXED_FEATURE_FLAGS;
+
#pragma pack()
#endif // ARCH_COMMON_NAMESPACE_OBJECTS_H_
diff --git a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h
index 48e65a3cc0..66709c41fd 100644
--- a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h
+++ b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h
@@ -40,38 +40,37 @@ typedef enum ArmObjectID {
EArmObjGTBlockTimerFrameInfo, ///< 9 - Generic Timer Block Frame Info
EArmObjPlatformGenericWatchdogInfo, ///< 10 - Platform Generic Watchdog
EArmObjPciConfigSpaceInfo, ///< 11 - PCI Configuration Space Info
- EArmObjFixedFeatureFlags, ///< 12 - Fixed feature flags for FADT
- EArmObjItsGroup, ///< 13 - ITS Group
- EArmObjNamedComponent, ///< 14 - Named Component
- EArmObjRootComplex, ///< 15 - Root Complex
- EArmObjSmmuV1SmmuV2, ///< 16 - SMMUv1 or SMMUv2
- EArmObjSmmuV3, ///< 17 - SMMUv3
- EArmObjPmcg, ///< 18 - PMCG
- EArmObjGicItsIdentifierArray, ///< 19 - GIC ITS Identifier Array
- EArmObjIdMappingArray, ///< 20 - ID Mapping Array
- EArmObjSmmuInterruptArray, ///< 21 - SMMU Interrupt Array
- EArmObjProcHierarchyInfo, ///< 22 - Processor Hierarchy Info
- EArmObjCacheInfo, ///< 23 - Cache Info
- EArmObjCmRef, ///< 24 - CM Object Reference
- EArmObjMemoryAffinityInfo, ///< 25 - Memory Affinity Info
- EArmObjDeviceHandleAcpi, ///< 26 - Device Handle Acpi
- EArmObjDeviceHandlePci, ///< 27 - Device Handle Pci
- EArmObjGenericInitiatorAffinityInfo, ///< 28 - Generic Initiator Affinity
- EArmObjCmn600Info, ///< 29 - CMN-600 Info
- EArmObjLpiInfo, ///< 30 - Lpi Info
- EArmObjPciAddressMapInfo, ///< 31 - Pci Address Map Info
- EArmObjPciInterruptMapInfo, ///< 32 - Pci Interrupt Map Info
- EArmObjRmr, ///< 33 - Reserved Memory Range Node
- EArmObjMemoryRangeDescriptor, ///< 34 - Memory Range Descriptor
- EArmObjCpcInfo, ///< 35 - Continuous Performance Control Info
- EArmObjPccSubspaceType0Info, ///< 36 - Pcc Subspace Type 0 Info
- EArmObjPccSubspaceType1Info, ///< 37 - Pcc Subspace Type 2 Info
- EArmObjPccSubspaceType2Info, ///< 38 - Pcc Subspace Type 2 Info
- EArmObjPccSubspaceType3Info, ///< 39 - Pcc Subspace Type 3 Info
- EArmObjPccSubspaceType4Info, ///< 40 - Pcc Subspace Type 4 Info
- EArmObjPccSubspaceType5Info, ///< 41 - Pcc Subspace Type 5 Info
- EArmObjEtInfo, ///< 42 - Embedded Trace Extension/Module Info
- EArmObjPsdInfo, ///< 43 - P-State Dependency (PSD) Info
+ EArmObjItsGroup, ///< 12 - ITS Group
+ EArmObjNamedComponent, ///< 13 - Named Component
+ EArmObjRootComplex, ///< 14 - Root Complex
+ EArmObjSmmuV1SmmuV2, ///< 15 - SMMUv1 or SMMUv2
+ EArmObjSmmuV3, ///< 16 - SMMUv3
+ EArmObjPmcg, ///< 17 - PMCG
+ EArmObjGicItsIdentifierArray, ///< 18 - GIC ITS Identifier Array
+ EArmObjIdMappingArray, ///< 19 - ID Mapping Array
+ EArmObjSmmuInterruptArray, ///< 20 - SMMU Interrupt Array
+ EArmObjProcHierarchyInfo, ///< 21 - Processor Hierarchy Info
+ EArmObjCacheInfo, ///< 22 - Cache Info
+ EArmObjCmRef, ///< 23 - CM Object Reference
+ EArmObjMemoryAffinityInfo, ///< 24 - Memory Affinity Info
+ EArmObjDeviceHandleAcpi, ///< 25 - Device Handle Acpi
+ EArmObjDeviceHandlePci, ///< 26 - Device Handle Pci
+ EArmObjGenericInitiatorAffinityInfo, ///< 27 - Generic Initiator Affinity
+ EArmObjCmn600Info, ///< 28 - CMN-600 Info
+ EArmObjLpiInfo, ///< 29 - Lpi Info
+ EArmObjPciAddressMapInfo, ///< 30 - Pci Address Map Info
+ EArmObjPciInterruptMapInfo, ///< 31 - Pci Interrupt Map Info
+ EArmObjRmr, ///< 32 - Reserved Memory Range Node
+ EArmObjMemoryRangeDescriptor, ///< 33 - Memory Range Descriptor
+ EArmObjCpcInfo, ///< 34 - Continuous Performance Control Info
+ EArmObjPccSubspaceType0Info, ///< 35 - Pcc Subspace Type 0 Info
+ EArmObjPccSubspaceType1Info, ///< 36 - Pcc Subspace Type 2 Info
+ EArmObjPccSubspaceType2Info, ///< 37 - Pcc Subspace Type 2 Info
+ EArmObjPccSubspaceType3Info, ///< 38 - Pcc Subspace Type 3 Info
+ EArmObjPccSubspaceType4Info, ///< 39 - Pcc Subspace Type 4 Info
+ EArmObjPccSubspaceType5Info, ///< 40 - Pcc Subspace Type 5 Info
+ EArmObjEtInfo, ///< 41 - Embedded Trace Extension/Module Info
+ EArmObjPsdInfo, ///< 42 - P-State Dependency (PSD) Info
EArmObjMax
} EARM_OBJECT_ID;
@@ -438,16 +437,6 @@ typedef struct CmArmPciConfigSpaceInfo {
} CM_ARM_PCI_CONFIG_SPACE_INFO;
/** A structure that describes the
- Fixed feature flags for the Platform.
-
- ID: EArmObjFixedFeatureFlags
-*/
-typedef struct CmArmFixedFeatureFlags {
- /// The Fixed feature flags
- UINT32 Flags;
-} CM_ARM_FIXED_FEATURE_FLAGS;
-
-/** A structure that describes the
ITS Group node for the Platform.
ID: EArmObjItsGroup