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 E273A941949 for ; Thu, 21 Mar 2024 16:01:15 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=fVQb+xzRwvHr2ctS6m0AvN0w0yADnL0WcsOG7sU0vCY=; 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=1711036874; v=1; b=Lr+BYaLGPjJW/QyYTTfaTo4Fk5n4uCDOdODM5IOrO0A75NMN0WAu9dHllnFP01LJEKsOOqk2 O4lXi1cRV8UzSuoxFgfeY9B0llvIZHryBtHXnrqQps5ckeDycNphK2p3584AGxiTrTLFKIE8zuQ tsER2uLniFDliXMlF9rh5w3nvON9iXo+uIVwPWSRznD5JqVY2LCu6D30L7oUqUXYf59ImBpY7AK TAP9jPwDUclnalUUhG/eSigVkjfV0TbBOcw83puEfq5asZqteVRPADfVx+kIFFvPLuQmZqQgBmB tJaGjspCcrIYXbJQu3JZJJDaKJ5y1eSF36Pa1wYJYiIjg== X-Received: by 127.0.0.2 with SMTP id d3ylYY7687511xOey1XV4HgM; Thu, 21 Mar 2024 09:01:14 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.616.1711036873981700412 for ; Thu, 21 Mar 2024 09:01:14 -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 051C51007; Thu, 21 Mar 2024 09:01:48 -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 4552C3F67D; Thu, 21 Mar 2024 09:01:11 -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 19/19] DynamicTablesPkg: Move PSD info to Arch Common Date: Thu, 21 Mar 2024 16:59:24 +0100 Message-Id: <20240321155924.707272-20-pierre.gondois@arm.com> In-Reply-To: <20240321155924.707272-1-pierre.gondois@arm.com> References: <20240321155924.707272-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 09:01:14 -0700 Reply-To: devel@edk2.groups.io,pierre.gondois@arm.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: q12mhyOXRrQMYWydrrQcpJNYx7686176AA= 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=Lr+BYaLG; 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 Move the PSD info object from Arm Namespace to the Arch Common namespace. Correspondingly also update the following modules to reflect the changes introduced by the move: - SSDT CPU topology generator - ConfigurationManagerObjectParser - Dynamic Plat Repo TokenFixer map. 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/ArchCommonNameSpaceObjects.h | 10 ++++++++++ DynamicTablesPkg/Include/ArmNameSpaceObjects.h | 12 +----------- .../SsdtCpuTopologyGenerator.c | 14 +++++++------- .../Common/DynamicPlatRepoLib/CmObjectTokenFixer.c | 3 +-- .../ConfigurationManagerObjectParser.c | 6 +++--- DynamicTablesPkg/Readme.md | 2 +- 6 files changed, 23 insertions(+), 24 deletions(-) diff --git a/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h b/Dynami= cTablesPkg/Include/ArchCommonNameSpaceObjects.h index 58a137e905d9..6de57dbbf223 100644 --- a/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h +++ b/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h @@ -45,6 +45,7 @@ typedef enum ArchCommonObjectID { EArchCommonObjPccSubspaceType3Info, ///< 22 - Pcc Subspace Typ= e 3 Info=0D EArchCommonObjPccSubspaceType4Info, ///< 23 - Pcc Subspace Typ= e 4 Info=0D EArchCommonObjPccSubspaceType5Info, ///< 24 - Pcc Subspace Typ= e 5 Info=0D + EArchCommonObjPsdInfo, ///< 25 - P-State Dependen= cy (PSD) Info=0D EArchCommonObjMax=0D } EARCH_COMMON_OBJECT_ID;=0D =0D @@ -642,6 +643,15 @@ typedef struct CmArchCommonPccSubspaceType5Info { PCC_MAILBOX_REGISTER_INFO ErrorStatusReg;=0D } CM_ARCH_COMMON_PCC_SUBSPACE_TYPE5_INFO;=0D =0D +/** A structure that describes a=0D + P-State Dependency (PSD) Info.=0D +=0D + Cf. ACPI 6.5, s8.4.5.5 _PSD (P-State Dependency).=0D +=0D + ID: EArchCommonObjPsdInfo=0D +*/=0D +typedef AML_PSD_INFO CM_ARCH_COMMON_PSD_INFO;=0D +=0D #pragma pack()=0D =0D #endif // ARCH_COMMON_NAMESPACE_OBJECTS_H_=0D diff --git a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h b/DynamicTables= Pkg/Include/ArmNameSpaceObjects.h index 724e614bb652..958c3dc93cd3 100644 --- a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h +++ b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h @@ -52,7 +52,6 @@ typedef enum ArmObjectID { EArmObjRmr, ///< 21 - R= eserved Memory Range Node=0D EArmObjMemoryRangeDescriptor, ///< 22 - M= emory Range Descriptor=0D EArmObjEtInfo, ///< 23 - E= mbedded Trace Extension/Module Info=0D - EArmObjPsdInfo, ///< 24 - P= -State Dependency (PSD) Info=0D EArmObjMax=0D } EARM_OBJECT_ID;=0D =0D @@ -188,7 +187,7 @@ typedef struct CmArmGicCInfo { CM_OBJECT_TOKEN EtToken;=0D =0D /** Optional field: Reference Token for the Psd info of this processor.= =0D - i.e. a token referencing a CM_ARM_PSD_INFO object.=0D + i.e. a token referencing a CM_ARCH_COMMON_PSD_INFO object.=0D */=0D CM_OBJECT_TOKEN PsdToken;=0D } CM_ARM_GICC_INFO;=0D @@ -724,15 +723,6 @@ typedef struct CmArmEtInfo { ARM_ET_TYPE EtType;=0D } CM_ARM_ET_INFO;=0D =0D -/** A structure that describes a=0D - P-State Dependency (PSD) Info.=0D -=0D - Cf. ACPI 6.5, s8.4.5.5 _PSD (P-State Dependency).=0D -=0D - ID: EArmObjPsdInfo=0D -*/=0D -typedef AML_PSD_INFO CM_ARM_PSD_INFO;=0D -=0D #pragma pack()=0D =0D #endif // ARM_NAMESPACE_OBJECTS_H_=0D diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCpuTopologyLibArm/Ss= dtCpuTopologyGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCpuTop= ologyLibArm/SsdtCpuTopologyGenerator.c index 21233a404a05..f923f41d6bee 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCpuTopologyLibArm/SsdtCpuTo= pologyGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCpuTopologyLibArm/SsdtCpuTo= pologyGenerator.c @@ -42,7 +42,7 @@ Requirements: - EArchCommonObjCmRef (OPTIONAL)=0D - EArchCommonObjLpiInfo (OPTIONAL)=0D - GetEArmObjEtInfo (OPTIONAL)=0D - - EArmObjPsdInfo (OPTIONAL)=0D + - EArchCommonObjPsdInfo (OPTIONAL)=0D */=0D =0D /** This macro expands to a function that retrieves the GIC=0D @@ -109,9 +109,9 @@ GET_OBJECT_LIST ( information from the Configuration Manager.=0D */=0D GET_OBJECT_LIST (=0D - EObjNameSpaceArm,=0D - EArmObjPsdInfo,=0D - CM_ARM_PSD_INFO=0D + EObjNameSpaceArchCommon,=0D + EArchCommonObjPsdInfo,=0D + CM_ARCH_COMMON_PSD_INFO=0D );=0D =0D /** Initialize the TokenTable.=0D @@ -313,10 +313,10 @@ CreateAmlPsdNode ( IN AML_OBJECT_NODE_HANDLE *Node=0D )=0D {=0D - EFI_STATUS Status;=0D - CM_ARM_PSD_INFO *PsdInfo;=0D + EFI_STATUS Status;=0D + CM_ARCH_COMMON_PSD_INFO *PsdInfo;=0D =0D - Status =3D GetEArmObjPsdInfo (=0D + Status =3D GetEArchCommonObjPsdInfo (=0D CfgMgrProtocol,=0D GicCInfo->PsdToken,=0D &PsdInfo,=0D diff --git a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTok= enFixer.c b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectToke= nFixer.c index 05fbdadf156b..5325b20743e8 100644 --- a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer= .c +++ b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer= .c @@ -166,8 +166,7 @@ CM_OBJECT_TOKEN_FIXER TokenFixer[EArmObjMax] =3D { NULL, ///< 20 - CMN-600 Info=0D NULL, ///< 21 - Reserved Memory Range Node=0D NULL, ///< 22 - Memory Range Descriptor=0D - NULL, ///< 23 - Embedded Trace Extension/Mod= ule Info=0D - NULL ///< 24 - P-State Dependency (PSD) Inf= o=0D + NULL ///< 23 - Embedded Trace Extension/Mod= ule Info=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 da7901a2c48c..e726b2c61602 100644 --- a/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerOb= jectParser.c +++ b/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerOb= jectParser.c @@ -658,9 +658,9 @@ STATIC CONST CM_OBJ_PARSER CmArmEtInfo[] =3D { { "EtType", sizeof (ARM_ET_TYPE), "0x%x", NULL }=0D };=0D =0D -/** A parser for EArmObjPsdInfo.=0D +/** A parser for EArchCommonObjPsdInfo.=0D */=0D -STATIC CONST CM_OBJ_PARSER CmArmPsdInfoParser[] =3D {=0D +STATIC CONST CM_OBJ_PARSER CmArchCommonPsdInfoParser[] =3D {=0D { "Revision", 1, "0x%x", NULL },=0D { "DomainId", 4, "0x%x", NULL },=0D { "CoordType", 4, "0x%x", NULL },=0D @@ -695,6 +695,7 @@ STATIC CONST CM_OBJ_PARSER_ARRAY ArchCommonNamespaceOb= jectParser[] =3D { CM_PARSER_ADD_OBJECT (EArchCommonObjPccSubspaceType3Info, CmArchC= ommonPccSubspaceType34InfoParser),=0D CM_PARSER_ADD_OBJECT (EArchCommonObjPccSubspaceType4Info, CmArchC= ommonPccSubspaceType34InfoParser),=0D CM_PARSER_ADD_OBJECT (EArchCommonObjPccSubspaceType5Info, CmArchC= ommonPccSubspaceType5InfoParser),=0D + CM_PARSER_ADD_OBJECT (EArchCommonObjPsdInfo, CmArchC= ommonPsdInfoParser),=0D CM_PARSER_ADD_OBJECT_RESERVED (EArchCommonObjMax)=0D };=0D =0D @@ -725,7 +726,6 @@ STATIC CONST CM_OBJ_PARSER_ARRAY ArmNamespaceObjectPar= ser[] =3D { CM_PARSER_ADD_OBJECT (EArmObjRmr, CmArmRmrInfoPar= ser),=0D CM_PARSER_ADD_OBJECT (EArmObjMemoryRangeDescriptor, CmArmMemoryRang= eDescriptorInfoParser),=0D CM_PARSER_ADD_OBJECT (EArmObjEtInfo, CmArmEtInfo),=0D - CM_PARSER_ADD_OBJECT (EArmObjPsdInfo, CmArmPsdInfoPar= ser),=0D CM_PARSER_ADD_OBJECT_RESERVED (EArmObjMax)=0D };=0D =0D diff --git a/DynamicTablesPkg/Readme.md b/DynamicTablesPkg/Readme.md index d4c95a3c42c8..7790b14636ff 100644 --- a/DynamicTablesPkg/Readme.md +++ b/DynamicTablesPkg/Readme.md @@ -464,7 +464,6 @@ The CM_OBJECT_ID type is used to identify the Configura= tion Manager | 21 | Reserved Memory Range Node | |=0D | 22 | Memory Range Descriptor | |=0D | 23 | Embedded Trace Extension/Module Info | |=0D -| 24 | 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 @@ -496,5 +495,6 @@ The CM_OBJECT_ID type is used to identify the Configura= tion Manager | 22 | Pcc Subspace Type 3 Info | |=0D | 23 | Pcc Subspace Type 4 Info | |=0D | 24 | Pcc Subspace Type 5 Info | |=0D +| 25 | P-State Dependency (PSD) Info | |=0D | `*` | All other values are reserved. | |=0D =0D --=20 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#116997): https://edk2.groups.io/g/devel/message/116997 Mute This Topic: https://groups.io/mt/105068178/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-