From nobody Fri May 3 18:14:40 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+92528+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 1660754384779249.24996353537847; Wed, 17 Aug 2022 09:39:44 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id sLzBYY1788612x3QkL9zZfDY; Wed, 17 Aug 2022 09:39:43 -0700 X-Received: from NAM12-DM6-obe.outbound.protection.outlook.com (NAM12-DM6-obe.outbound.protection.outlook.com [40.107.243.45]) by mx.groups.io with SMTP id smtpd.web08.31202.1660754382670296910 for ; Wed, 17 Aug 2022 09:39:42 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aVMETyuc+F2IabVxd3gG6Vz+3bqHD5jsLRNG8kF6CgDi5mAgVmtlZgtcxogn0OIU0JV61iT4Vn41qjmSG9ZTVg5vPU3tib+FcstHgv1ZT+m7X56OKYzAab0f0E0vYP4AJoAAMAiQQ0+vddfLY1TVxqG0sdUfVfpK8SaezAt4gkOaEUwngRDAHaFezivqktdqOj3e1AnzycHdJpeTIjHywjXex881Fb0Q6Sam4NWjzeq7yWGvD6a+Yck/1nCqUutPiehnPBhfe3ZNJwqm9vtdQVwejKK6M0oGeWzlCOeX6grJ+BkESkTQB1/Euc1qI2tyaoz75mUtQKCisRqWp3zdcw== 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=n3Ooswmo5oIRQ8HJOQRM7I6nfBcHbLyTeG02/6rmePs=; b=EpWdP9zqlZZOGNMPn7R4TBNXvpXvpzUSUlQRhAtFrjz0e0xbT4/AENGG4ultFS1h/O/1492iBm/e0YIQ7ZVz7ollvp++uI6rE49/p2BGIwgQ1Y9cOnCJwWGYxI56WlW8dh+fvPE4yjjCQbIewj5aKPWc+ItYnvPJt8eWOp7nrc79DqpnqKxIcGacz0TiTZIM9TQmZ2yLSfmgPbDCljSCFCEWGEKJIhMNtmiUhcdMvlo7I2ueTM+dV2JjtYjx66nPqWv1NGOsvKcO7m/naLt2OrNFGamB4sSGPIBYJRalNGjQ0i9xBx2sla0nQnJ6QAWKSaIKAMj5IV+yUazld6AxGA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.238) smtp.rcpttodomain=arm.com 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 DM6PR02CA0150.namprd02.prod.outlook.com (2603:10b6:5:332::17) by DS0PR12MB6655.namprd12.prod.outlook.com (2603:10b6:8:d0::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5525.10; Wed, 17 Aug 2022 16:39:40 +0000 X-Received: from DM6NAM11FT054.eop-nam11.prod.protection.outlook.com (2603:10b6:5:332:cafe::92) by DM6PR02CA0150.outlook.office365.com (2603:10b6:5:332::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5525.16 via Frontend Transport; Wed, 17 Aug 2022 16:39:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.238) 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+92528+1787277+3901457@groups.io; helo=mail02.groups.io; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 12.22.5.238 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.238; helo=mail.nvidia.com; pr=C X-Received: from mail.nvidia.com (12.22.5.238) by DM6NAM11FT054.mail.protection.outlook.com (10.13.173.95) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5546.15 via Frontend Transport; Wed, 17 Aug 2022 16:39:40 +0000 X-Received: from rnnvmail202.nvidia.com (10.129.68.7) by DRHQMAIL105.nvidia.com (10.27.9.14) with Microsoft SMTP Server (TLS) id 15.0.1497.38; Wed, 17 Aug 2022 16:39:40 +0000 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; Wed, 17 Aug 2022 09:39:39 -0700 X-Received: from ed7fa55790ac.nvidia.com (10.127.8.9) by mail.nvidia.com (10.129.68.8) with Microsoft SMTP Server id 15.2.986.29 via Frontend Transport; Wed, 17 Aug 2022 09:39:38 -0700 From: "Jeff Brasen via groups.io" To: CC: , , , , Jeff Brasen Subject: [edk2-devel] [PATCH v3] DynamicTablesPkg: Add support to build _DSD Date: Wed, 17 Aug 2022 10:39:39 -0600 Message-ID: <5f525aa26bd4fcd82ed5498569830f0882e06a4e.1660754335.git.jbrasen@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 16def8bb-fac6-4b5d-152e-08da806f14fb X-MS-TrafficTypeDiagnostic: DS0PR12MB6655:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: qK6fZOerwlohES3X4Wvsen49wdIxouM7yO8TBWlKJpplHienw4IrSrC71xuGy2mXivS8VcWoQvlL7C00lrBUbhwDN1m/I2LGe0a8zz1BRxxWql5QvVflaFiUWtTTUTMrlYPM8fcbw9E0+SS+02gaQum8hhePSa6r2pzca8FD7k9ORt1iGJyTA8S15bsLN8JgSBoeY+C1o5lwKCUeV5XT0Gx559Iu3Oa6MhQeWWwaGtmU+hfJRGnjNk/UojzOgan6kU6K3NS0XAbs5hxO1LXoieSJC3yPRHvp86ss24PiS0nBIjrNiF/QRPwpv0Lx30GqV4yAkJN5hRblvh72UpyPcVp5+rRXeIQl+Ib+qEYjxZv9i9tzmwdOt9mxy9s7VwTroTUsc2UNJrI4tglnBn1QdputQkj2jkppWtY6SLVIUylEooGKoESNDo5q+bw/ysUwLYZL+RdOytTjbiiziCxKScrvIFXuVoa81D1X4hY5YNUC9YiqYw+y83zqhIgcbX3oJZav1HKPlLL4bSfsYrSxN7VmAoqKC7k/NvP6oFZo6EKUGumWEbE+EiUc6sTUMAlhlZrjz+Bp1tGTM94Eh24K0FJyJGa6fx2J9H7Zmfk69dEyPT0QyBpfxL/p7qBeuJqdqpEB/LglFVi4BLshc8rBU6NegtrvZBK57RBpCa69acMm4aBoxUVK5rB6mnGesT0al2slvgvybzCdLH1u05HirbtU+K5Rm6mPAvGNzLohTsSvUHk7lHf5GKgz6Bzw023rGTVoeQTn8JRvUcYk9gViCMgfTWF65Tz6CDMLncXck30wB11tC97S4QbzMzZ5abByN4xF/gi74kEghmo37D/abDZx7WwAKLN+RUmXbhxC3Y7vA/ZgtQlcs1W5qzHFLZyr2AXkF+KQu+CjKiw9+ANHABXqB/dYpU0rFHGpPhflgSg= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Aug 2022 16:39:40.6508 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 16def8bb-fac6-4b5d-152e-08da806f14fb X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[12.22.5.238];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT054.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB6655 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: zQwJAN1V18wOppa9ARSbW7NWx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1660754383; bh=zSzLk7R1ojQ88cMnXn5RjkUlNlcHdWIrk4vx3Py36Zo=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=LFW2VTzmVXNz0kWH3Xg5ppmm0yx5txOo6MvjNxCb7yAiSyAl1Sy9xHDLHo/SI49AzMP 3qLRDjaKI6e89MOADtF3auhB3kK3L5ci4akSgN7+OtzmlOqOCm00yxoS2nDd6u2QfdPU0 8/fZcyc0gzcUqseybZq3rYh8NzZRf6/1qtE= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1660754386456100003 Content-Type: text/plain; charset="utf-8" Add APIs needed to build _DSD with different UUIDs. This is per ACPI specification 6.4 s6.2.5. Adds support for building data packages with format Package {"Name", Integer} Signed-off-by: Jeff Brasen Reviewed-by: Pierre Gondois Reviewed-by: Sami Mujawar --- .../Include/Library/AmlLib/AmlLib.h | 60 +++++ .../Common/AmlLib/CodeGen/AmlCodeGen.c | 254 ++++++++++++++++++ 2 files changed, 314 insertions(+) diff --git a/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h b/DynamicTabl= esPkg/Include/Library/AmlLib/AmlLib.h index 6f214c0dfa..18013f3c0c 100644 --- a/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h +++ b/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h @@ -1280,6 +1280,66 @@ AmlAddLpiState ( IN AML_OBJECT_NODE_HANDLE LpiNode ); =20 +/** AML code generation for a _DSD device data object. + + AmlAddDeviceDataDescriptorPackage (Uuid, DsdNode, PackageNode) is + equivalent of the following ASL code: + ToUUID(Uuid), + Package () {} + + Cf ACPI 6.4 specification, s6.2.5 "_DSD (Device Specific Data)". + + _DSD (Device Specific Data) Implementation Guide + https://github.com/UEFI/DSD-Guide + Per s3. "'Well-Known _DSD UUIDs and Data Structure Formats'" + If creating a Device Properties data then UUID daffd814-6eba-4d8c-8a91-b= c9bbf4aa301 should be used. + + @ingroup CodeGenApis + + @param [in] Uuid The Uuid of the descriptor to be created + @param [in] DsdNode Node of the DSD Package. + @param [out] PackageNode If success, contains the created package nod= e. + + @retval EFI_SUCCESS Success. + @retval EFI_INVALID_PARAMETER Invalid parameter. + @retval EFI_OUT_OF_RESOURCES Failed to allocate memory. +**/ +EFI_STATUS +EFIAPI +AmlAddDeviceDataDescriptorPackage ( + IN CONST EFI_GUID *Uuid, + IN AML_OBJECT_NODE_HANDLE DsdNode, + OUT AML_OBJECT_NODE_HANDLE *PackageNode + ); + +/** AML code generation to add a package with a name and value, + to a parent package. + This is useful for build the _DSD package but can be used in other cas= es. + + AmlAddNameValuePackage ("Name", Value, PackageNode) is + equivalent of the following ASL code: + Package (2) {"Name", Value} + + Cf ACPI 6.4 specification, s6.2.5 "_DSD (Device Specific Data)". + + @ingroup CodeGenApis + + @param [in] Name String to place in first entry of package + @param [in] Value Integer to place in second entry of package + @param [in] PackageNode Package to add new sub package to. + + @retval EFI_SUCCESS Success. + @retval EFI_INVALID_PARAMETER Invalid parameter. + @retval EFI_OUT_OF_RESOURCES Failed to allocate memory. +**/ +EFI_STATUS +EFIAPI +AmlAddNameIntegerPackage ( + IN CHAR8 *Name, + IN UINT64 Value, + IN AML_OBJECT_NODE_HANDLE PackageNode + ); + // 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 e51d2dd7f0..cf92e7aee7 100644 --- a/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlCodeGen.c +++ b/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlCodeGen.c @@ -2600,3 +2600,257 @@ error_handler: =20 return Status; } + +/** AML code generation for a _DSD device data object. + + AmlAddDeviceDataDescriptorPackage (Uuid, DsdNode, PackageNode) is + equivalent of the following ASL code: + ToUUID(Uuid), + Package () {} + + Cf ACPI 6.4 specification, s6.2.5 "_DSD (Device Specific Data)". + + _DSD (Device Specific Data) Implementation Guide + https://github.com/UEFI/DSD-Guide + Per s3. "'Well-Known _DSD UUIDs and Data Structure Formats'" + If creating a Device Properties data then UUID daffd814-6eba-4d8c-8a91-b= c9bbf4aa301 should be used. + + @ingroup CodeGenApis + + @param [in] Uuid The Uuid of the descriptor to be created + @param [in] DsdNode Node of the DSD Package. + @param [out] PackageNode If success, contains the created package nod= e. + + @retval EFI_SUCCESS Success. + @retval EFI_INVALID_PARAMETER Invalid parameter. + @retval EFI_OUT_OF_RESOURCES Failed to allocate memory. +**/ +EFI_STATUS +EFIAPI +AmlAddDeviceDataDescriptorPackage ( + IN CONST EFI_GUID *Uuid, + IN AML_OBJECT_NODE_HANDLE DsdNode, + OUT AML_OBJECT_NODE_HANDLE *PackageNode + ) +{ + EFI_STATUS Status; + AML_OBJECT_NODE *UuidNode; + AML_DATA_NODE *UuidDataNode; + AML_OBJECT_NODE_HANDLE DsdEntryList; + + if ((Uuid =3D=3D NULL) || + (PackageNode =3D=3D NULL) || + (AmlGetNodeType ((AML_NODE_HANDLE)DsdNode) !=3D EAmlNodeObject) || + (!AmlNodeHasOpCode (DsdNode, AML_NAME_OP, 0)) || + !AmlNameOpCompareName (DsdNode, "_DSD")) + { + ASSERT_EFI_ERROR (EFI_INVALID_PARAMETER); + return EFI_INVALID_PARAMETER; + } + + // Get the Package object node of the _DSD node, + // which is the 2nd fixed argument (i.e. index 1). + DsdEntryList =3D (AML_OBJECT_NODE_HANDLE)AmlGetFixedArgument ( + DsdNode, + EAmlParseIndexTerm1 + ); + if ((DsdEntryList =3D=3D NULL) = || + (AmlGetNodeType ((AML_NODE_HANDLE)DsdEntryList) !=3D EAmlNodeObject)= || + (!AmlNodeHasOpCode (DsdEntryList, AML_PACKAGE_OP, 0))) + { + ASSERT_EFI_ERROR (EFI_INVALID_PARAMETER); + return EFI_INVALID_PARAMETER; + } + + *PackageNode =3D NULL; + UuidDataNode =3D NULL; + + Status =3D AmlCodeGenBuffer (NULL, 0, &UuidNode); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + return Status; + } + + Status =3D AmlCreateDataNode ( + EAmlNodeDataTypeRaw, + (CONST UINT8 *)Uuid, + sizeof (EFI_GUID), + &UuidDataNode + ); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlVarListAddTail ( + (AML_NODE_HEADER *)UuidNode, + (AML_NODE_HEADER *)UuidDataNode + ); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + UuidDataNode =3D NULL; + + // Append to the list of _DSD entries. + Status =3D AmlVarListAddTail ( + (AML_NODE_HANDLE)DsdEntryList, + (AML_NODE_HANDLE)UuidNode + ); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlCodeGenPackage (PackageNode); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler_detach; + } + + // Append to the list of _DSD entries. + Status =3D AmlVarListAddTail ( + (AML_NODE_HANDLE)DsdEntryList, + (AML_NODE_HANDLE)*PackageNode + ); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler_detach; + } + + return Status; + +error_handler_detach: + if (UuidNode !=3D NULL) { + AmlDetachNode ((AML_NODE_HANDLE)UuidNode); + } + +error_handler: + if (UuidNode !=3D NULL) { + AmlDeleteTree ((AML_NODE_HANDLE)UuidNode); + } + + if (*PackageNode !=3D NULL) { + AmlDeleteTree ((AML_NODE_HANDLE)*PackageNode); + *PackageNode =3D NULL; + } + + if (UuidDataNode !=3D NULL) { + AmlDeleteTree ((AML_NODE_HANDLE)UuidDataNode); + } + + return Status; +} + +/** AML code generation to add a package with a name and value, + to a parent package. + This is useful for build the _DSD package but can be used in other cas= es. + + AmlAddNameValuePackage ("Name", Value, PackageNode) is + equivalent of the following ASL code: + Package (2) {"Name", Value} + + Cf ACPI 6.4 specification, s6.2.5 "_DSD (Device Specific Data)". + + @ingroup CodeGenApis + + @param [in] Name String to place in first entry of package + @param [in] Value Integer to place in second entry of package + @param [in] PackageNode Package to add new sub package to. + + @retval EFI_SUCCESS Success. + @retval EFI_INVALID_PARAMETER Invalid parameter. + @retval EFI_OUT_OF_RESOURCES Failed to allocate memory. +**/ +EFI_STATUS +EFIAPI +AmlAddNameIntegerPackage ( + IN CHAR8 *Name, + IN UINT64 Value, + IN AML_OBJECT_NODE_HANDLE PackageNode + ) +{ + EFI_STATUS Status; + AML_OBJECT_NODE *NameNode; + AML_OBJECT_NODE *ValueNode; + AML_OBJECT_NODE *NewPackageNode; + + if ((Name =3D=3D NULL) || + (AmlGetNodeType ((AML_NODE_HANDLE)PackageNode) !=3D EAmlNodeObject) = || + (!AmlNodeHasOpCode (PackageNode, AML_PACKAGE_OP, 0))) + { + ASSERT_EFI_ERROR (EFI_INVALID_PARAMETER); + return EFI_INVALID_PARAMETER; + } + + NameNode =3D NULL; + ValueNode =3D NULL; + + // The new package entry. + Status =3D AmlCodeGenPackage (&NewPackageNode); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + return Status; + } + + Status =3D AmlCodeGenString (Name, &NameNode); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlVarListAddTail ( + (AML_NODE_HANDLE)NewPackageNode, + (AML_NODE_HANDLE)NameNode + ); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + NameNode =3D NULL; + + Status =3D AmlCodeGenInteger (Value, &ValueNode); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + Status =3D AmlVarListAddTail ( + (AML_NODE_HANDLE)NewPackageNode, + (AML_NODE_HANDLE)ValueNode + ); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + ValueNode =3D NULL; + + Status =3D AmlVarListAddTail ( + (AML_NODE_HANDLE)PackageNode, + (AML_NODE_HANDLE)NewPackageNode + ); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto error_handler; + } + + return Status; + +error_handler: + if (NewPackageNode !=3D NULL) { + AmlDeleteTree ((AML_NODE_HANDLE)NewPackageNode); + } + + if (NameNode !=3D NULL) { + AmlDeleteTree ((AML_NODE_HANDLE)NameNode); + } + + if (ValueNode !=3D NULL) { + AmlDeleteTree ((AML_NODE_HANDLE)ValueNode); + } + + 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 (#92528): https://edk2.groups.io/g/devel/message/92528 Mute This Topic: https://groups.io/mt/93085812/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-