tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-27 15:44:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

DynamicTablesPkg: Drop Reserved29 object ID from Arm Namespace

Browse Source 
The Arm Namespace Object ID Reserved29 was a reserved ID
that was never used. Therefore, drop the EArmObjReserved29
object ID also update the Dynamic Plat Repo TokenFixer map
and the Configuration Manager Object Parser.

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>
This commit is contained in:
Sami Mujawar 2024-03-05 14:31:49 +00:00 committed by mergify[bot]
parent b0b0812a6e
commit 58c36ce09f
4 changed files with 62 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
DynamicTablesPkg/Include/ArmNameSpaceObjects.h
View File

@ -56,28 +56,27 @@ typedef enum ArmObjectID {
EArmObjSmmuInterruptArray, ///< 25 - SMMU Interrupt Array EArmObjSmmuInterruptArray, ///< 25 - SMMU Interrupt Array
EArmObjProcHierarchyInfo, ///< 26 - Processor Hierarchy Info EArmObjProcHierarchyInfo, ///< 26 - Processor Hierarchy Info
EArmObjCacheInfo, ///< 27 - Cache Info EArmObjCacheInfo, ///< 27 - Cache Info
EArmObjReserved29, ///< 28 - Reserved EArmObjCmRef, ///< 28 - CM Object Reference
EArmObjCmRef, ///< 29 - CM Object Reference EArmObjMemoryAffinityInfo, ///< 29 - Memory Affinity Info
EArmObjMemoryAffinityInfo, ///< 30 - Memory Affinity Info EArmObjDeviceHandleAcpi, ///< 30 - Device Handle Acpi
EArmObjDeviceHandleAcpi, ///< 31 - Device Handle Acpi EArmObjDeviceHandlePci, ///< 31 - Device Handle Pci
EArmObjDeviceHandlePci, ///< 32 - Device Handle Pci EArmObjGenericInitiatorAffinityInfo, ///< 32 - Generic Initiator Affinity
EArmObjGenericInitiatorAffinityInfo, ///< 33 - Generic Initiator Affinity EArmObjSerialPortInfo, ///< 33 - Generic Serial Port Info
EArmObjSerialPortInfo, ///< 34 - Generic Serial Port Info EArmObjCmn600Info, ///< 34 - CMN-600 Info
EArmObjCmn600Info, ///< 35 - CMN-600 Info EArmObjLpiInfo, ///< 35 - Lpi Info
EArmObjLpiInfo, ///< 36 - Lpi Info EArmObjPciAddressMapInfo, ///< 36 - Pci Address Map Info
EArmObjPciAddressMapInfo, ///< 37 - Pci Address Map Info EArmObjPciInterruptMapInfo, ///< 37 - Pci Interrupt Map Info
EArmObjPciInterruptMapInfo, ///< 38 - Pci Interrupt Map Info EArmObjRmr, ///< 38 - Reserved Memory Range Node
EArmObjRmr, ///< 39 - Reserved Memory Range Node EArmObjMemoryRangeDescriptor, ///< 39 - Memory Range Descriptor
EArmObjMemoryRangeDescriptor, ///< 40 - Memory Range Descriptor EArmObjCpcInfo, ///< 40 - Continuous Performance Control Info
EArmObjCpcInfo, ///< 41 - Continuous Performance Control Info EArmObjPccSubspaceType0Info, ///< 41 - Pcc Subspace Type 0 Info
EArmObjPccSubspaceType0Info, ///< 42 - Pcc Subspace Type 0 Info EArmObjPccSubspaceType1Info, ///< 42 - Pcc Subspace Type 2 Info
EArmObjPccSubspaceType1Info, ///< 43 - Pcc Subspace Type 2 Info EArmObjPccSubspaceType2Info, ///< 43 - Pcc Subspace Type 2 Info
EArmObjPccSubspaceType2Info, ///< 44 - Pcc Subspace Type 2 Info EArmObjPccSubspaceType3Info, ///< 44 - Pcc Subspace Type 3 Info
EArmObjPccSubspaceType3Info, ///< 45 - Pcc Subspace Type 3 Info EArmObjPccSubspaceType4Info, ///< 45 - Pcc Subspace Type 4 Info
EArmObjPccSubspaceType4Info, ///< 46 - Pcc Subspace Type 4 Info EArmObjPccSubspaceType5Info, ///< 46 - Pcc Subspace Type 5 Info
EArmObjPccSubspaceType5Info, ///< 47 - Pcc Subspace Type 5 Info EArmObjEtInfo, ///< 47 - Embedded Trace Extension/Module Info
EArmObjEtInfo, ///< 48 - Embedded Trace Extension/Module Info EArmObjPsdInfo, ///< 48 - P-State Dependency (PSD) Info
EArmObjPsdInfo, ///< 49 - P-State Dependency (PSD) Info
EArmObjMax EArmObjMax
} EARM_OBJECT_ID; } EARM_OBJECT_ID;

