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 539D2AC1198 for ; Thu, 21 Mar 2024 16:01:02 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=uoZn7yuw5KW4n7q37OH0NK4RRrj0fSMbuBtkGZCmlIA=; 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=1711036861; v=1; b=YTj+KipmBXupGTm9BSq9e5YnV2cPvybdg5wpE/0JwrKMoYlTd4qur5iwjOb40PJNpxScEc8x nCkVp3vE+24RtQ5TyZRkpsyVJa91y9StR8ykOyz3S8LtKFYWa7UxclAqNP6Nvi1Zk4ekQZ3GiD4 SSHtgU6dlrasX9IPBc4K8/zkMNr3TJMFE2/tIi7UWBUUi3vN3JVLl26Fzqni55NoEpxCijR5t3o OPsWHKoSqtLTQaQuHhCPbp0k/NXR7SPrOG0YAOoM+BldbGeYuYixWTb8WZgRPDP4ctAdGvzPdGz J7YUg/AhgvvtvQx1sXSVmGBokhxVlKjzP/4SN89p/8nHg== X-Received: by 127.0.0.2 with SMTP id SMddYY7687511xSqAoq4PqUu; Thu, 21 Mar 2024 09:01:01 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.633.1711036860138281819 for ; Thu, 21 Mar 2024 09:01:00 -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 793A61007; Thu, 21 Mar 2024 09:01:33 -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 515E03F67D; Thu, 21 Mar 2024 09:00:56 -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 14/19] DynamicTablesPkg: Move PCC Type0 info to Arch Common Date: Thu, 21 Mar 2024 16:59:19 +0100 Message-Id: <20240321155924.707272-15-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:00 -0700 Reply-To: devel@edk2.groups.io,pierre.gondois@arm.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: wjGl3DzaGtnXT5SOKuvJKBPkx7686176AA= 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=YTj+Kipm; 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 Type0 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 | 8 ++ .../Include/ArmNameSpaceObjects.h | 22 ++-- .../Acpi/Arm/AcpiPcctLibArm/PcctGenerator.c | 104 +++++++++--------- .../Acpi/Arm/AcpiPcctLibArm/PcctGenerator.h | 5 +- .../DynamicPlatRepoLib/CmObjectTokenFixer.c | 13 +-- .../ConfigurationManagerObjectParser.c | 22 ++-- DynamicTablesPkg/Readme.md | 16 +-- 7 files changed, 96 insertions(+), 94 deletions(-) diff --git a/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h b/Dynami= cTablesPkg/Include/ArchCommonNameSpaceObjects.h index e21e2ca4e0d2..4ce2d7b48ebf 100644 --- a/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h +++ b/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h @@ -39,6 +39,7 @@ typedef enum ArchCommonObjectID { EArchCommonObjProcHierarchyInfo, ///< 16 - Processor Hierar= chy Info=0D EArchCommonObjCacheInfo, ///< 17 - Cache Info=0D EArchCommonObjCpcInfo, ///< 18 - Continuous Perfo= rmance Control Info=0D + EArchCommonObjPccSubspaceType0Info, ///< 19 - Pcc Subspace Typ= e 0 Info=0D EArchCommonObjMax=0D } EARCH_COMMON_OBJECT_ID;=0D =0D @@ -523,6 +524,13 @@ typedef struct PccSubspaceGenericInfo { PCC_SUBSPACE_CHANNEL_TIMING_INFO ChannelTiming;=0D } PCC_SUBSPACE_GENERIC_INFO;=0D =0D +/** A structure that describes a=0D + PCC Subspace of type 0 (Generic).=0D +=0D + ID: EArchCommonObjPccSubspaceType0Info=0D +*/=0D +typedef PCC_SUBSPACE_GENERIC_INFO CM_ARCH_COMMON_PCC_SUBSPACE_TYPE0_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 e9a2cb0fe6c5..a28415c77687 100644 --- a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h +++ b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h @@ -51,14 +51,13 @@ 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 - EArmObjPccSubspaceType0Info, ///< 23 - P= cc Subspace Type 0 Info=0D - EArmObjPccSubspaceType1Info, ///< 24 - P= cc Subspace Type 2 Info=0D - EArmObjPccSubspaceType2Info, ///< 25 - P= cc Subspace Type 2 Info=0D - EArmObjPccSubspaceType3Info, ///< 26 - P= cc Subspace Type 3 Info=0D - EArmObjPccSubspaceType4Info, ///< 27 - P= cc Subspace Type 4 Info=0D - EArmObjPccSubspaceType5Info, ///< 28 - P= cc Subspace Type 5 Info=0D - EArmObjEtInfo, ///< 29 - E= mbedded Trace Extension/Module Info=0D - EArmObjPsdInfo, ///< 30 - P= -State Dependency (PSD) Info=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 EArmObjMax=0D } EARM_OBJECT_ID;=0D =0D @@ -714,13 +713,6 @@ typedef struct CmArmRmrDescriptor { UINT64 Length;=0D } CM_ARM_MEMORY_RANGE_DESCRIPTOR;=0D =0D -/** A structure that describes a=0D - PCC Subspace of type 0 (Generic).=0D -=0D - ID: EArmObjPccSubspaceType0Info=0D -*/=0D -typedef PCC_SUBSPACE_GENERIC_INFO CM_ARM_PCC_SUBSPACE_TYPE0_INFO;=0D -=0D /** A structure that describes a=0D PCC Subspace of type 1 (HW-Reduced).=0D =0D diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiPcctLibArm/PcctGenerator= .c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiPcctLibArm/PcctGenerator.c index 36caf4aaeab7..575ab31f7ff2 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiPcctLibArm/PcctGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiPcctLibArm/PcctGenerator.c @@ -29,7 +29,7 @@ Requirements:=0D The following Configuration Manager Object(s) are required by=0D this Generator:=0D - - EArmObjPccSubspaceType0Info=0D + - EArchCommonObjPccSubspaceType0Info=0D - EArmObjPccSubspaceType1Info=0D - EArmObjPccSubspaceType2Info=0D - EArmObjPccSubspaceType3Info=0D @@ -41,9 +41,9 @@ Requirements: Subspace of Type 0 Information from the Configuration Manager.=0D */=0D GET_OBJECT_LIST (=0D - EObjNameSpaceArm,=0D - EArmObjPccSubspaceType0Info,=0D - CM_ARM_PCC_SUBSPACE_TYPE0_INFO=0D + EObjNameSpaceArchCommon,=0D + EArchCommonObjPccSubspaceType0Info,=0D + CM_ARCH_COMMON_PCC_SUBSPACE_TYPE0_INFO=0D );=0D =0D /** This macro expands to a function that retrieves the PCC=0D @@ -164,11 +164,12 @@ MappingTableFree ( }=0D }=0D =0D -/** Add a new entry for CmArmPccSubspace at Index.=0D +/** Add a new entry for PccSubspace at Index.=0D =0D @param [in] MappingTable The mapping table structure.=0D - @param [in] CmArmPccSubspace Pointer to a CM_ARM_PCC_SUBSPACE_TYPE[X]_I= NFO.=0D - @param [in] Index Index at which CmArmPccSubspace must be ad= ded.=0D + @param [in] PccSubspace A pointer to=0D + CM_[ARM|ARCH_COMMON]_PCC_SUBSPACE_TYPE[X]_= INFO.=0D + @param [in] Index Index at which PccSubspace must be added.= =0D This is the Subspace Id.=0D =0D @retval EFI_SUCCESS Success.=0D @@ -180,13 +181,13 @@ EFI_STATUS EFIAPI=0D MappingTableAdd (=0D IN MAPPING_TABLE *MappingTable,=0D - IN VOID *CmArmPccSubspace,=0D + IN VOID *PccSubspace,=0D IN UINT32 Index=0D )=0D {=0D if ((MappingTable =3D=3D NULL) ||=0D (MappingTable->Table =3D=3D NULL) ||=0D - (CmArmPccSubspace =3D=3D NULL))=0D + (PccSubspace =3D=3D NULL))=0D {=0D ASSERT_EFI_ERROR (EFI_INVALID_PARAMETER);=0D return EFI_INVALID_PARAMETER;=0D @@ -200,14 +201,15 @@ MappingTableAdd ( }=0D =0D // Just map the Pcc Subspace in the Table.=0D - MappingTable->Table[Index] =3D CmArmPccSubspace;=0D + MappingTable->Table[Index] =3D PccSubspace;=0D return EFI_SUCCESS;=0D }=0D =0D /** Parse the CmPccArray objects and add them to the MappingTable.=0D =0D @param [in] MappingTable The mapping table structure.=0D - @param [in] CmPccArray Pointer to an array of CM_ARM_PCC_SUBSPACE_= TYPE[X]_INFO.=0D + @param [in] CmPccArray Pointer to an array of=0D + CM_[ARM|ARCH_COMMON]_PCC_SUBSPACE_TYPE[X]_I= NFO.=0D @param [in] CmPccCount Count of objects in CmPccArray.=0D =0D @retval EFI_SUCCESS Success.=0D @@ -242,7 +244,7 @@ MapPccSubspaceId ( =0D switch (GenericPcc->Type) {=0D case EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_GENERIC:=0D - CmObjSize =3D sizeof (CM_ARM_PCC_SUBSPACE_TYPE0_INFO);=0D + CmObjSize =3D sizeof (CM_ARCH_COMMON_PCC_SUBSPACE_TYPE0_INFO);=0D break;=0D =0D case EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_1_HW_REDUCED_COMMUNICATIONS:=0D @@ -304,8 +306,8 @@ STATIC EFI_STATUS=0D EFIAPI=0D AddSubspaceStructType0 (=0D - IN CM_ARM_PCC_SUBSPACE_TYPE0_INFO *PccCmObj,=0D - IN EFI_ACPI_6_4_PCCT_SUBSPACE_GENERIC *PccAcpi=0D + IN CM_ARCH_COMMON_PCC_SUBSPACE_TYPE0_INFO *PccCmObj,=0D + IN EFI_ACPI_6_4_PCCT_SUBSPACE_GENERIC *PccAcpi=0D )=0D {=0D PCC_MAILBOX_REGISTER_INFO *Doorbell;=0D @@ -360,11 +362,11 @@ AddSubspaceStructType1 ( IN EFI_ACPI_6_4_PCCT_SUBSPACE_1_HW_REDUCED_COMMUNICATIONS *PccAcpi=0D )=0D {=0D - CM_ARM_PCC_SUBSPACE_TYPE0_INFO *GenericPccCmObj;=0D - PCC_MAILBOX_REGISTER_INFO *Doorbell;=0D - PCC_SUBSPACE_CHANNEL_TIMING_INFO *ChannelTiming;=0D + CM_ARCH_COMMON_PCC_SUBSPACE_TYPE0_INFO *GenericPccCmObj;=0D + PCC_MAILBOX_REGISTER_INFO *Doorbell;=0D + PCC_SUBSPACE_CHANNEL_TIMING_INFO *ChannelTiming;=0D =0D - GenericPccCmObj =3D (CM_ARM_PCC_SUBSPACE_TYPE0_INFO *)PccCmObj;=0D + GenericPccCmObj =3D (CM_ARCH_COMMON_PCC_SUBSPACE_TYPE0_INFO *)PccCmObj;= =0D =0D if ((PccCmObj =3D=3D NULL) ||=0D (GenericPccCmObj->Type !=3D EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_1_HW_RED= UCED_COMMUNICATIONS) ||=0D @@ -420,12 +422,12 @@ AddSubspaceStructType2 ( IN EFI_ACPI_6_4_PCCT_SUBSPACE_2_HW_REDUCED_COMMUNICATIONS *PccAcpi=0D )=0D {=0D - CM_ARM_PCC_SUBSPACE_TYPE0_INFO *GenericPccCmObj;=0D - PCC_MAILBOX_REGISTER_INFO *Doorbell;=0D - PCC_MAILBOX_REGISTER_INFO *PlatIrqAck;=0D - PCC_SUBSPACE_CHANNEL_TIMING_INFO *ChannelTiming;=0D + CM_ARCH_COMMON_PCC_SUBSPACE_TYPE0_INFO *GenericPccCmObj;=0D + PCC_MAILBOX_REGISTER_INFO *Doorbell;=0D + PCC_MAILBOX_REGISTER_INFO *PlatIrqAck;=0D + PCC_SUBSPACE_CHANNEL_TIMING_INFO *ChannelTiming;=0D =0D - GenericPccCmObj =3D (CM_ARM_PCC_SUBSPACE_TYPE0_INFO *)PccCmObj;=0D + GenericPccCmObj =3D (CM_ARCH_COMMON_PCC_SUBSPACE_TYPE0_INFO *)PccCmObj;= =0D =0D if ((PccCmObj =3D=3D NULL) ||=0D (GenericPccCmObj->Type !=3D EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_2_HW_RED= UCED_COMMUNICATIONS) ||=0D @@ -491,15 +493,15 @@ AddSubspaceStructType34 ( IN EFI_ACPI_6_4_PCCT_SUBSPACE_3_EXTENDED_PCC *PccAcpi=0D )=0D {=0D - CM_ARM_PCC_SUBSPACE_TYPE0_INFO *GenericPccCmObj;=0D - PCC_MAILBOX_REGISTER_INFO *Doorbell;=0D - PCC_MAILBOX_REGISTER_INFO *PlatIrqAck;=0D - PCC_MAILBOX_REGISTER_INFO *CmdCompleteCheck;=0D - PCC_MAILBOX_REGISTER_INFO *CmdCompleteUpdate;=0D - PCC_MAILBOX_REGISTER_INFO *ErrorStatus;=0D - PCC_SUBSPACE_CHANNEL_TIMING_INFO *ChannelTiming;=0D + CM_ARCH_COMMON_PCC_SUBSPACE_TYPE0_INFO *GenericPccCmObj;=0D + PCC_MAILBOX_REGISTER_INFO *Doorbell;=0D + PCC_MAILBOX_REGISTER_INFO *PlatIrqAck;=0D + PCC_MAILBOX_REGISTER_INFO *CmdCompleteCheck;=0D + PCC_MAILBOX_REGISTER_INFO *CmdCompleteUpdate;=0D + PCC_MAILBOX_REGISTER_INFO *ErrorStatus;=0D + PCC_SUBSPACE_CHANNEL_TIMING_INFO *ChannelTiming;=0D =0D - GenericPccCmObj =3D (CM_ARM_PCC_SUBSPACE_TYPE0_INFO *)PccCmObj;=0D + GenericPccCmObj =3D (CM_ARCH_COMMON_PCC_SUBSPACE_TYPE0_INFO *)PccCmObj;= =0D =0D if ((PccCmObj =3D=3D NULL) ||=0D ((GenericPccCmObj->Type !=3D EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_3_EXTEN= DED_PCC) &&=0D @@ -603,13 +605,13 @@ AddSubspaceStructType5 ( IN EFI_ACPI_6_4_PCCT_SUBSPACE_5_HW_REGISTERS_COMMUNICATIONS *PccAcpi=0D )=0D {=0D - CM_ARM_PCC_SUBSPACE_TYPE0_INFO *GenericPccCmObj;=0D - PCC_MAILBOX_REGISTER_INFO *Doorbell;=0D - PCC_MAILBOX_REGISTER_INFO *CmdCompleteCheck;=0D - PCC_MAILBOX_REGISTER_INFO *ErrorStatus;=0D - PCC_SUBSPACE_CHANNEL_TIMING_INFO *ChannelTiming;=0D + CM_ARCH_COMMON_PCC_SUBSPACE_TYPE0_INFO *GenericPccCmObj;=0D + PCC_MAILBOX_REGISTER_INFO *Doorbell;=0D + PCC_MAILBOX_REGISTER_INFO *CmdCompleteCheck;=0D + PCC_MAILBOX_REGISTER_INFO *ErrorStatus;=0D + PCC_SUBSPACE_CHANNEL_TIMING_INFO *ChannelTiming;=0D =0D - GenericPccCmObj =3D (CM_ARM_PCC_SUBSPACE_TYPE0_INFO *)PccCmObj;=0D + GenericPccCmObj =3D (CM_ARCH_COMMON_PCC_SUBSPACE_TYPE0_INFO *)PccCmObj;= =0D =0D if ((PccCmObj =3D=3D NULL) ||=0D (GenericPccCmObj->Type !=3D EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_5_HW_REG= ISTERS_COMMUNICATIONS) ||=0D @@ -705,7 +707,7 @@ PopulatePcctTable ( switch (((PCC_SUBSPACE_GENERIC_INFO *)CurrentPccSubspace)->Type) {=0D case EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_GENERIC:=0D Status =3D AddSubspaceStructType0 (=0D - (CM_ARM_PCC_SUBSPACE_TYPE0_INFO *)CurrentPccSubspace,=0D + (CM_ARCH_COMMON_PCC_SUBSPACE_TYPE0_INFO *)CurrentPccSub= space,=0D (EFI_ACPI_6_4_PCCT_SUBSPACE_GENERIC *)PccBuffer=0D );=0D =0D @@ -822,18 +824,18 @@ BuildPcctTable ( MAPPING_TABLE *MappingTable;=0D UINT32 MappingTableCount;=0D =0D - CM_ARM_PCC_SUBSPACE_TYPE0_INFO *PccType0;=0D - UINT32 PccType0Count;=0D - CM_ARM_PCC_SUBSPACE_TYPE1_INFO *PccType1;=0D - UINT32 PccType1Count;=0D - CM_ARM_PCC_SUBSPACE_TYPE2_INFO *PccType2;=0D - UINT32 PccType2Count;=0D - CM_ARM_PCC_SUBSPACE_TYPE3_INFO *PccType3;=0D - UINT32 PccType3Count;=0D - CM_ARM_PCC_SUBSPACE_TYPE4_INFO *PccType4;=0D - UINT32 PccType4Count;=0D - CM_ARM_PCC_SUBSPACE_TYPE5_INFO *PccType5;=0D - UINT32 PccType5Count;=0D + CM_ARCH_COMMON_PCC_SUBSPACE_TYPE0_INFO *PccType0;=0D + UINT32 PccType0Count;=0D + CM_ARM_PCC_SUBSPACE_TYPE1_INFO *PccType1;=0D + UINT32 PccType1Count;=0D + CM_ARM_PCC_SUBSPACE_TYPE2_INFO *PccType2;=0D + UINT32 PccType2Count;=0D + CM_ARM_PCC_SUBSPACE_TYPE3_INFO *PccType3;=0D + UINT32 PccType3Count;=0D + CM_ARM_PCC_SUBSPACE_TYPE4_INFO *PccType4;=0D + UINT32 PccType4Count;=0D + CM_ARM_PCC_SUBSPACE_TYPE5_INFO *PccType5;=0D + UINT32 PccType5Count;=0D =0D ASSERT (This !=3D NULL);=0D ASSERT (AcpiTableInfo !=3D NULL);=0D @@ -863,7 +865,7 @@ BuildPcctTable ( =0D // First get all the Pcc Subpace CmObj of type X.=0D =0D - Status =3D GetEArmObjPccSubspaceType0Info (=0D + Status =3D GetEArchCommonObjPccSubspaceType0Info (=0D CfgMgrProtocol,=0D CM_NULL_TOKEN,=0D &PccType0,=0D diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiPcctLibArm/PcctGenerator= .h b/DynamicTablesPkg/Library/Acpi/Arm/AcpiPcctLibArm/PcctGenerator.h index 0631a1f5b74b..e1bca78c2ffa 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiPcctLibArm/PcctGenerator.h +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiPcctLibArm/PcctGenerator.h @@ -19,7 +19,7 @@ */=0D typedef struct MappingTable {=0D /// Mapping table for Subspace Ids.=0D - /// Subspace ID/Index <-> CM_ARM_PCC_SUBSPACE_TYPE[X]_INFO pointer=0D + /// Subspace ID/Index <-> CM_[ARM|ARCH_COMMON]_PCC_SUBSPACE_TYPE[X]_INFO= pointer=0D VOID **Table;=0D =0D /// Number of entries in the Table.=0D @@ -34,7 +34,8 @@ typedef struct AcpiPcctGenerator { =0D // Private fields are defined from here.=0D =0D - /// Table to map: Subspace ID/Index <-> CM_ARM_PCC_SUBSPACE_TYPE[X]_INFO= pointer=0D + /// Table to map:=0D + /// Subspace ID/Index <-> CM_[ARM|ARCH_COMMON]_PCC_SUBSPACE_TYPE[X]_INFO= pointer=0D MAPPING_TABLE MappingTable;=0D } ACPI_PCCT_GENERATOR;=0D =0D diff --git a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTok= enFixer.c b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectToke= nFixer.c index 68db478c5789..1691e6015bf8 100644 --- a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer= .c +++ b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer= .c @@ -166,14 +166,13 @@ 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 - Pcc Subspace Type 0 Info=0D + NULL, ///< 23 - Pcc Subspace Type 2 Info=0D NULL, ///< 24 - Pcc Subspace Type 2 Info=0D - NULL, ///< 25 - Pcc Subspace Type 2 Info=0D - NULL, ///< 26 - Pcc Subspace Type 3 Info=0D - NULL, ///< 27 - Pcc Subspace Type 4 Info=0D - NULL, ///< 28 - Pcc Subspace Type 5 Info=0D - NULL, ///< 29 - Embedded Trace Extension/Mod= ule Info=0D - NULL ///< 30 - P-State Dependency (PSD) Inf= o=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 };=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 54ecc66c5b40..e071fa460a40 100644 --- a/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerOb= jectParser.c +++ b/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerOb= jectParser.c @@ -574,9 +574,9 @@ STATIC CONST CM_OBJ_PARSER CmArmPccSubspaceChannelTimi= ngInfoParser[] =3D { { "MinRequestTurnaroundTime", 2, "0x%x", NULL },=0D };=0D =0D -/** A parser for EArmObjPccSubspaceType0Info.=0D +/** A parser for EArchCommonObjPccSubspaceType0Info.=0D */=0D -STATIC CONST CM_OBJ_PARSER CmArmPccSubspaceType0InfoParser[] =3D {=0D +STATIC CONST CM_OBJ_PARSER CmArchCommonPccSubspaceType0InfoParser[] =3D {= =0D { "SubspaceId", 1, "0x%x", = NULL },=0D { "Type", 1, "0x%x", = NULL },=0D { "BaseAddress", 8, "0x%llx", = NULL },=0D @@ -593,8 +593,8 @@ STATIC CONST CM_OBJ_PARSER CmArmPccSubspaceType0InfoPa= rser[] =3D { */=0D STATIC CONST CM_OBJ_PARSER CmArmPccSubspaceType1InfoParser[] =3D {=0D { "GenericPccInfo", sizeof (PCC_SUBSPACE_GENERIC_INFO),=0D - NULL, NULL, CmArmPccSubspaceType0InfoParser,=0D - ARRAY_SIZE (CmArmPccSubspaceType0InfoParser) },=0D + NULL, NULL, CmArchCommonPccSubspaceType0InfoParser,=0D + ARRAY_SIZE (CmArchCommonPccSubspaceType0InfoParser) },=0D { "PlatIrq", sizeof (CM_ARCH_COMMON_GENERIC_INTERRUPT),=0D NULL, NULL, CmArchCommonGenericInterruptParser,=0D ARRAY_SIZE (CmArchCommonGenericInterruptParser) },=0D @@ -604,8 +604,8 @@ STATIC CONST CM_OBJ_PARSER CmArmPccSubspaceType1InfoPa= rser[] =3D { */=0D STATIC CONST CM_OBJ_PARSER CmArmPccSubspaceType2InfoParser[] =3D {=0D { "GenericPccInfo", sizeof (PCC_SUBSPACE_GENERIC_INFO),=0D - NULL, NULL, CmArmPccSubspaceType0InfoParser,=0D - ARRAY_SIZE (CmArmPccSubspaceType0InfoParser) },=0D + NULL, NULL, CmArchCommonPccSubspaceType0InfoParser,=0D + ARRAY_SIZE (CmArchCommonPccSubspaceType0InfoParser) },=0D { "PlatIrq", sizeof (CM_ARCH_COMMON_GENERIC_INTERRUPT),NULL,NULL,= =0D CmArchCommonGenericInterruptParser, ARRAY_SIZE (CmArchCommonGenericInt= erruptParser) },=0D { "PlatIrqAckReg", sizeof (PCC_MAILBOX_REGISTER_INFO),=0D @@ -617,8 +617,8 @@ STATIC CONST CM_OBJ_PARSER CmArmPccSubspaceType2InfoPa= rser[] =3D { */=0D STATIC CONST CM_OBJ_PARSER CmArmPccSubspaceType34InfoParser[] =3D {=0D { "GenericPccInfo", sizeof (PCC_SUBSPACE_GENERIC_INFO),=0D - NULL, NULL, CmArmPccSubspaceType0InfoParser,=0D - ARRAY_SIZE (CmArmPccSubspaceType0InfoParser) },=0D + NULL, NULL, CmArchCommonPccSubspaceType0InfoParser,=0D + ARRAY_SIZE (CmArchCommonPccSubspaceType0InfoParser) },=0D { "PlatIrq", sizeof (CM_ARCH_COMMON_GENERIC_INTERRUPT),NULL= ,NULL,=0D CmArchCommonGenericInterruptParser, ARRAY_SIZE (CmArchCommonGenericInt= erruptParser) },=0D { "PlatIrqAckReg", sizeof (PCC_MAILBOX_REGISTER_INFO),=0D @@ -639,8 +639,8 @@ STATIC CONST CM_OBJ_PARSER CmArmPccSubspaceType34InfoP= arser[] =3D { */=0D STATIC CONST CM_OBJ_PARSER CmArmPccSubspaceType5InfoParser[] =3D {=0D { "GenericPccInfo", sizeof (PCC_SUBSPACE_GENERIC_INFO),=0D - NULL, NULL, CmArmPccSubspaceType0InfoParser,=0D - ARRAY_SIZE (CmArmPccSubspaceType0InfoParser) },=0D + NULL, NULL, CmArchCommonPccSubspaceType0InfoParser,=0D + ARRAY_SIZE (CmArchCommonPccSubspaceType0InfoParser) },=0D { "Version", 2, "0x%x= ",NULL },=0D { "PlatIrq", sizeof (CM_ARCH_COMMON_GENERIC_INTERRUPT),NULL,= NULL,=0D CmArchCommonGenericInterruptParser, ARRAY_SIZE (CmArchCommonGenericInt= erruptParser) },=0D @@ -689,6 +689,7 @@ STATIC CONST CM_OBJ_PARSER_ARRAY ArchCommonNamespaceOb= jectParser[] =3D { CM_PARSER_ADD_OBJECT (EArchCommonObjProcHierarchyInfo, CmArchC= ommonProcHierarchyInfoParser),=0D 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_RESERVED (EArchCommonObjMax)=0D };=0D =0D @@ -718,7 +719,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 (EArmObjPccSubspaceType0Info, CmArmPccSubspac= eType0InfoParser),=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 diff --git a/DynamicTablesPkg/Readme.md b/DynamicTablesPkg/Readme.md index 8ac9d126b834..999422035984 100644 --- a/DynamicTablesPkg/Readme.md +++ b/DynamicTablesPkg/Readme.md @@ -463,14 +463,13 @@ 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 0 Info | Move to Arch Common = NS |=0D -| 24 | Pcc Subspace Type 1 Info | Move to Arch Common = NS |=0D -| 25 | Pcc Subspace Type 2 Info | Move to Arch Common = NS |=0D -| 26 | Pcc Subspace Type 3 Info | Move to Arch Common = NS |=0D -| 27 | Pcc Subspace Type 4 Info | Move to Arch Common = NS |=0D -| 28 | Pcc Subspace Type 5 Info | Move to Arch Common = NS |=0D -| 29 | Embedded Trace Extension/Module Info | |=0D -| 30 | P-State Dependency (PSD) Info | Move to Arch Common = NS |=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 | `*` | 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 | 16 | Processor Hierarchy Info | |=0D | 17 | Cache Info | |=0D | 18 | Continuous Performance Control Info | |=0D +| 19 | Pcc Subspace Type 0 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 (#116992): https://edk2.groups.io/g/devel/message/116992 Mute This Topic: https://groups.io/mt/105068170/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-