From nobody Thu Apr 25 22:58:53 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+93826+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 1663247474567372.40521783303166; Thu, 15 Sep 2022 06:11:14 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id cQAKYY1788612xXAjM0sMqTv; Thu, 15 Sep 2022 06:11:14 -0700 X-Received: from NAM12-DM6-obe.outbound.protection.outlook.com (NAM12-DM6-obe.outbound.protection.outlook.com [40.107.243.65]) by mx.groups.io with SMTP id smtpd.web11.9913.1663247473062145989 for ; Thu, 15 Sep 2022 06:11:13 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ClnwMDGex0uzmZXILqGt9tJeP8R//e+YKHzlga72uSx2A7vxCF6yOPdAC71+hENsbpR20tdYwjlvSDQ4JzJrGYjaCoV/mK18DIcj7HkXyn2a/P0jeI/L86Ws8UZ2KeBhzJfg65BFgLuIr90A83MHUvxueF9asistVMUPpcuig6f+B+0EASz5vCotJr3rpTWa0tIB0uRSYEM7utUw0t1kXG8gHzQki/iG+ZZW3Kbli/iVb0+YCIAfJAXTCXlhNko0a1jJKsFO3APaDgDMWN80PfmU4lsFNQsEXgZ7myaBg265UEBMWu4z8lALLd+7n+6lwwLtJDuPDyJVzjpkiANyoA== 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=zmp1VNs1x5sveZGH7CN5e6zbeeHAe++qt2xmPruYUDQ=; b=kWUW1auj6hXjb+sCDkkNjTtWjfX6ZjzKb/nH/we6M2VMVy7/GxDYJAcCuM2JOB1XDiferH9lDLTx7RuzJE+brla39GsEXC9H2jvKnhbnAHTF3NLjBd2jEeC3i1KO/Sy/QdYv5PokE0c0dqL4eL3iOJ9D6WAVK8/HZY2oGEzFzykT4t/fS0jQpmU3LS39NYhfYzMoRhqL6RxAbkRx3BVjkAQ8EIy098upONHCIJ4u+E64GNouI4wbnNx4GKKPiwICkJ5UvTwlBhxmX/+RZMd8ta6YfMwDur2vo8djreB5n9ctpNl/vc7j5azUQ0nOvu0Bt8ZqnkWDOEu51oXyr9bi3w== 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 BN1PR13CA0017.namprd13.prod.outlook.com (2603:10b6:408:e2::22) by SN7PR12MB6929.namprd12.prod.outlook.com (2603:10b6:806:263::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.14; Thu, 15 Sep 2022 13:11:10 +0000 X-Received: from BN8NAM11FT089.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e2:cafe::a8) by BN1PR13CA0017.outlook.office365.com (2603:10b6:408:e2::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.6 via Frontend Transport; Thu, 15 Sep 2022 13:11:10 +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+93826+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 BN8NAM11FT089.mail.protection.outlook.com (10.13.176.105) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5632.12 via Frontend Transport; Thu, 15 Sep 2022 13:11:10 +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, 15 Sep 2022 06:10: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, 15 Sep 2022 06:10:55 -0700 X-Received: from f153882e4be8.nvidia.com (10.127.8.14) by mail.nvidia.com (10.129.68.8) with Microsoft SMTP Server id 15.2.986.29 via Frontend Transport; Thu, 15 Sep 2022 06:10:54 -0700 From: "Jeff Brasen via groups.io" To: CC: , , , , Jeff Brasen Subject: [edk2-devel] [PATCH v3 1/3] DynamicTablesPkg: Add CM_ARM_CPC_INFO object Date: Thu, 15 Sep 2022 07:10:50 -0600 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-NVConfidentiality: public X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT089:EE_|SN7PR12MB6929:EE_ X-MS-Office365-Filtering-Correlation-Id: b47b2edb-5179-4b7c-781e-08da971bc247 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: ADHmLLys/DXnkpBD9s4Z/2bUDbzl/atGBya40GWn0yeobZ0stYOQoevxv36j+7kjQK+MZBRia7lyS7kthZqgHwcwv/7S6yxvaWpZFno3TNHEg7+BVSN3zlYxFUa9u4cLdEfbMONUlDjwTAJH6Yar8P56Phxrgj3qM4MGmqCelIt1bGw60+P+YLm6MwfX1tUqvxwWkYc9LXFxEir7AumjdGSAUBRWgxE57oLhHvb4PqeZQAUxSO+02Nfa7KjHmxNg7O2oAj7Zriem+gpt8IRD7u4QmT+rRAucbIs3v3mLQI3cDuhvOxp94bpah5wCeKUjPEIA2QZTOKC3ZYAjm9dHvB3Ld3qqqQDBT421ybKfgJXHyGg5QLpgUUpQi4NOvhZITcPT4Fl3S6XjHaQWqql36JfYd07aJXb9u0vveMHpNEcODovO3WnTzEW0/3a/2JSEKfNMRjXwN/Z+7Ty7k4DF4Fu6aqK1COYHRI/ESMRK5M7VIM0yAx1p8IRNb5QtqlaiIh3Y4W5vJF+6SYZ/GjAwnmDxg25n6d5FMwkRWA8js+6vw+wiUxlWD/Pxx5MGrDR4rp/NTvbBu5Nj1Odfu6rzzGVR4hZcLppb8jrPNL0kFA1ZwOpcJWzZNlaOIXc2apl4HcJ8eenlU3NrFzzo7XrwBEUV1785nck6IlnWPycd+t7njAjs4EFewI+tiucD+D/pYShLTUk9lUWPxIXgnQSaKNenGpmO7wjFs5Jqs5wAlBNs3dhg5fckbf6ibfyHaGPG1YAbmq2YwHg+opEwQd3KMg== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2022 13:11:10.3690 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b47b2edb-5179-4b7c-781e-08da971bc247 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: BN8NAM11FT089.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB6929 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: eYGcA4BbmQNKEHngTcHIdk40x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1663247474; bh=o4tPhbEuoLJD9NKFDebia9+LSYifjRM2LTz3arv45Lg=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=gdHjTyZDSNHinssT0d6ZDbG/POIgkPD4hLenydws+JY8QNwiWCCCZOYPuqaXk7nZkGp BpA4VHC+O7wjkC57vLQU4/GSGiQ7nsLzNZcHWohDMm7SI84B9tWrtGhN2W/wT0AY7foqe jvJl0vxuPPR86Upm7egIvTyckysUB90JQsE= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1663247475732100001 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 --- .../Include/ArmNameSpaceObjects.h | 148 ++++++++++++++++-- .../ConfigurationManagerObjectParser.c | 80 ++++++++++ 2 files changed, 211 insertions(+), 17 deletions(-) diff --git a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h b/DynamicTables= Pkg/Include/ArmNameSpaceObjects.h index 102e0f96be..d76cc08e14 100644 --- a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h +++ b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h @@ -63,6 +63,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 +98,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 +1077,113 @@ 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 struct CmArmCpcInfo { + /// 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; +} CM_ARM_CPC_INFO; + #pragma pack() =20 #endif // ARM_NAMESPACE_OBJECTS_H_ diff --git a/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationMa= nagerObjectParser.c b/DynamicTablesPkg/Library/Common/TableHelperLib/Config= urationManagerObjectParser.c index c1b21d24a4..c7e0d51397 100644 --- a/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerOb= jectParser.c +++ b/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerOb= jectParser.c @@ -423,6 +423,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%llx", NULL }, + { "HighestPerformanceBuffer", sizeof (EFI_ACPI_6_4_GENERIC_= ADDRESS_STRUCTURE), + NULL, NULL, AcpiGenericAddressParser, + ARRAY_SIZE (AcpiGenericAddressParser) }, + { "HighestPerformanceInteger", 4, = "0x%llx", NULL }, + { "NominalPerformanceBuffer", sizeof (EFI_ACPI_6_4_GENERIC_= ADDRESS_STRUCTURE), + NULL, NULL, AcpiGenericAddressParser, + ARRAY_SIZE (AcpiGenericAddressParser) }, + { "NominalPerformanceInteger", 4, = "0x%llx", NULL }, + { "LowestNonlinearPerformanceBuffer", sizeof (EFI_ACPI_6_4_GENERIC_= ADDRESS_STRUCTURE), + NULL, NULL, AcpiGenericAddressParser, + ARRAY_SIZE (AcpiGenericAddressParser) }, + { "LowestNonlinearPerformanceInteger", 4, = "0x%llx", NULL }, + { "LowestPerformanceBuffer", sizeof (EFI_ACPI_6_4_GENERIC_= ADDRESS_STRUCTURE), + NULL, NULL, AcpiGenericAddressParser, + ARRAY_SIZE (AcpiGenericAddressParser) }, + { "LowestPerformanceInteger", 4, = "0x%llx", 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%llx", 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%llx", 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%llx", NULL }, + { "LowestFrequencyBuffer", sizeof (EFI_ACPI_6_4_GENERIC_= ADDRESS_STRUCTURE), + NULL, NULL, AcpiGenericAddressParser, + ARRAY_SIZE (AcpiGenericAddressParser) }, + { "LowestFrequencyInteger", 4, = "0x%llx", NULL }, + { "NominalFrequencyBuffer", sizeof (EFI_ACPI_6_4_GENERIC_= ADDRESS_STRUCTURE), + NULL, NULL, AcpiGenericAddressParser, + ARRAY_SIZE (AcpiGenericAddressParser) }, + { "NominalFrequencyInteger", 4, = "0x%llx", NULL }, +}; + /** A parser for Arm namespace objects. */ STATIC CONST CM_OBJ_PARSER_ARRAY ArmNamespaceObjectParser[] =3D { @@ -501,6 +579,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 (#93826): https://edk2.groups.io/g/devel/message/93826 Mute This Topic: https://groups.io/mt/93699435/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 Thu Apr 25 22:58:53 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+93829+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 1663247488029110.2218452982886; Thu, 15 Sep 2022 06:11:28 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id BRZFYY1788612xdMDG73PWhx; Thu, 15 Sep 2022 06:11:27 -0700 X-Received: from NAM11-DM6-obe.outbound.protection.outlook.com (NAM11-DM6-obe.outbound.protection.outlook.com [40.107.223.51]) by mx.groups.io with SMTP id smtpd.web08.9917.1663247486935227083 for ; Thu, 15 Sep 2022 06:11:27 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Iv/MhmLHbPQ+4cwFtP2DcbxtfhZD8Q5lKWvnZu5h1Ca9kjHpYQbv2FxWzA1osb1AzwymmM5e1L41Ue5RTyVepLpGRiXLMr0qkm99trvxLNUnWzN4g3gL88mejUNAVZcylpt53e0GyAs8Y16LHa8r0tmASYAc/bIREXyQtubyLSbKu6esPJUTY+VmQTpUglc5ctZtdTL4nmAS8Uav2qOwodxwgcmd78v2aRPj5YK7tcH52aEGymqISPeFcyIMKEot/QJo2cVxaGxWVpJzhx3cHH6JpqiiJOBSVPKBFRPskBRbgnHc33HHVeo77sGoYxRQARZxJ8HRfaxBTtD+1Wqgvw== 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=iY6ZS2Rai0svUmUYq2JKTZoWQ+vi1mM7DOqTbxnX/vI=; b=D05NpieLHAvP+Z4Bq5pmbrMDlNDcR3GJ/iwTaTb39NRwibDjRzS25whHTukKhksTYlqCQoqOkO3za3FZQMniLCHWqyEMo2OhDMNDc7jBtZNpfKOA7c5Yqm9NluB4BKe64okjK7Ztymu3MYMfR2bVKwlezKUbfvv4JQ7AbUtDH1JJ9bgSTAJlFMiF5xF80ASS/7Rlm0ZTBKyi+FuuWHftu2xKz/IKk+f4fUcmp+h+2qS3UrchS9xJn+vvow1mIE/dXU4X5RMWHB5//6tq+q3Uw/YrVdtQfJH0HrTcomd0IP1eHfj5g3CWMOx/1S+yCbU0npY9fCLLx5NHH2okkBadAQ== 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 MW4PR04CA0040.namprd04.prod.outlook.com (2603:10b6:303:6a::15) by CH3PR12MB7667.namprd12.prod.outlook.com (2603:10b6:610:14f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.22; Thu, 15 Sep 2022 13:11:23 +0000 X-Received: from CO1NAM11FT038.eop-nam11.prod.protection.outlook.com (2603:10b6:303:6a:cafe::33) by MW4PR04CA0040.outlook.office365.com (2603:10b6:303:6a::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.19 via Frontend Transport; Thu, 15 Sep 2022 13:11:23 +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+93829+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 CO1NAM11FT038.mail.protection.outlook.com (10.13.174.231) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5632.12 via Frontend Transport; Thu, 15 Sep 2022 13:11:22 +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, 15 Sep 2022 06:10:56 -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, 15 Sep 2022 06:10:56 -0700 X-Received: from f153882e4be8.nvidia.com (10.127.8.14) by mail.nvidia.com (10.129.68.8) with Microsoft SMTP Server id 15.2.986.29 via Frontend Transport; Thu, 15 Sep 2022 06:10:55 -0700 From: "Jeff Brasen via groups.io" To: CC: , , , , Jeff Brasen Subject: [edk2-devel] [PATCH v3 2/3] DynamicTablesPkg: AML Code generation to add _CPC entries Date: Thu, 15 Sep 2022 07:10:51 -0600 Message-ID: <2bc2acdd897dae6fab193cc4a92595e41be586ca.1663247185.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: CO1NAM11FT038:EE_|CH3PR12MB7667:EE_ X-MS-Office365-Filtering-Correlation-Id: 4783b436-04f1-459f-0feb-08da971bc9a3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: tABhjCPNVkq8dl3i+wgnXtH+cj4tRQ+SuCyC0zhpFkoK0aMtwwtIjBaZQuHP+Uar2yocp/xGV9ZRMkg/dwkTE/3PHnyOs0slkAWT8ZVLAUWsg9z2Q1PCTc+UpeVqb0PxBvkhNqIPb9lOxbqJKBLvbOOo/94NgyuE39HKMBEh7Rkc4bhUsQQ2QqMKZ2ZYbzafxFKNSJw8jbctEylSiF7rjr/fYhZsPBoD2SH5cBAMoW1a5j2NBy5yyKbrygPKLeFKqoV5K78Jg9m541hdRF0jwPMK/0m9JBJvjCVZqOEV/IqGT+AQIqPc7Bga1PeCF2Stqynkzc0UUuy6SSwt1g5awGNjl5HhVfL/ihsnz0AE+NdUTKzcSghsYX02O9RsKq8aWvLXVjgMkMwrsWWabfJWjTna27XyLlnQTuHzmRwlECLChLUMDKHM5Mssk2I03OVgT39X33HAKOrb9NpTDdv4ptTzcKfzv0pfGh5F5SDXkvEYWfsdOWsSghG6Ejh3+IXkC0zRUDuoMNc3pMpqajAyxebMb2/7n1TCO7f49FhiZ2DtptvjuzBy1yzdfoSTvMUEMdrmwICZVxJYyAkcAI5tuXc0sQimhDfn5iue1xXS3U/1KzaAtKwwss+PdQ3nqC8OHo+v8fyx0+2lZg2beQSuSJqdgw1mC+WB20zdXRxkQoLNAJK7d3S3Qqj4F1hhFTXHcwRkqGwSr4ZBCnESGi+qU908j/eJR+0mVuPlmOVc9Epsvv+gcsW/yyeQI6lURAPhUM7fLeHnrc9Ec55/xP3r9g== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2022 13:11:22.7602 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4783b436-04f1-459f-0feb-08da971bc9a3 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: CO1NAM11FT038.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB7667 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: iEjr6gYqiniyfK7ZlPcaQKThx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1663247487; bh=c/cml1C4lOtYvwHa6cYK43RNg7oJENtNY/PORfBvxoo=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=WiTlkp6wnHnmrIXZGCaxbQUQawEWWaE/MCd6lCMkDikDSUzwcTBfgwG9G8BIApCmKhw Hf1Al7cdnuXw8otyugp9Jrdrqm/0O5z9fozJmju3SuSXiTZUY1liiZ1jcPF6dyEpVWDr7 QK+CpA1/oIsJF4911lv/cRkTEr57S2WiL8c= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1663247490023100003 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 --- .../Include/Library/AmlLib/AmlLib.h | 156 +++++ .../Common/AmlLib/CodeGen/AmlCodeGen.c | 543 ++++++++++++++++++ 2 files changed, 699 insertions(+) diff --git a/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h b/DynamicTabl= esPkg/Include/Library/AmlLib/AmlLib.h index 39968660f2..3fafa6b0e8 100644 --- a/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h +++ b/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h @@ -1336,6 +1336,162 @@ 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] HighestPerformanceBuffer If provided, buffer = that indicates the highest level + of performance the p= rocessor. + @param [in] HighestPerformanceInteger Indicates the highes= t level of performance the processor, + used if buffer is NU= LL. + @param [in] NominalPerformanceBuffer If provided buffer t= hat indicates the highest sustained + performance level of= the processor. + @param [in] NominalPerformanceInteger Indicates the highes= t sustained performance level + of the processor, us= ed if buffer is NULL. + @param [in] LowestNonlinearPerformanceBuffer If provided, buffer = that indicates the lowest performance level + of the processor wit= h non-linear power savings. + @param [in] LowestNonlinearPerformanceInteger Indicates the lowest= performance level of the processor with + non-linear power sav= ings, used if buffer is NULL. + @param [in] LowestPerformanceBuffer If provided, buffer = that indicates the + lowest performance l= evel of the processor. + @param [in] LowestPerformanceInteger Indicates the lowest= performance level of the processor, + used if buffer is NU= LL. + @param [in] GuaranteedPerformanceRegister If provided, Guarant= eed Performance Register Buffer. + @param [in] DesiredPerformanceRegister If provided, Desired= Performance Register Buffer. + @param [in] MinimumPerformanceRegister If provided, Minimum= Performance Register Buffer. + @param [in] MaximumPerformanceRegister If provided, Maximum= Performance Register Buffer. + @param [in] PerformanceReductionToleranceRegister If provided, Perform= ance Reduction Tolerance Register. + @param [in] TimeWindowRegister If provided, Time Wi= ndow Register. + @param [in] CounterWraparoundTimeBuffer If provided, Counter= Wraparound Time buffer. + @param [in] CounterWraparoundTimeInteger Counter Wraparound T= ime, used if buffer is NULL. + @param [in] ReferencePerformanceCounterRegister Reference Performanc= e Counter Register. + @param [in] DeliveredPerformanceCounterRegister Delivered Performanc= e Counter Register. + @param [in] PerformanceLimitedRegister Performance Limited = Register. + @param [in] CPPCEnableRegister If provided, CPPC En= ableRegister. + @param [in] AutonomousSelectionEnableBuffer If provided, Autonom= ous Selection Enable buffer. + @param [in] AutonomousSelectionEnableInteger Autonomous Selection= Enable, used if buffer is NULL. + @param [in] AutonomousActivityWindowRegister If provided, Autonom= ousActivity-WindowRegister. + @param [in] EnergyPerformancePreferenceRegister If provided, EnergyP= erformance-PreferenceRegister. + @param [in] ReferencePerformanceBuffer If provided, Referen= ce Performance buffer. + @param [in] ReferencePerformanceInteger Reference Performanc= e, used if buffer is NULL. + @param [in] LowestFrequencyBuffer If provided, Lowest = Frequency buffer. + @param [in] LowestFrequencyInteger Lowest Frequency, us= ed if buffer is NULL. + @param [in] NominalFrequencyBuffer If provided, Nominal= FrequencyBuffer buffer. + @param [in] NominalFrequencyInteger NominalFrequencyBuff= er, used if buffer is NULL. + @param [in] ParentNode If provided, set Par= entNode as the parent + of the node created. + @param [out] NewCpcNode If success and provi= ded, 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 ( + /// The revision number of the _CPC package format. + IN UINT32 Revision, + /// Indicates the highest level of performance the processor + /// is theoretically capable of achieving. + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *HighestPerformanceBuffer OP= TIONAL, + IN UINT32 HighestPerformanceInteger, + /// Indicates the highest sustained performance level of the processor. + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *NominalPerformanceBuffer OP= TIONAL, + IN UINT32 NominalPerformanceInteger, + /// Indicates the lowest performance level of the processor with non-lin= ear power savings. + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *LowestNonlinearPerformanceB= uffer OPTIONAL, + IN UINT32 LowestNonlinearPerformanceIn= teger, + /// Indicates the lowest performance level of the processor.. + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *LowestPerformanceBuffer OPT= IONAL, + IN UINT32 LowestPerformanceInteger, + /// Guaranteed Performance Register Buffer. + /// Optional + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *GuaranteedPerformanceRegist= er OPTIONAL, + /// Desired Performance Register Buffer. + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *DesiredPerformanceRegister, + /// Minimum Performance Register Buffer. + /// Optional + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *MinimumPerformanceRegister = OPTIONAL, + /// Maximum Performance Register Buffer. + /// Optional + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *MaximumPerformanceRegister = OPTIONAL, + /// Performance Reduction Tolerance Register. + /// Optional + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *PerformanceReductionToleran= ceRegister OPTIONAL, + /// Time Window Register. + /// Optional + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *TimeWindowRegister OPTIONAL, + /// Counter Wraparound Time + /// Optional + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *CounterWraparoundTimeBuffer= OPTIONAL, + IN UINT32 CounterWraparoundTimeInteger, + /// Reference Performance Counter Register + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *ReferencePerformanceCounter= Register, + /// Delivered Performance Counter Register + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *DeliveredPerformanceCounter= Register, + /// Performance Limited Register + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *PerformanceLimitedRegister, + /// CPPC EnableRegister + /// Optional + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *CPPCEnableRegister OPTIONAL, + /// Autonomous Selection Enable + /// Optional + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *AutonomousSelectionEnableBu= ffer OPTIONAL, + IN UINT32 AutonomousSelectionEnableInt= eger, + /// AutonomousActivity-WindowRegister + /// Optional + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *AutonomousActivityWindowReg= ister OPTIONAL, + /// EnergyPerformance-PreferenceRegister + /// Optional + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *EnergyPerformancePreference= Register OPTIONAL, + /// Reference Performance + /// Optional + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *ReferencePerformanceBuffer = OPTIONAL, + IN UINT32 ReferencePerformanceInteger, + /// Lowest Frequency + /// Optional + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *LowestFrequencyBuffer OPTIO= NAL, + IN UINT32 LowestFrequencyInteger, + /// Nominal Frequency + /// Optional + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *NominalFrequencyBuffer OPTI= ONAL, + IN UINT32 NominalFrequencyInteger, + 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..42f0d0002c 100644 --- a/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlCodeGen.c +++ b/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlCodeGen.c @@ -2850,3 +2850,546 @@ 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; +} + +/** 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 (Register !=3D NULL) { + 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] HighestPerformanceBuffer If provided, buffer = that indicates the highest level + of performance the p= rocessor. + @param [in] HighestPerformanceInteger Indicates the highes= t level of performance the processor, + used if buffer is NU= LL. + @param [in] NominalPerformanceBuffer If provided buffer t= hat indicates the highest sustained + performance level of= the processor. + @param [in] NominalPerformanceInteger Indicates the highes= t sustained performance level + of the processor, us= ed if buffer is NULL. + @param [in] LowestNonlinearPerformanceBuffer If provided, buffer = that indicates the lowest performance level + of the processor wit= h non-linear power savings. + @param [in] LowestNonlinearPerformanceInteger Indicates the lowest= performance level of the processor with + non-linear power sav= ings, used if buffer is NULL. + @param [in] LowestPerformanceBuffer If provided, buffer = that indicates the + lowest performance l= evel of the processor. + @param [in] LowestPerformanceInteger Indicates the lowest= performance level of the processor, + used if buffer is NU= LL. + @param [in] GuaranteedPerformanceRegister If provided, Guarant= eed Performance Register Buffer. + @param [in] DesiredPerformanceRegister If provided, Desired= Performance Register Buffer. + @param [in] MinimumPerformanceRegister If provided, Minimum= Performance Register Buffer. + @param [in] MaximumPerformanceRegister If provided, Maximum= Performance Register Buffer. + @param [in] PerformanceReductionToleranceRegister If provided, Perform= ance Reduction Tolerance Register. + @param [in] TimeWindowRegister If provided, Time Wi= ndow Register. + @param [in] CounterWraparoundTimeBuffer If provided, Counter= Wraparound Time buffer. + @param [in] CounterWraparoundTimeInteger Counter Wraparound T= ime, used if buffer is NULL. + @param [in] ReferencePerformanceCounterRegister Reference Performanc= e Counter Register. + @param [in] DeliveredPerformanceCounterRegister Delivered Performanc= e Counter Register. + @param [in] PerformanceLimitedRegister Performance Limited = Register. + @param [in] CPPCEnableRegister If provided, CPPC En= ableRegister. + @param [in] AutonomousSelectionEnableBuffer If provided, Autonom= ous Selection Enable buffer. + @param [in] AutonomousSelectionEnableInteger Autonomous Selection= Enable, used if buffer is NULL. + @param [in] AutonomousActivityWindowRegister If provided, Autonom= ousActivity-WindowRegister. + @param [in] EnergyPerformancePreferenceRegister If provided, EnergyP= erformance-PreferenceRegister. + @param [in] ReferencePerformanceBuffer If provided, Referen= ce Performance buffer. + @param [in] ReferencePerformanceInteger Reference Performanc= e, used if buffer is NULL. + @param [in] LowestFrequencyBuffer If provided, Lowest = Frequency buffer. + @param [in] LowestFrequencyInteger Lowest Frequency, us= ed if buffer is NULL. + @param [in] NominalFrequencyBuffer If provided, Nominal= FrequencyBuffer buffer. + @param [in] NominalFrequencyInteger NominalFrequencyBuff= er, used if buffer is NULL. + @param [in] ParentNode If provided, set Par= entNode as the parent + of the node created. + @param [out] NewCpcNode If success and provi= ded, 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 ( + /// The revision number of the _CPC package format. + IN UINT32 Revision, + /// Indicates the highest level of performance the processor + /// is theoretically capable of achieving. + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *HighestPerformanceBuffer OPT= IONAL, + IN UINT32 HighestPerformanceInteger, + /// Indicates the highest sustained performance level of the processor. + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *NominalPerformanceBuffer OPT= IONAL, + IN UINT32 NominalPerformanceInteger, + /// Indicates the lowest performance level of the processor with non-lin= ear power savings. + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *LowestNonlinearPerformanceBu= ffer OPTIONAL, + IN UINT32 LowestNonlinearPerformanceInt= eger, + /// Indicates the lowest performance level of the processor.. + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *LowestPerformanceBuffer OPTI= ONAL, + IN UINT32 LowestPerformanceInteger, + /// Guaranteed Performance Register Buffer. + /// Optional + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *GuaranteedPerformanceRegiste= r OPTIONAL, + /// Desired Performance Register Buffer. + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *DesiredPerformanceRegister, + /// Minimum Performance Register Buffer. + /// Optional + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *MinimumPerformanceRegister O= PTIONAL, + /// Maximum Performance Register Buffer. + /// Optional + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *MaximumPerformanceRegister O= PTIONAL, + /// Performance Reduction Tolerance Register. + /// Optional + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *PerformanceReductionToleranc= eRegister OPTIONAL, + /// Time Window Register. + /// Optional + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *TimeWindowRegister OPTIONAL, + /// Counter Wraparound Time + /// Optional + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *CounterWraparoundTimeBuffer = OPTIONAL, + IN UINT32 CounterWraparoundTimeInteger, + /// Reference Performance Counter Register + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *ReferencePerformanceCounterR= egister, + /// Delivered Performance Counter Register + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *DeliveredPerformanceCounterR= egister, + /// Performance Limited Register + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *PerformanceLimitedRegister, + /// CPPC EnableRegister + /// Optional + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *CPPCEnableRegister OPTIONAL, + /// Autonomous Selection Enable + /// Optional + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *AutonomousSelectionEnableBuf= fer OPTIONAL, + IN UINT32 AutonomousSelectionEnableInte= ger, + /// AutonomousActivity-WindowRegister + /// Optional + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *AutonomousActivityWindowRegi= ster OPTIONAL, + /// EnergyPerformance-PreferenceRegister + /// Optional + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *EnergyPerformancePreferenceR= egister OPTIONAL, + /// Reference Performance + /// Optional + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *ReferencePerformanceBuffer O= PTIONAL, + IN UINT32 ReferencePerformanceInteger, + /// Lowest Frequency + /// Optional + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *LowestFrequencyBuffer OPTION= AL, + IN UINT32 LowestFrequencyInteger, + /// Nominal Frequency + /// Optional + IN EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE *NominalFrequencyBuffer OPTIO= NAL, + IN UINT32 NominalFrequencyInteger, + 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; + + // Revision 3 per ACPI 6.4 specification + if (Revision =3D=3D 3) { + // NumEntries 23 per ACPI 6.4 specification + NumberOfEntries =3D 23; + } else { + ASSERT (0); + return EFI_INVALID_PARAMETER; + } + + if (((HighestPerformanceBuffer =3D=3D NULL) && (HighestPerformanceIntege= r =3D=3D 0)) || + ((NominalPerformanceBuffer =3D=3D NULL) && (NominalPerformanceIntege= r =3D=3D 0)) || + ((LowestNonlinearPerformanceBuffer =3D=3D NULL) && (LowestNonlinearP= erformanceInteger =3D=3D 0)) || + ((LowestPerformanceBuffer =3D=3D NULL) && (LowestPerformanceInteger = =3D=3D 0)) || + (DesiredPerformanceRegister =3D=3D NULL) || + (ReferencePerformanceCounterRegister =3D=3D NULL) || + (DeliveredPerformanceCounterRegister =3D=3D NULL) || + (PerformanceLimitedRegister =3D=3D NULL) || + ((ParentNode =3D=3D NULL) && (NewCpcNode =3D=3D NULL))) + { + 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, + Revision, + CpcPackage + ); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterOrIntegerToPackage ( + HighestPerformanceBuffer, + HighestPerformanceInteger, + CpcPackage + ); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterOrIntegerToPackage ( + NominalPerformanceBuffer, + NominalPerformanceInteger, + CpcPackage + ); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterOrIntegerToPackage ( + LowestNonlinearPerformanceBuffer, + LowestNonlinearPerformanceInteger, + CpcPackage + ); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterOrIntegerToPackage ( + LowestPerformanceBuffer, + LowestPerformanceInteger, + CpcPackage + ); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterToPackage (GuaranteedPerformanceRegister, CpcPa= ckage); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterToPackage (DesiredPerformanceRegister, CpcPacka= ge); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterToPackage (MinimumPerformanceRegister, CpcPacka= ge); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterToPackage (MaximumPerformanceRegister, CpcPacka= ge); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterToPackage (PerformanceReductionToleranceRegiste= r, CpcPackage); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterToPackage (TimeWindowRegister, CpcPackage); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterOrIntegerToPackage ( + CounterWraparoundTimeBuffer, + CounterWraparoundTimeInteger, + CpcPackage + ); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterToPackage (ReferencePerformanceCounterRegister,= CpcPackage); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterToPackage (DeliveredPerformanceCounterRegister,= CpcPackage); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterToPackage (PerformanceLimitedRegister, CpcPacka= ge); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterToPackage (CPPCEnableRegister, CpcPackage); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterOrIntegerToPackage ( + AutonomousSelectionEnableBuffer, + AutonomousSelectionEnableInteger, + CpcPackage + ); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterToPackage (AutonomousActivityWindowRegister, Cp= cPackage); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterToPackage (EnergyPerformancePreferenceRegister,= CpcPackage); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterOrIntegerToPackage ( + ReferencePerformanceBuffer, + ReferencePerformanceInteger, + CpcPackage + ); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterOrIntegerToPackage ( + LowestFrequencyBuffer, + LowestFrequencyInteger, + CpcPackage + ); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlAddRegisterOrIntegerToPackage ( + NominalFrequencyBuffer, + 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 (#93829): https://edk2.groups.io/g/devel/message/93829 Mute This Topic: https://groups.io/mt/93699443/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 Thu Apr 25 22:58:53 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+93827+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 1663247476963309.9944147052021; Thu, 15 Sep 2022 06:11:16 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id QygqYY1788612xs58mXcMlAk; Thu, 15 Sep 2022 06:11:15 -0700 X-Received: from NAM11-CO1-obe.outbound.protection.outlook.com (NAM11-CO1-obe.outbound.protection.outlook.com [40.107.220.41]) by mx.groups.io with SMTP id smtpd.web10.9784.1663247474457221945 for ; Thu, 15 Sep 2022 06:11:14 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Pi2JmRcDhb13o44JeJPNLGBjSTE9JY4UDdDExCHOZLBxYk44j18+fLg7K15EZHK9IbpFU4IaJZdueeM0ruMs8WJzPmHIbiMy9pS+yZoLGDjSrCQMKr0zgc2uKGNWofsiV9MebCq4xpsuQBxsGTbxEcy8DTzLYR3qjf4t4whdecuwU1HoYOOggzNoOe/OZ5h/0HmgP1BruwwIsyBBnxZkHnOogyQlIp8VZyFJcpA7y2l/VyQwzohG25l8/t5HfSHrGzhQawl3iq7P3gnx6w14emj565axopvdHSZQPsc+ZeEhi/FLfODfj9QUH6K9ehqHEBpsDzjmanEz0xsaA0bofg== 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=AjpEITJxarHyBREu+RIRk/Sxf9B+fjOVERoK9MdHRfM=; b=mSxiaiyoEiH5VpcyEe6y7BUDWD/6ZbCjtRP9vEcSHXivnmUF2iOOnQUdOZEECoKS+5Trfv/eaFCM71Y4qgsrNJ97AIpqX3i/0wmq1s4qzfbJwmoHHJP46uPOPTBfk+MflJnkxy1D6TcfHW1aR3yhxLvG4DtQ+gPTktCAY7KIZ/PJIs83KQjuD1Vd01MOFlTxO7cOqXkZQqXZkRDTJmYcbC4oTICFLTAXUoGu90Kug6JK8TH7XcmCOn8wvepN4miB+F2llbBHACosDAjiLe93nGcqIy0ft5klSixLK6mZuBPW8QtfinifDwU3fbfb/ShY7wAL7XasvOxpEMgR5oLyvw== 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 BN1PR13CA0004.namprd13.prod.outlook.com (2603:10b6:408:e2::9) by SJ1PR12MB6363.namprd12.prod.outlook.com (2603:10b6:a03:453::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.22; Thu, 15 Sep 2022 13:11:12 +0000 X-Received: from BN8NAM11FT089.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e2:cafe::6e) by BN1PR13CA0004.outlook.office365.com (2603:10b6:408:e2::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.6 via Frontend Transport; Thu, 15 Sep 2022 13:11:11 +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+93827+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 BN8NAM11FT089.mail.protection.outlook.com (10.13.176.105) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5632.12 via Frontend Transport; Thu, 15 Sep 2022 13:11:11 +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, 15 Sep 2022 06:10:57 -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, 15 Sep 2022 06:10:57 -0700 X-Received: from f153882e4be8.nvidia.com (10.127.8.14) by mail.nvidia.com (10.129.68.8) with Microsoft SMTP Server id 15.2.986.29 via Frontend Transport; Thu, 15 Sep 2022 06:10:56 -0700 From: "Jeff Brasen via groups.io" To: CC: , , , , Jeff Brasen Subject: [edk2-devel] [PATCH v3 3/3] DynamicTablesPkg: SSDT CPU _CPC generator Date: Thu, 15 Sep 2022 07:10:52 -0600 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-NVConfidentiality: public X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT089:EE_|SJ1PR12MB6363:EE_ X-MS-Office365-Filtering-Correlation-Id: 27a7bfdf-3d4e-4f5a-429a-08da971bc319 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: BFfqamB78ylAXFIsigKPn1Rak/203kgCbsTMlld1uOi+6k8XE3XA/qPy+T8gX843ZocIW/TmHnVWAlGJeeBHIJPBCjXK3+sen44xD+VD11w2FEG4QgpJEXVqCiNJlX4U0Q2N6bKrdovER1JjU5Ey1dl45t+cA3R+rI25khKusVJZEHT/XMzB3Nu4rZPYRo/98siPobjzr12fXjhzrsS7AvxOkhbtiu3hYhScRGff2+/9bJvOLGhD43jfQ7l7lLb9TwhnjtckZePhPL2NTx0Y+0T5571EHBRzyFm50kZWx7Zpn68OI+E0VuruTYflAahTvlLvxk5qF1T8ynmISfDCE1M6g0AIw23xLvyrcs8e+2a1a643X0h+5fvlZdS71FZ9vPmlo7SMTP8SZ6mVb6d6YM5gIgAKfszfF9g9S2nsELNjGub2FuHwruAQbGdowSgNEfrV7KEorCeWZdt8oM8nsEHWh9pJma5bFKHaIILXtOk9e+/pkT2o+BgZTQ3cJnzwfs3OHtW0atHfzcCrRTvYy5gPSpbNVQgpcQ4BomckZvAnTlXOUFfwQ1948D1o+U9JE3FO3Zb80YfNEPmK+RM2kp0wr9rawY/EyzNvTb+hGjlZTfcpXDYTIZHIOxADth1+BCvpBEpIjL6uVebHZSWhFzZVlpiQLGTR5XDs4jp6XS7ShAXIba+b3qns8pWZO/9b1s0VikgU4z6gR5liLefddrkHFIYzipdTw1/q8QBiRY+SVgwmNhvWpJYkbwnqW7RVs4b9/LqYXmO9h5mtqsUV4G+iprvwZfwdi9fjuMG0kRduNDx62VRmCyx1kdH7hu7WqnpN44fGKc5H6m0YLk3i6w== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2022 13:11:11.7439 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 27a7bfdf-3d4e-4f5a-429a-08da971bc319 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: BN8NAM11FT089.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ1PR12MB6363 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: 7vsDt96M18Kr2LKxiBtpts3Ix1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1663247475; bh=Wr2UQwAvJCxmusCXtN7X6P42LTwW35d2M2B73hD4iAI=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=M3dfb/89Fb3IZ4xqfFDUwWYi72tuWoVM4Kq9aPFna/h3Nq1u9CE6wHQ8vTKjQZYrcL9 1t23t6rGsTy90xotzs7WGdz4vwohJM9KiKs9V8s11lFuxoIX97p1yLeA5LrMmJ+VOcJVy 4MIxJ6WylN5zE+7Tj0bQMmpw8auvBKoeyAQ= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1663247477815100007 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 --- .../SsdtCpuTopologyGenerator.c | 223 +++++++++++++++++- 1 file changed, 217 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..5d41d57064 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,183 @@ WriteAslName ( return EFI_SUCCESS; } =20 +/** 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; +} + +/** 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->Revision, + IsNullGenericAddress (&CpcInfo->HighestPerformanceBuffer) ? + NULL : + &CpcInfo->HighestPerformanceBuffer, + CpcInfo->HighestPerformanceInteger, + IsNullGenericAddress (&CpcInfo->NominalPerformanceBuffer) ? + NULL : + &CpcInfo->NominalPerformanceBuffer, + CpcInfo->NominalPerformanceInteger, + IsNullGenericAddress (&CpcInfo->LowestNonlinearPerformanceBuf= fer) ? + NULL : + &CpcInfo->LowestNonlinearPerformanceBuffer, + CpcInfo->LowestNonlinearPerformanceInteger, + IsNullGenericAddress (&CpcInfo->LowestPerformanceBuffer) ? + NULL : + &CpcInfo->LowestPerformanceBuffer, + CpcInfo->LowestPerformanceInteger, + IsNullGenericAddress (&CpcInfo->GuaranteedPerformanceRegister= ) ? + NULL : + &CpcInfo->GuaranteedPerformanceRegister, + IsNullGenericAddress (&CpcInfo->DesiredPerformanceRegister) ? + NULL : + &CpcInfo->DesiredPerformanceRegister, + IsNullGenericAddress (&CpcInfo->MinimumPerformanceRegister) ? + NULL : + &CpcInfo->MinimumPerformanceRegister, + IsNullGenericAddress (&CpcInfo->MaximumPerformanceRegister) ? + NULL : + &CpcInfo->MaximumPerformanceRegister, + IsNullGenericAddress (&CpcInfo->PerformanceReductionTolerance= Register) ? + NULL : + &CpcInfo->PerformanceReductionToleranceRegister, + IsNullGenericAddress (&CpcInfo->TimeWindowRegister) ? + NULL : + &CpcInfo->TimeWindowRegister, + IsNullGenericAddress (&CpcInfo->CounterWraparoundTimeBuffer) ? + NULL : + &CpcInfo->CounterWraparoundTimeBuffer, + CpcInfo->CounterWraparoundTimeInteger, + &CpcInfo->ReferencePerformanceCounterRegister, + &CpcInfo->DeliveredPerformanceCounterRegister, + &CpcInfo->PerformanceLimitedRegister, + IsNullGenericAddress (&CpcInfo->CPPCEnableRegister) ? + NULL : + &CpcInfo->CPPCEnableRegister, + IsNullGenericAddress (&CpcInfo->AutonomousSelectionEnableBuff= er) ? + NULL : + &CpcInfo->AutonomousSelectionEnableBuffer, + CpcInfo->AutonomousSelectionEnableInteger, + IsNullGenericAddress (&CpcInfo->AutonomousActivityWindowRegis= ter) ? + NULL : + &CpcInfo->AutonomousActivityWindowRegister, + IsNullGenericAddress (&CpcInfo->EnergyPerformancePreferenceRe= gister) ? + NULL : + &CpcInfo->EnergyPerformancePreferenceRegister, + IsNullGenericAddress (&CpcInfo->ReferencePerformanceBuffer) ? + NULL : + &CpcInfo->ReferencePerformanceBuffer, + CpcInfo->ReferencePerformanceInteger, + IsNullGenericAddress (&CpcInfo->LowestFrequencyBuffer) ? + NULL : + &CpcInfo->LowestFrequencyBuffer, + CpcInfo->LowestFrequencyInteger, + IsNullGenericAddress (&CpcInfo->NominalFrequencyBuffer) ? + NULL : + &CpcInfo->NominalFrequencyBuffer, + CpcInfo->NominalFrequencyInteger, + 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 +768,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 +1134,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 +1162,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 (#93827): https://edk2.groups.io/g/devel/message/93827 Mute This Topic: https://groups.io/mt/93699436/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-