41
DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c
View File

@ -171,28 +171,27 @@ CM_OBJECT_TOKEN_FIXER TokenFixer[EArmObjMax] = {
NULL, ///< 25 - SMMU Interrupt Array NULL, ///< 25 - SMMU Interrupt Array
TokenFixerNotImplemented, ///< 26 - Processor Hierarchy Info TokenFixerNotImplemented, ///< 26 - Processor Hierarchy Info
TokenFixerNotImplemented, ///< 27 - Cache Info TokenFixerNotImplemented, ///< 27 - Cache Info
TokenFixerNotImplemented, ///< 29 - Reserved NULL, ///< 28 - CM Object Reference
NULL, ///< 29 - CM Object Reference NULL, ///< 29 - Memory Affinity Info
NULL, ///< 30 - Memory Affinity Info NULL, ///< 30 - Device Handle Acpi
NULL, ///< 31 - Device Handle Acpi NULL, ///< 31 - Device Handle Pci
NULL, ///< 32 - Device Handle Pci NULL, ///< 32 - Generic Initiator Affinity
NULL, ///< 33 - Generic Initiator Affinity NULL, ///< 33 - Generic Serial Port Info
NULL, ///< 34 - Generic Serial Port Info NULL, ///< 34 - CMN-600 Info
NULL, ///< 35 - CMN-600 Info NULL, ///< 35 - Lpi Info
NULL, ///< 36 - Lpi Info NULL, ///< 36 - Pci Address Map Info
NULL, ///< 37 - Pci Address Map Info NULL, ///< 37 - Pci Interrupt Map Info
NULL, ///< 38 - Pci Interrupt Map Info NULL, ///< 38 - Reserved Memory Range Node
NULL, ///< 39 - Reserved Memory Range Node NULL, ///< 39 - Memory Range Descriptor
NULL, ///< 40 - Memory Range Descriptor NULL, ///< 40 - Continuous Performance Control Info
NULL, ///< 41 - Continuous Performance Control Info NULL, ///< 41 - Pcc Subspace Type 0 Info
NULL, ///< 42 - Pcc Subspace Type 0 Info NULL, ///< 42 - Pcc Subspace Type 2 Info
NULL, ///< 43 - Pcc Subspace Type 2 Info NULL, ///< 43 - Pcc Subspace Type 2 Info
NULL, ///< 44 - Pcc Subspace Type 2 Info NULL, ///< 44 - Pcc Subspace Type 3 Info
NULL, ///< 45 - Pcc Subspace Type 3 Info NULL, ///< 45 - Pcc Subspace Type 4 Info
NULL, ///< 46 - Pcc Subspace Type 4 Info NULL, ///< 46 - Pcc Subspace Type 5 Info
NULL, ///< 47 - Pcc Subspace Type 5 Info NULL, ///< 47 - Embedded Trace Extension/Module Info
NULL, ///< 48 - Embedded Trace Extension/Module Info NULL ///< 48 - P-State Dependency (PSD) Info
NULL ///< 49 - P-State Dependency (PSD) Info
}; };
/** CmObj token fixer. /** CmObj token fixer.

1
DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c
View File

@ -705,7 +705,6 @@ STATIC CONST CM_OBJ_PARSER_ARRAY ArmNamespaceObjectParser[] = {
CM_PARSER_ADD_OBJECT (EArmObjSmmuInterruptArray, CmArmGenericInterruptParser), CM_PARSER_ADD_OBJECT (EArmObjSmmuInterruptArray, CmArmGenericInterruptParser),
CM_PARSER_ADD_OBJECT (EArmObjProcHierarchyInfo, CmArmProcHierarchyInfoParser), CM_PARSER_ADD_OBJECT (EArmObjProcHierarchyInfo, CmArmProcHierarchyInfoParser),
CM_PARSER_ADD_OBJECT (EArmObjCacheInfo, CmArmCacheInfoParser), CM_PARSER_ADD_OBJECT (EArmObjCacheInfo, CmArmCacheInfoParser),
CM_PARSER_ADD_OBJECT_RESERVED (EArmObjReserved29),
CM_PARSER_ADD_OBJECT (EArmObjCmRef, CmArmObjRefParser), CM_PARSER_ADD_OBJECT (EArmObjCmRef, CmArmObjRefParser),
CM_PARSER_ADD_OBJECT (EArmObjMemoryAffinityInfo, CmArmMemoryAffinityInfoParser), CM_PARSER_ADD_OBJECT (EArmObjMemoryAffinityInfo, CmArmMemoryAffinityInfoParser),
CM_PARSER_ADD_OBJECT (EArmObjDeviceHandleAcpi, CmArmDeviceHandleAcpiParser), CM_PARSER_ADD_OBJECT (EArmObjDeviceHandleAcpi, CmArmDeviceHandleAcpiParser),

43
DynamicTablesPkg/Readme.md
View File

@ -468,28 +468,27 @@ The CM_OBJECT_ID type is used to identify the Configuration Manager
| 25 | SMMU Interrupt Array | | | 25 | SMMU Interrupt Array | |
| 26 | Processor Hierarchy Info | Move to Arch Common NS | | 26 | Processor Hierarchy Info | Move to Arch Common NS |
| 27 | Cache Info | Move to Arch Common NS | | 27 | Cache Info | Move to Arch Common NS |
| 28 | Reserved29 | Unused to be dropped.| | 28 | CM Object Reference | Move to Arch Common NS |
| 29 | CM Object Reference | Move to Arch Common NS | | 29 | Memory Affinity Info | Move to Arch Common NS |
| 30 | Memory Affinity Info | Move to Arch Common NS | | 30 | Device Handle Acpi | Move to Arch Common NS |
| 31 | Device Handle Acpi | Move to Arch Common NS | | 31 | Device Handle PCI | Move to Arch Common NS |
| 32 | Device Handle PCI | Move to Arch Common NS | | 32 | Generic Initiator Affinity Info | Move to Arch Common NS |
| 33 | Generic Initiator Affinity Info | Move to Arch Common NS | | 33 | Serial Port Info | Move to Arch Common NS |
| 34 | Serial Port Info | Move to Arch Common NS | | 34 | CMN 600 Info | |
| 35 | CMN 600 Info | | | 35 | Low Power Idle State Info | Move to Arch Common NS |
| 36 | Low Power Idle State Info | Move to Arch Common NS | | 36 | PCI Address Map Info | Move to Arch Common NS |
| 37 | PCI Address Map Info | Move to Arch Common NS | | 37 | PCI Interrupt Map Info | Move to Arch Common NS |
| 38 | PCI Interrupt Map Info | Move to Arch Common NS | | 38 | Reserved Memory Range Node | |
| 39 | Reserved Memory Range Node | | | 39 | Memory Range Descriptor | |
| 40 | Memory Range Descriptor | | | 40 | Continuous Performance Control Info | Move to Arch Common NS |
| 41 | Continuous Performance Control Info | Move to Arch Common NS | | 41 | Pcc Subspace Type 0 Info | Move to Arch Common NS |
| 42 | Pcc Subspace Type 0 Info | Move to Arch Common NS | | 42 | Pcc Subspace Type 1 Info | Move to Arch Common NS |
| 43 | Pcc Subspace Type 1 Info | Move to Arch Common NS | | 43 | Pcc Subspace Type 2 Info | Move to Arch Common NS |
| 44 | Pcc Subspace Type 2 Info | Move to Arch Common NS | | 44 | Pcc Subspace Type 3 Info | Move to Arch Common NS |
| 45 | Pcc Subspace Type 3 Info | Move to Arch Common NS | | 45 | Pcc Subspace Type 4 Info | Move to Arch Common NS |
| 46 | Pcc Subspace Type 4 Info | Move to Arch Common NS | | 46 | Pcc Subspace Type 5 Info | Move to Arch Common NS |
| 47 | Pcc Subspace Type 5 Info | Move to Arch Common NS | | 47 | Embedded Trace Extension/Module Info | |
| 48 | Embedded Trace Extension/Module Info | | | 48 | P-State Dependency (PSD) Info | Move to Arch Common NS |
| 49 | P-State Dependency (PSD) Info | Move to Arch Common NS |
| `*` | All other values are reserved. | | | `*` | All other values are reserved. | |
#### Object ID's in the Arch Common Namespace: #### Object ID's in the Arch Common Namespace: