From nobody Fri May 3 10:59:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+94130+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1663879030997863.6754096463876; Thu, 22 Sep 2022 13:37:10 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id nDG1YY1788612xcIjcb9OTAR; Thu, 22 Sep 2022 13:37:10 -0700 X-Received: from NAM11-CO1-obe.outbound.protection.outlook.com (NAM11-CO1-obe.outbound.protection.outlook.com [40.107.220.45]) by mx.groups.io with SMTP id smtpd.web08.270.1663879029755871046 for ; Thu, 22 Sep 2022 13:37:10 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cWNs/hcms9sLp4skW7zmbf7D7j6HkXFqHsrIT/4VzcS7406AtGn8uiZLR8LYVMCl+13fUJIWaMxJUD2HRZuRijgGUCySaYQHSYlMzxWvqrZZn62tsi9ChzJWuJADNn0DYLDcT/8f8dLx9MZGKOqBGvXC75gwvCrvyVEb8TcH8DZPIwftqgK+HSVimx1WpwjCuKiwaMElK1C6UvOeG6RT+k2d+8NTbwCWV0+PPnuADgNJIofiy6TenaJ+3EbN/gkzAY2Uj4u6zz1HFXqIZJx4cmxDxGrPxQQPWcO6blSBBLGc8XPYv8dLIrikX1gqJ2JjtE5lFsPEjvKsKUQ+kJ6eZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ZTDi9c+HHtxSXBPr/Czm9Oq57FtKWqhRTupS4J4ElSg=; b=C7N9q1fQ9dKe9okDoBrsqqEdmOJ++Abrr/5q9scjgkesqRcMHMNf65kcO1eh1dUZzoCoa5nWzv72Zk12K1sH60ijqJagQKRa7+YoKcWDXdVb/8kr7KxsKiGxlXB9m/0iJEgl0MYzr4m7hSIHrda4wquW2jr2rQi+7tLZo9wJbu4gWy3Efi+HZApQuNioxP0H02W0+EA95ckggNib97xOH80ObTgcU/tCWpXIYm6HGmNPcIhhxfpslEgvTHbTKenP+/7CZWHvNFKzM/egRsXTaii8mbS8VTiOqw80q/9kJcdhUi90KnT8UUMdtEB6HP1LzHCtwzSr/xuO9+GaqGH++A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none X-Received: from DS7PR03CA0213.namprd03.prod.outlook.com (2603:10b6:5:3ba::8) by IA1PR12MB7614.namprd12.prod.outlook.com (2603:10b6:208:429::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.16; Thu, 22 Sep 2022 20:37:06 +0000 X-Received: from DM6NAM11FT084.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3ba:cafe::ea) by DS7PR03CA0213.outlook.office365.com (2603:10b6:5:3ba::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.19 via Frontend Transport; Thu, 22 Sep 2022 20:37:06 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+94130+1787277+3901457@groups.io; helo=mail02.groups.io; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C X-Received: from mail.nvidia.com (216.228.117.160) by DM6NAM11FT084.mail.protection.outlook.com (10.13.172.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.14 via Frontend Transport; Thu, 22 Sep 2022 20:37:06 +0000 X-Received: from rnnvmail202.nvidia.com (10.129.68.7) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.26; Thu, 22 Sep 2022 13:36:53 -0700 X-Received: from rnnvmail201.nvidia.com (10.129.68.8) by rnnvmail202.nvidia.com (10.129.68.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.29; Thu, 22 Sep 2022 13:36:53 -0700 X-Received: from f153882e4be8.nvidia.com (10.127.8.13) by mail.nvidia.com (10.129.68.8) with Microsoft SMTP Server id 15.2.986.29 via Frontend Transport; Thu, 22 Sep 2022 13:36:52 -0700 From: "Jeff Brasen via groups.io" To: CC: , , , , , Jeff Brasen Subject: [edk2-devel] [PATCH v5 1/3] DynamicTablesPkg: Add CM_ARM_CPC_INFO object Date: Thu, 22 Sep 2022 14:36:44 -0600 Message-ID: <03d241a3a0143019586a5b2c68f3f49189f70dbd.1663878888.git.jbrasen@nvidia.com> In-Reply-To: References: MIME-Version: 1.0 X-NVConfidentiality: public X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT084:EE_|IA1PR12MB7614:EE_ X-MS-Office365-Filtering-Correlation-Id: 8c332564-d692-41e3-92d4-08da9cda36e4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: dydjeTsVOSQ4eeZ9tLiwwWgVpQSuV0i77cErTddmHMj1zTpngk56S7q6SA5s2qJmKl1XYwBRyjSI7Q1QwQ/fAnIMusInlNVNIhfp+FtUdQo288Z8oV4o5BZ09XyUyo3I8pM5Hq0gs3m2FSi5XB/9OjAcLf3hgfDFau65/0fMsAsooDDhTC1a4+E/u4F1KWalp6KuoJmb36HPwTelEUU2uRP8VEbE43Xtfk5SuQkx/W+v5GHRK2UNEI3wlPQKk/xCpEIdIuPkwRLoZlJqhc1yIDaLsfWARXoSuIIW1X9+BmWtwOTVmGqIFSEyx+B/OwxNp18AGXPCi9rVYj0Ot+ufXUVhp48QScdrAiXgTLNyjcHA0OMCFvArwlIotu/AdyqWkKSJbzPD2VqfkN+TL33BpBgxreVv58whJxwaZGxXhqICGLSV8bgzO0rCz+CkAje/YN9EAWS7L9AZoJj6OiUrO+6gaQowumAEEzXZLmje6iwuWIMVtxfxCXUYcnzH/goe0OKxAM+akLboiDCO8kPvOPG4Qd1SV3uXn4S8tswaqRek/ziYqLPftIy3yp8QrJPPkddGU+5YDxfPvnvTk+ZwRs72gbZWflY2UeM/99nUCIK+MoztadHGEtODdDPcq5IkzG90KkleK7PeOEKuPvWk+OVdRIY/3nzlQdHELXa2dXWjbLh/qVv5jomIP68mLUeMfYvIM4o4nBqUiQiGsshHcJMw4iykUKpaQCmIF7FJ/FiZl3rBHHrriCWkA3/4q/djFsk1kNUvOHQNqH+7BFiCag== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2022 20:37:06.2537 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8c332564-d692-41e3-92d4-08da9cda36e4 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT084.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB7614 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,jbrasen@nvidia.com X-Gm-Message-State: lfJTuF95v6Fd8UgADMmXb6gRx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1663879030; bh=W3mpMQQfn+yvADWhWeTA8ISPUgXu5Vw+FzBcb5wpxdI=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=EBLZkqDzMxm+FOFBWuI6Ka4ZS+Kt0G1aQq0tefpfDHwRnKbvtY9mxklFvwYkY+M82i8 UkU6RY8YhrIZDS5TJkQs9WpROL90EPxfqkuc8Wg25ObbrxM4ex4+h8fxL+bx11Lm2Tto4 j8Y+qHYV1wpfyYgX2tCm6a7o5k8RDt3xC2k= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1663879033230100009 Content-Type: text/plain; charset="utf-8" Introduce the CM_ARM_CPC_INFO CmObj in the ArmNameSpaceObjects. This allows to describe CPC information, as described in ACPI 6.4, s8.4.7.1 "_CPC (Continuous Performance Control)". Signed-off-by: Jeff Brasen Reviewed-by: Sami Mujawar --- .../Include/ArmNameSpaceObjects.h | 60 ++++++--- DynamicTablesPkg/Include/Library/AmlCpcInfo.h | 124 ++++++++++++++++++ .../ConfigurationManagerObjectParser.c | 115 +++++++++++++--- 3 files changed, 265 insertions(+), 34 deletions(-) create mode 100644 DynamicTablesPkg/Include/Library/AmlCpcInfo.h diff --git a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h b/DynamicTables= Pkg/Include/ArmNameSpaceObjects.h index 102e0f96be..ea5bf81070 100644 --- a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h +++ b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h @@ -14,6 +14,7 @@ #define ARM_NAMESPACE_OBJECTS_H_ =20 #include +#include =20 #pragma pack(1) =20 @@ -63,6 +64,7 @@ typedef enum ArmObjectID { EArmObjPciInterruptMapInfo, ///< 39 - Pci Interrupt Map Info EArmObjRmr, ///< 40 - Reserved Memory Range Node EArmObjMemoryRangeDescriptor, ///< 41 - Memory Range Descriptor + EArmObjCpcInfo, ///< 42 - Continuous Performance Co= ntrol Info EArmObjMax } EARM_OBJECT_ID; =20 @@ -97,99 +99,105 @@ typedef struct CmArmPowerManagementProfileInfo { */ typedef struct CmArmGicCInfo { /// The GIC CPU Interface number. - UINT32 CPUInterfaceNumber; + UINT32 CPUInterfaceNumber; =20 /** The ACPI Processor UID. This must match the _UID of the CPU Device object information described in the DSDT/SSDT for the CPU. */ - UINT32 AcpiProcessorUid; + UINT32 AcpiProcessorUid; =20 /** The flags field as described by the GICC structure in the ACPI Specification. */ - UINT32 Flags; + UINT32 Flags; =20 /** The parking protocol version field as described by the GICC structure in the ACPI Specification. */ - UINT32 ParkingProtocolVersion; + UINT32 ParkingProtocolVersion; =20 /** The Performance Interrupt field as described by the GICC structure in the ACPI Specification. */ - UINT32 PerformanceInterruptGsiv; + UINT32 PerformanceInterruptGsiv; =20 /** The CPU Parked address field as described by the GICC structure in the ACPI Specification. */ - UINT64 ParkedAddress; + UINT64 ParkedAddress; =20 /** The base address for the GIC CPU Interface as described by the GICC structure in the ACPI Specification. */ - UINT64 PhysicalBaseAddress; + UINT64 PhysicalBaseAddress; =20 /** The base address for GICV interface as described by the GICC structure in the ACPI Specification. */ - UINT64 GICV; + UINT64 GICV; =20 /** The base address for GICH interface as described by the GICC structure in the ACPI Specification. */ - UINT64 GICH; + UINT64 GICH; =20 /** The GICV maintenance interrupt as described by the GICC structure in the ACPI Specification. */ - UINT32 VGICMaintenanceInterrupt; + UINT32 VGICMaintenanceInterrupt; =20 /** The base address for GICR interface as described by the GICC structure in the ACPI Specification. */ - UINT64 GICRBaseAddress; + UINT64 GICRBaseAddress; =20 /** The MPIDR for the CPU as described by the GICC structure in the ACPI Specification. */ - UINT64 MPIDR; + UINT64 MPIDR; =20 /** The Processor Power Efficiency class as described by the GICC structure in the ACPI Specification. */ - UINT8 ProcessorPowerEfficiencyClass; + UINT8 ProcessorPowerEfficiencyClass; =20 /** Statistical Profiling Extension buffer overflow GSIV. Zero if unsupported by this processor. This field was introduced in ACPI 6.3 (MADT revision 5) and is therefore ignored when generating MADT revision 4 or lower. */ - UINT16 SpeOverflowInterrupt; + UINT16 SpeOverflowInterrupt; =20 /** The proximity domain to which the logical processor belongs. This field is used to populate the GICC affinity structure in the SRAT table. */ - UINT32 ProximityDomain; + UINT32 ProximityDomain; =20 /** The clock domain to which the logical processor belongs. This field is used to populate the GICC affinity structure in the SRAT table. */ - UINT32 ClockDomain; + UINT32 ClockDomain; =20 /** The GICC Affinity flags field as described by the GICC Affinity stru= cture in the SRAT table. */ - UINT32 AffinityFlags; + UINT32 AffinityFlags; + + /** Optional field: Reference Token for the Cpc info of this processor. + Token identifying a CM_ARM_OBJ_REF structure, itself referencing + CM_ARM_CPC_INFO objects. + */ + CM_OBJECT_TOKEN CpcToken; } CM_ARM_GICC_INFO; =20 /** A structure that describes the @@ -1070,6 +1078,24 @@ typedef struct CmArmRmrDescriptor { UINT64 Length; } CM_ARM_MEMORY_RANGE_DESCRIPTOR; =20 +/** A structure that describes the Cpc information. + + Continuous Performance Control is described in DSDT/SSDT and associated + to cpus/clusters in the cpu topology. + + Unsupported Optional registers should be encoded with NULL resource + Register {(SystemMemory, 0, 0, 0, 0)} + + For values that support Integer or Buffer, integer will be used + if buffer is NULL resource. + If resource is not NULL then Integer must be 0 + + Cf. ACPI 6.4, s8.4.7.1 _CPC (Continuous Performance Control) + + ID: EArmObjCpcInfo +*/ +typedef AML_CPC_INFO CM_ARM_CPC_INFO; + #pragma pack() =20 #endif // ARM_NAMESPACE_OBJECTS_H_ diff --git a/DynamicTablesPkg/Include/Library/AmlCpcInfo.h b/DynamicTablesP= kg/Include/Library/AmlCpcInfo.h new file mode 100644 index 0000000000..8981c22954 --- /dev/null +++ b/DynamicTablesPkg/Include/Library/AmlCpcInfo.h @@ -0,0 +1,124 @@ +/** @file + + Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved= .
+ + SPDX-License-Identifier: BSD-2-Clause-Patent +**/ + +#ifndef AML_CPC_INFO_H_ +#define AML_CPC_INFO_H_ + +#include + +#pragma pack(1) + +/** A structure that describes the Cpc information. + + Continuous Performance Control is described in DSDT/SSDT and associated + to cpus/clusters in the cpu topology. + + Unsupported Optional registers should be encoded with NULL resource + Register {(SystemMemory, 0, 0, 0, 0)} + + For values that support Integer or Buffer, integer will be used + if buffer is NULL resource. + If resource is not NULL then Integer must be 0 + + Cf. ACPI 6.4, s8.4.7.1 _CPC (Continuous Performance Control) + +**/ + +typedef struct AmlCpcInfo { + /// The revision number of the _CPC package format. + UINT32 Revision; + + /// Indicates the highest level of performance the processor + /// is theoretically capable of achieving. + EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE HighestPerformanceBuffer; + UINT32 HighestPerformanceInteger; + + /// Indicates the highest sustained performance level of the processor. + EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE NominalPerformanceBuffer; + UINT32 NominalPerformanceInteger; + + /// Indicates the lowest performance level of the processor with non-lin= ear power savings. + EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE LowestNonlinearPerformanceBuff= er; + UINT32 LowestNonlinearPerformanceInte= ger; + + /// Indicates the lowest performance level of the processor.. + EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE LowestPerformanceBuffer; + UINT32 LowestPerformanceInteger; + + /// Guaranteed Performance Register Buffer. + /// Optional + EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE GuaranteedPerformanceRegister; + + /// Desired Performance Register Buffer. + EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE DesiredPerformanceRegister; + + /// Minimum Performance Register Buffer. + /// Optional + EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE MinimumPerformanceRegister; + + /// Maximum Performance Register Buffer. + /// Optional + EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE MaximumPerformanceRegister; + + /// Performance Reduction Tolerance Register. + /// Optional + EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE PerformanceReductionToleranceR= egister; + + /// Time Window Register. + /// Optional + EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE TimeWindowRegister; + + /// Counter Wraparound Time + /// Optional + EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE CounterWraparoundTimeBuffer; + UINT32 CounterWraparoundTimeInteger; + + /// Reference Performance Counter Register + EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE ReferencePerformanceCounterReg= ister; + + /// Delivered Performance Counter Register + EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE DeliveredPerformanceCounterReg= ister; + + /// Performance Limited Register + EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE PerformanceLimitedRegister; + + /// CPPC EnableRegister + /// Optional + EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE CPPCEnableRegister; + + /// Autonomous Selection Enable + /// Optional + EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE AutonomousSelectionEnableBuffe= r; + UINT32 AutonomousSelectionEnableInteg= er; + + /// AutonomousActivity-WindowRegister + /// Optional + EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE AutonomousActivityWindowRegist= er; + + /// EnergyPerformance-PreferenceRegister + /// Optional + EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE EnergyPerformancePreferenceReg= ister; + + /// Reference Performance + /// Optional + EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE ReferencePerformanceBuffer; + UINT32 ReferencePerformanceInteger; + + /// Lowest Frequency + /// Optional + EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE LowestFrequencyBuffer; + UINT32 LowestFrequencyInteger; + + /// Nominal Frequency + /// Optional + EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE NominalFrequencyBuffer; + UINT32 NominalFrequencyInteger; +} AML_CPC_INFO; + +#pragma pack() + +#endif //AML_CPC_INFO_H_ diff --git a/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationMa= nagerObjectParser.c b/DynamicTablesPkg/Library/Common/TableHelperLib/Config= urationManagerObjectParser.c index c1b21d24a4..08b4f60dfb 100644 --- a/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerOb= jectParser.c +++ b/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerOb= jectParser.c @@ -34,23 +34,24 @@ STATIC CONST CM_OBJ_PARSER CmArmPowerManagementProfile= InfoParser[] =3D { /** A parser for EArmObjGicCInfo. */ STATIC CONST CM_OBJ_PARSER CmArmGicCInfoParser[] =3D { - { "CPUInterfaceNumber", 4, "0x%x", NULL }, - { "AcpiProcessorUid", 4, "0x%x", NULL }, - { "Flags", 4, "0x%x", NULL }, - { "ParkingProtocolVersion", 4, "0x%x", NULL }, - { "PerformanceInterruptGsiv", 4, "0x%x", NULL }, - { "ParkedAddress", 8, "0x%llx", NULL }, - { "PhysicalBaseAddress", 8, "0x%llx", NULL }, - { "GICV", 8, "0x%llx", NULL }, - { "GICH", 8, "0x%llx", NULL }, - { "VGICMaintenanceInterrupt", 4, "0x%x", NULL }, - { "GICRBaseAddress", 8, "0x%llx", NULL }, - { "MPIDR", 8, "0x%llx", NULL }, - { "ProcessorPowerEfficiencyClass", 1, "0x%x", NULL }, - { "SpeOverflowInterrupt", 2, "0x%x", NULL }, - { "ProximityDomain", 4, "0x%x", NULL }, - { "ClockDomain", 4, "0x%x", NULL }, - { "AffinityFlags", 4, "0x%x", NULL } + { "CPUInterfaceNumber", 4, "0x%x", N= ULL }, + { "AcpiProcessorUid", 4, "0x%x", N= ULL }, + { "Flags", 4, "0x%x", N= ULL }, + { "ParkingProtocolVersion", 4, "0x%x", N= ULL }, + { "PerformanceInterruptGsiv", 4, "0x%x", N= ULL }, + { "ParkedAddress", 8, "0x%llx", N= ULL }, + { "PhysicalBaseAddress", 8, "0x%llx", N= ULL }, + { "GICV", 8, "0x%llx", N= ULL }, + { "GICH", 8, "0x%llx", N= ULL }, + { "VGICMaintenanceInterrupt", 4, "0x%x", N= ULL }, + { "GICRBaseAddress", 8, "0x%llx", N= ULL }, + { "MPIDR", 8, "0x%llx", N= ULL }, + { "ProcessorPowerEfficiencyClass", 1, "0x%x", N= ULL }, + { "SpeOverflowInterrupt", 2, "0x%x", N= ULL }, + { "ProximityDomain", 4, "0x%x", N= ULL }, + { "ClockDomain", 4, "0x%x", N= ULL }, + { "AffinityFlags", 4, "0x%x", N= ULL }, + { "CpcToken", sizeof (CM_OBJECT_TOKEN), "0x%p", N= ULL } }; =20 /** A parser for EArmObjGicDInfo. @@ -423,6 +424,84 @@ STATIC CONST CM_OBJ_PARSER CmPciInterruptMapInfoParse= r[] =3D { ARRAY_SIZE (CmArmGenericInterruptParser) }, }; =20 +/** A parser for EArmObjCpcInfo. +*/ +STATIC CONST CM_OBJ_PARSER CmArmCpcInfoParser[] =3D { + { "Revision", 4, = "0x%lx", NULL }, + { "HighestPerformanceBuffer", sizeof (EFI_ACPI_6_4_GENERIC_= ADDRESS_STRUCTURE), + NULL, NULL, AcpiGenericAddressParser, + ARRAY_SIZE (AcpiGenericAddressParser) }, + { "HighestPerformanceInteger", 4, = "0x%lx", NULL }, + { "NominalPerformanceBuffer", sizeof (EFI_ACPI_6_4_GENERIC_= ADDRESS_STRUCTURE), + NULL, NULL, AcpiGenericAddressParser, + ARRAY_SIZE (AcpiGenericAddressParser) }, + { "NominalPerformanceInteger", 4, = "0x%lx", NULL }, + { "LowestNonlinearPerformanceBuffer", sizeof (EFI_ACPI_6_4_GENERIC_= ADDRESS_STRUCTURE), + NULL, NULL, AcpiGenericAddressParser, + ARRAY_SIZE (AcpiGenericAddressParser) }, + { "LowestNonlinearPerformanceInteger", 4, = "0x%lx", NULL }, + { "LowestPerformanceBuffer", sizeof (EFI_ACPI_6_4_GENERIC_= ADDRESS_STRUCTURE), + NULL, NULL, AcpiGenericAddressParser, + ARRAY_SIZE (AcpiGenericAddressParser) }, + { "LowestPerformanceInteger", 4, = "0x%lx", NULL }, + { "GuaranteedPerformanceRegister", sizeof (EFI_ACPI_6_4_GENERIC_= ADDRESS_STRUCTURE), + NULL, NULL, AcpiGenericAddressParser, + ARRAY_SIZE (AcpiGenericAddressParser) }, + { "DesiredPerformanceRegister", sizeof (EFI_ACPI_6_4_GENERIC_= ADDRESS_STRUCTURE), + NULL, NULL, AcpiGenericAddressParser, + ARRAY_SIZE (AcpiGenericAddressParser) }, + { "MinimumPerformanceRegister", sizeof (EFI_ACPI_6_4_GENERIC_= ADDRESS_STRUCTURE), + NULL, NULL, AcpiGenericAddressParser, + ARRAY_SIZE (AcpiGenericAddressParser) }, + { "MaximumPerformanceRegister", sizeof (EFI_ACPI_6_4_GENERIC_= ADDRESS_STRUCTURE), + NULL, NULL, AcpiGenericAddressParser, + ARRAY_SIZE (AcpiGenericAddressParser) }, + { "PerformanceReductionToleranceRegister", sizeof (EFI_ACPI_6_4_GENERIC_= ADDRESS_STRUCTURE), + NULL, NULL, AcpiGenericAddressParser, + ARRAY_SIZE (AcpiGenericAddressParser) }, + { "TimeWindowRegister", sizeof (EFI_ACPI_6_4_GENERIC_= ADDRESS_STRUCTURE), + NULL, NULL, AcpiGenericAddressParser, + ARRAY_SIZE (AcpiGenericAddressParser) }, + { "CounterWraparoundTimeBuffer", sizeof (EFI_ACPI_6_4_GENERIC_= ADDRESS_STRUCTURE), + NULL, NULL, AcpiGenericAddressParser, + ARRAY_SIZE (AcpiGenericAddressParser) }, + { "CounterWraparoundTimeInteger", 4, = "0x%lx", NULL }, + { "ReferencePerformanceCounterRegister", sizeof (EFI_ACPI_6_4_GENERIC_= ADDRESS_STRUCTURE), + NULL, NULL, AcpiGenericAddressParser, + ARRAY_SIZE (AcpiGenericAddressParser) }, + { "DeliveredPerformanceCounterRegister", sizeof (EFI_ACPI_6_4_GENERIC_= ADDRESS_STRUCTURE), + NULL, NULL, AcpiGenericAddressParser, + ARRAY_SIZE (AcpiGenericAddressParser) }, + { "PerformanceLimitedRegister", sizeof (EFI_ACPI_6_4_GENERIC_= ADDRESS_STRUCTURE), + NULL, NULL, AcpiGenericAddressParser, + ARRAY_SIZE (AcpiGenericAddressParser) }, + { "CPPCEnableRegister", sizeof (EFI_ACPI_6_4_GENERIC_= ADDRESS_STRUCTURE), + NULL, NULL, AcpiGenericAddressParser, + ARRAY_SIZE (AcpiGenericAddressParser) }, + { "AutonomousSelectionEnableBuffer", sizeof (EFI_ACPI_6_4_GENERIC_= ADDRESS_STRUCTURE), + NULL, NULL, AcpiGenericAddressParser, + ARRAY_SIZE (AcpiGenericAddressParser) }, + { "AutonomousSelectionEnableInteger", 4, = "0x%lx", NULL }, + { "AutonomousActivityWindowRegister", sizeof (EFI_ACPI_6_4_GENERIC_= ADDRESS_STRUCTURE), + NULL, NULL, AcpiGenericAddressParser, + ARRAY_SIZE (AcpiGenericAddressParser) }, + { "EnergyPerformancePreferenceRegister", sizeof (EFI_ACPI_6_4_GENERIC_= ADDRESS_STRUCTURE), + NULL, NULL, AcpiGenericAddressParser, + ARRAY_SIZE (AcpiGenericAddressParser) }, + { "ReferencePerformanceBuffer", sizeof (EFI_ACPI_6_4_GENERIC_= ADDRESS_STRUCTURE), + NULL, NULL, AcpiGenericAddressParser, + ARRAY_SIZE (AcpiGenericAddressParser) }, + { "ReferencePerformanceInteger", 4, = "0x%lx", NULL }, + { "LowestFrequencyBuffer", sizeof (EFI_ACPI_6_4_GENERIC_= ADDRESS_STRUCTURE), + NULL, NULL, AcpiGenericAddressParser, + ARRAY_SIZE (AcpiGenericAddressParser) }, + { "LowestFrequencyInteger", 4, = "0x%lx", NULL }, + { "NominalFrequencyBuffer", sizeof (EFI_ACPI_6_4_GENERIC_= ADDRESS_STRUCTURE), + NULL, NULL, AcpiGenericAddressParser, + ARRAY_SIZE (AcpiGenericAddressParser) }, + { "NominalFrequencyInteger", 4, = "0x%lx", NULL }, +}; + /** A parser for Arm namespace objects. */ STATIC CONST CM_OBJ_PARSER_ARRAY ArmNamespaceObjectParser[] =3D { @@ -501,6 +580,8 @@ STATIC CONST CM_OBJ_PARSER_ARRAY ArmNamespaceObjectPar= ser[] =3D { ARRAY_SIZE (CmArmPciAddressMapInfoParser) }, { "EArmObjPciInterruptMapInfo", CmPciInterruptMapInfoParser, ARRAY_SIZE (CmPciInterruptMapInfoParser) }, + { "EArmObjCpcInfo", CmArmCpcInfoParser, + ARRAY_SIZE (CmArmCpcInfoParser) }, { "EArmObjMax", NULL, = 0 }, }; =20 --=20 2.25.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#94130): https://edk2.groups.io/g/devel/message/94130 Mute This Topic: https://groups.io/mt/93857388/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri May 3 10:59:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+94132+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1663879032005702.2327720444468; Thu, 22 Sep 2022 13:37:12 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id qqjIYY1788612xC1Om3UiR4b; Thu, 22 Sep 2022 13:37:11 -0700 X-Received: from NAM02-DM3-obe.outbound.protection.outlook.com (NAM02-DM3-obe.outbound.protection.outlook.com [40.107.95.71]) by mx.groups.io with SMTP id smtpd.web08.271.1663879030398202803 for ; Thu, 22 Sep 2022 13:37:10 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ifS22F35QJzGlwGIl0xuzXG82G+ZuoLUSTOchdbK5FiUVSeUlST5KeGrg6Ebf/BvU4v88asZxnCPca3Ic26VSpbYbS7b9J1IT3g0m+86QjdxUiV4xu+BHQe9Daq/13WfbvbvYCDbTH5GBc9fWAo3LAqj4vwbPrlHwdlLFI0US9g/LvzVO33+I+BL9bf7ovT6JAzkfAdDteD10hBa/7xMBuPGpvPabtI58zA1HNhfg2jmhBPyapu2GKVyznal0rDfgR4ej3NIpGsf85w43Y8/kSlFNZ4uTglFWxQBZAmGaSF8ARNeQIEfX7zSSvo/k+6BRFu538CgbdnTERheEi0vjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Ci+PwmG4lbLz9lR2Dr7EHm66qsreIMu9k6TdHv19LPc=; b=DpnFk6AVsggdQ5cRah0Uf5hS8dMPAADdl0BsJmSHOL9xy9XAEUlUxCS4fXc4PaRqcM4SqUL8E2SRNezP8uT8tX2PuxqQsKYhNomP9fzM+3LG3qS+3ruyqqEnv5cMWqAZUw3xq2fpiP1o/bWzjoiWNvcoZ/krJhcLAgpZYxdRAVFrvEt2emv8LMhdWF0fCARRy7pcdVV/Z7aosAdkyP/BE64Gjok8p44m7qgVy2wxuPjLUBmkHhOyaYGK7SmBpKEXI/DC88ibZldbxGAxHReKsKkoPu73tX2xkGbH4GRQqayTCWtO6jsogvYrfSy9zlDpDrGXn3KIniLicIAn+LUK8w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none X-Received: from BN1PR12CA0008.namprd12.prod.outlook.com (2603:10b6:408:e1::13) by IA1PR12MB6388.namprd12.prod.outlook.com (2603:10b6:208:388::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.17; Thu, 22 Sep 2022 20:37:08 +0000 X-Received: from BN8NAM11FT025.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e1:cafe::e7) by BN1PR12CA0008.outlook.office365.com (2603:10b6:408:e1::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.19 via Frontend Transport; Thu, 22 Sep 2022 20:37:08 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+94132+1787277+3901457@groups.io; helo=mail02.groups.io; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C X-Received: from mail.nvidia.com (216.228.117.161) by BN8NAM11FT025.mail.protection.outlook.com (10.13.177.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.14 via Frontend Transport; Thu, 22 Sep 2022 20:37:08 +0000 X-Received: from rnnvmail202.nvidia.com (10.129.68.7) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.26; Thu, 22 Sep 2022 13:36:54 -0700 X-Received: from rnnvmail201.nvidia.com (10.129.68.8) by rnnvmail202.nvidia.com (10.129.68.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.29; Thu, 22 Sep 2022 13:36:54 -0700 X-Received: from f153882e4be8.nvidia.com (10.127.8.13) by mail.nvidia.com (10.129.68.8) with Microsoft SMTP Server id 15.2.986.29 via Frontend Transport; Thu, 22 Sep 2022 13:36:53 -0700 From: "Jeff Brasen via groups.io" To: CC: , , , , , Jeff Brasen Subject: [edk2-devel] [PATCH v5 2/3] DynamicTablesPkg: AML Code generation to add _CPC entries Date: Thu, 22 Sep 2022 14:36:45 -0600 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-NVConfidentiality: public X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT025:EE_|IA1PR12MB6388:EE_ X-MS-Office365-Filtering-Correlation-Id: 3c9b67ad-4037-4cfd-7834-08da9cda37f7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: CFNMniKgW7HqbdfRMB5NzOfnmweD1xAK9GQ5tIEc592lFRCtiBeUSaEts9CkVNMCHY9pdLco+zHLqruU0M8vIU+HH0/22iuXczuaX2Cb3+AaXbBLaFy/1DktK3LViM7tyKVaIRGyqwqRkWOKGdmMr3Nz2I8aA6ihFSlOJvF8dBDWj0ydfTNZbqCix6+Z3YHKXhoL1h8MNo+Q9jbaGq9D6Gc7j7qR2vFFBN95pqPAwUZBeyHv9rpueMFkuzNdo6BoM8Xnt6BbeUa5KrhX5kjtGtv7FJna6DMvxOTDui3b1cwDDKvS6mdxs15POFP76G7PJtMealWwoy7+5JAJUEqQv5G7tZPpgxWoKOxZMzpF9PS/WvD8/jr2mQ0iZ9KBXOQuYUKFo0iX48KAmOdi4LhC5jXYj2oE4c4smnPShf8Kslw+vCivXUiXvFTOEmf/eNh60dfIQ5i7Tbg1SrSiRpDdUr0Fog2NQUZEzyeOq+0xUkElGENTvNxhZ2fXz/V8w2dsjldB/mnMxPYzrLMCnsYPcIRKjHagdDrtxNr/WtQI/0lRc8RZdHnzC15WX4Zfz9COjd7cGwruyO5YexzOH1mnIr+psdGqImNwekE+21SFFXqw34T9bzj6Lw/5qjhWd3X2iKNpW013eGXtHoKWJWxF5tKAUtFXnaaEDP26zzJXMVDCmsPbktrn+xgb3+DO48fCkdLdvVaQGmWRUw4E6sGZ5SYqO4fj3aBUQTvE+BPfd0vd1IfJ7nQqN6VRt7e4z/Yadfw8WZt8kV/jPKevjXfJv2PImiaBpSu0OFHFHe/m4R4= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2022 20:37:08.0083 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3c9b67ad-4037-4cfd-7834-08da9cda37f7 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT025.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6388 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,jbrasen@nvidia.com X-Gm-Message-State: j7yhNSetfN6yrRMVtvKmyBiTx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1663879031; bh=5cEjnyUP0V0T7XLELuzruuKbQ9V/u6ccq7CKGLlRnL8=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=J1m0XL5VP81d9sUfwcrjWDeIWzlojyIFGXNAb8bpt/n3j2Y9FLfpGpdstQaA4wYsRnF kZZ7u6OLLCx4uE1xwapdvaLzv5s3MqjIyORm+xytT95j1aUX+bREOd29I0wazshnyzBCL lSeneUTFTwTDO8DJeagT/wWWjrONTneurSk= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1663879033226100007 Content-Type: text/plain; charset="utf-8" _CPC entries can describe CPU performance information. The object is described in ACPI 6.4 s8.4.7.1. "_CPC (Continuous Performance Control)". Add AmlCreateCpcNode() helper function to add _CPC entries to an existing CPU object. Signed-off-by: Jeff Brasen Reviewed-by: Sami Mujawar --- .../Include/Library/AmlLib/AmlLib.h | 54 ++ .../Common/AmlLib/CodeGen/AmlCodeGen.c | 475 ++++++++++++++++++ 2 files changed, 529 insertions(+) diff --git a/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h b/DynamicTabl= esPkg/Include/Library/AmlLib/AmlLib.h index 39968660f2..ebaccba811 100644 --- a/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h +++ b/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h @@ -37,6 +37,7 @@ */ =20 #include +#include =20 #ifndef AML_HANDLE =20 @@ -1336,6 +1337,59 @@ AmlAddNameIntegerPackage ( IN AML_OBJECT_NODE_HANDLE PackageNode ); =20 +/** Create a _CPC node. + + Creates and optionally adds the following node + Name(_CPC, Package() + { + NumEntries, // Integer + Revision, // Integer + HighestPerformance, // Integer or Buffer (Resourc= e Descriptor) + NominalPerformance, // Integer or Buffer (Resourc= e Descriptor) + LowestNonlinearPerformance, // Integer or Buffer (Resourc= e Descriptor) + LowestPerformance, // Integer or Buffer (Resourc= e Descriptor) + GuaranteedPerformanceRegister, // Buffer (Resource Descripto= r) + DesiredPerformanceRegister , // Buffer (Resource Descripto= r) + MinimumPerformanceRegister , // Buffer (Resource Descripto= r) + MaximumPerformanceRegister , // Buffer (Resource Descripto= r) + PerformanceReductionToleranceRegister, // Buffer (Resource Descripto= r) + TimeWindowRegister, // Buffer (Resource Descripto= r) + CounterWraparoundTime, // Integer or Buffer (Resourc= e Descriptor) + ReferencePerformanceCounterRegister, // Buffer (Resource Descripto= r) + DeliveredPerformanceCounterRegister, // Buffer (Resource Descripto= r) + PerformanceLimitedRegister, // Buffer (Resource Descripto= r) + CPPCEnableRegister // Buffer (Resource Descripto= r) + AutonomousSelectionEnable, // Integer or Buffer (Resourc= e Descriptor) + AutonomousActivityWindowRegister, // Buffer (Resource Descripto= r) + EnergyPerformancePreferenceRegister, // Buffer (Resource Descripto= r) + ReferencePerformance // Integer or Buffer (Resourc= e Descriptor) + LowestFrequency, // Integer or Buffer (Resourc= e Descriptor) + NominalFrequency // Integer or Buffer (Resourc= e Descriptor) + }) + + If resource buffer is NULL then integer will be used. + + Cf. ACPI 6.4, s8.4.7.1 _CPC (Continuous Performance Control) + + @ingroup CodeGenApis + + @param [in] CpcInfo CpcInfo object + @param [in] ParentNode If provided, set ParentNode as the pa= rent + of the node created. + @param [out] NewCpcNode If success and provided, contains the= created node. + + @retval EFI_SUCCESS The function completed successfully. + @retval EFI_INVALID_PARAMETER Invalid parameter. + @retval EFI_OUT_OF_RESOURCES Failed to allocate memory. +**/ +EFI_STATUS +EFIAPI +AmlCreateCpcNode ( + IN AML_CPC_INFO *CpcInfo, + IN AML_NODE_HANDLE ParentNode OPTIONAL, + OUT AML_OBJECT_NODE_HANDLE *NewCpcNode OPTIONAL + ); + // DEPRECATED APIS #ifndef DISABLE_NEW_DEPRECATED_INTERFACES =20 diff --git a/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlCodeGen.c b/= DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlCodeGen.c index 5fb39d077b..4dc810c034 100644 --- a/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlCodeGen.c +++ b/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlCodeGen.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -2850,3 +2851,477 @@ error_handler: =20 return Status; } + +/** Adds a register to the package + + @ingroup CodeGenApis + + @param [in] Register If provided, register that will be added to pa= ckage. + otherwise NULL register will be added + @param [in] PackageNode Package to add value to + + @retval EFI_SUCCESS The function completed successfully. + @retval EFI_INVALID_PARAMETER Invalid parameter. + @retval EFI_OUT_OF_RESOURCES Failed to allocate memory. +**/ +STATIC +EFI_STATUS +EFIAPI +AmlAddRegisterToPackage ( + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *Register OPTIONAL, + IN AML_OBJECT_NODE_HANDLE PackageNode + ) +{ + EFI_STATUS Status; + AML_DATA_NODE_HANDLE RdNode; + AML_OBJECT_NODE_HANDLE ResourceTemplateNode; + + RdNode =3D NULL; + + Status =3D AmlCodeGenResourceTemplate (&ResourceTemplateNode); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + return Status; + } + + if (Register !=3D NULL) { + Status =3D AmlCodeGenRdRegister ( + Register->AddressSpaceId, + Register->RegisterBitWidth, + Register->RegisterBitOffset, + Register->Address, + Register->AccessSize, + NULL, + &RdNode + ); + } else { + Status =3D AmlCodeGenRdRegister ( + EFI_ACPI_6_4_SYSTEM_MEMORY, + 0, + 0, + 0, + 0, + NULL, + &RdNode + ); + } + + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAppendRdNode (ResourceTemplateNode, RdNode); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + RdNode =3D NULL; + + Status =3D AmlVarListAddTail ( + (AML_NODE_HANDLE)PackageNode, + (AML_NODE_HANDLE)ResourceTemplateNode + ); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + return Status; + +error_handler: + if (RdNode !=3D NULL) { + AmlDeleteTree ((AML_NODE_HANDLE)RdNode); + } + + if (ResourceTemplateNode !=3D NULL) { + AmlDeleteTree ((AML_NODE_HANDLE)ResourceTemplateNode); + } + + return Status; +} + +/** Utility function to check if generic address points to NULL + + @param [in] Address Pointer to the Generic address + + @retval TRUE Address is system memory with an Address of 0. + @retval FALSE Address does not point to NULL. +**/ +STATIC +BOOLEAN +EFIAPI +IsNullGenericAddress ( + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *Address + ) +{ + if ((Address =3D=3D NULL) || + ((Address->AddressSpaceId =3D=3D EFI_ACPI_6_4_SYSTEM_MEMORY) && + (Address->Address =3D=3D 0x0))) + { + return TRUE; + } + + return FALSE; +} + +/** Adds an integer or register to the package + + @ingroup CodeGenApis + + @param [in] Register If provided, register that will be added to pa= ckage + @param [in] Integer If Register is NULL, integer that will be adde= d to the package + @param [in] PackageNode Package to add value to + + @retval EFI_SUCCESS The function completed successfully. + @retval EFI_INVALID_PARAMETER Invalid parameter. + @retval EFI_OUT_OF_RESOURCES Failed to allocate memory. +**/ +STATIC +EFI_STATUS +EFIAPI +AmlAddRegisterOrIntegerToPackage ( + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *Register OPTIONAL, + IN UINT32 Integer, + IN AML_OBJECT_NODE_HANDLE PackageNode + ) +{ + EFI_STATUS Status; + AML_OBJECT_NODE_HANDLE IntegerNode; + + IntegerNode =3D NULL; + + if (!IsNullGenericAddress (Register)) { + Status =3D AmlAddRegisterToPackage (Register, PackageNode); + } else { + Status =3D AmlCodeGenInteger (Integer, &IntegerNode); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + return Status; + } + + Status =3D AmlVarListAddTail ( + (AML_NODE_HANDLE)PackageNode, + (AML_NODE_HANDLE)IntegerNode + ); + } + + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + if (IntegerNode !=3D NULL) { + AmlDeleteTree ((AML_NODE_HANDLE)IntegerNode); + } + } + + return Status; +} + +/** Create a _CPC node. + + Creates and optionally adds the following node + Name(_CPC, Package() + { + NumEntries, // Integer + Revision, // Integer + HighestPerformance, // Integer or Buffer (Resourc= e Descriptor) + NominalPerformance, // Integer or Buffer (Resourc= e Descriptor) + LowestNonlinearPerformance, // Integer or Buffer (Resourc= e Descriptor) + LowestPerformance, // Integer or Buffer (Resourc= e Descriptor) + GuaranteedPerformanceRegister, // Buffer (Resource Descripto= r) + DesiredPerformanceRegister , // Buffer (Resource Descripto= r) + MinimumPerformanceRegister , // Buffer (Resource Descripto= r) + MaximumPerformanceRegister , // Buffer (Resource Descripto= r) + PerformanceReductionToleranceRegister, // Buffer (Resource Descripto= r) + TimeWindowRegister, // Buffer (Resource Descripto= r) + CounterWraparoundTime, // Integer or Buffer (Resourc= e Descriptor) + ReferencePerformanceCounterRegister, // Buffer (Resource Descripto= r) + DeliveredPerformanceCounterRegister, // Buffer (Resource Descripto= r) + PerformanceLimitedRegister, // Buffer (Resource Descripto= r) + CPPCEnableRegister // Buffer (Resource Descripto= r) + AutonomousSelectionEnable, // Integer or Buffer (Resourc= e Descriptor) + AutonomousActivityWindowRegister, // Buffer (Resource Descripto= r) + EnergyPerformancePreferenceRegister, // Buffer (Resource Descripto= r) + ReferencePerformance // Integer or Buffer (Resourc= e Descriptor) + LowestFrequency, // Integer or Buffer (Resourc= e Descriptor) + NominalFrequency // Integer or Buffer (Resourc= e Descriptor) + }) + + If resource buffer is NULL then integer will be used. + + Cf. ACPI 6.4, s8.4.7.1 _CPC (Continuous Performance Control) + + @ingroup CodeGenApis + + @param [in] CpcInfo CpcInfo object + @param [in] ParentNode If provided, set ParentNode as the pa= rent + of the node created. + @param [out] NewCpcNode If success and provided, contains the= created node. + + @retval EFI_SUCCESS The function completed successfully. + @retval EFI_INVALID_PARAMETER Invalid parameter. + @retval EFI_OUT_OF_RESOURCES Failed to allocate memory. +**/ +EFI_STATUS +EFIAPI +AmlCreateCpcNode ( + IN AML_CPC_INFO *CpcInfo, + IN AML_NODE_HANDLE ParentNode OPTIONAL, + OUT AML_OBJECT_NODE_HANDLE *NewCpcNode OPTIONAL + ) +{ + EFI_STATUS Status; + AML_OBJECT_NODE_HANDLE CpcNode; + AML_OBJECT_NODE_HANDLE CpcPackage; + UINT32 NumberOfEntries; + + if ((CpcInfo =3D=3D NULL) || + ((ParentNode =3D=3D NULL) && (NewCpcNode =3D=3D NULL))) + { + ASSERT (0); + return EFI_INVALID_PARAMETER; + } + + // Revision 3 per ACPI 6.4 specification + if (CpcInfo->Revision =3D=3D 3) { + // NumEntries 23 per ACPI 6.4 specification + NumberOfEntries =3D 23; + } else { + ASSERT (0); + return EFI_INVALID_PARAMETER; + } + + if ((IsNullGenericAddress (&CpcInfo->HighestPerformanceBuffer) && + (CpcInfo->HighestPerformanceInteger =3D=3D 0)) || + (IsNullGenericAddress (&CpcInfo->NominalPerformanceBuffer) && + (CpcInfo->NominalPerformanceInteger =3D=3D 0)) || + (IsNullGenericAddress (&CpcInfo->LowestNonlinearPerformanceBuffer) && + (CpcInfo->LowestNonlinearPerformanceInteger =3D=3D 0)) || + (IsNullGenericAddress (&CpcInfo->LowestPerformanceBuffer) && + (CpcInfo->LowestPerformanceInteger =3D=3D 0)) || + IsNullGenericAddress (&CpcInfo->DesiredPerformanceRegister) || + IsNullGenericAddress (&CpcInfo->ReferencePerformanceCounterRegister)= || + IsNullGenericAddress (&CpcInfo->DeliveredPerformanceCounterRegister)= || + IsNullGenericAddress (&CpcInfo->PerformanceLimitedRegister)) + { + ASSERT (0); + return EFI_INVALID_PARAMETER; + } + + CpcPackage =3D NULL; + + Status =3D AmlCodeGenNamePackage ("_CPC", NULL, &CpcNode); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + return Status; + } + + // Get the Package object node of the _CPC node, + // which is the 2nd fixed argument (i.e. index 1). + CpcPackage =3D (AML_OBJECT_NODE_HANDLE)AmlGetFixedArgument ( + CpcNode, + EAmlParseIndexTerm1 + ); + if ((CpcPackage =3D=3D NULL) = || + (AmlGetNodeType ((AML_NODE_HANDLE)CpcPackage) !=3D EAmlNodeObject) = || + (!AmlNodeHasOpCode (CpcPackage, AML_PACKAGE_OP, 0))) + { + ASSERT (0); + Status =3D EFI_INVALID_PARAMETER; + goto error_handler; + } + + Status =3D AmlAddRegisterOrIntegerToPackage ( + NULL, + NumberOfEntries, + CpcPackage + ); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterOrIntegerToPackage ( + NULL, + CpcInfo->Revision, + CpcPackage + ); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterOrIntegerToPackage ( + &CpcInfo->HighestPerformanceBuffer, + CpcInfo->HighestPerformanceInteger, + CpcPackage + ); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterOrIntegerToPackage ( + &CpcInfo->NominalPerformanceBuffer, + CpcInfo->NominalPerformanceInteger, + CpcPackage + ); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterOrIntegerToPackage ( + &CpcInfo->LowestNonlinearPerformanceBuffer, + CpcInfo->LowestNonlinearPerformanceInteger, + CpcPackage + ); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterOrIntegerToPackage ( + &CpcInfo->LowestPerformanceBuffer, + CpcInfo->LowestPerformanceInteger, + CpcPackage + ); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterToPackage (&CpcInfo->GuaranteedPerformanceRegis= ter, CpcPackage); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterToPackage (&CpcInfo->DesiredPerformanceRegister= , CpcPackage); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterToPackage (&CpcInfo->MinimumPerformanceRegister= , CpcPackage); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterToPackage (&CpcInfo->MaximumPerformanceRegister= , CpcPackage); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterToPackage (&CpcInfo->PerformanceReductionTolera= nceRegister, CpcPackage); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterToPackage (&CpcInfo->TimeWindowRegister, CpcPac= kage); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterOrIntegerToPackage ( + &CpcInfo->CounterWraparoundTimeBuffer, + CpcInfo->CounterWraparoundTimeInteger, + CpcPackage + ); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterToPackage (&CpcInfo->ReferencePerformanceCounte= rRegister, CpcPackage); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterToPackage (&CpcInfo->DeliveredPerformanceCounte= rRegister, CpcPackage); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterToPackage (&CpcInfo->PerformanceLimitedRegister= , CpcPackage); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterToPackage (&CpcInfo->CPPCEnableRegister, CpcPac= kage); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterOrIntegerToPackage ( + &CpcInfo->AutonomousSelectionEnableBuffer, + CpcInfo->AutonomousSelectionEnableInteger, + CpcPackage + ); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterToPackage (&CpcInfo->AutonomousActivityWindowRe= gister, CpcPackage); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterToPackage (&CpcInfo->EnergyPerformancePreferenc= eRegister, CpcPackage); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterOrIntegerToPackage ( + &CpcInfo->ReferencePerformanceBuffer, + CpcInfo->ReferencePerformanceInteger, + CpcPackage + ); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterOrIntegerToPackage ( + &CpcInfo->LowestFrequencyBuffer, + CpcInfo->LowestFrequencyInteger, + CpcPackage + ); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterOrIntegerToPackage ( + &CpcInfo->NominalFrequencyBuffer, + CpcInfo->NominalFrequencyInteger, + CpcPackage + ); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D LinkNode (CpcNode, ParentNode, NewCpcNode); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + return Status; + +error_handler: + AmlDeleteTree ((AML_NODE_HANDLE)CpcNode); + return Status; +} --=20 2.25.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#94132): https://edk2.groups.io/g/devel/message/94132 Mute This Topic: https://groups.io/mt/93857390/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri May 3 10:59:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+94131+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1663879033003726.2213442866886; Thu, 22 Sep 2022 13:37:13 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id BFAJYY1788612xbqXUkgf7sn; Thu, 22 Sep 2022 13:37:11 -0700 X-Received: from NAM10-DM6-obe.outbound.protection.outlook.com (NAM10-DM6-obe.outbound.protection.outlook.com [40.107.93.84]) by mx.groups.io with SMTP id smtpd.web10.242.1663879030404731482 for ; Thu, 22 Sep 2022 13:37:10 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y+zTcim09XsW2xuTXjT90h2zdQjY/1bbElp5lNWMZY6vqYrRBHddCmTMOvN27z9gT8EZlKSbTjXEKRR2BSBTIYPpZu3GXOyqnU9+ay8hBkaZB9dOVUzUICMJzC3IRYGiX6TbQnhdDFQ/7uR3FY2GrXvF9QvbHt6gnh/3mxQ0NxVO7QQHqbT3Ri7slqj44UA1IYGT/wT8jGxebfdLlO5Gyu8yeVfVkr+qHGV4gdlT3OVTK5VeJAC2ishLQnYBClYlJQsENe0rqCBCCNqHDLsOW3DzWYcpQ+I4MYDezVqGTr/v484polNPYJCGMyexXtaQ74sb9Grl83tX+f3e3fQT4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=o29N+fsz4FJVamCJ5J0XJneZ5mWurTTSj6LNAFuc2AY=; b=H9o4jD2KUgRtgxUHnRblmZ6OcqxKBgTNYTWnVmSBTQ2LlfgliSxlzj9iTjEPcX4TaK0fSu6drT4RWAPTWAPddXecYgSSZt+K9G2kJBYL691PALC0IE3j1Ka2wgttFU/PZ+UQlenb1K+eDxL4+bbPcmeqG406PB1JGkvsVprsnld/ZmHyIQtaCxZMY3AuSl4GJt8VVIHRQEm+/8zdOYwXV8Uzb7f4UOYMDn6FhrYXyODhvKekrPdvIJHHlUX7Aqa3gfp/9/n6Tn4anTe5F2lWxMH4/2Y0nVp2152KV508HNjW6L0GBM2YOIdZy7DTv3CqXEl66/Hvyo3edMwKZuzE4Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none X-Received: from DM6PR06CA0026.namprd06.prod.outlook.com (2603:10b6:5:120::39) by DM4PR12MB5086.namprd12.prod.outlook.com (2603:10b6:5:389::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.18; Thu, 22 Sep 2022 20:37:08 +0000 X-Received: from DM6NAM11FT094.eop-nam11.prod.protection.outlook.com (2603:10b6:5:120:cafe::5b) by DM6PR06CA0026.outlook.office365.com (2603:10b6:5:120::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.18 via Frontend Transport; Thu, 22 Sep 2022 20:37:08 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+94131+1787277+3901457@groups.io; helo=mail02.groups.io; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C X-Received: from mail.nvidia.com (216.228.117.160) by DM6NAM11FT094.mail.protection.outlook.com (10.13.172.195) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.14 via Frontend Transport; Thu, 22 Sep 2022 20:37:08 +0000 X-Received: from rnnvmail202.nvidia.com (10.129.68.7) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.26; Thu, 22 Sep 2022 13:36:55 -0700 X-Received: from rnnvmail201.nvidia.com (10.129.68.8) by rnnvmail202.nvidia.com (10.129.68.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.29; Thu, 22 Sep 2022 13:36:55 -0700 X-Received: from f153882e4be8.nvidia.com (10.127.8.13) by mail.nvidia.com (10.129.68.8) with Microsoft SMTP Server id 15.2.986.29 via Frontend Transport; Thu, 22 Sep 2022 13:36:54 -0700 From: "Jeff Brasen via groups.io" To: CC: , , , , , Jeff Brasen Subject: [edk2-devel] [PATCH v5 3/3] DynamicTablesPkg: SSDT CPU _CPC generator Date: Thu, 22 Sep 2022 14:36:46 -0600 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-NVConfidentiality: public X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT094:EE_|DM4PR12MB5086:EE_ X-MS-Office365-Filtering-Correlation-Id: 8a449508-59a5-4c26-43a6-08da9cda3840 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: +thpZcmr/uc5/Vs1cKis4m4tbyGklmXQ3+mNucggROjms5HmSU9ALJNY2UUQgPp1KbWEGSBmkLIg9OWB199jKFvn5Rzb98QaYO/UEHisaplfvAA/Mez/Jmz4FQrMA3MIprxZix9wtPxsRIIkLAMRBzqMPkgD5MF1lLYj2vsWGPNE/2REHyw6xKR6qG1PSeNBNze0UDBnjUAgMvqeQzHtzXc4uM5uEx1ekb2o1oEtWPQs8ELo9SHGp2AlV2pTq/7b8acRI5c3HYT0YbB12ok4mRxB+wIYdDNU85k3HW5QVBEI9DI6e7+OapHAt4zTkhnv2cY9V1x/DVWDPWKE+jLSgk6s6f96HjhmY0SIhTrQV4bRRUvzV0WO8n3NaN4MMxUvWXJ8iQZ1/wYx59CNKhbDO9QCLC2XSbBo1NwbvZUzn2LNVz3xQ8vvHzwnTUuoHV0HMeNVbg2hLU0uBrA/uD5IrKE6uBCoDr1nNYSVMojPLtmRcSuB402bonVhglgpWkzMI6ZaJpLhGC/Xd8Ig5HiFY1p4MOOU/pZQ3PkiVZOJbvx0jsQ/qE2HT4cV/zaWEvB0tOu+kU6JToZjMB95kV1AFURJ833BbZGMiSqsEprT86uYLL6Ex/XjwTzmasOVnZtrT6E+TUMj/Io3Q054c1TAFQiGJ6SwEuVdNXDVYLdmvgpDHN2t27FqdexSFrItE3GXxFu+dWfHflsaF85aRR0BOiAy8N1lPZWpqwiwppNhdPSm6YM5IeVm8cHchjIKZGIsViuONYBdo3EsDVQbZPETkg== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2022 20:37:08.5479 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8a449508-59a5-4c26-43a6-08da9cda3840 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT094.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5086 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,jbrasen@nvidia.com X-Gm-Message-State: d4uHOzIauYmZA9bZB459NC20x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1663879031; bh=6Wa1mDdXF5su5SlJvC+zFsRJhGSmh4UokKdKunlw5GE=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=qGzxQ3LtwKrLTZRoHH/0gbNw6TZK3xTna2nvGctJTnZMf/5tuRdYDNTu4w7SGn6GyxJ 9PqF0i7rHHLsLhFSEi58S1I6JN5hqLJrZz2FIt8OjMN26NrcJxSp66u4Nejk0Ys+igjZU aRBm1r7vLCvvrm0cLkMyhqQTb/sq+Fr3tY0= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1663879034949100015 Content-Type: text/plain; charset="utf-8" Add code to use a token attached to GICC to generate _CPC object on cpus. Signed-off-by: Jeff Brasen Reviewed-by: Sami Mujawar --- .../SsdtCpuTopologyGenerator.c | 133 +++++++++++++++++- 1 file changed, 127 insertions(+), 6 deletions(-) diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCpuTopologyLibArm/Ss= dtCpuTopologyGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCpuTop= ologyLibArm/SsdtCpuTopologyGenerator.c index 8561f48e1f..22422aef75 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCpuTopologyLibArm/SsdtCpuTo= pologyGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCpuTopologyLibArm/SsdtCpuTo= pologyGenerator.c @@ -76,6 +76,16 @@ GET_OBJECT_LIST ( CM_ARM_LPI_INFO ); =20 +/** + This macro expands to a function that retrieves the CPC + information from the Configuration Manager. +*/ +GET_OBJECT_LIST ( + EObjNameSpaceArm, + EArmObjCpcInfo, + CM_ARM_CPC_INFO + ); + /** Initialize the TokenTable. =20 One entry should be allocated for each CM_ARM_PROC_HIERARCHY_INFO @@ -229,6 +239,93 @@ WriteAslName ( return EFI_SUCCESS; } =20 +/** Create and add an _CPC Node to Cpu Node. + + For instance, transform an AML node from: + Device (C002) + { + Name (_UID, 2) + Name (_HID, "ACPI0007") + } + + To: + Device (C002) + { + Name (_UID, 2) + Name (_HID, "ACPI0007") + Name(_CPC, Package() + { + NumEntries, // Integer + Revision, // Integer + HighestPerformance, // Integer or Buffer (Res= ource Descriptor) + NominalPerformance, // Integer or Buffer (Res= ource Descriptor) + LowestNonlinearPerformance, // Integer or Buffer (Res= ource Descriptor) + LowestPerformance, // Integer or Buffer (Res= ource Descriptor) + GuaranteedPerformanceRegister, // Buffer (Resource Descr= iptor) + DesiredPerformanceRegister , // Buffer (Resource Descr= iptor) + MinimumPerformanceRegister , // Buffer (Resource Descr= iptor) + MaximumPerformanceRegister , // Buffer (Resource Descr= iptor) + PerformanceReductionToleranceRegister, // Buffer (Resource Descr= iptor) + TimeWindowRegister, // Buffer (Resource Descr= iptor) + CounterWraparoundTime, // Integer or Buffer (Res= ource Descriptor) + ReferencePerformanceCounterRegister, // Buffer (Resource Descr= iptor) + DeliveredPerformanceCounterRegister, // Buffer (Resource Descr= iptor) + PerformanceLimitedRegister, // Buffer (Resource Descr= iptor) + CPPCEnableRegister // Buffer (Resource Descr= iptor) + AutonomousSelectionEnable, // Integer or Buffer (Res= ource Descriptor) + AutonomousActivityWindowRegister, // Buffer (Resource Descr= iptor) + EnergyPerformancePreferenceRegister, // Buffer (Resource Descr= iptor) + ReferencePerformance // Integer or Buffer (Res= ource Descriptor) + LowestFrequency, // Integer or Buffer (Res= ource Descriptor) + NominalFrequency // Integer or Buffer (Res= ource Descriptor) + }) + } + + @param [in] Generator The SSDT Cpu Topology generator. + @param [in] CfgMgrProtocol Pointer to the Configuration Manager + Protocol Interface. + @param [in] ProcHierarchyNodeInfo CM_ARM_PROC_HIERARCHY_INFO describing + the Cpu. + @param [in] Node CPU Node to which the _CPC node is + attached. + + @retval EFI_SUCCESS The function completed successfully. + @retval EFI_INVALID_PARAMETER Invalid parameter. + @retval EFI_OUT_OF_RESOURCES Failed to allocate memory. +**/ +STATIC +EFI_STATUS +EFIAPI +CreateAmlCpcNode ( + IN ACPI_CPU_TOPOLOGY_GENERATOR *Generator, + IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProtocol, + IN CM_ARM_GICC_INFO *GicCInfo, + IN AML_OBJECT_NODE_HANDLE *Node + ) +{ + EFI_STATUS Status; + CM_ARM_CPC_INFO *CpcInfo; + + Status =3D GetEArmObjCpcInfo ( + CfgMgrProtocol, + GicCInfo->CpcToken, + &CpcInfo, + NULL + ); + if (EFI_ERROR (Status)) { + ASSERT (0); + return Status; + } + + Status =3D AmlCreateCpcNode ( + CpcInfo, + Node, + NULL + ); + ASSERT_EFI_ERROR (Status); + return Status; +} + /** Create and add an _LPI method to Cpu/Cluster Node. =20 For instance, transform an AML node from: @@ -581,7 +678,20 @@ CreateAmlCpuFromProcHierarchy ( // CM_ARM_PROC_HIERARCHY_INFO, create an _LPI method returning them. if (ProcHierarchyNodeInfo->LpiToken !=3D CM_NULL_TOKEN) { Status =3D CreateAmlLpiMethod (Generator, ProcHierarchyNodeInfo, CpuNo= de); - ASSERT_EFI_ERROR (Status); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + return Status; + } + } + + // If a CPC info is associated with the + // GicCinfo, create an _CPC method returning them. + if (GicCInfo->CpcToken !=3D CM_NULL_TOKEN) { + Status =3D CreateAmlCpcNode (Generator, CfgMgrProtocol, GicCInfo, CpuN= ode); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + return Status; + } } =20 return Status; @@ -934,10 +1044,11 @@ CreateTopologyFromGicC ( IN AML_OBJECT_NODE_HANDLE ScopeNode ) { - EFI_STATUS Status; - CM_ARM_GICC_INFO *GicCInfo; - UINT32 GicCInfoCount; - UINT32 Index; + EFI_STATUS Status; + CM_ARM_GICC_INFO *GicCInfo; + UINT32 GicCInfoCount; + UINT32 Index; + AML_OBJECT_NODE_HANDLE CpuNode; =20 ASSERT (Generator !=3D NULL); ASSERT (CfgMgrProtocol !=3D NULL); @@ -961,12 +1072,22 @@ CreateTopologyFromGicC ( ScopeNode, &GicCInfo[Index], Index, - NULL + &CpuNode ); if (EFI_ERROR (Status)) { ASSERT (0); break; } + + // If a CPC info is associated with the + // GicCinfo, create an _CPC method returning them. + if (GicCInfo->CpcToken !=3D CM_NULL_TOKEN) { + Status =3D CreateAmlCpcNode (Generator, CfgMgrProtocol, &GicCInfo[In= dex], CpuNode); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + break; + } + } } // for =20 return Status; --=20 2.25.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#94131): https://edk2.groups.io/g/devel/message/94131 Mute This Topic: https://groups.io/mt/93857389/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-