From nobody Thu May 2 03:26:19 2024 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+43004+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1561717497; cv=none; d=zoho.com; s=zohoarc; b=YcYBmSF2LtHmy6ySV9zAgKwyf/YOxzawRzi7Gp4ODiL29TQzvlZJtHXo47lnFL7bmHEhjkaY3ysRYPFAalMfCZpubQMYlhanBNjhG8zjdhQTo66wp0tWFjqPkW27uIOlE36o41x+5M/yp/0Aa7g0RBSDvegj4Rz+gbBAUl+0t10= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561717497; h=Content-Type:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=wJv8aPtS3/byE3Dakybkrn8nPqJEeFPpToHD9Qp38Fs=; b=oT5xSbqtpO5ROj11qEqeRmkmWKF6JxmCjSFkKJ+A89tT52QuN6SMo+ZG/NyEsmQA6wX1J0CD0bwRqVL6pFJlGvzxV5TYVjuADz6oBSMwRBEzj9zI3OntJ7iQ3oVaiJfyWQRJIC3fbeShhbrsxofDi039EFc8w4SWKnTsqFiDKtk= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+43004+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1561717497580888.7943000203572; Fri, 28 Jun 2019 03:24:57 -0700 (PDT) Return-Path: X-Received: from EUR01-DB5-obe.outbound.protection.outlook.com (EUR01-DB5-obe.outbound.protection.outlook.com [40.107.15.58]) by groups.io with SMTP; Fri, 28 Jun 2019 03:24:56 -0700 X-Received: from VI1PR08CA0125.eurprd08.prod.outlook.com (2603:10a6:800:d4::27) by VI1PR08MB3967.eurprd08.prod.outlook.com (2603:10a6:803:df::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2032.17; Fri, 28 Jun 2019 10:24:52 +0000 X-Received: from AM5EUR03FT044.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e08::200) by VI1PR08CA0125.outlook.office365.com (2603:10a6:800:d4::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2032.18 via Frontend Transport; Fri, 28 Jun 2019 10:24:52 +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+43004+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 AM5EUR03FT044.mail.protection.outlook.com (10.152.17.56) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2032.15 via Frontend Transport; Fri, 28 Jun 2019 10:24:50 +0000 X-Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1415.2; Fri, 28 Jun 2019 10:24:46 +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; Fri, 28 Jun 2019 10:24:46 +0000 From: "Krzysztof Koch" To: CC: , , , , , Subject: [edk2-devel] [PATCH v1 1/4] ShellPkg: acpiview: Improve PPTT table field validation Date: Fri, 28 Jun 2019 11:24:35 +0100 Message-ID: <20190628102438.30544-2-krzysztof.koch@arm.com> In-Reply-To: <20190628102438.30544-1-krzysztof.koch@arm.com> References: <20190628102438.30544-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: fffe9225-09a9-43cd-036a-08d6fbb2da9d X-MS-TrafficTypeDiagnostic: VI1PR08MB3967: X-MS-Exchange-PUrlCount: 1 NoDisclaimer: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:473; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: Np+qks3b9Yf5zZSDRNYeYaHzBbxDTluDXxzzhFxdQzGfRv/5HaFybjHiYdWJp3x5bH411EIPQZtvy4Lcyvjs5A4MntBH68isceC1AuGlQ8IEhlh/kBs6cDob4iqUEOri2m4/hlAexm5iRErtvHE4wfIAka7YGyFC8pBdiYAD0YeGPzMYQo7dU9KWXNZzQ93xyskbgwAdFtQ5slJOWdcO3HafmPa5v53YcRLiVWhlbwxkAyzPkQbPAtfGDS3IXNOy0IZJNquE0kjAtyoAp1fskNyytQP6XiaGX8Ni+DJQrh+hdajPm4PmTgM4eDSEm13nnwu4rQKXTvyxOqZfbIjVkew/xI11q7gUZdBrQSedDQhjUlxbSU2kvzMm/FDYnrLnW/ikh1V7Gqead7D2/UvJeKvYqR2OEgc9qReBs5xkciQ= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2019 10:24:50.8626 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fffe9225-09a9-43cd-036a-08d6fbb2da9d 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: VI1PR08MB3967 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=1561717496; bh=N+bfZQYTjBmAPnBqKNfp/lLnvQvSL4hSTh9kmcj4+yo=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=k0F6TlcBurFd38zM4MLFuowuT9NNB4iiorOddn8ONZFrRRud/bMxp2Jvs/typ3C7x1P YEjvjb+YuU1Z5VsVehPpxk4ktRuclsULUWyZfl7I5TmvERUEfIAXUVV4HroYtl3Qm+LuM 5oQP5QRxY8/1VPGdpIZ1QgokV2lOAj89yT4= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add Cache Structure (Type 1) 'Number of sets' and 'Associativity' field validation in the acpiview Processor Properties Topology Table (PPTT) parser. Replace literal values with precompiler macros for existing Cache Structure validation functions. Signed-off-by: Krzysztof Koch Reviewed-by: Alexei Fedorov Reviewed-by: Sami Mujawar --- Changes can be seen at: https://github.com/KrzysztofKoch1/edk2/commit/014f9= 8b8f1ba29607d8d465cac779badc3c79982 Notes: v1: - Use macros to define constant values used for validation [Krzysztof] - Add two new PPTT Type 1 structure validation functions [Krzysztof] ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.c | 1= 02 ++++++++++++++++++-- ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.h | = 38 ++++++++ 2 files changed, 130 insertions(+), 10 deletions(-) diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/Pptt= Parser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttPa= rser.c index 71b6e7ae7c727ee0ea12f74e60c27c4c46e05872..cec57be55e77096f9448f637ea1= 29af2b42111ad 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.c @@ -5,12 +5,15 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =20 @par Reference(s): - - ACPI 6.2 Specification - Errata A, September 2017 + - ACPI 6.3 Specification - January 2019 + - ARM Architecture Reference Manual ARMv8 (D.a) **/ =20 #include #include #include "AcpiParser.h" +#include "AcpiView.h" +#include "PpttParser.h" =20 // Local variables STATIC CONST UINT8* ProcessorTopologyStructureType; @@ -19,11 +22,80 @@ STATIC CONST UINT32* NumberOfPrivateResources; STATIC ACPI_DESCRIPTION_HEADER_INFO AcpiHdrInfo; =20 /** - An ACPI_PARSER array describing the ACPI PPTT Table. + This function validates the Cache Type Structure (Type 1) 'Number of set= s' + field. + + @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 CONST ACPI_PARSER PpttParser[] =3D { - PARSE_ACPI_HEADER (&AcpiHdrInfo) -}; +STATIC +VOID +EFIAPI +ValidateCacheNumberOfSets ( + IN UINT8* Ptr, + IN VOID* Context + ) +{ + UINT32 NumberOfSets; + NumberOfSets =3D *(UINT32*)Ptr; + + if (NumberOfSets =3D=3D 0) { + IncrementErrorCount (); + Print (L"\nERROR: Cache number of sets must be greater than 0"); + return; + } + +#if defined(MDE_CPU_ARM) || defined (MDE_CPU_AARCH64) + if (NumberOfSets > PPTT_ARM_CCIDX_CACHE_NUMBER_OF_SETS_MAX) { + IncrementErrorCount (); + Print ( + L"\nERROR: When ARMv8.3-CCIDX is implemented the maximum cache numbe= r of " + L"sets must be less than or equal to %d", + PPTT_ARM_CCIDX_CACHE_NUMBER_OF_SETS_MAX + ); + return; + } + + if (NumberOfSets > PPTT_ARM_CACHE_NUMBER_OF_SETS_MAX) { + IncrementWarningCount (); + Print ( + L"\nWARNING: Without ARMv8.3-CCIDX, the maximum cache number of sets= " + L"must be less than or equal to %d. Ignore this message if " + L"ARMv8.3-CCIDX is implemented", + PPTT_ARM_CACHE_NUMBER_OF_SETS_MAX + ); + return; + } +#endif + +} + +/** + This function validates the Cache Type Structure (Type 1) 'Associativity' + field. + + @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 +ValidateCacheAssociativity ( + IN UINT8* Ptr, + IN VOID* Context + ) +{ + UINT8 Associativity; + Associativity =3D *(UINT8*)Ptr; + + if (Associativity =3D=3D 0) { + IncrementErrorCount (); + Print (L"\nERROR: Cache associativity must be greater than 0"); + return; + } +} =20 /** This function validates the Cache Type Structure (Type 1) Line size fiel= d. @@ -49,11 +121,14 @@ ValidateCacheLineSize ( UINT16 LineSize; LineSize =3D *(UINT16*)Ptr; =20 - if ((LineSize < 16) || (LineSize > 2048)) { + if ((LineSize < PPTT_ARM_CACHE_LINE_SIZE_MIN) || + (LineSize > PPTT_ARM_CACHE_LINE_SIZE_MAX)) { IncrementErrorCount (); Print ( - L"\nERROR: The cache line size must be between 16 and 2048 bytes" - L" on ARM Platforms." + L"\nERROR: The cache line size must be between %d and %d bytes" + L" on ARM Platforms.", + PPTT_ARM_CACHE_LINE_SIZE_MIN, + PPTT_ARM_CACHE_LINE_SIZE_MAX ); return; } @@ -96,6 +171,13 @@ ValidateCacheAttributes ( } } =20 +/** + An ACPI_PARSER array describing the ACPI PPTT Table. +**/ +STATIC CONST ACPI_PARSER PpttParser[] =3D { + PARSE_ACPI_HEADER (&AcpiHdrInfo) +}; + /** An ACPI_PARSER array describing the processor topology structure header. **/ @@ -133,8 +215,8 @@ STATIC CONST ACPI_PARSER CacheTypeStructureParser[] =3D= { {L"Flags", 4, 4, L"0x%x", NULL, NULL, NULL, NULL}, {L"Next Level of Cache", 4, 8, L"0x%x", NULL, NULL, NULL, NULL}, {L"Size", 4, 12, L"0x%x", NULL, NULL, NULL, NULL}, - {L"Number of sets", 4, 16, L"%d", NULL, NULL, NULL, NULL}, - {L"Associativity", 1, 20, L"%d", NULL, NULL, NULL, NULL}, + {L"Number of sets", 4, 16, L"%d", NULL, NULL, ValidateCacheNumberOfSets,= NULL}, + {L"Associativity", 1, 20, L"%d", NULL, NULL, ValidateCacheAssociativity,= NULL}, {L"Attributes", 1, 21, L"0x%x", NULL, NULL, ValidateCacheAttributes, NUL= L}, {L"Line size", 2, 22, L"%d", NULL, NULL, ValidateCacheLineSize, NULL} }; diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/Pptt= Parser.h b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttPa= rser.h new file mode 100644 index 0000000000000000000000000000000000000000..2a671203fb0035bbc407ff4bb0c= a9960706fa588 --- /dev/null +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.h @@ -0,0 +1,38 @@ +/** @file + Header file for PPTT parser + + Copyright (c) 2019, ARM Limited. All rights reserved. + SPDX-License-Identifier: BSD-2-Clause-Patent + + @par Reference(s): + - ARM Architecture Reference Manual ARMv8 (D.a) +**/ + +#ifndef PPTT_PARSER_H_ +#define PPTT_PARSER_H_ + +#if defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64) + +/// Cache parameters allowed by the architecture with +/// ARMv8.3-CCIDX (Cache extended number of sets) +/// Derived from CCSIDR_EL1 when ID_AA64MMFR2_EL1.CCIDX=3D=3D0001 +#define PPTT_ARM_CCIDX_CACHE_NUMBER_OF_SETS_MAX (1 << 24) +#define PPTT_ARM_CCIDX_CACHE_ASSOCIATIVITY_MAX (1 << 21) + +/// Cache parameters allowed by the architecture without +/// ARMv8.3-CCIDX (Cache extended number of sets) +/// Derived from CCSIDR_EL1 when ID_AA64MMFR2_EL1.CCIDX=3D=3D0000 +#define PPTT_ARM_CACHE_NUMBER_OF_SETS_MAX (1 << 15) +#define PPTT_ARM_CACHE_ASSOCIATIVITY_MAX (1 << 10) + +/// Common cache parameters +/// Derived from CCSIDR_EL1 +/// The LineSize is represented by bits 2:0 +/// (Log2(Number of bytes in cache line)) - 4 is used to represent +/// the LineSize bits. +#define PPTT_ARM_CACHE_LINE_SIZE_MAX (1 << 11) +#define PPTT_ARM_CACHE_LINE_SIZE_MIN (1 << 4) + +#endif // if defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64) + +#endif // PPTT_PARSER_H_ -- '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 (#43004): https://edk2.groups.io/g/devel/message/43004 Mute This Topic: https://groups.io/mt/32240395/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 Thu May 2 03:26:19 2024 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+43005+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1561717498; cv=none; d=zoho.com; s=zohoarc; b=FlXFEaPQMH/H8TGx+gxbdGa2ozo21+bgLSjBRs62iUfvRL9TC4Q/WNDHwh2wFNu57M5Ft+0CZms/SO9hOmaQHl+a388TOjeOrijPIj6Pid/b0jXZwtZDZ5BPpM9eg4UrlN7CJCQ+qbrFQMdzsuNCHgBmjfUSOQ+e1EpX8H1T0ik= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561717498; h=Content-Type:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=wd7gion9ffYsvC5gDCk55WbadY+4uQPsiaVHW3IOZ+I=; b=mH65c8jbgjV/HyY9hi6fAZReYWYUMajbbScAUsGlVX+1NpaDQDO3BHR88zZxO+9O3HuwzZmwkBvdOhb412lLBEz37Ah/PrM4iaKufFg47nBP9PlPyxmtdIcuIyLh6VDDpDz1bUGJip4lsYHyfb5026kMlJP6o5DRzpchImxcWdU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+43005+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1561717498030311.84662661926325; Fri, 28 Jun 2019 03:24:58 -0700 (PDT) Return-Path: X-Received: from EUR03-AM5-obe.outbound.protection.outlook.com (EUR03-AM5-obe.outbound.protection.outlook.com [40.107.3.82]) by groups.io with SMTP; Fri, 28 Jun 2019 03:24:56 -0700 X-Received: from VI1PR08CA0118.eurprd08.prod.outlook.com (2603:10a6:800:d4::20) by AM6PR08MB3959.eurprd08.prod.outlook.com (2603:10a6:20b:a2::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2032.18; Fri, 28 Jun 2019 10:24:52 +0000 X-Received: from AM5EUR03FT015.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e08::205) by VI1PR08CA0118.outlook.office365.com (2603:10a6:800:d4::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2032.18 via Frontend Transport; Fri, 28 Jun 2019 10:24:52 +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+43005+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 AM5EUR03FT015.mail.protection.outlook.com (10.152.16.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2032.15 via Frontend Transport; Fri, 28 Jun 2019 10:24:50 +0000 X-Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1415.2; Fri, 28 Jun 2019 10:24:46 +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; Fri, 28 Jun 2019 10:24:46 +0000 From: "Krzysztof Koch" To: CC: , , , , , Subject: [edk2-devel] [PATCH v1 2/4] ShellPkg: acpiview: Make DBG2 output consistent with other tables Date: Fri, 28 Jun 2019 11:24:36 +0100 Message-ID: <20190628102438.30544-3-krzysztof.koch@arm.com> In-Reply-To: <20190628102438.30544-1-krzysztof.koch@arm.com> References: <20190628102438.30544-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: 27ecc6fc-1ad3-4abe-8aa9-08d6fbb2da79 X-MS-TrafficTypeDiagnostic: AM6PR08MB3959: X-MS-Exchange-PUrlCount: 1 NoDisclaimer: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:161; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: 5GS051YM3JskwsC61Dry26yx83WfZ/6YBzuysfVCUPubkoZVbmOD4V84FGyUK6fuRTiExISQdfqLEuHRQKe2ECzpULr92H/Zdy6lZF1PFKtnYuFaWkYMeaYlbflUlsmOwJCcFzV2avGd249OEwY9WQhF/aKvgGUP7Dgu8boRy+UjEv7uTcafWnssv/ORqnk+q4XpMVGpMZMmYYnwuwAyTCTLKxHohGKbjeLQLCA0Fv7iFnvGL0KhxYNoSEy6Ck4CFarecbs1iKyjQKI6qzR0hwW3dc12AFLoONgzbz9ByY3kWYPssVndamH3nzNTtS+XDNvKCPxOoL8xk/p6qRRCMdMjnu3CCqSdj+3rAbr2k4uzbkQ6nyewyZBSpjym7TITXm+sbAZrodn5VPTOx7lsntlrzZr3n+dlxnlZ+PYEPuE= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2019 10:24:50.6411 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 27ecc6fc-1ad3-4abe-8aa9-08d6fbb2da79 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: AM6PR08MB3959 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=1561717497; bh=czmp3c7tlSvrynpv+oR83UriFPBEzLd0LaCZdapqMn4=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=EtQr//6JDpv2NSOmwL75J0Wg9DlgDXF1UOR+I4CMor6dRGTfoY93ZobncvpSwGuYMCB WkO2VMxSXfZdudzEMrMnneBP9vek8dRhF3lbplecZ1dJHv6Bi9qyVKe3NXkOedxL5953g Q+vEvpYNetKkxrRaGQ/HRhlTNcAwJRylNL0= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Print an extra newline character at the end DBG2 table parsing in order to make the output resemble the one for other ACPI table parsers. With this change, there is now a blank line between the DBG2 table dump and the 'Table Statistics' section. Signed-off-by: Krzysztof Koch Reviewed-by: Alexei Fedorov Reviewed-by: Alexei Fedorov Reviewed-by: Sami Mujawar --- Changes can be seen at: https://github.com/KrzysztofKoch1/edk2/commit/397c3= 7eb5a73ee0f3bbd363075f97b19c0edaf2e Notes: v1: - Print one more newline character after DBG2 table dump [Krzysztof] ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dbg2/Dbg2Parser.c | 3= ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dbg2/Dbg2= Parser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dbg2/Dbg2Pa= rser.c index 310d3f18ec24532289c8f6a58cbd117fed0ca071..8de5ebf74775bab8e765849cba6= ef4eb6f659a5a 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dbg2/Dbg2Parser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dbg2/Dbg2Parser.c @@ -1,7 +1,7 @@ /** @file DBG2 table parser =20 - Copyright (c) 2016 - 2018, ARM Limited. All rights reserved. + Copyright (c) 2016 - 2019, ARM Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent =20 @par Reference(s): @@ -190,6 +190,7 @@ DumpDbgDeviceInfo ( Print (L"\n%-*s ", OUTPUT_FIELD_COLUMN_WIDTH, L""); } } + Print (L"\n"); =20 *Length =3D *DbgDevInfoLen; } -- '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 (#43005): https://edk2.groups.io/g/devel/message/43005 Mute This Topic: https://groups.io/mt/32240396/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 Thu May 2 03:26:19 2024 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+43006+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1561717543; cv=none; d=zoho.com; s=zohoarc; b=V0fx8kFoWEmubUffh28G3JuZsF551o0hzV0vZIOn8qGb/KHGv9juXJoAoClvxWig5yWWW7BvZ0Af6M29eIngBYMZcpM825cnF5qTcPe1v3yUCFOq9W4vZFsfi5AwBOTmH+cxLUscpNxHiBAyn1ihC8RBYRlQioOogPJZU2gavS0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561717543; h=Content-Type:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=iZXEJprY8T03k8Mkk9F0Pib40vvoEGGknhVTgzIHWps=; b=aQRcKiDCd03NQkL2h8TjgcTBFiHR59BhSDr4SZ12IhrtqJLIIki3cBObs0I3dMAUHfi1cQU1Nsu/F/g5hlPifyaITr4Q74QAvcqKpHX8UBl15xQEnq+4HpI8nruXG+O+NUvInOnlaL2FPsSMP4PYTEHRm9YfeWXSi+V18dzD0LA= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+43006+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1561717543705881.3412396123996; Fri, 28 Jun 2019 03:25:43 -0700 (PDT) Return-Path: X-Received: from EUR03-AM5-obe.outbound.protection.outlook.com (EUR03-AM5-obe.outbound.protection.outlook.com [40.107.3.68]) by groups.io with SMTP; Fri, 28 Jun 2019 03:25:42 -0700 X-Received: from AM6PR08CA0046.eurprd08.prod.outlook.com (2603:10a6:20b:c0::34) by DB8PR08MB5035.eurprd08.prod.outlook.com (2603:10a6:10:eb::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2032.18; Fri, 28 Jun 2019 10:25:39 +0000 X-Received: from AM5EUR03FT034.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e08::204) by AM6PR08CA0046.outlook.office365.com (2603:10a6:20b:c0::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2032.18 via Frontend Transport; Fri, 28 Jun 2019 10:25:39 +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+43006+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 AM5EUR03FT034.mail.protection.outlook.com (10.152.16.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2032.15 via Frontend Transport; Fri, 28 Jun 2019 10:25:38 +0000 X-Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1415.2; Fri, 28 Jun 2019 10:24:47 +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; Fri, 28 Jun 2019 10:24:47 +0000 From: "Krzysztof Koch" To: CC: , , , , , Subject: [edk2-devel] [PATCH v1 3/4] ShellPkg: acpiview: Remove redundant IORT node types enum Date: Fri, 28 Jun 2019 11:24:37 +0100 Message-ID: <20190628102438.30544-4-krzysztof.koch@arm.com> In-Reply-To: <20190628102438.30544-1-krzysztof.koch@arm.com> References: <20190628102438.30544-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: 2ad07ac6-3bee-4f7b-a57e-08d6fbb2f6e8 X-MS-TrafficTypeDiagnostic: DB8PR08MB5035: X-MS-Exchange-PUrlCount: 1 X-Microsoft-Antispam-PRVS: NoDisclaimer: True X-MS-Oob-TLC-OOBClassifiers: OLM:2733; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: Cv9kaXTDaifhnXszdMfZx2oEKYBBik0+D4R1by8LnE2yPDMV7mKawGBar9rxwgVUAOP9TlJOhquQoEt8SNpe07LowqTlxdRJ3qJszs13/gAl/077KzefUuSpYscbwEcwh/7GKsgROXvOereqjcButf+mPTgwBEl9flu0WZrIVBQJDBMzuuplPxsnzQhsR1nOj+lPOXGoOSxOVTHGX0qdPHArcGFO5mJoBWq8YCZzE+3IyOuWwC6MCMQCZIQhZIvhYQoLkWUeyUHigKPlHyIZ1PNB7XA/fcUzRdXykoDC/4bBPiJNStrYEPeXBJyv7QwDvQitp6NVEwOvm8dJC0ST38EFYC53A7FWHWz7wX126zxV1MN/7uhlvFZHSUonnjv+tzuQUXZwVadRR+dubHdkty1fpqtP8kx7OX2njWvCXZU= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2019 10:25:38.3405 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2ad07ac6-3bee-4f7b-a57e-08d6fbb2f6e8 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: DB8PR08MB5035 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=1561717543; bh=0awDt3KoBD6YreQYo0RiBt0FHQk1cBUP/ESdZzV+fFg=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=mL1l1yVKJz/0tjT7M5YNV6v+XGMeG2rFLS7Xc10p/t9tG3TZ6ki3bXab23nZVnYPIc5 Xqs8eDSXS2i085OiPE1K55DXERbJ+r3WLKuEJuMoViCB4I8Db/EXlXCRheBp4zp878I5D ONGARWqHm/qFY+NdGbxKVm37FRMx8S+V80I= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace the enum defining valid node types in the IORT table with macros from IoRemappingTable.h. Signed-off-by: Krzysztof Koch Reviewed-by: Alexei Fedorov Reviewed-by: Alexei Fedorov Reviewed-by: Sami Mujawar --- Changes can be seen at: https://github.com/KrzysztofKoch1/edk2/commit/79650= cd6f2552e849afcd89aa016f35774376408 Notes: v1: - Remove redundant enum defining allowed IORT node types [Krzysztof] - Use macros from IoRemappingTable.h instead [Krzysztof] ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c | 3= 0 ++++++-------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/Iort= Parser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortPa= rser.c index e3d9bc9a996001f77ed8b13a1c57505496807f4c..a91a4f9db13a52285bf56abe33f= 359a771fc04bd 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c @@ -1,7 +1,7 @@ /** @file IORT table parser =20 - Copyright (c) 2016 - 2018, ARM Limited. All rights reserved. + Copyright (c) 2016 - 2019, ARM Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent =20 @par Reference(s): @@ -17,24 +17,10 @@ // Local variables STATIC ACPI_DESCRIPTION_HEADER_INFO AcpiHdrInfo; =20 -/** - The EIORT_NODE enum describes the IORT Node types. -**/ -typedef enum IortNode { - Iort_Node_ITS_Group, ///< ITS Group node - Iort_Node_Named_Component, ///< Named Component node - Iort_Node_Root_Complex, ///< Root Complex node - Iort_Node_SMMUV1_V2, ///< SMMU v1/v2 node - Iort_Node_SMMUV3, ///< SMMU v3 node - Iort_Node_PMCG, ///< PMC group node - Iort_Node_Max -} EIORT_NODE; - -// Local Variables STATIC CONST UINT32* IortNodeCount; STATIC CONST UINT32* IortNodeOffset; =20 -STATIC CONST UINT8* IortNodeType; +STATIC CONST UINT8* IortNodeType; STATIC CONST UINT16* IortNodeLength; STATIC CONST UINT32* IortIdMappingCount; STATIC CONST UINT32* IortIdMappingOffset; @@ -659,13 +645,13 @@ ParseAcpiIort ( Print (L"0x%x\n", Offset); =20 switch (*IortNodeType) { - case Iort_Node_ITS_Group: + case EFI_ACPI_IORT_TYPE_ITS_GROUP: DumpIortNodeIts ( NodePtr, *IortNodeLength ); break; - case Iort_Node_Named_Component: + case EFI_ACPI_IORT_TYPE_NAMED_COMP: DumpIortNodeNamedComponent ( NodePtr, *IortNodeLength, @@ -673,7 +659,7 @@ ParseAcpiIort ( *IortIdMappingOffset ); break; - case Iort_Node_Root_Complex: + case EFI_ACPI_IORT_TYPE_ROOT_COMPLEX: DumpIortNodeRootComplex ( NodePtr, *IortNodeLength, @@ -681,7 +667,7 @@ ParseAcpiIort ( *IortIdMappingOffset ); break; - case Iort_Node_SMMUV1_V2: + case EFI_ACPI_IORT_TYPE_SMMUv1v2: DumpIortNodeSmmuV1V2 ( NodePtr, *IortNodeLength, @@ -689,7 +675,7 @@ ParseAcpiIort ( *IortIdMappingOffset ); break; - case Iort_Node_SMMUV3: + case EFI_ACPI_IORT_TYPE_SMMUv3: DumpIortNodeSmmuV3 ( NodePtr, *IortNodeLength, @@ -697,7 +683,7 @@ ParseAcpiIort ( *IortIdMappingOffset ); break; - case Iort_Node_PMCG: + case EFI_ACPI_IORT_TYPE_PMCG: DumpIortNodePmcg ( NodePtr, *IortNodeLength, -- '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 (#43006): https://edk2.groups.io/g/devel/message/43006 Mute This Topic: https://groups.io/mt/32240402/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 Thu May 2 03:26:19 2024 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+43007+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1561717547; cv=none; d=zoho.com; s=zohoarc; b=HIwtDFpbah/O9y6PbGPMNsFWWkcH/20yRi11uJtIwAAROwlVTBVDgyBVbpgkVjd6a5lD+UHRF0gxArmSeA6ZxG/SX59tAoehlKp0mlf04pUesg4VMVSosY+b/TVmz5FALDwDlCMusXd9qzVbGdch4oqYil6at6RqRPP892TK5hE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561717547; h=Content-Type:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=HiRb2WltqmLsTNvWnOA9VRtJYHKKsgxDo71uaMiddDA=; b=c2j3qmPi3GlVAal3XRG2ii7vMzM2M4vRQqzUdxQDLzN5fU9f+IR6NqAigiKwEcH+0zX42OTTKm4++6PYtGcz6mQTLyHINAFf6lokczY50G5UcSpmI/pYQLVVZ0B0KgGOwj8kP8mbODcB4NyLkoBhv1QNqlJX8rpGBknSXsqihnM= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+43007+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1561717547531841.0757357188227; Fri, 28 Jun 2019 03:25:47 -0700 (PDT) Return-Path: X-Received: from EUR03-DB5-obe.outbound.protection.outlook.com (EUR03-DB5-obe.outbound.protection.outlook.com [40.107.4.44]) by groups.io with SMTP; Fri, 28 Jun 2019 03:25:46 -0700 X-Received: from VI1PR0802CA0041.eurprd08.prod.outlook.com (2603:10a6:800:a9::27) by AM6PR08MB4311.eurprd08.prod.outlook.com (2603:10a6:20b:b8::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2032.18; Fri, 28 Jun 2019 10:25:42 +0000 X-Received: from AM5EUR03FT009.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e08::207) by VI1PR0802CA0041.outlook.office365.com (2603:10a6:800:a9::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2032.17 via Frontend Transport; Fri, 28 Jun 2019 10:25:41 +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+43007+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 AM5EUR03FT009.mail.protection.outlook.com (10.152.16.110) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2032.15 via Frontend Transport; Fri, 28 Jun 2019 10:25:40 +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; Fri, 28 Jun 2019 10:24:48 +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; Fri, 28 Jun 2019 10:24:47 +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; Fri, 28 Jun 2019 10:24:47 +0000 From: "Krzysztof Koch" To: CC: , , , , , Subject: [edk2-devel] [PATCH v1 4/4] ShellPkg: acpiview: Remove duplicate indentation in IORT parser Date: Fri, 28 Jun 2019 11:24:38 +0100 Message-ID: <20190628102438.30544-5-krzysztof.koch@arm.com> In-Reply-To: <20190628102438.30544-1-krzysztof.koch@arm.com> References: <20190628102438.30544-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: 604de79f-80d7-4df7-feb7-08d6fbb2f83a X-MS-TrafficTypeDiagnostic: AM6PR08MB4311: X-MS-Exchange-PUrlCount: 1 NoDisclaimer: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:962; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: mUTQwUj/IhwuLtVsAnzmValfMLASAAICkQaUDlKcATAkqz/cMvEZcgfOxixllorS36BdwkGahwcvWViGFr9s+OlN/aA8lFs/y3bcU/UMJLkwxa2+ZCS2PZ1eVdab6ECTzM9FtgqzIhMpGRMPq1xleTrf1naOnNotq+U9ulZ7Vr7GN4QoUBH/Wd6727jk4RHWEdUrpbM0QO/m8302pROmuP/ArvKxLlO01daJVKldvaqMXg/hGAGD6R7ef2Oz0hQiSNYxRb8NIwcGtOOsCX684fb/fYdpuxga2u3skIUYFRj3LdRG5VV+gLV4C0PWi8zg+E0+bB4q10LhO+gpqNi7/lArVT7T/qFQGN8e9UkCOPeSHO1SldjLYJEgyoA2Tys0P523GTiDDZT2PMEY7I7qgjeDNEFZiI7REvi9otJVWcE= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2019 10:25:40.5579 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 604de79f-80d7-4df7-feb7-08d6fbb2f83a 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: AM6PR08MB4311 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=1561717546; bh=xgF9Oq+8tqP93cHmuMHk6EAE3OXesm3s2XHXRz3wZak=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=AK8wDv3jXEyixwbElHtquZQvHIfOaNfgi6JBJXQfDphYS8tFoSfWyaXA6Kt+6z8W317 K4YxoU0WwtmuSvhRLSt67envaFI0ipkJD3TE3GTj4Frhs7yaDEwU0pGvwtczNFkU2SZcs zYfn3+Q1IsPXpA4mcBsBd+q/i+gNmm/fce0= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove redundant whitespace characters at the beginning of the strings describing IORT table field names. When dumping ACPI table contents, the indentation level for printing field names is controled using the 'Indent' argument to the 'ParseAcpi' function. In the IORT acpiview parser, both 'Indent' and extra whitespace characters are used for indentation, which results in excess indentation. Signed-off-by: Krzysztof Koch Reviewed-by: Alexei Fedorov Reviewed-by: Alexei Fedorov Reviewed-by: Sami Mujawar --- Changes can be seen at: https://github.com/KrzysztofKoch1/edk2/commit/b44e0= 07195f32246f33000934a6178d36f79e4b1 Notes: v1: - fix indentation issues in the IORT table parser [Krzysztof] ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c | 1= 8 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/Iort= Parser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortPa= rser.c index a91a4f9db13a52285bf56abe33f359a771fc04bd..93f78e1a9786ed53f6b5529f478= b72a220b4f8df 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c @@ -131,19 +131,19 @@ STATIC CONST ACPI_PARSER IortNodeSmmuV1V2Parser[] =3D= { An ACPI_PARSER array describing the SMMUv1/2 Node Interrupt Array. **/ STATIC CONST ACPI_PARSER InterruptArrayParser[] =3D { - {L" Interrupt GSIV", 4, 0, L"0x%x", NULL, NULL, NULL, NULL}, - {L" Flags", 4, 4, L"0x%x", NULL, NULL, NULL, NULL} + {L"Interrupt GSIV", 4, 0, L"0x%x", NULL, NULL, NULL, NULL}, + {L"Flags", 4, 4, L"0x%x", NULL, NULL, NULL, NULL} }; =20 /** An ACPI_PARSER array describing the IORT ID Mapping. **/ STATIC CONST ACPI_PARSER IortNodeIdMappingParser[] =3D { - {L" Input base", 4, 0, L"0x%x", NULL, NULL, NULL, NULL}, - {L" Number of IDs", 4, 4, L"0x%x", NULL, NULL, NULL, NULL}, - {L" Output base", 4, 8, L"0x%x", NULL, NULL, NULL, NULL}, - {L" Output reference", 4, 12, L"0x%x", NULL, NULL, NULL, NULL}, - {L" Flags", 4, 16, L"0x%x", NULL, NULL, NULL, NULL} + {L"Input base", 4, 0, L"0x%x", NULL, NULL, NULL, NULL}, + {L"Number of IDs", 4, 4, L"0x%x", NULL, NULL, NULL, NULL}, + {L"Output base", 4, 8, L"0x%x", NULL, NULL, NULL, NULL}, + {L"Output reference", 4, 12, L"0x%x", NULL, NULL, NULL, NULL}, + {L"Flags", 4, 16, L"0x%x", NULL, NULL, NULL, NULL} }; =20 /** @@ -170,14 +170,14 @@ STATIC CONST ACPI_PARSER IortNodeItsParser[] =3D { ValidateItsIdMappingCount, ValidateItsIdArrayReference ), - {L" Number of ITSs", 4, 16, L"%d", NULL, (VOID**)&ItsCount, NULL} + {L"Number of ITSs", 4, 16, L"%d", NULL, (VOID**)&ItsCount, NULL} }; =20 /** An ACPI_PARSER array describing the ITS ID. **/ STATIC CONST ACPI_PARSER ItsIdParser[] =3D { - { L" GIC ITS Identifier", 4, 0, L"%d", NULL, NULL, NULL } + { L"GIC ITS Identifier", 4, 0, L"%d", NULL, NULL, NULL } }; =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 (#43007): https://edk2.groups.io/g/devel/message/43007 Mute This Topic: https://groups.io/mt/32240403/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-