From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id BD0E0AC1619 for ; Thu, 21 Mar 2024 15:54:25 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=Vjbsu26kUQntGBBMu8YT6v/vuKuDkkOB7nrjT4Ch28s=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Resent-Date:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20240206; t=1711036464; v=1; b=XqDWdEb+ZM91XjvdWTHcn1cH9BBlsAJpjAkAJ9jK1kw2GXYKiJ6uQ3UIOa+TsfVaHmKi/D+o vNoCiJxQFngNw69fNr9XTE2RFCV10FpoNr1pbkhmZ+eA5a1jnZGrjGeyTbc/6HC44D3q73h9x95 IvSP4I2ETkQ5UtoNNI2zpqIG2WHQTahH7PphrlqQk5Jd0HEbfRJPDyq2yUPeRLXz6IoLJkytUWl ZZjQk/SknJtJp2f+Qq0iUap1+x06zwWGye4v4tbjyGB7Gx8hVjjLCHKCBjb+27roi9AVMSi7G30 SlFRrt1DYgmKI+ba61I8BMdgfdQznaPCmmTaJCYwC/zQA== X-Received: by 127.0.0.2 with SMTP id lsU3YY7687511x3TtSEhM8rD; Thu, 21 Mar 2024 08:54:24 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.389.1711036463611781665 for ; Thu, 21 Mar 2024 08:54:23 -0700 X-Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8701C1007; Thu, 21 Mar 2024 08:54:57 -0700 (PDT) X-Received: from e126645.nice.arm.com (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 2384B3F67D; Thu, 21 Mar 2024 08:54:18 -0700 (PDT) From: "PierreGondois" To: devel@edk2.groups.io Cc: Pierre Gondois , Sami Mujawar , Pierre Gondois , Yeo Reum Yun , Sunil V L , AbdulLateef Attar , Jeshua Smith , Jeff Brasen , Girish Mahadevan , Leif Lindholm , Meenakshi Aggarwal Subject: [edk2-devel] [PATCH 10/16] DynamicTablesPkg: Drop Reserved29 object ID from Arm Namespace Date: Thu, 21 Mar 2024 16:53:13 +0100 Message-Id: <20240321155319.701355-11-pierre.gondois@arm.com> In-Reply-To: <20240321155319.701355-1-pierre.gondois@arm.com> References: <20240321155319.701355-1-pierre.gondois@arm.com> MIME-Version: 1.0 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Resent-Date: Thu, 21 Mar 2024 08:54:23 -0700 Reply-To: devel@edk2.groups.io,pierre.gondois@arm.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: W3NVwgayCfiOcVEALi3l2VjGx7686176AA= Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b=XqDWdEb+; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=arm.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io From: Sami Mujawar 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 Cc: Yeo Reum Yun Cc: AbdulLateef Attar Cc: Jeshua Smith Cc: Jeff Brasen Cc: Girish Mahadevan Cc: Leif Lindholm Cc: Meenakshi Aggarwal Signed-off-by: Sami Mujawar Signed-off-by: Pierre Gondois --- .../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/DynamicTables= Pkg/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 - S= MMU Interrupt Array=0D EArmObjProcHierarchyInfo, ///< 26 - P= rocessor Hierarchy Info=0D EArmObjCacheInfo, ///< 27 - C= ache Info=0D - EArmObjReserved29, ///< 28 - R= eserved=0D - EArmObjCmRef, ///< 29 - C= M Object Reference=0D - EArmObjMemoryAffinityInfo, ///< 30 - M= emory Affinity Info=0D - EArmObjDeviceHandleAcpi, ///< 31 - D= evice Handle Acpi=0D - EArmObjDeviceHandlePci, ///< 32 - D= evice Handle Pci=0D - EArmObjGenericInitiatorAffinityInfo, ///< 33 - G= eneric Initiator Affinity=0D - EArmObjSerialPortInfo, ///< 34 - G= eneric Serial Port Info=0D - EArmObjCmn600Info, ///< 35 - C= MN-600 Info=0D - EArmObjLpiInfo, ///< 36 - L= pi Info=0D - EArmObjPciAddressMapInfo, ///< 37 - P= ci Address Map Info=0D - EArmObjPciInterruptMapInfo, ///< 38 - P= ci Interrupt Map Info=0D - EArmObjRmr, ///< 39 - R= eserved Memory Range Node=0D - EArmObjMemoryRangeDescriptor, ///< 40 - M= emory Range Descriptor=0D - EArmObjCpcInfo, ///< 41 - C= ontinuous Performance Control Info=0D - EArmObjPccSubspaceType0Info, ///< 42 - P= cc Subspace Type 0 Info=0D - EArmObjPccSubspaceType1Info, ///< 43 - P= cc Subspace Type 2 Info=0D - EArmObjPccSubspaceType2Info, ///< 44 - P= cc Subspace Type 2 Info=0D - EArmObjPccSubspaceType3Info, ///< 45 - P= cc Subspace Type 3 Info=0D - EArmObjPccSubspaceType4Info, ///< 46 - P= cc Subspace Type 4 Info=0D - EArmObjPccSubspaceType5Info, ///< 47 - P= cc Subspace Type 5 Info=0D - EArmObjEtInfo, ///< 48 - E= mbedded Trace Extension/Module Info=0D - EArmObjPsdInfo, ///< 49 - P= -State Dependency (PSD) Info=0D + EArmObjCmRef, ///< 28 - C= M Object Reference=0D + EArmObjMemoryAffinityInfo, ///< 29 - M= emory Affinity Info=0D + EArmObjDeviceHandleAcpi, ///< 30 - D= evice Handle Acpi=0D + EArmObjDeviceHandlePci, ///< 31 - D= evice Handle Pci=0D + EArmObjGenericInitiatorAffinityInfo, ///< 32 - G= eneric Initiator Affinity=0D + EArmObjSerialPortInfo, ///< 33 - G= eneric Serial Port Info=0D + EArmObjCmn600Info, ///< 34 - C= MN-600 Info=0D + EArmObjLpiInfo, ///< 35 - L= pi Info=0D + EArmObjPciAddressMapInfo, ///< 36 - P= ci Address Map Info=0D + EArmObjPciInterruptMapInfo, ///< 37 - P= ci Interrupt Map Info=0D + EArmObjRmr, ///< 38 - R= eserved Memory Range Node=0D + EArmObjMemoryRangeDescriptor, ///< 39 - M= emory Range Descriptor=0D + EArmObjCpcInfo, ///< 40 - C= ontinuous Performance Control Info=0D + EArmObjPccSubspaceType0Info, ///< 41 - P= cc Subspace Type 0 Info=0D + EArmObjPccSubspaceType1Info, ///< 42 - P= cc Subspace Type 2 Info=0D + EArmObjPccSubspaceType2Info, ///< 43 - P= cc Subspace Type 2 Info=0D + EArmObjPccSubspaceType3Info, ///< 44 - P= cc Subspace Type 3 Info=0D + EArmObjPccSubspaceType4Info, ///< 45 - P= cc Subspace Type 4 Info=0D + EArmObjPccSubspaceType5Info, ///< 46 - P= cc Subspace Type 5 Info=0D + EArmObjEtInfo, ///< 47 - E= mbedded Trace Extension/Module Info=0D + EArmObjPsdInfo, ///< 48 - P= -State Dependency (PSD) Info=0D EArmObjMax=0D } EARM_OBJECT_ID;=0D =0D diff --git a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTok= enFixer.c b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectToke= nFixer.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] =3D { NULL, ///< 25 - SMMU Interrupt Array=0D TokenFixerNotImplemented, ///< 26 - Processor Hierarchy Info=0D TokenFixerNotImplemented, ///< 27 - Cache Info=0D - TokenFixerNotImplemented, ///< 29 - Reserved=0D - NULL, ///< 29 - CM Object Reference=0D - NULL, ///< 30 - Memory Affinity Info=0D - NULL, ///< 31 - Device Handle Acpi=0D - NULL, ///< 32 - Device Handle Pci=0D - NULL, ///< 33 - Generic Initiator Affinity=0D - NULL, ///< 34 - Generic Serial Port Info=0D - NULL, ///< 35 - CMN-600 Info=0D - NULL, ///< 36 - Lpi Info=0D - NULL, ///< 37 - Pci Address Map Info=0D - NULL, ///< 38 - Pci Interrupt Map Info=0D - NULL, ///< 39 - Reserved Memory Range Node=0D - NULL, ///< 40 - Memory Range Descriptor=0D - NULL, ///< 41 - Continuous Performance Contr= ol Info=0D - NULL, ///< 42 - Pcc Subspace Type 0 Info=0D + NULL, ///< 28 - CM Object Reference=0D + NULL, ///< 29 - Memory Affinity Info=0D + NULL, ///< 30 - Device Handle Acpi=0D + NULL, ///< 31 - Device Handle Pci=0D + NULL, ///< 32 - Generic Initiator Affinity=0D + NULL, ///< 33 - Generic Serial Port Info=0D + NULL, ///< 34 - CMN-600 Info=0D + NULL, ///< 35 - Lpi Info=0D + NULL, ///< 36 - Pci Address Map Info=0D + NULL, ///< 37 - Pci Interrupt Map Info=0D + NULL, ///< 38 - Reserved Memory Range Node=0D + NULL, ///< 39 - Memory Range Descriptor=0D + NULL, ///< 40 - Continuous Performance Contr= ol Info=0D + NULL, ///< 41 - Pcc Subspace Type 0 Info=0D + NULL, ///< 42 - Pcc Subspace Type 2 Info=0D NULL, ///< 43 - Pcc Subspace Type 2 Info=0D - NULL, ///< 44 - Pcc Subspace Type 2 Info=0D - NULL, ///< 45 - Pcc Subspace Type 3 Info=0D - NULL, ///< 46 - Pcc Subspace Type 4 Info=0D - NULL, ///< 47 - Pcc Subspace Type 5 Info=0D - NULL, ///< 48 - Embedded Trace Extension/Mod= ule Info=0D - NULL ///< 49 - P-State Dependency (PSD) Inf= o=0D + NULL, ///< 44 - Pcc Subspace Type 3 Info=0D + NULL, ///< 45 - Pcc Subspace Type 4 Info=0D + NULL, ///< 46 - Pcc Subspace Type 5 Info=0D + NULL, ///< 47 - Embedded Trace Extension/Mod= ule Info=0D + NULL ///< 48 - P-State Dependency (PSD) Inf= o=0D };=0D =0D /** CmObj token fixer.=0D diff --git a/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationMa= nagerObjectParser.c b/DynamicTablesPkg/Library/Common/TableHelperLib/Config= urationManagerObjectParser.c index af5884832cda..6896463b2848 100644 --- a/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerOb= jectParser.c +++ b/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerOb= jectParser.c @@ -705,7 +705,6 @@ STATIC CONST CM_OBJ_PARSER_ARRAY ArmNamespaceObjectPar= ser[] =3D { CM_PARSER_ADD_OBJECT (EArmObjSmmuInterruptArray, CmArmGenericIn= terruptParser),=0D CM_PARSER_ADD_OBJECT (EArmObjProcHierarchyInfo, CmArmProcHiera= rchyInfoParser),=0D CM_PARSER_ADD_OBJECT (EArmObjCacheInfo, CmArmCacheInfo= Parser),=0D - CM_PARSER_ADD_OBJECT_RESERVED (EArmObjReserved29),=0D CM_PARSER_ADD_OBJECT (EArmObjCmRef, CmArmObjRefPar= ser),=0D CM_PARSER_ADD_OBJECT (EArmObjMemoryAffinityInfo, CmArmMemoryAff= inityInfoParser),=0D CM_PARSER_ADD_OBJECT (EArmObjDeviceHandleAcpi, CmArmDeviceHan= dleAcpiParser),=0D 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 Configu= ration Manager | 25 | SMMU Interrupt Array | |=0D | 26 | Processor Hierarchy Info | Move to Arch Common = NS |=0D | 27 | Cache Info | Move to Arch Common = NS |=0D -| 28 | Reserved29 | Unused to be dropped= .|=0D -| 29 | CM Object Reference | Move to Arch Common = NS |=0D -| 30 | Memory Affinity Info | Move to Arch Common = NS |=0D -| 31 | Device Handle Acpi | Move to Arch Common = NS |=0D -| 32 | Device Handle PCI | Move to Arch Common = NS |=0D -| 33 | Generic Initiator Affinity Info | Move to Arch Common = NS |=0D -| 34 | Serial Port Info | Move to Arch Common = NS |=0D -| 35 | CMN 600 Info | |=0D -| 36 | Low Power Idle State Info | Move to Arch Common = NS |=0D -| 37 | PCI Address Map Info | Move to Arch Common = NS |=0D -| 38 | PCI Interrupt Map Info | Move to Arch Common = NS |=0D -| 39 | Reserved Memory Range Node | |=0D -| 40 | Memory Range Descriptor | |=0D -| 41 | Continuous Performance Control Info | Move to Arch Common = NS |=0D -| 42 | Pcc Subspace Type 0 Info | Move to Arch Common = NS |=0D -| 43 | Pcc Subspace Type 1 Info | Move to Arch Common = NS |=0D -| 44 | Pcc Subspace Type 2 Info | Move to Arch Common = NS |=0D -| 45 | Pcc Subspace Type 3 Info | Move to Arch Common = NS |=0D -| 46 | Pcc Subspace Type 4 Info | Move to Arch Common = NS |=0D -| 47 | Pcc Subspace Type 5 Info | Move to Arch Common = NS |=0D -| 48 | Embedded Trace Extension/Module Info | |=0D -| 49 | P-State Dependency (PSD) Info | Move to Arch Common = NS |=0D +| 28 | CM Object Reference | Move to Arch Common = NS |=0D +| 29 | Memory Affinity Info | Move to Arch Common = NS |=0D +| 30 | Device Handle Acpi | Move to Arch Common = NS |=0D +| 31 | Device Handle PCI | Move to Arch Common = NS |=0D +| 32 | Generic Initiator Affinity Info | Move to Arch Common = NS |=0D +| 33 | Serial Port Info | Move to Arch Common = NS |=0D +| 34 | CMN 600 Info | |=0D +| 35 | Low Power Idle State Info | Move to Arch Common = NS |=0D +| 36 | PCI Address Map Info | Move to Arch Common = NS |=0D +| 37 | PCI Interrupt Map Info | Move to Arch Common = NS |=0D +| 38 | Reserved Memory Range Node | |=0D +| 39 | Memory Range Descriptor | |=0D +| 40 | Continuous Performance Control Info | Move to Arch Common = NS |=0D +| 41 | Pcc Subspace Type 0 Info | Move to Arch Common = NS |=0D +| 42 | Pcc Subspace Type 1 Info | Move to Arch Common = NS |=0D +| 43 | Pcc Subspace Type 2 Info | Move to Arch Common = NS |=0D +| 44 | Pcc Subspace Type 3 Info | Move to Arch Common = NS |=0D +| 45 | Pcc Subspace Type 4 Info | Move to Arch Common = NS |=0D +| 46 | Pcc Subspace Type 5 Info | Move to Arch Common = NS |=0D +| 47 | Embedded Trace Extension/Module Info | |=0D +| 48 | P-State Dependency (PSD) Info | Move to Arch Common = NS |=0D | `*` | All other values are reserved. | |=0D =0D #### Object ID's in the Arch Common Namespace:=0D --=20 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] -=-=-=-=-=-=-=-=-=-=-=-