From nobody Tue Apr 23 12:55:24 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+92167+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 1659712498678951.6910919862689; Fri, 5 Aug 2022 08:14:58 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id zCGuYY1788612xzfnJqT7lgj; Fri, 05 Aug 2022 08:14:55 -0700 X-Received: from NAM10-DM6-obe.outbound.protection.outlook.com (NAM10-DM6-obe.outbound.protection.outlook.com [40.107.93.56]) by mx.groups.io with SMTP id smtpd.web11.8127.1659712493987442406 for ; Fri, 05 Aug 2022 08:14:54 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mB7DSRtxePxlwQ2u27oQynjCQRtFUGKctZbhf9jtKUVsEllHDZN5brkNK7mpDQseRAgtn1oPSFZxUAMVfWQkny8j/3MhsrXklIm2/zhHS2sHuclKXziqwN0czLHgUjNu/afnJ3sE0XtUw/U3GqPrjLzUIRhgFxJIq+G7Z3xIWT1VyrM+k0o0ziIvf7w2iwtKKb7lcT3LMvrYmob1KUO590SzLO5LBZIBQC7NAXD3KBEjXuocDcy7oUH063XTNMURDucrYfYS2T6UKWMVCP4ZD0we9tbGNd2qvlmn76CjCy03y4kVRDFNOP5UZWuDR1P07vEqL7XMTFf1eNJl/r77SQ== 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=MzS+X3Xr+OX4EYobQtVw+O/8i5C50mU7bWthiqqgP1Y=; b=RK1HDQEh0H/5urgDaHp/sSiEO7oHtKYx1xqH97MUmzyT2R9LD2pkqml2SAfTDqMq3bcgV4HsRM1j0yKmJIQyjHOhtywe4uhnX94nWv/qE/78juNhML+pDFhey0arGfBEgesA7fq/0CZP2bHOWusip75xTZDi61CIx1wRoumvveRkjjesQOGy+a06RUAwhSWXzPKmq1HRccQdtW8uNYR6Bo68g5pMKpaxb7qYjTX8tvxw1MkJoXRdZe3RRK8VaMJiQfXpBCoP5V4Di5vV44Nbz2yN09RrbncCp5ny3dxo78dxaJOjRUCya0Glo1B1jyoompMIjSNYOi7+K3yXZjTw9g== 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 BN0PR03CA0019.namprd03.prod.outlook.com (2603:10b6:408:e6::24) by CH2PR12MB4922.namprd12.prod.outlook.com (2603:10b6:610:65::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.14; Fri, 5 Aug 2022 15:14:52 +0000 X-Received: from BN8NAM11FT006.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e6:cafe::cb) by BN0PR03CA0019.outlook.office365.com (2603:10b6:408:e6::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.16 via Frontend Transport; Fri, 5 Aug 2022 15:14:51 +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+92167+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 BN8NAM11FT006.mail.protection.outlook.com (10.13.177.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5504.14 via Frontend Transport; Fri, 5 Aug 2022 15:14:51 +0000 X-Received: from drhqmail202.nvidia.com (10.126.190.181) by DRHQMAIL105.nvidia.com (10.27.9.14) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Fri, 5 Aug 2022 15:14:48 +0000 X-Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail202.nvidia.com (10.126.190.181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.26; Fri, 5 Aug 2022 08:14:48 -0700 X-Received: from 455d231bdffa.nvidia.com (10.127.8.14) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server id 15.2.986.26 via Frontend Transport; Fri, 5 Aug 2022 08:14:47 -0700 From: "Jeff Brasen via groups.io" To: CC: , , Jeff Brasen Subject: [edk2-devel] [PATCH] DynamicTablesPkg: Add support to build _DSD Date: Fri, 5 Aug 2022 09:14:48 -0600 Message-ID: MIME-Version: 1.0 X-NVConfidentiality: public X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 35a1d7a2-a92b-4071-8f62-08da76f53e8b X-MS-TrafficTypeDiagnostic: CH2PR12MB4922:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: vIqAcvhA8NXcRbz8F9UGr4myDl11purwVq4BRCe9zxjhh2GVkyIVbTmesIxHSrlJ4YBjP2Xxh+o7sTcLmUmSbPMdVER24FRNKf2kpASoTNkYyXFnJW9uhvyUZ9ILujLMo5mwJIkZXlqOCz1GoyATLyI/wy8x/enr4nawfZ19bC9U7ZOUE8cOuZCGiwakgLtDPBTqGMG9WraTnnTgPuL8vtmasknutdUm9rCfVfX2wlPgP56t/ob4n11V96fN24io7HMgz9sl2oAEi7+av6jYDdWOVrTwBzm4ivNLaN5mWXorpyJhNDy+LGtkL5MUrHZR+Wt25ozvBGGMDNSI3nku8t4qk3YDzSX4sbaS9oqB6XG3zIOmZ6yJlL90OQXYiYbkVwCNwX/BZaWKa8AePHC1i3B7hwMGG3kFvPPid5jnWM1kYje6khqe6a7drUCCdLSI209sUABWqqzOLs5CGg9DCCrpN3yfG5i0ukwklRKcCJYxJK8qcV5gBmiRY9iRjS1u1y75Mtu67LdjASI57iVwIL6W7CbCJDsn9ttohHaoxPM5cic8WdsCDy4VEM7qJUD9Zp1svQocDHJmhpHPYCjpcUiJA2tW7bivc5DyBHEnjjFy3SVj4FvMoB8DaQRLntGzlluXHX/NY5qL9fQqGeXGzV6bOu53M/qQnhnqfWWq1FFzGPmcMfFkjgks6AnLwOV8RNxwZfoQEeQpM+PMvSGUak7GpOrwlTMLlGwom0hx2rQaYubXb+JokQKtSKAxdBZF5qytGCqsj/2kfB9GqdBdgR3k7m52DoDS0NPwJrTlvc63wJtfS4226IeB2KhnM9DkEoVlNAQd+nIn98R7Vr9USw== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2022 15:14:51.3026 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 35a1d7a2-a92b-4071-8f62-08da76f53e8b 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: BN8NAM11FT006.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4922 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: Q7TfP7fYNlGtdeBbK4tZnhSSx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1659712495; bh=9Dcjm+JVyJiDtadgEV4xzNm94fdXNWJ4U4kmC9IKD0c=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=rNNT2z6ivIQElljsFBzrG5Y4JltmEDCGQvuuTM39IoIyeZ/pRpwuz/VLHs8HjBJENuR aQ24hLZCnmNIRvGt4meKjZ8iv7GZdAMzIc31dsmhu+9RmgNRDTBI44Nm8ebaNNAnCYULO CmyeUsFKEdy0BkeCPsqW2tzpanyO7+P65Po= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1659712499358100003 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 --- .../Include/Library/AmlLib/AmlLib.h | 50 ++++ .../Common/AmlLib/CodeGen/AmlCodeGen.c | 236 ++++++++++++++++++ 2 files changed, 286 insertions(+) diff --git a/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h b/DynamicTabl= esPkg/Include/Library/AmlLib/AmlLib.h index 6f214c0dfa..30cab3f6bb 100644 --- a/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h +++ b/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h @@ -1280,6 +1280,56 @@ AmlAddLpiState ( IN AML_OBJECT_NODE_HANDLE LpiNode ); =20 +/** AML code generation for a _DSD device data object. + + AmlAddDeviceDataDescriptorPackage (Uuid, ParentNode, NewObjectNode) is + equivalent of the following ASL code: + ToUUID(Uuid), + Package () {} + + @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 + + AmlAddNameValuePackage ("Name", Value, ParentNode) is + equivalent of the following ASL code: + Package (2) {"Name", Value} + + @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..80e43d0e62 100644 --- a/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlCodeGen.c +++ b/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlCodeGen.c @@ -2600,3 +2600,239 @@ error_handler: =20 return Status; } + +/** AML code generation for a _DSD device data object. + + AmlAddDeviceDataDescriptorPackage (Uuid, ParentNode, NewObjectNode) is + equivalent of the following ASL code: + ToUUID(Uuid), + Package () {} + + @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 (0); + 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 (0); + return EFI_INVALID_PARAMETER; + } + + *PackageNode =3D NULL; + UuidNode =3D NULL; + + Status =3D AmlCodeGenBuffer (NULL, 0, &UuidNode); + if (EFI_ERROR (Status)) { + ASSERT (0); + goto error_handler; + } + + Status =3D AmlCreateDataNode ( + EAmlNodeDataTypeRaw, + (CONST UINT8 *)Uuid, + sizeof (EFI_GUID), + &UuidDataNode + ); + if (EFI_ERROR (Status)) { + ASSERT (0); + goto error_handler; + } + + Status =3D AmlVarListAddTail ( + (AML_NODE_HEADER *)UuidNode, + (AML_NODE_HEADER *)UuidDataNode + ); + if (EFI_ERROR (Status)) { + ASSERT (0); + goto error_handler; + } + UuidDataNode =3D NULL; + + // Append to the the list of _DSD entries. + Status =3D AmlVarListAddTail ( + (AML_NODE_HANDLE)DsdEntryList, + (AML_NODE_HANDLE)UuidNode + ); + if (EFI_ERROR (Status)) { + ASSERT (0); + goto error_handler; + } + + Status =3D AmlCodeGenPackage (PackageNode); + if (EFI_ERROR (Status)) { + ASSERT (0); + goto error_handler; + } + + // Append to the the list of _DSD entries. + Status =3D AmlVarListAddTail ( + (AML_NODE_HANDLE)DsdEntryList, + (AML_NODE_HANDLE)*PackageNode + ); + if (EFI_ERROR (Status)) { + ASSERT (0); + goto error_handler; + } + + return Status; + +error_handler: + if (UuidNode !=3D NULL) { + //Need to check to detach as there is an error path that have + //this attached to the DsdEntry + if (AML_NODE_HAS_PARENT (UuidNode)) { + AmlDetachNode ((AML_NODE_HANDLE)UuidNode); + } + 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 + + AmlAddNameValuePackage ("Name", Value, ParentNode) is + equivalent of the following ASL code: + Package (2) {"Name", Value} + + @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 (0); + return EFI_INVALID_PARAMETER; + } + + NewPackageNode =3D NULL; + // The new package entry. + Status =3D AmlCodeGenPackage (&NewPackageNode); + if (EFI_ERROR (Status)) { + ASSERT (0); + 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 (0); + goto error_handler; + } + NameNode =3D NULL; + + Status =3D AmlCodeGenInteger (Value, &ValueNode); + if (EFI_ERROR (Status)) { + ASSERT (0); + goto error_handler; + } + + Status =3D AmlVarListAddTail ( + (AML_NODE_HANDLE)NewPackageNode, + (AML_NODE_HANDLE)ValueNode + ); + if (EFI_ERROR (Status)) { + ASSERT (0); + goto error_handler; + } + ValueNode =3D NULL; + + Status =3D AmlVarListAddTail ( + (AML_NODE_HANDLE)PackageNode, + (AML_NODE_HANDLE)NewPackageNode + ); + if (EFI_ERROR (Status)) { + ASSERT (0); + 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 (#92167): https://edk2.groups.io/g/devel/message/92167 Mute This Topic: https://groups.io/mt/92836835/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-