From nobody Sun May 5 06:26:39 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+92481+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 1660675039064297.11253043016643; Tue, 16 Aug 2022 11:37:19 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 49ssYY1788612xGk5ISWjdLx; Tue, 16 Aug 2022 11:37:18 -0700 X-Received: from NAM10-DM6-obe.outbound.protection.outlook.com (NAM10-DM6-obe.outbound.protection.outlook.com [40.107.93.76]) by mx.groups.io with SMTP id smtpd.web09.19620.1660675037454099722 for ; Tue, 16 Aug 2022 11:37:17 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jnkKHHVWWPCIWRJZOW4Q1Vz3Wsmq56VZv8V2vfyFPhj9AVf44FoEBxeokr55IBSv9TLAi73jzu9uxpvog5r21/8m+ZM/5MxVYf0bFUk1jWvLSG9aSyKLLTvyEw7O40NSFI3PCGQW3ynLV4P4FrsHncR/VPQ2qJ/BfEZ6cvfB0eP5sutFtb6rOOhTA2sw4QuzikkMX1WA3oW2yO47+rcRSPRqbskBLS00cz4F0bH+J7Ef2whZtTGuAQwcOv0Og4AauzHJrvmi0+63UQnC/uTvLF2a0f+zbcuDjInVCjhbxOXhn9Ldd9+Oyrb9bzV2FoWoemnNUBUXG5Ji4YtqCl3nyw== 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=ppJoHFqNnHZnRCoxnnCfcTvMaxANREaonMiliQ6/Qr8=; b=lvn3i7jCP5kcQ0lRdYS+Nuc73D+iuMs0zzcXr9kfFVfHUCiKDsMe0NJ4JOQEoNk2kih98HIxAs2Wlf6eMbCJs45wE0i0HjBtDd8a+qwhP2FqOdQCalG6pSw9n/Xevo3XF8xcYuTJ3Qd1ZeW9dxRuFGtT/tmS3DMsb+l8JIQ8Z+XWyTzfhjBG9b6p9Gh29q1+6ZQzqlCtbm5t7+ljWpXCdbQJp9XEAdJVOEhlZ1s3q1EWnmMpy9wRU4dkL6omUhMnvQJHR9tGXcJGLaK03bABlcxenGpwljMp/dFWdPMtqvXqfm0tLnUGrxS212/yd6iHAuyIJAMf7o20KA0LdlRLmA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.236) 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 DS7PR03CA0075.namprd03.prod.outlook.com (2603:10b6:5:3bb::20) by DM4PR12MB5916.namprd12.prod.outlook.com (2603:10b6:8:69::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5525.11; Tue, 16 Aug 2022 18:37:14 +0000 X-Received: from DM6NAM11FT086.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3bb:cafe::c2) by DS7PR03CA0075.outlook.office365.com (2603:10b6:5:3bb::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5525.15 via Frontend Transport; Tue, 16 Aug 2022 18:37:14 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.236) 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+92481+1787277+3901457@groups.io; helo=mail02.groups.io; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 12.22.5.236 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.236; helo=mail.nvidia.com; pr=C X-Received: from mail.nvidia.com (12.22.5.236) by DM6NAM11FT086.mail.protection.outlook.com (10.13.173.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5546.7 via Frontend Transport; Tue, 16 Aug 2022 18:37:14 +0000 X-Received: from rnnvmail205.nvidia.com (10.129.68.10) by DRHQMAIL109.nvidia.com (10.27.9.19) with Microsoft SMTP Server (TLS) id 15.0.1497.38; Tue, 16 Aug 2022 18:37:13 +0000 X-Received: from rnnvmail202.nvidia.com (10.129.68.7) by rnnvmail205.nvidia.com (10.129.68.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.29; Tue, 16 Aug 2022 11:37:13 -0700 X-Received: from ed7fa55790ac.nvidia.com (10.127.8.9) by mail.nvidia.com (10.129.68.7) with Microsoft SMTP Server id 15.2.986.29 via Frontend Transport; Tue, 16 Aug 2022 11:37:12 -0700 From: "Jeff Brasen via groups.io" To: CC: , , , , Jeff Brasen Subject: [edk2-devel] [PATCH v2] DynamicTablesPkg: Add support to build _DSD Date: Tue, 16 Aug 2022 12:37:05 -0600 Message-ID: <271411ea70c897459a6e257e75cbed40018cde00.1660674939.git.jbrasen@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 52abd79c-9c14-4f5b-12ba-08da7fb65707 X-MS-TrafficTypeDiagnostic: DM4PR12MB5916:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: QcG2K4TUoK3fFgnOG6RH8epwubrtbwXOaqdCnr/we6uN4aLC1DjueUSduqc1u8ethoEXOZSrnrK2+9BVfA7q7lFRutM/JLxu2EyYfwYUMJa6hjRYzIPBmGqVbti4WnDRD4JxoKVjSl6oVeSHQpT9qNRx/7FZCwF0DRued+s21ZAd3MafFb4kN17HBtKKF9FYwajxeoJpLbArdNRRB9lIiInV3rJ25jwvUBRNlgoZhGiC3UqB76d/wd9RGoCRRS7nruOZx0r2QF+GAoXKIhw5wUyA1DJ4tqCJ4xenZxp6xVeC2oTN6Y/Df0z5HpAzZDBYmQQ4nRr8S/ruDTN2EtBLCbdZM/cO2fq0c0NgRh+Is2EZ71shtnruQBKo6aU/bQTi1vjPX52YiYi0ltkuoxfgGT9buyB1I8H52lHgoUIIjcRwtLopjTtB/uriLU8F01ly8Ko/a84FN2VspXJeqsruZlrR5ia8gx3Z33KnEz+v5BiET7JHuuVCTjX6UEhjOI4++ciORZWvbi9koPLUzzfUEv9bjzg6w1xf8W2Kv9aDQ1ebObmQoWH1H8F0Gc3bePPhcMqVJUl4oyw3FDMJX1OtK67QIGHc1DGa5KIBF0gXPV2mGlNW8lVxw/pJTl2XQ8CDO8wAp+w+KrHgvdOZIiOHJGQaUJmL54NwG9KgZKXO1Mqt83bCaLhWk+JmQf996/vJXARdfOljJ5OLgnsz+0seEGkbu311GjtwJSDlCgXkZtf+1eY9Ao7bc9r9epQ2fcWhgh44f0QExbPLMPl+3w1WuKqPyHh250jB9z7sBTwolta1Rfsg8Mul44cnp4b+KdhPJJm4AxOS3ldxIXcPJLnGAw== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Aug 2022 18:37:14.5640 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 52abd79c-9c14-4f5b-12ba-08da7fb65707 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.236];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT086.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5916 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: 6a5C4M7qSthdmZkcOrs2K4U2x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1660675038; bh=q2vCC8h3ePMOhrLZR/x3ycrwKynbaKi7/vVdQrBtkjg=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=lbswJTcp+KxoUqmRzp1W02VUPr+DErMjnySj3OnRs9z/rxydS3xQMgWO7BS5OuIoN8H VuFHeDC21b5GwMpmlUb9zheXnst/yHostG65SIjbkGU+dVsL2LsVo498WW1jl7B8DDVGx lqrq4wUC0qYlVYhpIHDTfjRwd0LjPAopI/g= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1660675040122100003 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 --- .../Include/Library/AmlLib/AmlLib.h | 55 ++++ .../Common/AmlLib/CodeGen/AmlCodeGen.c | 249 ++++++++++++++++++ 2 files changed, 304 insertions(+) diff --git a/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h b/DynamicTabl= esPkg/Include/Library/AmlLib/AmlLib.h index 6f214c0dfa..86a0e802f4 100644 --- a/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h +++ b/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h @@ -1280,6 +1280,61 @@ 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)". + + @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, ParentNode) 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..6f96e5952b 100644 --- a/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlCodeGen.c +++ b/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlCodeGen.c @@ -2600,3 +2600,252 @@ 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)". + + @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, ParentNode) 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 (#92481): https://edk2.groups.io/g/devel/message/92481 Mute This Topic: https://groups.io/mt/93065307/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-