From: "PierreGondois" <pierre.gondois@arm.com>
To: devel@edk2.groups.io
Cc: Pierre Gondois <pierre.gondois@arm.com>,
Sami Mujawar <sami.mujawar@arm.com>,
Pierre Gondois <Pierre.Gondois@arm.com>,
Yeo Reum Yun <YeoReum.Yun@arm.com>,
Sunil V L <sunilvl@ventanamicro.com>,
AbdulLateef Attar <AbdulLateef.Attar@amd.com>,
Jeshua Smith <jeshuas@nvidia.com>,
Jeff Brasen <jbrasen@nvidia.com>,
Girish Mahadevan <gmahadevan@nvidia.com>,
Leif Lindholm <quic_llindhol@quicinc.com>,
Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>
Subject: [edk2-devel] [PATCH 10/16] DynamicTablesPkg: Drop Reserved29 object ID from Arm Namespace
Date: Thu, 21 Mar 2024 16:53:13 +0100 [thread overview]
Message-ID: <20240321155319.701355-11-pierre.gondois@arm.com> (raw)
In-Reply-To: <20240321155319.701355-1-pierre.gondois@arm.com>
From: Sami Mujawar <sami.mujawar@arm.com>
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>
---
.../Include/ArmNameSpaceObjects.h | 43 +++++++++----------
.../DynamicPlatRepoLib/CmObjectTokenFixer.c | 41 +++++++++---------
.../ConfigurationManagerObjectParser.c | 1 -
DynamicTablesPkg/Readme.md | 43 +++++++++----------
4 files changed, 62 insertions(+), 66 deletions(-)
diff --git a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h
index 2eeff594fc59..f7e1a0933f7b 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 07e26a4f4e4c..833fa2d6a24b 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 af5884832cda..6896463b2848 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 80759f953487..8d30bf560b3d 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:
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#116971): https://edk2.groups.io/g/devel/message/116971
Mute This Topic: https://groups.io/mt/105067982/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
next prev parent reply other threads:[~2024-03-21 15:54 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-21 15:53 [edk2-devel] [PATCH 00/16] DynamicTablesPkg: Move objects to Arch Common NameSpace (first) PierreGondois
2024-03-21 15:53 ` [edk2-devel] [PATCH 01/16] DynamicTablesPkg/SsdtCpuTopology: Update function's parameter description PierreGondois
2024-03-21 15:53 ` [edk2-devel] [PATCH 02/16] DynamicTablesPkg: Replace ProcNodeIdInfo with EArmObjReserved29 PierreGondois
2024-03-21 15:53 ` [edk2-devel] [PATCH 03/16] DynamicTablesPkg: Introduce ObjectId to validate CmObject Parser Array PierreGondois
2024-03-21 15:53 ` [edk2-devel] [PATCH 04/16] DynamicTablesPkg: Introduce an Arch Common Namespace header file PierreGondois
2024-03-21 15:53 ` [edk2-devel] [PATCH 05/16] DynamicTablesPkg: Add support for ArchCommon objects in CmObjParser PierreGondois
2024-03-21 15:53 ` [edk2-devel] [PATCH 06/16] DynamicTablesPkg: TokenFixer: Return Non Arm NS objs as unsupported PierreGondois
2024-03-21 15:53 ` [edk2-devel] [PATCH 07/16] DynamicTablesPkg: Update DynamicPlatRepo for Arch Common namespace PierreGondois
2024-03-21 15:53 ` [edk2-devel] [PATCH 08/16] DynamicTablesPkg: Update documentation for CM_OBJECT_ID PierreGondois
2024-03-21 15:53 ` [edk2-devel] [PATCH 09/16] DynamicTablesPkg: Drop Cpu Info object ID from Arm Namespace PierreGondois
2024-03-21 15:53 ` PierreGondois [this message]
2024-03-21 15:53 ` [edk2-devel] [PATCH 11/16] ArmVirtPkg: Kvmtool: Update ConfigMgr to support ArchCommon PierreGondois
2024-03-21 15:53 ` [edk2-devel] [PATCH 12/16] DynamicTablesPkg & ArmVirtPkg: Move Power Mgmt Profile Info Object PierreGondois
2024-03-21 15:53 ` [edk2-devel] [PATCH 13/16] DynamicTablesPkg: Move Hypervisor Vendor Id to Arch Common PierreGondois
2024-03-21 15:53 ` [edk2-devel] [PATCH 14/16] DynamicTablesPkg: Move FADT Fixed Features Flags " PierreGondois
2024-03-21 15:53 ` [edk2-devel] [PATCH 15/16] DynamicTablesPkg: Move Cm Reference object " PierreGondois
2024-03-21 15:53 ` [edk2-devel] [PATCH 16/16] DynamicTablesPkg & ArmVirtPkg: Move Pci Config Space Info PierreGondois
2024-04-04 10:02 ` [edk2-devel] [PATCH 00/16] DynamicTablesPkg: Move objects to Arch Common NameSpace (first) Sunil V L
2024-06-07 14:19 ` Sami Mujawar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240321155319.701355-11-pierre.gondois@arm.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox