X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=DynamicTablesPkg%2FInclude%2FArmNameSpaceObjects.h;h=2adaa788083e4e15d049f5f6b6312f77f3c02488;hp=ec31c40449d0658f98a89ce0bb6f604b491f1f34;hb=98a4a7a99bf588dffac031bb300d9aba4adcdea5;hpb=07f4e26eb6fe5203028ecfe9bad90d3b67dc72c8 diff --git a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h index ec31c40449..2adaa78808 100644 --- a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h +++ b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h @@ -1,6 +1,6 @@ /** @file - Copyright (c) 2017 - 2019, ARM Limited. All rights reserved. + Copyright (c) 2017 - 2018, ARM Limited. All rights reserved. This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -59,8 +59,6 @@ typedef enum ArmObjectID { /** A structure that describes the ARM Boot Architecture flags. - - ID: EArmObjBootArchInfo */ typedef struct CmArmBootArchInfo { /** This is the ARM_BOOT_ARCH flags field of the FADT Table @@ -73,10 +71,13 @@ typedef struct CmArmCpuInfo { // Reserved for use when SMBIOS tables are implemented } CM_ARM_CPU_INFO; +typedef struct CmArmCpuInfoList { + UINT32 CpuCount; + CM_ARM_CPU_INFO * CpuInfo; +} CM_ARM_CPU_INFO_LIST; + /** A structure that describes the Power Management Profile Information for the Platform. - - ID: EArmObjPowerManagementProfileInfo */ typedef struct CmArmPowerManagementProfileInfo { /** This is the Preferred_PM_Profile field of the FADT Table @@ -87,8 +88,6 @@ typedef struct CmArmPowerManagementProfileInfo { /** A structure that describes the GIC CPU Interface for the Platform. - - ID: EArmObjGicCInfo */ typedef struct CmArmGicCInfo { /// The GIC CPU Interface number. @@ -165,10 +164,11 @@ typedef struct CmArmGicCInfo { /** A structure that describes the GIC Distributor information for the Platform. - - ID: EArmObjGicDInfo */ typedef struct CmArmGicDInfo { + /// The GIC Distributor ID. + UINT32 GicId; + /// The Physical Base address for the GIC Distributor. UINT64 PhysicalBaseAddress; @@ -187,8 +187,6 @@ typedef struct CmArmGicDInfo { /** A structure that describes the GIC MSI Frame information for the Platform. - - ID: EArmObjGicMsiFrameInfo */ typedef struct CmArmGicMsiFrameInfo { /// The GIC MSI Frame ID @@ -212,8 +210,6 @@ typedef struct CmArmGicMsiFrameInfo { /** A structure that describes the GIC Redistributor information for the Platform. - - ID: EArmObjGicRedistributorInfo */ typedef struct CmArmGicRedistInfo { /** The physical address of a page range @@ -227,8 +223,6 @@ typedef struct CmArmGicRedistInfo { /** A structure that describes the GIC Interrupt Translation Service information for the Platform. - - ID: EArmObjGicItsInfo */ typedef struct CmArmGicItsInfo { /// The GIC ITS ID @@ -240,9 +234,6 @@ typedef struct CmArmGicItsInfo { /** A structure that describes the Serial Port information for the Platform. - - ID: EArmObjSerialConsolePortInfo or - EArmObjSerialDebugPortInfo */ typedef struct CmArmSerialPortInfo { /// The physical base address for the serial port @@ -263,8 +254,6 @@ typedef struct CmArmSerialPortInfo { /** A structure that describes the Generic Timer information for the Platform. - - ID: EArmObjGenericTimerInfo */ typedef struct CmArmGenericTimerInfo { /// The physical base address for the counter control frame @@ -300,8 +289,6 @@ typedef struct CmArmGenericTimerInfo { /** A structure that describes the Platform Generic Block Timer Frame information for the Platform. - - ID: EArmObjGTBlockTimerFrameInfo */ typedef struct CmArmGTBlockTimerFrameInfo { /// The Generic Timer frame number @@ -337,8 +324,6 @@ typedef struct CmArmGTBlockTimerFrameInfo { /** A structure that describes the Platform Generic Block Timer information for the Platform. - - ID: EArmObjPlatformGTBlockInfo */ typedef struct CmArmGTBlockInfo { /// The physical base address for the GT Block Timer structure @@ -353,8 +338,6 @@ typedef struct CmArmGTBlockInfo { /** A structure that describes the SBSA Generic Watchdog information for the Platform. - - ID: EArmObjPlatformGenericWatchdogInfo */ typedef struct CmArmGenericWatchdogInfo { /// The physical base address of the SBSA Watchdog control frame @@ -374,8 +357,6 @@ typedef struct CmArmGenericWatchdogInfo { /** A structure that describes the PCI Configuration Space information for the Platform. - - ID: EArmObjPciConfigSpaceInfo */ typedef struct CmArmPciConfigSpaceInfo { /// The physical base address for the PCI segment @@ -393,8 +374,6 @@ typedef struct CmArmPciConfigSpaceInfo { /** A structure that describes the Hypervisor Vendor ID information for the Platform. - - ID: EArmObjHypervisorVendorIdentity */ typedef struct CmArmHypervisorVendorId { /// The hypervisor Vendor ID @@ -403,8 +382,6 @@ typedef struct CmArmHypervisorVendorId { /** A structure that describes the Fixed feature flags for the Platform. - - ID: EArmObjFixedFeatureFlags */ typedef struct CmArmFixedFeatureFlags { /// The Fixed feature flags @@ -413,11 +390,9 @@ typedef struct CmArmFixedFeatureFlags { /** A structure that describes the ITS Group node for the Platform. - - ID: EArmObjItsGroup */ typedef struct CmArmItsGroupNode { - /// An unique token used to identify this object + /// An unique token used to ideintify this object CM_OBJECT_TOKEN Token; /// The number of ITS identifiers in the ITS node UINT32 ItsIdCount; @@ -427,8 +402,6 @@ typedef struct CmArmItsGroupNode { /** A structure that describes the GIC ITS Identifiers for an ITS Group node. - - ID: EArmObjGicItsIdentifierArray */ typedef struct CmArmGicItsIdentifier { /// The ITS Identifier @@ -437,11 +410,9 @@ typedef struct CmArmGicItsIdentifier { /** A structure that describes the Named component node for the Platform. - - ID: EArmObjNamedComponent */ typedef struct CmArmNamedComponentNode { - /// An unique token used to identify this object + /// An unique token used to ideintify this object CM_OBJECT_TOKEN Token; /// Number of ID mappings UINT32 IdMappingCount; @@ -468,11 +439,9 @@ typedef struct CmArmNamedComponentNode { /** A structure that describes the Root complex node for the Platform. - - ID: EArmObjRootComplex */ typedef struct CmArmRootComplexNode { - /// An unique token used to identify this object + /// An unique token used to ideintify this object CM_OBJECT_TOKEN Token; /// Number of ID mappings UINT32 IdMappingCount; @@ -496,11 +465,9 @@ typedef struct CmArmRootComplexNode { /** A structure that describes the SMMUv1 or SMMUv2 node for the Platform. - - ID: EArmObjSmmuV1SmmuV2 */ typedef struct CmArmSmmuV1SmmuV2Node { - /// An unique token used to identify this object + /// An unique token used to ideintify this object CM_OBJECT_TOKEN Token; /// Number of ID mappings UINT32 IdMappingCount; @@ -538,11 +505,9 @@ typedef struct CmArmSmmuV1SmmuV2Node { /** A structure that describes the SMMUv3 node for the Platform. - - ID: EArmObjSmmuV3 */ typedef struct CmArmSmmuV3Node { - /// An unique token used to identify this object + /// An unique token used to ideintify this object CM_OBJECT_TOKEN Token; /// Number of ID mappings UINT32 IdMappingCount; @@ -574,11 +539,9 @@ typedef struct CmArmSmmuV3Node { /** A structure that describes the PMCG node for the Platform. - - ID: EArmObjPmcg */ typedef struct CmArmPmcgNode { - /// An unique token used to identify this object + /// An unique token used to ideintify this object CM_OBJECT_TOKEN Token; /// Number of ID mappings UINT32 IdMappingCount; @@ -598,8 +561,6 @@ typedef struct CmArmPmcgNode { /** A structure that describes the ID Mappings for the Platform. - - ID: EArmObjIdMappingArray */ typedef struct CmArmIdMapping { /// Input base @@ -616,8 +577,6 @@ typedef struct CmArmIdMapping { /** A structure that describes the SMMU interrupts for the Platform. - - ID: EArmObjSmmuInterruptArray */ typedef struct CmArmSmmuInterrupt { /// Interrupt number