From nobody Sat May 18 13:36:46 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+109360+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 1696523953084139.52543479989617; Thu, 5 Oct 2023 09:39:13 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=GWJwVPndL5lR6WEFwzOUoGJJbqhuUXZBmJyzMoeCR7k=; c=relaxed/simple; d=groups.io; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:Received-SPF:From:To:CC:Subject:Date:Message-ID: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=1696523952; v=1; b=tFImZ/WIY9dhHVmxq979WDc93MvWRhExdf6CUKKdCy6uQqWvvR9MbY/0ScJ8nHOh5WmoZ7iN Fd5gW8yyH2kYixuoddS3A3hLKUB0SB2EzCRpEAiurwJLuq9ob5I8xtnS+HcVTraziqk8SqYjDm0 sOropXqZarHIrjpKkpYkW+Fg= X-Received: by 127.0.0.2 with SMTP id wQ5VYY1788612x3htUrpKKQv; Thu, 05 Oct 2023 09:39:12 -0700 X-Received: from NAM12-MW2-obe.outbound.protection.outlook.com (NAM12-MW2-obe.outbound.protection.outlook.com [40.107.244.60]) by mx.groups.io with SMTP id smtpd.web11.20524.1696523951470408901 for ; Thu, 05 Oct 2023 09:39:11 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oaqS+4c9AokkoeBrJ2I5eZvTkA/gmE8Sss4/Hp0itYdHMjoIg5d1PDucDb0KQk+9VBTal/Ed+Fnik//H+MMtO3DJJuOPauL7NBYHQlqTnPaIubaWPCxNlbjNDf5d7EgbY0XzNXzkLgb4D3XAIR8WUhLLGLtf5zdkO61yutkEJ9Tdf7jPbjDdWMnQcViBfQHT71beRFRx5dbHDwAKxMKFwBvhJCOnOFwvvFafM/H9glbT1xVQzH6rliukMgt4jc/yCJ3L7Q6EjJwn9osI2SBIiU3NC6hnEOg/Wkra9uFz7euZoqGe1187sZGuzRP6Vahx60+szbTKAWa1V2X8uA70KA== 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=xUxp0bBF+7G4uesUII3emMZQkIdedcXNLTvLRCngZRw=; b=QJkd8lqkZeJjNnkljNK07F0WxKDrctLjlUfv5o4W7EPtOZHizNT6HdY7v9fS4JYn6HIznGyi/z/yVN1JHHSecQ+hr0potEgcH69sp/xrRT7HXi9sRmQeocsuxNkpOebftwqganPVqXCtw1/VMsO6mWj47K13DtPdR+f57BBCLG2B+BFRZdXHpyIzX7yDrpcxlh4A21AbElE9lYmALx+2XBrJDqkHD/1KRhly/4JX6K8sbcRdce6h9axoaPhIT9N8FrnGE5RNbG2Ek4datQAAFjZ9vHIyDUkDZatu3QlRvw5oKlYPDVykSBQZSnbnqwLY9FRHlxe4iTom/ntGhKC+AA== 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 BN9PR03CA0251.namprd03.prod.outlook.com (2603:10b6:408:ff::16) by CH2PR12MB4277.namprd12.prod.outlook.com (2603:10b6:610:ae::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.31; Thu, 5 Oct 2023 16:39:09 +0000 X-Received: from SN1PEPF0002BA52.namprd03.prod.outlook.com (2603:10b6:408:ff:cafe::9e) by BN9PR03CA0251.outlook.office365.com (2603:10b6:408:ff::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.25 via Frontend Transport; Thu, 5 Oct 2023 16:39:08 +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+109360+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 SN1PEPF0002BA52.mail.protection.outlook.com (10.167.242.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.14 via Frontend Transport; Thu, 5 Oct 2023 16:39:08 +0000 X-Received: from rnnvmail203.nvidia.com (10.129.68.9) 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.41; Thu, 5 Oct 2023 09:38:52 -0700 X-Received: from rnnvmail201.nvidia.com (10.129.68.8) by rnnvmail203.nvidia.com (10.129.68.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Thu, 5 Oct 2023 09:38:52 -0700 X-Received: from localhost.localdomain (10.127.8.11) by mail.nvidia.com (10.129.68.8) with Microsoft SMTP Server id 15.2.986.41 via Frontend Transport; Thu, 5 Oct 2023 09:38:52 -0700 From: "Jeshua Smith via groups.io" To: CC: , , , , Jeshua Smith Subject: [edk2-devel] [PATCH v2] DynamicTablesPkg/AmlLib: Enumerate memory attributes Date: Thu, 5 Oct 2023 16:38:49 +0000 Message-ID: <62418e30e2f01cd9234caa783e22fd6a18613d06.1696453749.git.jeshuas@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF0002BA52:EE_|CH2PR12MB4277:EE_ X-MS-Office365-Filtering-Correlation-Id: 1f85f8fc-f6ce-44fa-be73-08dbc5c198da X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: lLPWZKw9ic6FkmgRQd8oZceTdVox1/WgF14TvA9ZxRKwv+71bjvua2qN1GjrC7KOrHyrK469CtohE9X80YVT6lS4dMMiYcEaJ7UN+KTrstoEQCtn0IMJxK9DLsAn+PuKNpaqXXcr+qAprK2dDgBUsTf8wVA58eMNPoe6MPRXp0+6McGSNlJdBVwduI5SURSyj2cNEDWc+3ePURi+L7bWToJDQnGiPL2vHa+/dFuVmIY0mt2j3Lb5/j6kpI8FsjdlmchuyrjA4pLJyqzBgWD7efi1MSNJdMwRTCEv7iA7/qKSHMs4BUpcTUCkU4M3DysJOf2/wRBttOYKulle9rr35M1TaEVooAVx6gOs+oefEtq+F5YuRbD4wIlNI5ueC9mcx+AMXS0LrAfyn1lM4VUEhJm4P0Y5j918LfTT2c6saFfzV8BOLgS783hsrJJ5L1rNs98iexBQr574hnEGr1AZ3M9/OMi6dcpY7jk2Hg+GwhCbIl+6atrQcnHCrDmA4/rJrdVPYGYB2NojPBJk5fjBqZrIza0aZF/IaouiBpizwTyqAQ++KevNbBWDkgR3LshcwrwqTg22weTD0GSxtVMMt8+PM9kFuTv1RKlOPMLw/ORwidJ8JNFnOAQ7LCUcqHi3xkkUk+OY02R/CNw/njIDG8GrHwqE4qRvfI/gdsKiSdpW+qg6eV6BgL97F1I6XbQP5MgWryQEX4oRrY6PbjdNVaXJVQ5RiallBjcBmcHtBPl9uZXRrp0H9AzQg/9DEvar X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Oct 2023 16:39:08.5483 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1f85f8fc-f6ce-44fa-be73-08dbc5c198da 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: SN1PEPF0002BA52.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4277 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,jeshuas@nvidia.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: paZhTl9Y6bxnhLzxugdkro2Nx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1696523954324100001 Content-Type: text/plain; charset="utf-8" AmlCodeGenRdQWordMemory's and AmlCodeGenRdDWordMemory's Cacheable and MemoryRangeType parameters treat specific values as having specific meanings as defined by the spec. This change adds enums to map those meanings to their corresponding values. Signed-off-by: Jeshua Smith Reviewed-by: Pierre Gondois Reviewed-by: Sami Mujawar --- Notes: v2: based on comments from Pierre Gondois - Added documentation reference - Changed enum type and member names to closer align with documentation - Changed enum member names to CamelCase - Added *Max members to enums - Updated the signatures of relevant functions to use the enum types instead of UNIT8 .../Include/Library/AmlLib/AmlLib.h | 49 +++++++++++++++++-- .../AcpiSsdtPcieLibArm/SsdtPcieGenerator.c | 12 ++--- .../AmlLib/CodeGen/AmlResourceDataCodeGen.c | 8 +-- 3 files changed, 55 insertions(+), 14 deletions(-) diff --git a/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h b/DynamicTabl= esPkg/Include/Library/AmlLib/AmlLib.h index 510c79a399..71e8539b30 100644 --- a/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h +++ b/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h @@ -59,6 +59,47 @@ typedef void *AML_DATA_NODE_HANDLE; =20 #endif // AML_HANDLE =20 +/** Memory attributes, _MEM (2 bits) + + Possible values are: + 0-The memory is non-cacheable + 1-The memory is cacheable (DEPRECATED) + 2-The memory is cacheable and supports + write combining (DEPRECATED) + 3-The memory is cacheable and prefetchable + + @par Reference(s): + - ACPI 6.5, s6.4.3.5.5 "Resource Type Specific Flags" + +**/ +typedef enum { + AmlMemoryNonCacheable =3D 0, + AmlMemoryCacheable =3D 1, + AmlMemoryCacheableWriteCombine =3D 2, + AmlMemoryCacheablePrefetch =3D 3, + AmlMemoryCacheablityMax =3D 4 +} AML_MEMORY_ATTRIBUTES_MEM; + +/** Memory attributes, _MTP (2 bits) + + Possible values are: + 0-AddressRangeMemory + 1-AddressRangeReserved + 2-AddressRangeACPI + 3-AddressRangeNVS + + @par Reference(s): + - ACPI 6.5, s6.4.3.5.5 "Resource Type Specific Flags" + +**/ +typedef enum { + AmlAddressRangeMemory =3D 0, + AmlAddressRangeReserved =3D 1, + AmlAddressRangeACPI =3D 2, + AmlAddressRangeNVS =3D 3, + AmlAddressRangeMax =3D 4 +} AML_MEMORY_ATTRIBUTES_MTP; + /** Parse the definition block. =20 The function parses the whole AML blob. It starts with the ACPI DSDT/SSDT @@ -578,7 +619,7 @@ AmlCodeGenRdDWordMemory ( IN BOOLEAN IsPosDecode, IN BOOLEAN IsMinFixed, IN BOOLEAN IsMaxFixed, - IN UINT8 Cacheable, + IN AML_MEMORY_ATTRIBUTES_MEM Cacheable, IN BOOLEAN IsReadWrite, IN UINT32 AddressGranularity, IN UINT32 AddressMinimum, @@ -587,7 +628,7 @@ AmlCodeGenRdDWordMemory ( IN UINT32 RangeLength, IN UINT8 ResourceSourceIndex, IN CONST CHAR8 *ResourceSource, - IN UINT8 MemoryRangeType, + IN AML_MEMORY_ATTRIBUTES_MTP MemoryRangeType, IN BOOLEAN IsTypeStatic, IN AML_OBJECT_NODE_HANDLE NameOpNode, OPTIONAL OUT AML_DATA_NODE_HANDLE *NewRdNode OPTIONAL @@ -809,7 +850,7 @@ AmlCodeGenRdQWordMemory ( IN BOOLEAN IsPosDecode, IN BOOLEAN IsMinFixed, IN BOOLEAN IsMaxFixed, - IN UINT8 Cacheable, + IN AML_MEMORY_ATTRIBUTES_MEM Cacheable, IN BOOLEAN IsReadWrite, IN UINT64 AddressGranularity, IN UINT64 AddressMinimum, @@ -818,7 +859,7 @@ AmlCodeGenRdQWordMemory ( IN UINT64 RangeLength, IN UINT8 ResourceSourceIndex, IN CONST CHAR8 *ResourceSource, - IN UINT8 MemoryRangeType, + IN AML_MEMORY_ATTRIBUTES_MTP MemoryRangeType, IN BOOLEAN IsTypeStatic, IN AML_OBJECT_NODE_HANDLE NameOpNode, OPTIONAL OUT AML_DATA_NODE_HANDLE *NewRdNode OPTIONAL diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieG= enerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieG= enerator.c index 9ddaddc198..72873709aa 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerato= r.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerato= r.c @@ -566,7 +566,7 @@ GeneratePciCrs ( IsPosDecode, TRUE, TRUE, - TRUE, + AmlMemoryCacheable, TRUE, 0, AddrMapInfo->PciAddress, @@ -575,7 +575,7 @@ GeneratePciCrs ( AddrMapInfo->AddressSize, 0, NULL, - 0, + AmlAddressRangeMemory, TRUE, CrsNode, NULL @@ -588,7 +588,7 @@ GeneratePciCrs ( IsPosDecode, TRUE, TRUE, - TRUE, + AmlMemoryCacheable, TRUE, 0, AddrMapInfo->PciAddress, @@ -597,7 +597,7 @@ GeneratePciCrs ( AddrMapInfo->AddressSize, 0, NULL, - 0, + AmlAddressRangeMemory, TRUE, CrsNode, NULL @@ -718,7 +718,7 @@ ReserveEcamSpace ( TRUE, TRUE, TRUE, - FALSE, // non-cacheable + AmlMemoryNonCacheable, TRUE, 0, AddressMinimum, @@ -727,7 +727,7 @@ ReserveEcamSpace ( AddressMaximum - AddressMinimum + 1, 0, NULL, - 0, + AmlAddressRangeMemory, TRUE, CrsNode, NULL diff --git a/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlResourceData= CodeGen.c b/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlResourceDataC= odeGen.c index 9c6700b9e0..0bc1c1d119 100644 --- a/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlResourceDataCodeGen= .c +++ b/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlResourceDataCodeGen= .c @@ -570,7 +570,7 @@ AmlCodeGenRdDWordMemory ( IN BOOLEAN IsPosDecode, IN BOOLEAN IsMinFixed, IN BOOLEAN IsMaxFixed, - IN UINT8 Cacheable, + IN AML_MEMORY_ATTRIBUTES_MEM Cacheable, IN BOOLEAN IsReadWrite, IN UINT32 AddressGranularity, IN UINT32 AddressMinimum, @@ -579,7 +579,7 @@ AmlCodeGenRdDWordMemory ( IN UINT32 RangeLength, IN UINT8 ResourceSourceIndex, IN CONST CHAR8 *ResourceSource, - IN UINT8 MemoryRangeType, + IN AML_MEMORY_ATTRIBUTES_MTP MemoryRangeType, IN BOOLEAN IsTypeStatic, IN AML_OBJECT_NODE_HANDLE NameOpNode, OPTIONAL OUT AML_DATA_NODE_HANDLE *NewRdNode OPTIONAL @@ -1161,7 +1161,7 @@ AmlCodeGenRdQWordMemory ( IN BOOLEAN IsPosDecode, IN BOOLEAN IsMinFixed, IN BOOLEAN IsMaxFixed, - IN UINT8 Cacheable, + IN AML_MEMORY_ATTRIBUTES_MEM Cacheable, IN BOOLEAN IsReadWrite, IN UINT64 AddressGranularity, IN UINT64 AddressMinimum, @@ -1170,7 +1170,7 @@ AmlCodeGenRdQWordMemory ( IN UINT64 RangeLength, IN UINT8 ResourceSourceIndex, IN CONST CHAR8 *ResourceSource, - IN UINT8 MemoryRangeType, + IN AML_MEMORY_ATTRIBUTES_MTP MemoryRangeType, IN BOOLEAN IsTypeStatic, IN AML_OBJECT_NODE_HANDLE NameOpNode, OPTIONAL OUT AML_DATA_NODE_HANDLE *NewRdNode OPTIONAL --=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 (#109360): https://edk2.groups.io/g/devel/message/109360 Mute This Topic: https://groups.io/mt/101780411/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-