From nobody Sun May 12 01:01:09 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+111848+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 1701273978879341.67541634713723; Wed, 29 Nov 2023 08:06:18 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=01dKeJoFkr1qHfRdiG3tnIeq+LylmUGVn9b0ODnS+OM=; c=relaxed/simple; d=groups.io; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:Received-SPF:From:To:CC:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1701273978; v=1; b=vd/Fl3lO0sryzYCKynmhG86TrPA5HZGTYeMC3nv99lE0Gc1wYFjy/iPIAEGOmh4TwNGV4Sas Z908qe88yHfoYz2H3AkjH3U+xFYEGmQCn/s+9ZnCudIIHoKcJSHT3J81kTvSRV9wHa9KJSFlpD/ v8DJR+Hhgdq2O4DhMazNxVN0= X-Received: by 127.0.0.2 with SMTP id Be71YY1788612xWakU1qUnA1; Wed, 29 Nov 2023 08:06:18 -0800 X-Received: from NAM11-CO1-obe.outbound.protection.outlook.com (NAM11-CO1-obe.outbound.protection.outlook.com [40.107.220.51]) by mx.groups.io with SMTP id smtpd.web11.40795.1701273977643188588 for ; Wed, 29 Nov 2023 08:06:17 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=alem47IsbI4A0K7Nr2OFfQjL70QG0QJQOJoiXE6GE+Fcen762x0WMro9Iq+gTnw7MXbCppx5BG1sAKFhHRzPu4FdkkF1r48jjHikBw75yyhZIyjEn9fXHTDPokT6Z4KkgHCKhzq/sFP35lJO1HAjQ01lVQH08SEMUT/xFhgn5Ox9xcrBNz8Wodx3+X6ilu2zGwSJBA8DF5V6Iu7LK4BbH9fLjjXMALBrCIzsr6+gm19ylgj+424f35yNfCU6eeE4UxIcjQrpDMfiKxMKabz7kKOlgg2HGL19+80RRxsPXFulfIstd1SCebl8JDPJYeSEbnub7zoqTMqPHs/+m9JxAw== 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=GIe4resMvr511fpqHwr7w+kvWFeBsbKQTauvpQF9bQQ=; b=Fpu/3yJjqm8a8OBJXQ1hgdgf6OjESV9eA8kBoiUp3M2PycW44D1/IQItQPoP69T+3TEhH9rmqEETo0KqlMvPWfdIEDtIWkXE5QqGZ1CF44r8Yl8HVu6Wrt2Mixvr/E4YYfQCA6fgCCnm0GW1pnzCZ+VERBKTUJMG1QCvXhgXv535fk+fztGSwDgvKhxJex1N2NfoWpwpI/someUHQmXYq04FLr8x1/zdA7Kmrp2CotKAkYcyOj6r4VOBpqxwzsT6uLnyhhdIO29PitiVkd/H3M2QxFqqXFOkMsOWvtUgmwVdI1UTnMmnXH5X1aLQbF2NcwWdjLyw3VN8TrcAuFlcjw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) X-Received: from BL0PR02CA0019.namprd02.prod.outlook.com (2603:10b6:207:3c::32) by PH7PR12MB8793.namprd12.prod.outlook.com (2603:10b6:510:27a::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.22; Wed, 29 Nov 2023 16:06:14 +0000 X-Received: from MN1PEPF0000F0E3.namprd04.prod.outlook.com (2603:10b6:207:3c:cafe::c9) by BL0PR02CA0019.outlook.office365.com (2603:10b6:207:3c::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.23 via Frontend Transport; Wed, 29 Nov 2023 16:06:14 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.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+111848+1787277+3901457@groups.io; helo=mail02.groups.io; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; pr=C X-Received: from SATLEXMB03.amd.com (165.204.84.17) by MN1PEPF0000F0E3.mail.protection.outlook.com (10.167.242.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7046.17 via Frontend Transport; Wed, 29 Nov 2023 16:06:14 +0000 X-Received: from SATLEXMB05.amd.com (10.181.40.146) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Wed, 29 Nov 2023 10:06:14 -0600 X-Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB05.amd.com (10.181.40.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Wed, 29 Nov 2023 10:06:14 -0600 X-Received: from BLR-LAB-SFW01.amd.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.34 via Frontend Transport; Wed, 29 Nov 2023 10:06:12 -0600 From: "Abdul Lateef Attar via groups.io" To: CC: Abdul Lateef Attar , Pierre Gondois , Sami Mujawar Subject: [edk2-devel] [PATCH v1 1/3] DynamicTablesPkg: AML Code generation for word I/O ranges Date: Wed, 29 Nov 2023 21:36:00 +0530 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN1PEPF0000F0E3:EE_|PH7PR12MB8793:EE_ X-MS-Office365-Filtering-Correlation-Id: de769d7d-f581-4d2a-a92c-08dbf0f51cf7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: JKh4JeMJ+Nd5hcdGEqiSfCumTcBCmcz+w1UUmCB3hJtGI+D0oMKrcqBhljxJCoxRQ8Z8bQZLX9HRkRlKowD6VgCV60MXKqyD1Z8aObMnorZ5JthgeoNvbY349UVWD+oRmNMnw+nQ5Zua1aMtqFxpN5FTyDBpWc0o5M7r+ToBSDhd6RrPJEu9+2+VyXW2yFBo45h37Xo/oh0Wegl0oN3S5hLIWC2vNv1/OeETXkgbpfaqJ2y0NHeKnMCYPcsEA4b2UqQRq9i/cj4bckkrmXXRGtGlHjKwVS9i6bs99Wlc3+4Qw3vLh+U1TNxlgX8Q2m6GnQDenBZo9VhUXYrgPZ5LWWbInN3nKyyaRvD8Vgn80DeHp+9FRBv/4o+EFoQgT7BksK84PQN1F8YDFYV0LYhqV4CPOls2R0Ktq3TwCq9xV2ort6l56ihubVWgcnl5JTxghqOIPgy1L944LgBfp6FH00Ah7R7vS/Swb3zC0n9oljzvoXvSQbPVPpNXay6jwCr/G56NcD9wdFSNkmS+yeJ+fc4ArIlyvFa4FIRgX3USvxyLg4ZEloNOEBdfLFO976VMXWcG9VqQQJT5/dcfTNvvS2RO5ZhOtoLr5nbNsrAhveBfF4rFRaWd/cRVvDGfwBFQERCITbh1iWN91G4nHschiPxV5GHOMp+x+rJdTMYN65Xk902Vjv3Htvu4sBaQ679sPHrb1lRylBvscNBG3x1M0QeTs8bxoMnKBg5hr5HuR5hRhZTb5+N42vz9poZ3yjAgdOEl+sMmOCYo0R2dR3YvNQ== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Nov 2023 16:06:14.6234 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: de769d7d-f581-4d2a-a92c-08dbf0f51cf7 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: MN1PEPF0000F0E3.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB8793 Precedence: Bulk 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,AbdulLateef.Attar@amd.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: JiB6zRW0zBUiQB6pwYz3Y25Rx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1701273979846000007 Content-Type: text/plain; charset="utf-8" From: Abdul Lateef Attar Add helper functions to generate AML resource data for word I/O. Cc: Pierre Gondois Cc: Sami Mujawar Signed-off-by: Abdul Lateef Attar Reviewed-by: Pierre Gondois --- .../Include/Library/AmlLib/AmlLib.h | 65 ++++++++++++++ .../AmlLib/CodeGen/AmlResourceDataCodeGen.c | 88 +++++++++++++++++++ 2 files changed, 153 insertions(+) diff --git a/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h b/DynamicTabl= esPkg/Include/Library/AmlLib/AmlLib.h index 71e8539b30..5e340b94ce 100644 --- a/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h +++ b/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h @@ -2,6 +2,7 @@ AML Lib. =20 Copyright (c) 2019 - 2021, Arm Limited. All rights reserved.
+ Copyright (C) 2023 Advanced Micro Devices, Inc. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -724,6 +725,70 @@ AmlCodeGenRdWordBusNumber ( OUT AML_DATA_NODE_HANDLE *NewRdNode OPTIONAL ); =20 +/** Code generation for the "WordIO ()" ASL function. + + The Resource Data effectively created is a Word Address Space Resource + Data. Cf ACPI 6.5: + - s6.4.3.5.3 "Word Address Space Descriptor". + + The created resource data node can be: + - appended to the list of resource data elements of the NameOpNode. + In such case NameOpNode must be defined by a the "Name ()" ASL statem= ent + and initially contain a "ResourceTemplate ()". + - returned through the NewRdNode parameter. + + @param [in] IsResourceConsumer ResourceUsage parameter. + @param [in] IsMinFixed Minimum address is fixed. + @param [in] IsMaxFixed Maximum address is fixed. + @param [in] IsPosDecode Decode parameter + @param [in] IsaRanges Possible values are: + 0-Reserved + 1-NonISAOnly + 2-ISAOnly + 3-EntireRange + @param [in] AddressGranularity Address granularity. + @param [in] AddressMinimum Minimum address. + @param [in] AddressMaximum Maximum address. + @param [in] AddressTranslation Address translation. + @param [in] RangeLength Range length. + @param [in] ResourceSourceIndex Resource Source index. + Not supported. Must be 0. + @param [in] ResourceSource Resource Source. + Not supported. Must be NULL. + @param [in] IsDenseTranslation TranslationDensity parameter. + @param [in] IsTypeStatic TranslationType parameter. + @param [in] NameOpNode NameOp object node defining a named ob= ject. + If provided, append the new resource d= ata + node to the list of resource data elem= ents + of this node. + @param [out] NewRdNode If provided and success, + contain the created node. + + @retval EFI_SUCCESS The function completed successfully. + @retval EFI_INVALID_PARAMETER Invalid parameter. + @retval EFI_OUT_OF_RESOURCES Could not allocate memory. +**/ +EFI_STATUS +EFIAPI +AmlCodeGenRdWordIo ( + IN BOOLEAN IsResourceConsumer, + IN BOOLEAN IsMinFixed, + IN BOOLEAN IsMaxFixed, + IN BOOLEAN IsPosDecode, + IN UINT8 IsaRanges, + IN UINT16 AddressGranularity, + IN UINT16 AddressMinimum, + IN UINT16 AddressMaximum, + IN UINT16 AddressTranslation, + IN UINT16 RangeLength, + IN UINT8 ResourceSourceIndex, + IN CONST CHAR8 *ResourceSource, + IN BOOLEAN IsDenseTranslation, + IN BOOLEAN IsTypeStatic, + IN AML_OBJECT_NODE_HANDLE NameOpNode, OPTIONAL + OUT AML_DATA_NODE_HANDLE *NewRdNode OPTIONAL + ); + /** Code generation for the "QWordIO ()" ASL function. =20 The Resource Data effectively created is a QWord Address Space Resource diff --git a/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlResourceData= CodeGen.c b/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlResourceDataC= odeGen.c index 0bc1c1d119..60fe69ba6d 100644 --- a/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlResourceDataCodeGen= .c +++ b/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlResourceDataCodeGen= .c @@ -2,6 +2,7 @@ AML Resource Data Code Generation. =20 Copyright (c) 2020 - 2021, Arm Limited. All rights reserved.
+ Copyright (C) 2023 Advanced Micro Devices, Inc. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -878,6 +879,93 @@ AmlCodeGenRdWordBusNumber ( ); } =20 +/** Code generation for the "WordIO ()" ASL function. + + The Resource Data effectively created is a Word Address Space Resource + Data. Cf ACPI 6.5: + - s6.4.3.5.3 "Word Address Space Descriptor". + + The created resource data node can be: + - appended to the list of resource data elements of the NameOpNode. + In such case NameOpNode must be defined by a the "Name ()" ASL statem= ent + and initially contain a "ResourceTemplate ()". + - returned through the NewRdNode parameter. + + @param [in] IsResourceConsumer ResourceUsage parameter. + @param [in] IsMinFixed Minimum address is fixed. + @param [in] IsMaxFixed Maximum address is fixed. + @param [in] IsPosDecode Decode parameter + @param [in] IsaRanges Possible values are: + 0-Reserved + 1-NonISAOnly + 2-ISAOnly + 3-EntireRange + @param [in] AddressGranularity Address granularity. + @param [in] AddressMinimum Minimum address. + @param [in] AddressMaximum Maximum address. + @param [in] AddressTranslation Address translation. + @param [in] RangeLength Range length. + @param [in] ResourceSourceIndex Resource Source index. + Not supported. Must be 0. + @param [in] ResourceSource Resource Source. + Not supported. Must be NULL. + @param [in] IsDenseTranslation TranslationDensity parameter. + @param [in] IsTypeStatic TranslationType parameter. + @param [in] NameOpNode NameOp object node defining a named ob= ject. + If provided, append the new resource d= ata + node to the list of resource data elem= ents + of this node. + @param [out] NewRdNode If provided and success, + contain the created node. + + @retval EFI_SUCCESS The function completed successfully. + @retval EFI_INVALID_PARAMETER Invalid parameter. + @retval EFI_OUT_OF_RESOURCES Could not allocate memory. +**/ +EFI_STATUS +EFIAPI +AmlCodeGenRdWordIo ( + IN BOOLEAN IsResourceConsumer, + IN BOOLEAN IsMinFixed, + IN BOOLEAN IsMaxFixed, + IN BOOLEAN IsPosDecode, + IN UINT8 IsaRanges, + IN UINT16 AddressGranularity, + IN UINT16 AddressMinimum, + IN UINT16 AddressMaximum, + IN UINT16 AddressTranslation, + IN UINT16 RangeLength, + IN UINT8 ResourceSourceIndex, + IN CONST CHAR8 *ResourceSource, + IN BOOLEAN IsDenseTranslation, + IN BOOLEAN IsTypeStatic, + IN AML_OBJECT_NODE_HANDLE NameOpNode, OPTIONAL + OUT AML_DATA_NODE_HANDLE *NewRdNode OPTIONAL + ) +{ + return AmlCodeGenRdWordSpace ( + ACPI_ADDRESS_SPACE_TYPE_IO, + IsResourceConsumer, + IsPosDecode, + IsMinFixed, + IsMaxFixed, + RdIoRangeSpecificFlags ( + IsaRanges, + IsDenseTranslation, + IsTypeStatic + ), + AddressGranularity, + AddressMinimum, + AddressMaximum, + AddressTranslation, + RangeLength, + ResourceSourceIndex, + ResourceSource, + NameOpNode, + NewRdNode + ); +} + /** Code generation for the "QWordSpace ()" ASL function. =20 The Resource Data effectively created is a QWord Address Space Resource --=20 2.34.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 (#111848): https://edk2.groups.io/g/devel/message/111848 Mute This Topic: https://groups.io/mt/102874538/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 Sun May 12 01:01:09 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+111849+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 1701273979823935.0148892328099; Wed, 29 Nov 2023 08:06:19 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=x7oyZuuFAtulr88LlVc53wOg/uI6aru1VMGcqpVTjCI=; c=relaxed/simple; d=groups.io; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:Received-SPF:From:To:CC:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1701273979; v=1; b=goZQ14t4lM9gw3b8ioUnX4KUNB9e0HD0o7lqsXYffPuNgMXpWSCSfuohFtpyvLItaxSixMuy amR1u2/2mt29qXEcn698Vl97biJNN+7IZWhJAIURPw53nIXkbUv3FDF9vqY7qreP8F0qNTNoOGi XkzdTKMJ6PW+/CC+MPoJqyLY= X-Received: by 127.0.0.2 with SMTP id rvrFYY1788612xSFF0sOLm3x; Wed, 29 Nov 2023 08:06:19 -0800 X-Received: from NAM11-DM6-obe.outbound.protection.outlook.com (NAM11-DM6-obe.outbound.protection.outlook.com [40.107.223.63]) by mx.groups.io with SMTP id smtpd.web11.40796.1701273978575449525 for ; Wed, 29 Nov 2023 08:06:18 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VWNx6K4A7/j+1ILLHOz1IJMxcL5Tnq1hvp2aFACJlO48jyKothw/hTdRBKloagzEuunphbLdW6pQoMwsuQiOO7KiAUux5R4LsNz6oLykaRwK0CXyDVkttqLz35e33VqpwfOxSy6xOokDVJJHYlt3ZDHVpklCgwDZby3E3B3i+b8lrH8ulFNWNBruH289mUufNYuRpgyS3WOIME7U2G8I30F7xPy/KJoZy+wJFzmMZy/vNed9ty/c4KyMIt1qOP4EMRnGBoiF2oqUKiQ7CTMsCdnB6HrROQ4Lqf7lmt+H099pTtKBkgvMibuAQ+4XSVY4AdAuGZLvXsroaebJIhAz2w== 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=8rZvZrC4OAWuxkFxomnUGToeeQbzm09Z5qQAyYU7UWg=; b=GRK266quvtEk8+D+sxdWQd/QnAtgCsdVhVdig7eKigAFdtD6hXhv/t+vKY8MA3dKtSbkzZ/iZnOnJqZANQGjDTRZRxV4Bk5xWpbLRgN9phL8ZGC0DJI3K2vbpvlkyZd0xAqlBEYdjxc/HsmyyiFI0czupaLbCALafOVT9y+2iZwWUERMAUOQFB5k6Kw70XoDA3dtevqm9QeDduo2uVp8kIFeEw62fRCDOjze++Nx7kwb/b/pYNO27+uU0JSzzXf91KntDzyiJOYu09mpiGxkTOSI3/ySb6vRQqfkc+onU0kxj4T1Mhum/BlAgUPykSPFkiOuE+LHe3rEbRCGxL/dvg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) X-Received: from SN7PR04CA0077.namprd04.prod.outlook.com (2603:10b6:806:121::22) by BY5PR12MB4195.namprd12.prod.outlook.com (2603:10b6:a03:200::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.23; Wed, 29 Nov 2023 16:06:16 +0000 X-Received: from SN1PEPF0002636A.namprd02.prod.outlook.com (2603:10b6:806:121:cafe::60) by SN7PR04CA0077.outlook.office365.com (2603:10b6:806:121::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.22 via Frontend Transport; Wed, 29 Nov 2023 16:06:16 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.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+111849+1787277+3901457@groups.io; helo=mail02.groups.io; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C X-Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF0002636A.mail.protection.outlook.com (10.167.241.135) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7046.17 via Frontend Transport; Wed, 29 Nov 2023 16:06:16 +0000 X-Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Wed, 29 Nov 2023 10:06:15 -0600 X-Received: from BLR-LAB-SFW01.amd.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.34 via Frontend Transport; Wed, 29 Nov 2023 10:06:14 -0600 From: "Abdul Lateef Attar via groups.io" To: CC: Abdul Lateef Attar , Pierre Gondois , Sami Mujawar Subject: [edk2-devel] [PATCH v1 2/3] DynamicTablesPkg: Corrects AmlCodeGenRdWordBusNumber parameters Date: Wed, 29 Nov 2023 21:36:01 +0530 Message-ID: <32e2e56459b96c6d871b4387466f15ac45eee33e.1701268006.git.AbdulLateef.Attar@amd.com> In-Reply-To: References: MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF0002636A:EE_|BY5PR12MB4195:EE_ X-MS-Office365-Filtering-Correlation-Id: 517987f3-b096-429c-4f9e-08dbf0f51dd9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: Cl6yC7LbL0TrzVFK0X4tG2sy9ri+GgnFbE42tyYEps3T1E5l4brK46xPjKVPwb1wrJDVv1vROKhHvEX1FfkcwGWQasw0sXKDkByLBgCyJ4WnTjksfw1KrU05ASuZBP8EamGL53tejpJ+Y31U9rUUQMU0dOD2hE7mUoZOPxgb1sUoQWOO2mXvqJoo7bjpebycMobp4UuMq+PlNolyZU/npaXzTgJpJUXwEFUySNu+1MKC3LTwWWByi4RhUol78cgobXXkBBk4RfLzQxE1zZoF2X/9U9BeraSLexzC5rpbkpu7sD8tYz3PeSi4CtoV4G9fzosfepYWvQ2Ni+AuoI8t9RlC09aeZNJfSTENyeBMIflFV4Jio7tZDr1RRkJpEM4R62/96Af7mi21vaen7NdbStseAiqaeH44bx6U9IZd6uz+GNmI4v47jAMQwot9YobH4IqL9oFrhNVVQqJtYA6HId+TwSc6TcyYHEeeI9BNsyQLTqJqT6wQqe3zvnVL05JXVNDSelGT7m/vyR+fopYi8Aba96Udcc/TQ03Wxw433z1D+ZNEkOLoWwfrKk9CBLpTWGXFMaw0qL92MNtuHxOpjs9udmihQoRvLE6REOonm22yUnt0bnTrg1iqkGjdfSycui6T+q/ubuM0nt/ITyZ/Cjm1PF8ZjbDemKxoYuWFN8E6p3NOi+hogfhMGzgGjBqCdVUV3lHAsmH1xsahRCzyGsI/BJcUKxqyTyozbwEK5ihqlJtL5zb/zdwxzIeoLwPQbWlVeOowffXgq0C/zEybKg== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Nov 2023 16:06:16.0866 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 517987f3-b096-429c-4f9e-08dbf0f51dd9 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF0002636A.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4195 Precedence: Bulk 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,AbdulLateef.Attar@amd.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: Wvw0ryrsi60kTbMZM1mkj79Kx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1701273981838000011 Content-Type: text/plain; charset="utf-8" From: Abdul Lateef Attar Corrects the parameters of AmlCodeGenRdWordBusNumber() to UINT16 to generate word bus number. Cc: Pierre Gondois Cc: Sami Mujawar Signed-off-by: Abdul Lateef Attar Reviewed-by: Pierre Gondois --- DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h | 10 +++++----- .../Common/AmlLib/CodeGen/AmlResourceDataCodeGen.c | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h b/DynamicTabl= esPkg/Include/Library/AmlLib/AmlLib.h index 5e340b94ce..eb8740692f 100644 --- a/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h +++ b/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h @@ -714,11 +714,11 @@ AmlCodeGenRdWordBusNumber ( IN BOOLEAN IsMinFixed, IN BOOLEAN IsMaxFixed, IN BOOLEAN IsPosDecode, - IN UINT32 AddressGranularity, - IN UINT32 AddressMinimum, - IN UINT32 AddressMaximum, - IN UINT32 AddressTranslation, - IN UINT32 RangeLength, + IN UINT16 AddressGranularity, + IN UINT16 AddressMinimum, + IN UINT16 AddressMaximum, + IN UINT16 AddressTranslation, + IN UINT16 RangeLength, IN UINT8 ResourceSourceIndex, IN CONST CHAR8 *ResourceSource, IN AML_OBJECT_NODE_HANDLE NameOpNode, OPTIONAL diff --git a/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlResourceData= CodeGen.c b/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlResourceDataC= odeGen.c index 60fe69ba6d..46243f981c 100644 --- a/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlResourceDataCodeGen= .c +++ b/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlResourceDataCodeGen= .c @@ -848,11 +848,11 @@ AmlCodeGenRdWordBusNumber ( IN BOOLEAN IsMinFixed, IN BOOLEAN IsMaxFixed, IN BOOLEAN IsPosDecode, - IN UINT32 AddressGranularity, - IN UINT32 AddressMinimum, - IN UINT32 AddressMaximum, - IN UINT32 AddressTranslation, - IN UINT32 RangeLength, + IN UINT16 AddressGranularity, + IN UINT16 AddressMinimum, + IN UINT16 AddressMaximum, + IN UINT16 AddressTranslation, + IN UINT16 RangeLength, IN UINT8 ResourceSourceIndex, IN CONST CHAR8 *ResourceSource, IN AML_OBJECT_NODE_HANDLE NameOpNode, OPTIONAL --=20 2.34.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 (#111849): https://edk2.groups.io/g/devel/message/111849 Mute This Topic: https://groups.io/mt/102874539/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 Sun May 12 01:01:09 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+111850+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 1701273982143850.5640299352119; Wed, 29 Nov 2023 08:06:22 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=6P2llg4R1itA+n9+wBdvgPB/nLrnaMZIPKQQEAhPEpo=; c=relaxed/simple; d=groups.io; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:Received-SPF:From:To:CC:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1701273981; v=1; b=DvbX+rm0B3CMeL65/mktX9LGHwQyQmdzsgc+yxL09QQ150C0EjMX/B3axLeQLoXEURpiNeMZ xjXtunjTFxOq57eL3+MU2Pt0kuN6oyFdDjVDu5qFOTIiV8zQrRze3NuqaivL244qCVwQadJQqOs dDriakgnswJ4xA9R30bLLC/c= X-Received: by 127.0.0.2 with SMTP id EiVdYY1788612xGmqEyerxV0; Wed, 29 Nov 2023 08:06:21 -0800 X-Received: from NAM10-DM6-obe.outbound.protection.outlook.com (NAM10-DM6-obe.outbound.protection.outlook.com [40.107.93.81]) by mx.groups.io with SMTP id smtpd.web10.40669.1701273980949280409 for ; Wed, 29 Nov 2023 08:06:21 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RrvaQQx9bm1dPehYSDX8F2tQ0vPPG3NHBwzZIdKsVKhrAJHk4ZCf+2mxT5m7wpdYXZVNWh7za9SB5eFOhTbP1fMhxxgEKU+4IUa06BpYo362CpEW9P5imqlGGM5U8VXmWLuO0wJQZ/glEIMfLE7Gw//ydIjWNA2JbTrO6vZhxjtd7p27J4wtI+jcKilpYf+qNT4DclhvSUSZcVv58CxhyfZENk5fsrO+oKIIxlwacgVFd2Ie1e188s1DHp9JBJzDw7ieFx1OireNysl2FK8VXT1K31Rlt4dFV5k1bvc6YLXCcKZxyUkRD218AOty1nqZq4bvIU6NZoAbGGWJt5mg6w== 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=EXoQV+ateTIRHKAvh7LKu1uHScrPzHweQZf/qPqfJzo=; b=DTB4hh6e4GSibJHYISTwm+1MqaxjaVuCWffVoN4EBdr10Rq6Yj4p3W1qoyryRnWh0NTm14xN416hbI8lMWzMrZvLmhjNvZsZPZ6WOAAvjvJnrGS21LT8P83TA6QhfEImTSq2b+eXBdRTZRQOdPwwu7aVe++fZUPUjA+tw2BVC4Snybo0lp7JfRnQOzQgKqYueoKfGOrfGpA0Kyz6P84UQ3DeZTwsj67OXCL0surZnlYZvyLM/I1hz9K/CWkKJaz5COkUsDU5OAt2k08IwvO0oisWCC8AzgQUM0lMvcHgTY7kFSOZnfDf8DZOzLEz3FUzk/1dM7lF4XrTf12d6QD/Iw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) X-Received: from MN2PR01CA0044.prod.exchangelabs.com (2603:10b6:208:23f::13) by LV3PR12MB9213.namprd12.prod.outlook.com (2603:10b6:408:1a6::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7025.29; Wed, 29 Nov 2023 16:06:18 +0000 X-Received: from MN1PEPF0000F0E4.namprd04.prod.outlook.com (2603:10b6:208:23f:cafe::5c) by MN2PR01CA0044.outlook.office365.com (2603:10b6:208:23f::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7025.29 via Frontend Transport; Wed, 29 Nov 2023 16:06:18 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.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+111850+1787277+3901457@groups.io; helo=mail02.groups.io; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; pr=C X-Received: from SATLEXMB03.amd.com (165.204.84.17) by MN1PEPF0000F0E4.mail.protection.outlook.com (10.167.242.42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7046.17 via Frontend Transport; Wed, 29 Nov 2023 16:06:17 +0000 X-Received: from SATLEXMB05.amd.com (10.181.40.146) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Wed, 29 Nov 2023 10:06:17 -0600 X-Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB05.amd.com (10.181.40.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Wed, 29 Nov 2023 10:06:17 -0600 X-Received: from BLR-LAB-SFW01.amd.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.34 via Frontend Transport; Wed, 29 Nov 2023 10:06:16 -0600 From: "Abdul Lateef Attar via groups.io" To: CC: Abdul Lateef Attar , Pierre Gondois , Sami Mujawar Subject: [edk2-devel] [PATCH v1 3/3] DynamicTablesPkg: Corrects function pointer typedef of AML_PARSE_FUNCTION Date: Wed, 29 Nov 2023 21:36:02 +0530 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN1PEPF0000F0E4:EE_|LV3PR12MB9213:EE_ X-MS-Office365-Filtering-Correlation-Id: 4667f35c-0008-4170-dd30-08dbf0f51ef7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: Qp2pJjWz2lgF9VP5n2+0C72WP7U7oSwW5qQZS5qWxfpQ7CFx8aPwzWHUwhYg6XPzC2G8mei6UCo2CwcbCqZzwcQYW1TwuLGxWi5JkeU3PDRJSJzaWfOvbVJzSRkceGdJ4sEm6FlPSJilsaa+yCl7lg1xzARmYoqOqZvRdebD5+I4SZGZNAAABLKLYNUKL1UlTogTgtTNiHqadA00LcRWD+OqBwcr5uKxx6GgMz3MnyZkCS60OOlPJJKQfnW7tbxqM79sB6EF6djW5AbTgd0K+7YeyTZi1pTrgMsF5W9ioyhF5GFZZH98hztqAjXIiRzww8DEDI5SmAhMQkACEpcnATRpkMPRsZmY3NI2xnCCTV8yTyIg1O9eRl6BIjdw0UfUyPCXmprsILAUbEFOor7z492YwOak+27DsfJxE6ShIuL+qrsNxOOlQskSTdEHOX37dxs4ovTvvdSWmkR125oKYTfd4W5IV5dWz2zEklVwc004Pjv6CI1sSMbTdU6lvj6kDFEAaiVrValu7ZexBY3PkCKvs95myj4XEjxpogxOLhe+LZniT5wfRkM3nAX315o6jnKbvlzDWvExOGNR0UZKYMvcfrYTHGWyQqg1TpobnCinG4MGDCcsgl4V5VvKuyGrTzUrIRkCFZBYPAz1VGJ96qnCkKDyYp81kvrlOqHqC8B339EoJg1YdsapvUWGskJAUbAZSo8EFdhsNdYUqLVgFTVPNMxRhNSLbTs++9X+f2EwwPy1NQ7Sp6yBXwhMJvpoLrfTQr4hnJmMuE8cay/unA== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Nov 2023 16:06:17.9802 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4667f35c-0008-4170-dd30-08dbf0f51ef7 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: MN1PEPF0000F0E4.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR12MB9213 Precedence: Bulk 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,AbdulLateef.Attar@amd.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: BZDEGYeXugNVSTXL6sEE7dxex1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1701273983819000015 Content-Type: text/plain; charset="utf-8" From: Abdul Lateef Attar Corrects the function pointer typedef AML_PARSE_FUNCTION, otherwise some compiler like VS2019 gives error. Cc: Pierre Gondois Cc: Sami Mujawar Signed-off-by: Abdul Lateef Attar Reviewed-by: Pierre Gondois --- DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlParser.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlParser.c b/Dy= namicTablesPkg/Library/Common/AmlLib/Parser/AmlParser.c index 8e584d4930..d3a51a94c7 100644 --- a/DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlParser.c +++ b/DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlParser.c @@ -100,8 +100,7 @@ AmlParseStream ( **/ typedef EFI_STATUS -EFIAPI -(*AML_PARSE_FUNCTION) ( +(EFIAPI *AML_PARSE_FUNCTION)( IN CONST AML_NODE_HEADER *Node, IN AML_PARSE_FORMAT ExpectedFormat, IN OUT AML_STREAM *FStream, --=20 2.34.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 (#111850): https://edk2.groups.io/g/devel/message/111850 Mute This Topic: https://groups.io/mt/102874541/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-