diff options
| author | Sami Mujawar <sami.mujawar@arm.com> | 2024-03-05 14:31:49 +0000 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2024-07-29 13:44:55 +0000 |
| commit | 58c36ce09f677a2e14681d3baf19753e86c6c103 (patch) | |
| tree | 24af44eec6a5410bafa8a04b3635da3b7b7aed17 /DynamicTablesPkg | |
| parent | b0b0812a6e085945bb01d31eaefd7d4b2c24c243 (diff) | |
| download | edk2-58c36ce09f677a2e14681d3baf19753e86c6c103.tar.gz | |
DynamicTablesPkg: Drop Reserved29 object ID from Arm Namespace
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>
Diffstat (limited to 'DynamicTablesPkg')
4 files changed, 62 insertions, 66 deletions
diff --git a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h index 2eeff594fc..f7e1a0933f 100644 --- a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h +++ b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h @@ -56,28 +56,27 @@ typedef enum ArmObjectID { EArmObjSmmuInterruptArray, ///< 25 - SMMU Interrupt Array
EArmObjProcHierarchyInfo, ///< 26 - Processor Hierarchy Info
EArmObjCacheInfo, ///< 27 - Cache Info
- EArmObjReserved29, ///< 28 - Reserved
- EArmObjCmRef, ///< 29 - CM Object Reference
- EArmObjMemoryAffinityInfo, ///< 30 - Memory Affinity Info
- EArmObjDeviceHandleAcpi, ///< 31 - Device Handle Acpi
- EArmObjDeviceHandlePci, ///< 32 - Device Handle Pci
- EArmObjGenericInitiatorAffinityInfo, ///< 33 - Generic Initiator Affinity
- EArmObjSerialPortInfo, ///< 34 - Generic Serial Port Info
- EArmObjCmn600Info, ///< 35 - CMN-600 Info
- EArmObjLpiInfo, ///< 36 - Lpi Info
- EArmObjPciAddressMapInfo, ///< 37 - Pci Address Map Info
- EArmObjPciInterruptMapInfo, ///< 38 - Pci Interrupt Map Info
- EArmObjRmr, ///< 39 - Reserved Memory Range Node
- EArmObjMemoryRangeDescriptor, ///< 40 - Memory Range Descriptor
- EArmObjCpcInfo, ///< 41 - Continuous Performance Control Info
- EArmObjPccSubspaceType0Info, ///< 42 - Pcc Subspace Type 0 Info
- EArmObjPccSubspaceType1Info, ///< 43 - Pcc Subspace Type 2 Info
- EArmObjPccSubspaceType2Info, ///< 44 - Pcc Subspace Type 2 Info
- EArmObjPccSubspaceType3Info, ///< 45 - Pcc Subspace Type 3 Info
- EArmObjPccSubspaceType4Info, ///< 46 - Pcc Subspace Type 4 Info
- EArmObjPccSubspaceType5Info, ///< 47 - Pcc Subspace Type 5 Info
- EArmObjEtInfo, ///< 48 - Embedded Trace Extension/Module Info
- EArmObjPsdInfo, ///< 49 - P-State Dependency (PSD) Info
+ EArmObjCmRef, ///< 28 - CM Object Reference
+ EArmObjMemoryAffinityInfo, ///< 29 - Memory Affinity Info
+ EArmObjDeviceHandleAcpi, ///< 30 - Device Handle Acpi
+ EArmObjDeviceHandlePci, ///< 31 - Device Handle Pci
+ EArmObjGenericInitiatorAffinityInfo, ///< 32 - Generic Initiator Affinity
+ EArmObjSerialPortInfo, ///< 33 - Generic Serial Port Info
+ EArmObjCmn600Info, ///< 34 - CMN-600 Info
+ EArmObjLpiInfo, ///< 35 - Lpi Info
+ EArmObjPciAddressMapInfo, ///< 36 - Pci Address Map Info
+ EArmObjPciInterruptMapInfo, ///< 37 - Pci Interrupt Map Info
+ EArmObjRmr, ///< 38 - Reserved Memory Range Node
+ EArmObjMemoryRangeDescriptor, ///< 39 - Memory Range Descriptor
+ EArmObjCpcInfo, ///< 40 - Continuous Performance Control Info
+ EArmObjPccSubspaceType0Info, ///< 41 - Pcc Subspace Type 0 Info
+ EArmObjPccSubspaceType1Info, ///< 42 - Pcc Subspace Type 2 Info
+ EArmObjPccSubspaceType2Info, ///< 43 - Pcc Subspace Type 2 Info
+ EArmObjPccSubspaceType3Info, ///< 44 - Pcc Subspace Type 3 Info
+ EArmObjPccSubspaceType4Info, ///< 45 - Pcc Subspace Type 4 Info
+ EArmObjPccSubspaceType5Info, ///< 46 - Pcc Subspace Type 5 Info
+ EArmObjEtInfo, ///< 47 - Embedded Trace Extension/Module Info
+ EArmObjPsdInfo, ///< 48 - P-State Dependency (PSD) Info
EArmObjMax
} EARM_OBJECT_ID;
diff --git a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c index 07e26a4f4e..833fa2d6a2 100644 --- a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c +++ b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c @@ -171,28 +171,27 @@ CM_OBJECT_TOKEN_FIXER TokenFixer[EArmObjMax] = { NULL, ///< 25 - SMMU Interrupt Array
TokenFixerNotImplemented, ///< 26 - Processor Hierarchy Info
TokenFixerNotImplemented, ///< 27 - Cache Info
- TokenFixerNotImplemented, ///< 29 - Reserved
- NULL, ///< 29 - CM Object Reference
- NULL, ///< 30 - Memory Affinity Info
- NULL, ///< 31 - Device Handle Acpi
- NULL, ///< 32 - Device Handle Pci
- NULL, ///< 33 - Generic Initiator Affinity
- NULL, ///< 34 - Generic Serial Port Info
- NULL, ///< 35 - CMN-600 Info
- NULL, ///< 36 - Lpi Info
- NULL, ///< 37 - Pci Address Map Info
- NULL, ///< 38 - Pci Interrupt Map Info
- NULL, ///< 39 - Reserved Memory Range Node
- NULL, ///< 40 - Memory Range Descriptor
- NULL, ///< 41 - Continuous Performance Control Info
- NULL, ///< 42 - Pcc Subspace Type 0 Info
+ NULL, ///< 28 - CM Object Reference
+ NULL, ///< 29 - Memory Affinity Info
+ NULL, ///< 30 - Device Handle Acpi
+ NULL, ///< 31 - Device Handle Pci
+ NULL, ///< 32 - Generic Initiator Affinity
+ NULL, ///< 33 - Generic Serial Port Info
+ NULL, ///< 34 - CMN-600 Info
+ NULL, ///< 35 - Lpi Info
+ NULL, ///< 36 - Pci Address Map Info
+ NULL, ///< 37 - Pci Interrupt Map Info
+ NULL, ///< 38 - Reserved Memory Range Node
+ NULL, ///< 39 - Memory Range Descriptor
+ NULL, ///< 40 - Continuous Performance Control Info
+ NULL, ///< 41 - Pcc Subspace Type 0 Info
+ NULL, ///< 42 - Pcc Subspace Type 2 Info
NULL, ///< 43 - Pcc Subspace Type 2 Info
- NULL, ///< 44 - Pcc Subspace Type 2 Info
- NULL, ///< 45 - Pcc Subspace Type 3 Info
- NULL, ///< 46 - Pcc Subspace Type 4 Info
- NULL, ///< 47 - Pcc Subspace Type 5 Info
- NULL, ///< 48 - Embedded Trace Extension/Module Info
- NULL ///< 49 - P-State Dependency (PSD) Info
+ NULL, ///< 44 - Pcc Subspace Type 3 Info
+ NULL, ///< 45 - Pcc Subspace Type 4 Info
+ NULL, ///< 46 - Pcc Subspace Type 5 Info
+ NULL, ///< 47 - Embedded Trace Extension/Module Info
+ NULL ///< 48 - P-State Dependency (PSD) Info
};
/** CmObj token fixer.
diff --git a/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c b/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c index af5884832c..6896463b28 100644 --- a/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c +++ b/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c @@ -705,7 +705,6 @@ STATIC CONST CM_OBJ_PARSER_ARRAY ArmNamespaceObjectParser[] = { CM_PARSER_ADD_OBJECT (EArmObjSmmuInterruptArray, CmArmGenericInterruptParser),
CM_PARSER_ADD_OBJECT (EArmObjProcHierarchyInfo, CmArmProcHierarchyInfoParser),
CM_PARSER_ADD_OBJECT (EArmObjCacheInfo, CmArmCacheInfoParser),
- CM_PARSER_ADD_OBJECT_RESERVED (EArmObjReserved29),
CM_PARSER_ADD_OBJECT (EArmObjCmRef, CmArmObjRefParser),
CM_PARSER_ADD_OBJECT (EArmObjMemoryAffinityInfo, CmArmMemoryAffinityInfoParser),
CM_PARSER_ADD_OBJECT (EArmObjDeviceHandleAcpi, CmArmDeviceHandleAcpiParser),
diff --git a/DynamicTablesPkg/Readme.md b/DynamicTablesPkg/Readme.md index 80759f9534..8d30bf560b 100644 --- a/DynamicTablesPkg/Readme.md +++ b/DynamicTablesPkg/Readme.md @@ -468,28 +468,27 @@ The CM_OBJECT_ID type is used to identify the Configuration Manager | 25 | SMMU Interrupt Array | |
| 26 | Processor Hierarchy Info | Move to Arch Common NS |
| 27 | Cache Info | Move to Arch Common NS |
-| 28 | Reserved29 | Unused to be dropped.|
-| 29 | CM Object Reference | Move to Arch Common NS |
-| 30 | Memory Affinity Info | Move to Arch Common NS |
-| 31 | Device Handle Acpi | Move to Arch Common NS |
-| 32 | Device Handle PCI | Move to Arch Common NS |
-| 33 | Generic Initiator Affinity Info | Move to Arch Common NS |
-| 34 | Serial Port Info | Move to Arch Common NS |
-| 35 | CMN 600 Info | |
-| 36 | Low Power Idle State Info | Move to Arch Common NS |
-| 37 | PCI Address Map Info | Move to Arch Common NS |
-| 38 | PCI Interrupt Map Info | Move to Arch Common NS |
-| 39 | Reserved Memory Range Node | |
-| 40 | Memory Range Descriptor | |
-| 41 | Continuous Performance Control Info | Move to Arch Common NS |
-| 42 | Pcc Subspace Type 0 Info | Move to Arch Common NS |
-| 43 | Pcc Subspace Type 1 Info | Move to Arch Common NS |
-| 44 | Pcc Subspace Type 2 Info | Move to Arch Common NS |
-| 45 | Pcc Subspace Type 3 Info | Move to Arch Common NS |
-| 46 | Pcc Subspace Type 4 Info | Move to Arch Common NS |
-| 47 | Pcc Subspace Type 5 Info | Move to Arch Common NS |
-| 48 | Embedded Trace Extension/Module Info | |
-| 49 | P-State Dependency (PSD) Info | Move to Arch Common NS |
+| 28 | CM Object Reference | Move to Arch Common NS |
+| 29 | Memory Affinity Info | Move to Arch Common NS |
+| 30 | Device Handle Acpi | Move to Arch Common NS |
+| 31 | Device Handle PCI | Move to Arch Common NS |
+| 32 | Generic Initiator Affinity Info | Move to Arch Common NS |
+| 33 | Serial Port Info | Move to Arch Common NS |
+| 34 | CMN 600 Info | |
+| 35 | Low Power Idle State Info | Move to Arch Common NS |
+| 36 | PCI Address Map Info | Move to Arch Common NS |
+| 37 | PCI Interrupt Map Info | Move to Arch Common NS |
+| 38 | Reserved Memory Range Node | |
+| 39 | Memory Range Descriptor | |
+| 40 | Continuous Performance Control Info | Move to Arch Common NS |
+| 41 | 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 2 Info | Move to Arch Common NS |
+| 44 | 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 5 Info | Move to Arch Common NS |
+| 47 | Embedded Trace Extension/Module Info | |
+| 48 | P-State Dependency (PSD) Info | Move to Arch Common NS |
| `*` | All other values are reserved. | |
#### Object ID's in the Arch Common Namespace:
|