From nobody Tue Feb 10 07:42:47 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+44111+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1563781986609868.0728495110602; Mon, 22 Jul 2019 00:53:06 -0700 (PDT) Return-Path: X-Received: from EUR03-VE1-obe.outbound.protection.outlook.com (EUR03-VE1-obe.outbound.protection.outlook.com [40.107.5.62]) by groups.io with SMTP; Mon, 22 Jul 2019 00:53:05 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HNa1pRpLtBH5O5I0eQXv9mtkV34JNls+Kzi2KfT26GWiDn4Cv8aOUAPa2Gs1oz2+pn3FBK2hzoi0EcpFHEb5w24pAUrbr8nz/TiXF+chFFZdKDVGumYOX1CavC+s2P0urLYc1WeSMFyUEflAW+XGCTWHN6sYonS7jGtKnNNSx7zATxJO71laJbPgB3sGy0PVdAnf/2IBPxKJ1MKXG6yMm3k7IbdEA78mfa38xhG3hpB6TxkMf6MGlmqcE0HdZ5T6GtT/L+xelpE/pRDkMlwsX9gCwkIihZTKzG7UQRQ7+J4W5p9qFZGs9ADn15BcaGpV6WpaudApC+k+QpWgV3WC5A== 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-SenderADCheck; bh=17xfkri1qQLqm/Awan27Fad6oJHKS69tw9lx/fntXR0=; b=HYZHDWapykxtkzmXa4UA9E+0BOKKdeTaDMgMYEZ6QRvip0MJ+SzlZLohFM+FNGeZJgKq1LqSHMkEyVB/ZEm4vvU/K8S0iuJD4h+581e9inIBCkqTuZcuR+v4sFV6kQ2yBk0lTzp2w4WpTdO58QJ5UGY+/evjaXr33n/2Il6qBnDFfEDHKiP5tBfUeUcGi7RHr81sMTL8kQsJ+w/0i5eVP8ucCZPf4Jj+j4dfJ+pGmxvpstCw8Svw5SaX5zo7X7NqvOMJPl1iTIr15Mt+bK3UgzsPkgGq1iMaT+icGEeRqTNzy7w4dTzxif4KNc61+MLQrNEbvrF457tDfCzsLgAxFg== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=temperror (sender ip is 40.67.248.234) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=arm.com;dmarc=temperror action=none header.from=arm.com;dkim=none (message not signed);arc=none X-Received: from AM6PR08CA0017.eurprd08.prod.outlook.com (2603:10a6:20b:b2::29) by HE1PR0802MB2602.eurprd08.prod.outlook.com (2603:10a6:3:e2::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2094.17; Mon, 22 Jul 2019 07:53:00 +0000 X-Received: from AM5EUR03FT046.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e08::202) by AM6PR08CA0017.outlook.office365.com (2603:10a6:20b:b2::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2094.14 via Frontend Transport; Mon, 22 Jul 2019 07:53:00 +0000 Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+44111+1787277+3901457@groups.io; helo=web01.groups.io; Received-SPF: TempError (protection.outlook.com: error in processing during lookup of arm.com: DNS Timeout) X-Received: from nebula.arm.com (40.67.248.234) by AM5EUR03FT046.mail.protection.outlook.com (10.152.16.164) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2052.18 via Frontend Transport; Mon, 22 Jul 2019 07:52:59 +0000 X-Received: from AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1415.2; Mon, 22 Jul 2019 07:50:38 +0000 X-Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) by AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1415.2; Mon, 22 Jul 2019 07:50:37 +0000 X-Received: from E119924.Arm.com (10.1.199.124) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.1415.2 via Frontend Transport; Mon, 22 Jul 2019 07:50:37 +0000 From: "Krzysztof Koch" To: CC: , , , , , Subject: [edk2-devel] [PATCH v2 6/6] ShellPkg: acpiview: IORT: Refactor PMCG node mapping count validation Date: Mon, 22 Jul 2019 08:50:26 +0100 Message-ID: <20190722075026.20244-7-krzysztof.koch@arm.com> In-Reply-To: <20190722075026.20244-1-krzysztof.koch@arm.com> References: <20190722075026.20244-1-krzysztof.koch@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2b459ee1-7f4d-4759-2a78-08d70e799dac X-MS-TrafficTypeDiagnostic: HE1PR0802MB2602: X-Microsoft-Antispam-PRVS: NoDisclaimer: True X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: JjxeNgOTQ2mDV7zJeIsT6adivVARFq+8pzKib6lhHG74UlsdBKlmXsYOmSwdmkrCPm1XemN0JYdBvLep1UERrLzbrvIRmF4SaZUmPmhxRvDczCNf3WsKbf6dzHrTC9Az17ngcIpysQzNdNuYdmIFJ1SWEq5B9MgdF8wbmrybh0n1Qmy4L+nUt/EAgJBAeciEKw3irNO6fI4XG8Hsw275gGKQeH7RTv3JTk+egkinzob2ApBzEejc9LRWubojN6piZ06pWfMcE0J3C7T+SrtgdABdROrvxlm+9UDKNYbfDW/r9nkXYT+Nui+v/K741P2BQeQ4fgLAv1gzWvIV/eFH+Az36oMY97PfyMnSiR+eHYLKMpKy2eLY5ngagp56MJ+6Qu7o4CTpxKLGUoNKthzxJ58/+R8ig5otbLDJ8EMtoQg= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jul 2019 07:52:59.4041 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2b459ee1-7f4d-4759-2a78-08d70e799dac X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[40.67.248.234];Helo=[nebula.arm.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0802MB2602 Precedence: Bulk List-Unsubscribe: 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,krzysztof.koch@arm.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1563781986; bh=FFjRCmIa6dJj0tHXn2qRhaDh+140A0b6Ml4UVACnTCg=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=jlUBty0Gtzf3GHzIbpb0AD0e/Mvabl1BMrdTI5vGyfEplCjsVKiJmlvfE2D4TVq67Zu stcWHVdDUyitqZFsj/bwvaHCXjGtbA4ZAyCt9QjKX3taSpFVBLm5RLUNIbaMbsf/CVv0C Kt5suRxx02P8Qj34eDbz9PQznLfLK/uvYac= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move Performance Monitoring Counter Group (PMCG) node ID mapping count validation from the core IORT acpiview parser logic to a dedicated function. Now, the pointer to the validation function is passed to the IortNodePmcgParser[] ACPI_PARSER array. This check does not affect the flow of IORT parsing and is limited to a single table field in scope, therefore, it is better to keep it away from the code responsible for traversing the table. Signed-off-by: Krzysztof Koch --- Notes: v1: - refactor PMCG node mapping count validation [Krzysztof] ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c | 3= 2 ++++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/Iort= Parser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortPa= rser.c index 0461205b4f8bc02aa11ab1db1d0deb73bce053b7..7c850b3813d5204775e2cc247ca= bf42358b25769 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c @@ -53,6 +53,28 @@ ValidateItsIdMappingCount ( } } =20 +/** + This function validates the ID Mapping array count for the Performance + Monitoring Counter Group (PMCG) node. + + @param [in] Ptr Pointer to the start of the field data. + @param [in] Context Pointer to context specific information e.g. this + could be a pointer to the ACPI table header. +**/ +STATIC +VOID +EFIAPI +ValidatePmcgIdMappingCount ( + IN UINT8* Ptr, + IN VOID* Context + ) +{ + if (*(UINT32*)Ptr > 1) { + IncrementErrorCount (); + Print (L"\nERROR: IORT ID Mapping count must not be greater than 1."); + } +} + /** This function validates the ID Mapping array offset for the ITS node. =20 @@ -216,7 +238,7 @@ STATIC CONST ACPI_PARSER IortNodeRootComplexParser[] = =3D { An ACPI_PARSER array describing the IORT PMCG node. **/ STATIC CONST ACPI_PARSER IortNodePmcgParser[] =3D { - PARSE_IORT_NODE_HEADER (NULL, NULL), + PARSE_IORT_NODE_HEADER (ValidatePmcgIdMappingCount, NULL), {L"Base Address", 8, 16, L"0x%lx", NULL, NULL, NULL, NULL}, {L"Overflow interrupt GSIV", 4, 24, L"0x%x", NULL, NULL, NULL, NULL}, {L"Node reference", 4, 28, L"0x%x", NULL, NULL, NULL, NULL}, @@ -537,14 +559,6 @@ DumpIortNodePmcg ( if (*IortIdMappingCount !=3D 0) { DumpIortNodeIdMappings (Ptr, MappingCount, MappingOffset); } - - if (*IortIdMappingCount > 1) { - IncrementErrorCount (); - Print ( - L"ERROR: ID mapping must not be greater than 1. Id Mapping Count =3D= %d\n", - *IortIdMappingCount - ); - } } =20 /** -- 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)' -=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 (#44111): https://edk2.groups.io/g/devel/message/44111 Mute This Topic: https://groups.io/mt/32556344/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-