From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (NAM12-DM6-obe.outbound.protection.outlook.com [40.107.243.58]) by mx.groups.io with SMTP id smtpd.web10.106612.1671031814799823122 for ; Wed, 14 Dec 2022 07:30:14 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@nvidia.com header.s=selector2 header.b=k8uet3Kz; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: nvidia.com, ip: 40.107.243.58, mailfrom: jeshuas@nvidia.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IKMh5lQVNfSpA314r+sbUa41JDoClocBhM5m9e/7fhBoHPAyYfcBvaMwAQtKjYNH7/PfEwZNNHD1EevwG7RV7xp4fQP2K4cL2otaPLno7UaoVJHAVkr5fLvcML/VpzkaCWQEErfQksgKLYJfbJcFbnjZec5hMJgLp3Df7k/LlkUVc9Ad2Ogso8iQN4zv65VVxKT8kZ2YsdgMBS9CN/GfZ39t4p5W/KeGlTYX+5LE0icmtrWAE0KMZoIJdvasOJN6j7/eTmOv5GeBfLIPjtTC678GSlesVtpTQnrAQ9o0MQJt01zRjwJjUG2Uj0YmshlxiZ/UFuv3OE1KUVpECNc1Mw== 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=eXAhHcmZph+c5VhaDFkrjkJpnfOm7AMvjgKuJN1yYGQ=; b=c8Yyur1AmfWA+XHsyGm5EVTDCR9OV3nNa9bgVI1ucHu85r9DwN0DyiQItr+/s6QU9vlVaNQJHvbAaSGcHPc0i6u7fiBo66B0UyQ2LzhmTmqztauHAKwoU6N/U6125i3onr/ng+pc5SgvTDdXzK6Bgkw1NSmTXU9sYBdlPB9IfY0Ik5Ldxr7DZsPJjmyDEr+ZL0WkNysnU4xDczRrdNdLl7z1Gl7B+kOSxX4Znw8e51dyqIi7Ta1UFFusVkS8Mebh5bF40HiDJdO67WBLPLbo6by69LCc27Gw/z9CWJWo5Gqc2FYguzyEz2pITLBkyPkLLh2xSgFmGc7tid1qQk4pcA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eXAhHcmZph+c5VhaDFkrjkJpnfOm7AMvjgKuJN1yYGQ=; b=k8uet3KzemCkusDgbixK+DyPothxatGzfcyCdFVGrQmu67fCD+GPVcXLTeE70IxHSejcgDdbPwAg45KwnHn9PwD1bchKR+SlmPzSQ77I1vro0TVg5YB4F2Sq/RBJ1jnViPJtnYF7UtlJKOadwztFFXqfFWFchL/aJUpF/RM37C+nf9wZtf9p5CQuQ5Ig+eVFehHoBuoaVYHy0IjigdBqxmLokaWlw9DbqvDyt08w+uT5hOevODHJMkhmc5ZpZQgg0AMZB8NgIJVCMMeI/Z7Al24NmkGu+NOY3tIzkCIiNTO4VKAIeGZ4AlogMQe+FJA2YkK6ud/8tl0TGq6PaaTCig== Received: from DM6PR12MB3371.namprd12.prod.outlook.com (2603:10b6:5:116::27) by CY8PR12MB8215.namprd12.prod.outlook.com (2603:10b6:930:77::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.11; Wed, 14 Dec 2022 15:30:12 +0000 Received: from DM6PR12MB3371.namprd12.prod.outlook.com ([fe80::d52b:f6aa:20c9:6cbf]) by DM6PR12MB3371.namprd12.prod.outlook.com ([fe80::d52b:f6aa:20c9:6cbf%7]) with mapi id 15.20.5880.019; Wed, 14 Dec 2022 15:30:12 +0000 From: "Jeshua Smith" To: "devel@edk2.groups.io" , Jeshua Smith CC: "ray.ni@intel.com" , "zhichao.gao@intel.com" Subject: Re: [edk2-devel] [PATCH] ShellPkg/AcpiView: ERST Parser Thread-Topic: [edk2-devel] [PATCH] ShellPkg/AcpiView: ERST Parser Thread-Index: AQHZBOpXB9a9spZ9q0OLc05Xoh3we65tl+4A Date: Wed, 14 Dec 2022 15:30:12 +0000 Message-ID: References: <172C707E2AD4FEF1.1705@groups.io> In-Reply-To: <172C707E2AD4FEF1.1705@groups.io> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DM6PR12MB3371:EE_|CY8PR12MB8215:EE_ x-ms-office365-filtering-correlation-id: c7435d3d-baef-4f2d-9d93-08dadde817d0 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: PDjSwDd9xF2lhdX5jtcdT3rksNo3jM0z9g7M4CIX2V2Q6Po8HVsKeC6oCa/dOQKDP9YpxfRdYeDnV871IIeuav1gRPK8G0dAVYS1ebyF4+kVAGJsBpiF5FcQfcKEm3xyxaVYhGqPF8/G187wyUazcVP7NLB5hnx3gjJCnwKb8yhTuNTHVsq9ZIJNqZ06WjEc9ZkdyubFxFy3dy3R821unYUrVt+e0DsLGNaovJ+72xFZyLooxahMgsUsP+FioyYfHcoohvrl+kRHdkBRNdeBeQl1GYO7RZTlmbFwy0IA9Gj1AWraCVGFqdpwo5fs6bJVgh7FzBA8DxcOwrVizodnwX1MVZERAo5eIaOZD02ytjVO0Slq0wIz/Q9evsdw7YHZfy4Wk1HQdYuwdXjDumGe0krSntzlfsPrQuhy/xpH5c4eL/4ry/QrQI4dlNfVYT5fwcIDSZ/MvOnWyncDrAzMUepoJdiyAS+tDxfpdm4DyUOIEFRPoX7hvEDwEI65TrJn9WV1CKfLOlx62AkPi8BRAU1/4gWE/W/a14ndeYJ5K5bFApvOBmeR5ExQnUTh2I1bvn07RDq80k1XxFhXCLUQZtNIr8qrm2FgyDcGEOu6Y/5HvuNUh+5e24crbOvwc5S+mp3wQDOL3kJkSjNCenTwa/nJ+TaOBGN41nLs20jvuechGq2Brx4BcQJsXYiq6UxZ8wkSQGpifYpL/UWDNu8vCUEZEAh0hGBUxD5yKyyOIDY= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR12MB3371.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(39860400002)(346002)(136003)(366004)(396003)(376002)(451199015)(86362001)(83380400001)(38070700005)(55016003)(52536014)(38100700002)(122000001)(2906002)(8936002)(30864003)(5660300002)(26005)(41300700001)(9686003)(966005)(6506007)(71200400001)(66946007)(53546011)(76116006)(478600001)(66446008)(66476007)(8676002)(4326008)(66556008)(64756008)(7696005)(186003)(316002)(19627235002)(110136005)(54906003)(66899015)(33656002);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?V2HSJESPToDMnJg0bkzCEcUbFChc5ehCB5KCN3471/0widf7w10fn5yxMgQ+?= =?us-ascii?Q?FBD9l6vBoj3OneI2mloFq9cXMw6I7AuWVqNAvs/37dbVqpds6S8tC9z9oLhZ?= =?us-ascii?Q?G00NDB/44qIiMkIPke7258oTqFB1i7t/SidLnaCmGsKDL6d7yyOjxltaxPa5?= =?us-ascii?Q?A0vQEEqQiZdCATyBPpWOl1o8xrxwEQnhO+uDFpFOnQUonqYnNqQcbxXKvaSD?= =?us-ascii?Q?HboXUgqeSWNDIZNTOwuEmnteCXB7xy614oYNsH+98fuS6RY8Xzu5+DSg1jHC?= =?us-ascii?Q?59F5XTjqB8ufKWLEcMu0FllY/0K4A8+zOHG0yx1WlSssUbiiHJgIvFosYW+Z?= =?us-ascii?Q?GisWG8deY5b6mTcLCCpCBrw+lrddpNhmFGadBdVrcEtWuZMH8idn48NapVVW?= =?us-ascii?Q?dI0lchvRzX+cijvEHeLMPNbebeiO8hXKlGwqhT9liLVBXTFAIgQ7Z2STJ922?= =?us-ascii?Q?FcfqE4PSkmQLEfBOGwxSvqYUlRkuZmXQnYS60mpe8CSGTcW6ATYZnaNsDF+3?= =?us-ascii?Q?abNqX4qEqDObcgLrMqceRlWXQ2w0kyZfvZkuovs4eXeD19MIMJXJVcTJww+E?= =?us-ascii?Q?Olo8IZj7IPcqwtfpGtbtlWmKt59+h07Q5lEjcQLRoDWcNOr+8mxunDS+Zs4N?= =?us-ascii?Q?QILa58uVyQC1jL359Ks/Z7fgv/E+n0yFiGjr2jKWVH/xnsT5Xl5BROC+RWAD?= =?us-ascii?Q?S2g+PVDhrTZNmJIyvY42xMbuzrMqNQRRekfVeXdQozlhLg/tCyVS98ZTiKz5?= =?us-ascii?Q?7d3OV0P+WAfZkCbCmIhUZ/2g+W4OHtM9RI5nAV/FaS6MP9TsdN04FuJTk/UC?= =?us-ascii?Q?LQcIb20xaQRJnIlyXrmt9ifceI0Sj60cAqh/p6BPSSX68cEWY2t3d5OdsyeS?= =?us-ascii?Q?jVtBjHgFtV+zPqBfd4bVe/QFDMfNaSlGKKL54CYUQKXgwbx/dYaLCSbCWDb8?= =?us-ascii?Q?3GpwUKwLiZtEZ/gCJSafa2+6XRHdN7zT6pNeKcYXYu557JkXkmkH2bOk0bSx?= =?us-ascii?Q?lWXq/+oFu6fbr0AvYgtmfIeT6MyCPPazzPfv0nfnNZiZxd3mneN5J2oImPAH?= =?us-ascii?Q?cnmxSxJC1cXlD1ZMj9QEssDV8q31fA/uB/wAW/gOZA455uHEnhNncuQMKEmB?= =?us-ascii?Q?msUeEJs8TQdbue1Bmmyuni4bIXOoKicRSHGhAIe1X4VyHdu0jzc6oOo2DdB0?= =?us-ascii?Q?lKivi2sNxN4WlIxPzZiVa13lfO1C1q0LwOPRvcRCYPJNufHG+oBtNQ4E4Sf9?= =?us-ascii?Q?SC6ZIEk+12Nkh7y4z3sAJpSpH4E+0w/8ut/ZGlVyPN5V9T7piejVKPhWGO9v?= =?us-ascii?Q?ODMwFubsbTrJa0ZRqrSVuiSJyQMgSyYL0o1jJLHwo2V+B7XBV3lMPwhJfl7d?= =?us-ascii?Q?zpVeo+YDah4CuXZ7Yt2DNqLkHp15tVD24V+ymBQrbuHIFPxfs1+fYUs5CcgR?= =?us-ascii?Q?4sS0IrJbw9kTnOdEXB6I4TxzOAlxIc3Y/IFwm2U5aG3vzzLdZ2qUmTI6EdR1?= =?us-ascii?Q?2UCWwS1yjtr4YQDBzXDOjllWHYDlnU5tVawhP9k/FY+IMwegdgjSCJSdz003?= =?us-ascii?Q?wed4+H9BTKSCxw/a+NyCKgE5TGEZ5/sGJXSmj8Mc?= MIME-Version: 1.0 X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR12MB3371.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c7435d3d-baef-4f2d-9d93-08dadde817d0 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Dec 2022 15:30:12.7576 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: ae4w05GF1+2WRv9Qo5S3XAf/tzgNQ3Upf21NNMQ8m0ocx6ySdJ8IXYHg97xBuhfuafLIZ0v8gjC/QORnghbYvA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB8215 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Is there anything holding this up from getting reviewed? -----Original Message----- From: devel@edk2.groups.io On Behalf Of Jeshua Smith= via groups.io Sent: Wednesday, November 30, 2022 11:31 AM To: devel@edk2.groups.io Cc: ray.ni@intel.com; zhichao.gao@intel.com; Jeshua Smith Subject: [edk2-devel] [PATCH] ShellPkg/AcpiView: ERST Parser External email: Use caution opening links or attachments Add a new parser for the Error Record Serialization Table. The ERST table describes how an OS can save and retrieve hardware error information to and from a persistent store. Signed-off-by: Jeshua Smith --- .../UefiShellAcpiViewCommandLib/AcpiParser.h | 22 ++ .../Parsers/Erst/ErstParser.c | 278 ++++++++++++++++++ .../UefiShellAcpiViewCommandLib.c | 2 + .../UefiShellAcpiViewCommandLib.inf | 2 + 4 files changed, 304 insertions(+) create mode 100644 ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Er= st/ErstParser.c diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.h b/Sh= ellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.h index db8c88f6df..66c992c55c 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.h +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.h @@ -1,6 +1,7 @@ /** @file Header file for ACPI parser + Copyright (c) 2022, NVIDIA CORPORATION. All rights reserved. Copyright (c) 2016 - 2020, Arm Limited. All rights reserved. Copyright (c) 2022, AMD Incorporated. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent @@ -594,6 +595,27 @@ ParseAcpiDsdt ( IN UINT8 AcpiTableRevision ); +/** + This function parses the ACPI ERST table. + When trace is enabled this function parses the ERST table and + traces the ACPI table fields. + + This function also performs validation of the ACPI table fields. + + @param [in] Trace If TRUE, trace the ACPI fields. + @param [in] Ptr Pointer to the start of the buffer. + @param [in] AcpiTableLength Length of the ACPI table. + @param [in] AcpiTableRevision Revision of the ACPI table. +**/ +VOID +EFIAPI +ParseAcpiErst ( + IN BOOLEAN Trace, + IN UINT8 *Ptr, + IN UINT32 AcpiTableLength, + IN UINT8 AcpiTableRevision + ); + /** This function parses the ACPI FACS table. When trace is enabled this function parses the FACS table and diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Erst/Erst= Parser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Erst/ErstPa= rser.c new file mode 100644 index 0000000000..e2af0c44b4 --- /dev/null +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Erst/ErstParser.= c @@ -0,0 +1,278 @@ +/** @file + ERST table parser + + Copyright (c) 2022, NVIDIA CORPORATION. All rights reserved. + Copyright (c) 2016 - 2018, ARM Limited. All rights reserved. + SPDX-License-Identifier: BSD-2-Clause-Patent + + @par Reference(s): + - ACPI 6.5 Specification - August 2022 +**/ + +#include +#include +#include "AcpiParser.h" +#include "AcpiTableParser.h" + +// Local variables +STATIC ACPI_DESCRIPTION_HEADER_INFO AcpiHdrInfo; +STATIC UINT32 *InstructionEntryCount; + +/** + An array of strings describing the Erst actions +**/ +STATIC CONST CHAR16 *ErstActionTable[] =3D { + L"BEGIN_WRITE_OPERATION", + L"BEGIN_READ_OPERATION", + L"BEGIN_CLEAR_OPERATION", + L"END_OPERATION", + L"SET_RECORD_OFFSET", + L"EXECUTE_OPERATION", + L"CHECK_BUSY_STATUS", + L"GET_COMMAND_STATUS", + L"GET_RECORD_IDENTIFIER", + L"SET_RECORD_IDENTIFIER", + L"GET_RECORD_COUNT", + L"BEGIN_DUMMY_WRITE_OPERATION", + L"RESERVED", + L"GET_ERROR_LOG_ADDRESS_RANGE", + L"GET_ERROR_LOG_ADDRESS_RANGE_LENGTH", + L"GET_ERROR_LOG_ADDRESS_RANGE_ATTRIBUTES", + L"GET_EXECUTE_OPERATION_TIMINGS" +}; + +/** + An array of strings describing the Erst instructions +**/ +STATIC CONST CHAR16 *ErstInstructionTable[] =3D { + L"READ_REGISTER", + L"READ_REGISTER_VALUE", + L"WRITE_REGISTER", + L"WRITE_REGISTER_VALUE", + L"NOOP", + L"LOAD_VAR1", + L"LOAD_VAR2", + L"STORE_VAR1", + L"ADD", + L"SUBTRACT", + L"ADD_VALUE", + L"SUBTRACT_VALUE", + L"STALL", + L"STALL_WHILE_TRUE", + L"SKIP_NEXT_INSTRUCTION_IF_TRUE", + L"GOTO", + L"SET_SRC_ADDRESS_BASE", + L"SET_DST_ADDRESS_BASE", + L"MOVE_DATA" +}; + +/** + Validate Erst action. + + @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 +ValidateErstAction ( + IN UINT8 *Ptr, + IN VOID *Context + ) +{ + if (*Ptr > EFI_ACPI_6_4_ERST_GET_EXECUTE_OPERATION_TIMINGS) { + IncrementErrorCount (); + Print (L"\nError: 0x%02x is not a valid action encoding", *Ptr); + } +} + +/** + Validate Erst instruction. + + @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 +ValidateErstInstruction ( + IN UINT8 *Ptr, + IN VOID *Context + ) +{ + if (*Ptr > EFI_ACPI_6_4_ERST_MOVE_DATA) { + IncrementErrorCount (); + Print (L"\nError: 0x%02x is not a valid instruction encoding", *Ptr); + } +} + +/** + Validate Erst flags. + + @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 +ValidateErstFlags ( + IN UINT8 *Ptr, + IN VOID *Context + ) +{ + if ((*Ptr & 0xfe) !=3D 0) { + IncrementErrorCount (); + Print (L"\nError: Reserved Flag bits not set to 0"); + } +} + +/** + Looks up and prints the string corresponding to the index + + @param [in] Table Lookup table + @param [in] Index Entry to print + @param [in] NumEntries Number of valid entries in the table +**/ +STATIC +VOID +EFIAPI +FormatByte ( + IN CONST CHAR16 *Table[], + IN UINT8 Index, + IN UINT8 NumEntries + ) +{ + CONST CHAR16 *String; + + if (Index < NumEntries) { + String =3D Table[Index]; + } else { + String =3D L"**INVALID**"; + } + + Print ( + L"0x%02x (%s)", + Index, + String + ); +} + +/** + Prints the Erst Action + + @param [in] Format Optional format string for tracing the data. + @param [in] Ptr Pointer to the Action byte +**/ +STATIC +VOID +EFIAPI +DumpErstAction ( + IN CONST CHAR16 *Format OPTIONAL, + IN UINT8 *Ptr + ) +{ + FormatByte (ErstActionTable, *Ptr, ARRAY_SIZE (ErstActionTable)); +} + +/** + Prints the Erst Instruction + + @param [in] Format Optional format string for tracing the data. + @param [in] Ptr Pointer to the Instruction byte +**/ +STATIC +VOID +EFIAPI +DumpErstInstruction ( + IN CONST CHAR16 *Format OPTIONAL, + IN UINT8 *Ptr + ) +{ + FormatByte (ErstInstructionTable, *Ptr, ARRAY_SIZE (ErstInstructionTable= )); +} + +/** + An ACPI_PARSER array describing the ACPI ERST Table. +**/ +STATIC CONST ACPI_PARSER ErstParser[] =3D { + PARSE_ACPI_HEADER (&AcpiHdrInfo), + { L"Serialization Header Size", 4, 36, L"0x%x", NULL, NULL, = NULL, NULL }, + { L"Reserved", 4, 40, L"0x%x", NULL, NULL, = NULL, NULL }, + { L"Instruction Entry Count", 4, 44, L"0x%x", NULL, (VOID **)&Instru= ctionEntryCount, NULL, NULL } +}; + +/** + An ACPI_PARSER array describing the Serialization Instruction Entry stru= cture. +**/ +STATIC CONST ACPI_PARSER SerializationInstructionEntryParser[] =3D { + { L"Serialization Action", 1, 0, L"0x%x", DumpErstAction, NULL,= ValidateErstAction, NULL }, + { L"Instruction", 1, 1, L"0x%x", DumpErstInstruction, NULL,= ValidateErstInstruction, NULL }, + { L"Flags", 1, 2, L"0x%x", NULL, NULL,= ValidateErstFlags, NULL }, + { L"Reserved", 1, 3, L"0x%x", NULL, NULL,= NULL, NULL }, + { L"Register Region", 12, 4, NULL, DumpGas, NULL,= NULL, NULL }, + { L"Value", 8, 16, L"0x%llx", NULL, NULL,= NULL, NULL }, + { L"Mask", 8, 24, L"0x%llx", NULL, NULL,= NULL, NULL } +}; + +/** + This function parses the ACPI ERST table. + When trace is enabled this function parses the ERST table and + traces the ACPI table fields. + + This function also performs validation of the ACPI table fields. + + @param [in] Trace If TRUE, trace the ACPI fields. + @param [in] Ptr Pointer to the start of the buffer. + @param [in] AcpiTableLength Length of the ACPI table. + @param [in] AcpiTableRevision Revision of the ACPI table. +**/ +VOID +EFIAPI +ParseAcpiErst ( + IN BOOLEAN Trace, + IN UINT8 *Ptr, + IN UINT32 AcpiTableLength, + IN UINT8 AcpiTableRevision + ) +{ + UINT32 Offset; + + if (!Trace) { + return; + } + + Offset =3D ParseAcpi ( + Trace, + 0, + "ERST", + Ptr, + AcpiTableLength, + PARSER_PARAMS (ErstParser) + ); + + if (sizeof (EFI_ACPI_6_4_ERST_SERIALIZATION_INSTRUCTION_ENTRY)*(*Instruc= tionEntryCount) !=3D (AcpiTableLength - Offset)) { + IncrementErrorCount (); + Print ( + L"ERROR: Invalid InstructionEntryCount. " \ + L"Count =3D %d. Offset =3D %d. AcpiTableLength =3D %d.\n", + *InstructionEntryCount, + Offset, + AcpiTableLength + ); + return; + } + + while (Offset < AcpiTableLength) { + Offset +=3D ParseAcpi ( + Trace, + 2, + "Serialization Action", + Ptr + Offset, + (AcpiTableLength - Offset), + PARSER_PARAMS (SerializationInstructionEntryParser) + ); + } +} diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiView= CommandLib.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiVi= ewCommandLib.c index 09bdddb56e..d37ad7cacc 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommand= Lib.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommand= Lib.c @@ -1,6 +1,7 @@ /** @file Main file for 'acpiview' Shell command function. + Copyright (c) 2022, NVIDIA CORPORATION. All rights reserved. Copyright (c) 2016 - 2021, Arm Limited. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -52,6 +53,7 @@ ACPI_TABLE_PARSER ParserList[] =3D { { EFI_ACPI_6_2_DEBUG_PORT_2_TABLE_SIGNATURE, = ParseAcpiDbg2 }, { EFI_ACPI_6_2_DIFFERENTIATED_SYSTEM_DESCRIPTION_TABLE_SIGNATURE, ParseAcpiDsdt }, + { EFI_ACPI_6_4_ERROR_RECORD_SERIALIZATION_TABLE_SIGNATURE, = ParseAcpiErst }, { EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE, = ParseAcpiFacs }, { EFI_ACPI_6_2_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE, = ParseAcpiFadt }, { EFI_ACPI_6_4_GENERIC_TIMER_DESCRIPTION_TABLE_SIGNATURE, = ParseAcpiGtdt }, diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiView= CommandLib.inf b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpi= ViewCommandLib.inf index 63fc5a1281..904fea83de 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommand= Lib.inf +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommand= Lib.inf @@ -1,6 +1,7 @@ ## @file # Provides Shell 'acpiview' command functions # +# Copyright (c) 2022, NVIDIA CORPORATION. All rights reserved. # Copyright (c) 2016 - 2020, Arm Limited. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent @@ -31,6 +32,7 @@ Parsers/Bgrt/BgrtParser.c Parsers/Dbg2/Dbg2Parser.c Parsers/Dsdt/DsdtParser.c + Parsers/Erst/ErstParser.c Parsers/Facs/FacsParser.c Parsers/Fadt/FadtParser.c Parsers/Gtdt/GtdtParser.c -- 2.25.1