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 87DD3740041 for ; Thu, 21 Mar 2024 16:01:04 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=tnzJ5g9HbgA87/DNbi2ox8vM8+htMn/EPx7xnGubRgA=; 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=1711036863; v=1; b=pPoFp0RkFKTScbxNcDoFQhaUDvlOdDukEXCEbKPhnznYhdUupgdKr2RhsoaVMRXyBXz/gR08 //r/DhkXXeoJvhQQym1DY4qkCXajJdeTUl+JXK56MQjKmSNZw61dHruN5PP6zRcWiXI67MCo4NO /BMuU+yIeh41mnWNZIuJAMeFfcfpFjju3b9925G3WfUZ/kFx5DAhRLw6d3Uv9oLik59EF5hwU1g u3JveycdN6/BDWu9/Sm+SH49xxWewN+LZTumsGglEbAQGsXNqcjyPSCzqlbF13K6mgTp9PylgzI fKhGa33jTJ2kGTxyZOvWiWLWBdwAwJeoc1XdnCE+PoppQ== X-Received: by 127.0.0.2 with SMTP id AYz2YY7687511xVZguDa3tsQ; Thu, 21 Mar 2024 09:01:03 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.601.1711036862600485476 for ; Thu, 21 Mar 2024 09:01:02 -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 7FDDE1007; Thu, 21 Mar 2024 09:01:36 -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 4A09A3F7BD; Thu, 21 Mar 2024 09:00:59 -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 15/19] DynamicTablesPkg: Move PCC Type1 info to Arch Common Date: Thu, 21 Mar 2024 16:59:20 +0100 Message-Id: <20240321155924.707272-16-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:02 -0700 Reply-To: devel@edk2.groups.io,pierre.gondois@arm.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: AKmbx2gm5gcVdzwQSQj7h8v6x7686176AA= 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=pPoFp0Rk; 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 PCC Subspace Type1 info object from Arm Namespace to the Arch Common namespace. Correspondingly also update the following modules to reflect the changes introduced by the move: - PCCT 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 | 18 +++++++++++ .../Include/ArmNameSpaceObjects.h | 30 ++++--------------- .../Acpi/Arm/AcpiPcctLibArm/PcctGenerator.c | 18 +++++------ .../DynamicPlatRepoLib/CmObjectTokenFixer.c | 11 ++++--- .../ConfigurationManagerObjectParser.c | 6 ++-- DynamicTablesPkg/Readme.md | 14 ++++----- 6 files changed, 48 insertions(+), 49 deletions(-) diff --git a/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h b/Dynami= cTablesPkg/Include/ArchCommonNameSpaceObjects.h index 4ce2d7b48ebf..583ea0089146 100644 --- a/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h +++ b/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h @@ -40,6 +40,7 @@ typedef enum ArchCommonObjectID { EArchCommonObjCacheInfo, ///< 17 - Cache Info=0D EArchCommonObjCpcInfo, ///< 18 - Continuous Perfo= rmance Control Info=0D EArchCommonObjPccSubspaceType0Info, ///< 19 - Pcc Subspace Typ= e 0 Info=0D + EArchCommonObjPccSubspaceType1Info, ///< 20 - Pcc Subspace Typ= e 1 Info=0D EArchCommonObjMax=0D } EARCH_COMMON_OBJECT_ID;=0D =0D @@ -531,6 +532,23 @@ typedef struct PccSubspaceGenericInfo { */=0D typedef PCC_SUBSPACE_GENERIC_INFO CM_ARCH_COMMON_PCC_SUBSPACE_TYPE0_INFO;= =0D =0D +/** A structure that describes a=0D + PCC Subspace of type 1 (HW-Reduced).=0D +=0D + ID: EArchCommonObjPccSubspaceType1Info=0D +*/=0D +typedef struct CmArchCommonPccSubspaceType1Info {=0D + /** Generic Pcc information.=0D +=0D + The Subspace of Type0 contains information that can be re-used=0D + in other Subspace types.=0D + */=0D + PCC_SUBSPACE_GENERIC_INFO GenericPccInfo;=0D +=0D + /// Platform Interrupt.=0D + CM_ARCH_COMMON_GENERIC_INTERRUPT PlatIrq;=0D +} CM_ARCH_COMMON_PCC_SUBSPACE_TYPE1_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 a28415c77687..8a62d9386263 100644 --- a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h +++ b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h @@ -51,13 +51,12 @@ typedef enum ArmObjectID { EArmObjCmn600Info, ///< 20 - C= MN-600 Info=0D EArmObjRmr, ///< 21 - R= eserved Memory Range Node=0D EArmObjMemoryRangeDescriptor, ///< 22 - M= emory Range Descriptor=0D - EArmObjPccSubspaceType1Info, ///< 23 - P= cc Subspace Type 2 Info=0D - EArmObjPccSubspaceType2Info, ///< 24 - P= cc Subspace Type 2 Info=0D - EArmObjPccSubspaceType3Info, ///< 25 - P= cc Subspace Type 3 Info=0D - EArmObjPccSubspaceType4Info, ///< 26 - P= cc Subspace Type 4 Info=0D - EArmObjPccSubspaceType5Info, ///< 27 - P= cc Subspace Type 5 Info=0D - EArmObjEtInfo, ///< 28 - E= mbedded Trace Extension/Module Info=0D - EArmObjPsdInfo, ///< 29 - P= -State Dependency (PSD) Info=0D + EArmObjPccSubspaceType2Info, ///< 23 - P= cc Subspace Type 2 Info=0D + EArmObjPccSubspaceType3Info, ///< 24 - P= cc Subspace Type 3 Info=0D + EArmObjPccSubspaceType4Info, ///< 25 - P= cc Subspace Type 4 Info=0D + EArmObjPccSubspaceType5Info, ///< 26 - P= cc Subspace Type 5 Info=0D + EArmObjEtInfo, ///< 27 - E= mbedded Trace Extension/Module Info=0D + EArmObjPsdInfo, ///< 28 - P= -State Dependency (PSD) Info=0D EArmObjMax=0D } EARM_OBJECT_ID;=0D =0D @@ -713,23 +712,6 @@ typedef struct CmArmRmrDescriptor { UINT64 Length;=0D } CM_ARM_MEMORY_RANGE_DESCRIPTOR;=0D =0D -/** A structure that describes a=0D - PCC Subspace of type 1 (HW-Reduced).=0D -=0D - ID: EArmObjPccSubspaceType1Info=0D -*/=0D -typedef struct CmArmPccSubspaceType1Info {=0D - /** Generic Pcc information.=0D -=0D - The Subspace of Type0 contains information that can be re-used=0D - in other Subspace types.=0D - */=0D - PCC_SUBSPACE_GENERIC_INFO GenericPccInfo;=0D -=0D - /// Platform Interrupt.=0D - CM_ARCH_COMMON_GENERIC_INTERRUPT PlatIrq;=0D -} CM_ARM_PCC_SUBSPACE_TYPE1_INFO;=0D -=0D /** A structure that describes a=0D PCC Subspace of type 2 (HW-Reduced).=0D =0D diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiPcctLibArm/PcctGenerator= .c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiPcctLibArm/PcctGenerator.c index 575ab31f7ff2..183d8cd221bb 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiPcctLibArm/PcctGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiPcctLibArm/PcctGenerator.c @@ -30,7 +30,7 @@ Requirements: The following Configuration Manager Object(s) are required by=0D this Generator:=0D - EArchCommonObjPccSubspaceType0Info=0D - - EArmObjPccSubspaceType1Info=0D + - EArchCommonObjPccSubspaceType1Info=0D - EArmObjPccSubspaceType2Info=0D - EArmObjPccSubspaceType3Info=0D - EArmObjPccSubspaceType4Info=0D @@ -50,9 +50,9 @@ GET_OBJECT_LIST ( Subspace of Type 1 Information from the Configuration Manager.=0D */=0D GET_OBJECT_LIST (=0D - EObjNameSpaceArm,=0D - EArmObjPccSubspaceType1Info,=0D - CM_ARM_PCC_SUBSPACE_TYPE1_INFO=0D + EObjNameSpaceArchCommon,=0D + EArchCommonObjPccSubspaceType1Info,=0D + CM_ARCH_COMMON_PCC_SUBSPACE_TYPE1_INFO=0D );=0D =0D /** This macro expands to a function that retrieves the PCC=0D @@ -248,7 +248,7 @@ MapPccSubspaceId ( break;=0D =0D case EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_1_HW_REDUCED_COMMUNICATIONS:=0D - CmObjSize =3D sizeof (CM_ARM_PCC_SUBSPACE_TYPE1_INFO);=0D + CmObjSize =3D sizeof (CM_ARCH_COMMON_PCC_SUBSPACE_TYPE1_INFO);=0D break;=0D =0D case EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_2_HW_REDUCED_COMMUNICATIONS:=0D @@ -358,7 +358,7 @@ STATIC EFI_STATUS=0D EFIAPI=0D AddSubspaceStructType1 (=0D - IN CM_ARM_PCC_SUBSPACE_TYPE1_INFO *PccCmObj,=0D + IN CM_ARCH_COMMON_PCC_SUBSPACE_TYPE1_INFO *PccCmObj,=0D IN EFI_ACPI_6_4_PCCT_SUBSPACE_1_HW_REDUCED_COMMUNICATIONS *PccAcpi=0D )=0D {=0D @@ -716,7 +716,7 @@ PopulatePcctTable ( =0D case EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_1_HW_REDUCED_COMMUNICATIONS:=0D Status =3D AddSubspaceStructType1 (=0D - (CM_ARM_PCC_SUBSPACE_TYPE1_INFO *)CurrentPccSubspace,=0D + (CM_ARCH_COMMON_PCC_SUBSPACE_TYPE1_INFO *)CurrentPccSub= space,=0D (EFI_ACPI_6_4_PCCT_SUBSPACE_1_HW_REDUCED_COMMUNICATIONS= *)PccBuffer=0D );=0D =0D @@ -826,7 +826,7 @@ BuildPcctTable ( =0D CM_ARCH_COMMON_PCC_SUBSPACE_TYPE0_INFO *PccType0;=0D UINT32 PccType0Count;=0D - CM_ARM_PCC_SUBSPACE_TYPE1_INFO *PccType1;=0D + CM_ARCH_COMMON_PCC_SUBSPACE_TYPE1_INFO *PccType1;=0D UINT32 PccType1Count;=0D CM_ARM_PCC_SUBSPACE_TYPE2_INFO *PccType2;=0D UINT32 PccType2Count;=0D @@ -876,7 +876,7 @@ BuildPcctTable ( goto error_handler;=0D }=0D =0D - Status =3D GetEArmObjPccSubspaceType1Info (=0D + Status =3D GetEArchCommonObjPccSubspaceType1Info (=0D CfgMgrProtocol,=0D CM_NULL_TOKEN,=0D &PccType1,=0D diff --git a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTok= enFixer.c b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectToke= nFixer.c index 1691e6015bf8..3a19870aad34 100644 --- a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer= .c +++ b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer= .c @@ -167,12 +167,11 @@ CM_OBJECT_TOKEN_FIXER TokenFixer[EArmObjMax] =3D { NULL, ///< 21 - Reserved Memory Range Node=0D NULL, ///< 22 - Memory Range Descriptor=0D NULL, ///< 23 - Pcc Subspace Type 2 Info=0D - NULL, ///< 24 - Pcc Subspace Type 2 Info=0D - NULL, ///< 25 - Pcc Subspace Type 3 Info=0D - NULL, ///< 26 - Pcc Subspace Type 4 Info=0D - NULL, ///< 27 - Pcc Subspace Type 5 Info=0D - NULL, ///< 28 - Embedded Trace Extension/Mod= ule Info=0D - NULL ///< 29 - P-State Dependency (PSD) Inf= o=0D + NULL, ///< 24 - Pcc Subspace Type 3 Info=0D + NULL, ///< 25 - Pcc Subspace Type 4 Info=0D + NULL, ///< 26 - Pcc Subspace Type 5 Info=0D + NULL, ///< 27 - Embedded Trace Extension/Mod= ule Info=0D + NULL ///< 28 - 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 e071fa460a40..f8e277f1805e 100644 --- a/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerOb= jectParser.c +++ b/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerOb= jectParser.c @@ -589,9 +589,9 @@ STATIC CONST CM_OBJ_PARSER CmArchCommonPccSubspaceType= 0InfoParser[] =3D { ARRAY_SIZE (CmArmPccSubspaceChannelTimingInfoParser) },=0D };=0D =0D -/** A parser for EArmObjPccSubspaceType1Info.=0D +/** A parser for EArchCommonObjPccSubspaceType1Info.=0D */=0D -STATIC CONST CM_OBJ_PARSER CmArmPccSubspaceType1InfoParser[] =3D {=0D +STATIC CONST CM_OBJ_PARSER CmArchCommonPccSubspaceType1InfoParser[] =3D {= =0D { "GenericPccInfo", sizeof (PCC_SUBSPACE_GENERIC_INFO),=0D NULL, NULL, CmArchCommonPccSubspaceType0InfoParser,=0D ARRAY_SIZE (CmArchCommonPccSubspaceType0InfoParser) },=0D @@ -690,6 +690,7 @@ STATIC CONST CM_OBJ_PARSER_ARRAY ArchCommonNamespaceOb= jectParser[] =3D { CM_PARSER_ADD_OBJECT (EArchCommonObjCacheInfo, CmArchC= ommonCacheInfoParser),=0D CM_PARSER_ADD_OBJECT (EArchCommonObjCpcInfo, CmArchC= ommonCpcInfoParser),=0D CM_PARSER_ADD_OBJECT (EArchCommonObjPccSubspaceType0Info, CmArchC= ommonPccSubspaceType0InfoParser),=0D + CM_PARSER_ADD_OBJECT (EArchCommonObjPccSubspaceType1Info, CmArchC= ommonPccSubspaceType1InfoParser),=0D CM_PARSER_ADD_OBJECT_RESERVED (EArchCommonObjMax)=0D };=0D =0D @@ -719,7 +720,6 @@ STATIC CONST CM_OBJ_PARSER_ARRAY ArmNamespaceObjectPar= ser[] =3D { CM_PARSER_ADD_OBJECT (EArmObjCmn600Info, CmArmCmn600Info= Parser),=0D CM_PARSER_ADD_OBJECT (EArmObjRmr, CmArmRmrInfoPar= ser),=0D CM_PARSER_ADD_OBJECT (EArmObjMemoryRangeDescriptor, CmArmMemoryRang= eDescriptorInfoParser),=0D - CM_PARSER_ADD_OBJECT (EArmObjPccSubspaceType1Info, CmArmPccSubspac= eType1InfoParser),=0D CM_PARSER_ADD_OBJECT (EArmObjPccSubspaceType2Info, CmArmPccSubspac= eType2InfoParser),=0D CM_PARSER_ADD_OBJECT (EArmObjPccSubspaceType3Info, CmArmPccSubspac= eType34InfoParser),=0D CM_PARSER_ADD_OBJECT (EArmObjPccSubspaceType4Info, CmArmPccSubspac= eType34InfoParser),=0D diff --git a/DynamicTablesPkg/Readme.md b/DynamicTablesPkg/Readme.md index 999422035984..3fa3dd9af948 100644 --- a/DynamicTablesPkg/Readme.md +++ b/DynamicTablesPkg/Readme.md @@ -463,13 +463,12 @@ The CM_OBJECT_ID type is used to identify the Configu= ration Manager | 20 | CMN 600 Info | |=0D | 21 | Reserved Memory Range Node | |=0D | 22 | Memory Range Descriptor | |=0D -| 23 | Pcc Subspace Type 1 Info | Move to Arch Common = NS |=0D -| 24 | Pcc Subspace Type 2 Info | Move to Arch Common = NS |=0D -| 25 | Pcc Subspace Type 3 Info | Move to Arch Common = NS |=0D -| 26 | Pcc Subspace Type 4 Info | Move to Arch Common = NS |=0D -| 27 | Pcc Subspace Type 5 Info | Move to Arch Common = NS |=0D -| 28 | Embedded Trace Extension/Module Info | |=0D -| 29 | P-State Dependency (PSD) Info | Move to Arch Common = NS |=0D +| 23 | Pcc Subspace Type 2 Info | Move to Arch Common = NS |=0D +| 24 | Pcc Subspace Type 3 Info | Move to Arch Common = NS |=0D +| 25 | Pcc Subspace Type 4 Info | Move to Arch Common = NS |=0D +| 26 | Pcc Subspace Type 5 Info | Move to Arch Common = NS |=0D +| 27 | Embedded Trace Extension/Module Info | |=0D +| 28 | 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 | 17 | Cache Info | |=0D | 18 | Continuous Performance Control Info | |=0D | 19 | Pcc Subspace Type 0 Info | |=0D +| 20 | Pcc Subspace Type 1 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 (#116993): https://edk2.groups.io/g/devel/message/116993 Mute This Topic: https://groups.io/mt/105068171/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-