From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.64]) by mx.groups.io with SMTP id smtpd.web10.25293.1629125568762460245 for ; Mon, 16 Aug 2021 07:52:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=la1G2x4W; spf=pass (domain: arm.com, ip: 40.107.20.64, mailfrom: christopher.jones@arm.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+RkaEz1dpfWzJ4vEjNbnwyxAS5mFubfVIxFck0EDFxw=; b=la1G2x4Woq/9yRz++09Llu1N3AP2gLv5bdS40B6AZ2/JojNVsDwYkCQYCx/YATjl+euhcz8z8PQNlaPdJDiqSD4VQzM9RXkdhiRm+rOpchKAGnjKCKxPy4R9Ka27Z983T74TI3QCeoJfk0nGY3ekEOcPZlelsOmnXUCRtHR1NV0= Received: from AM8P190CA0016.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:219::21) by DB8PR08MB5146.eurprd08.prod.outlook.com (2603:10a6:10:e7::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.19; Mon, 16 Aug 2021 14:52:41 +0000 Received: from VE1EUR03FT026.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:219:cafe::68) by AM8P190CA0016.outlook.office365.com (2603:10a6:20b:219::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.17 via Frontend Transport; Mon, 16 Aug 2021 14:52:41 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; edk2.groups.io; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;edk2.groups.io; dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT026.mail.protection.outlook.com (10.152.18.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.16 via Frontend Transport; Mon, 16 Aug 2021 14:52:40 +0000 Received: ("Tessian outbound f11f34576ce3:v103"); Mon, 16 Aug 2021 14:52:40 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 54e53933eee08dbc X-CR-MTA-TID: 64aa7808 Received: from a37d14c4bbe4.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 4C009A47-A6B6-4D6C-973E-4F54DEC138C8.1; Mon, 16 Aug 2021 14:52:34 +0000 Received: from EUR03-AM5-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id a37d14c4bbe4.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 16 Aug 2021 14:52:34 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XbLsbFM11Jc2wWY1iwXamEhzf1in5lOoARGrURIUVQrAB1ZkAoP8UPog2Wi2qA5//+5JhPrYGNgD1PtkmluFeJC/k6iqqNUqIvt4qX95BUiFz364AQtLHOJuOLAlzPBlprzarl/DnQxxXYhuvbxs34VZqj/Iu3HPqO0pv+LqZ10A+1EJliCeQSAV3H4Jzejw9JJ4gYqePlx855gxdSq9s5NboOKC+Z+N+3rKrR/iQAkFmO6kRdVW6QtD5vnD5wF/6Hi9+P3/Sg3jla8dNiBDLBE7nfYzBQNz1OtZCOtCLPVpGamHGXN8ct4zPDnOnk84s6Co9a9R9hsbme/X1GvlsA== 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=+RkaEz1dpfWzJ4vEjNbnwyxAS5mFubfVIxFck0EDFxw=; b=LfxvRouGzRlSdI2X5n/hNjRjCtyGBFq/8qd2Ua4/36G2KGhfKvrCoUa69ZoI0LYSH2OOc6SLpb7vNVUgkeJqQoShTRScH/WFEFoT1Uv2OeMkmOh0uTiTd7vUYak1YkvX0iWRsWyYwCjoYIEsOAq9cacJiMeo/+JR4u7/e0ZwDoSyz/jfjAq+ZEurFVJeoYhxQrp1fYBkDFPYuFkNDS3EmwvNnySzCWFwVqB3tJTgKQmGQOqeN7R95y1Br45c7uPyQd3e0KUIVbowOnxdmkP91XMugfbdlw9uMuLZW/S0AWd55eGWNNaFQx6w+TgihuJaGsla1M5OYU1CC0ErHerKdw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+RkaEz1dpfWzJ4vEjNbnwyxAS5mFubfVIxFck0EDFxw=; b=la1G2x4Woq/9yRz++09Llu1N3AP2gLv5bdS40B6AZ2/JojNVsDwYkCQYCx/YATjl+euhcz8z8PQNlaPdJDiqSD4VQzM9RXkdhiRm+rOpchKAGnjKCKxPy4R9Ka27Z983T74TI3QCeoJfk0nGY3ekEOcPZlelsOmnXUCRtHR1NV0= Received: from PR0P264CA0229.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::25) by AM7PR08MB5527.eurprd08.prod.outlook.com (2603:10a6:20b:de::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.15; Mon, 16 Aug 2021 14:52:32 +0000 Received: from VE1EUR03FT012.eop-EUR03.prod.protection.outlook.com (2603:10a6:100:1e:cafe::90) by PR0P264CA0229.outlook.office365.com (2603:10a6:100:1e::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.15 via Frontend Transport; Mon, 16 Aug 2021 14:52:32 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; Received: from nebula.arm.com (40.67.248.234) by VE1EUR03FT012.mail.protection.outlook.com (10.152.18.211) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4415.14 via Frontend Transport; Mon, 16 Aug 2021 14:52:32 +0000 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.2308.14; Mon, 16 Aug 2021 14:52:19 +0000 Received: from e125153.arm.com (10.57.66.54) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.2308.14 via Frontend Transport; Mon, 16 Aug 2021 14:52:19 +0000 From: "Chris Jones" To: CC: , , , , , , , Subject: [PATCH v1 2/2] ShellPkg: Update Acpiview GTDT parser to ACPI 6.4 Date: Mon, 16 Aug 2021 15:52:18 +0100 Message-ID: <20210816145218.14140-3-christopher.jones@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210816145218.14140-1-christopher.jones@arm.com> References: <20210816145218.14140-1-christopher.jones@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cd120555-0875-45f6-07ac-08d960c57f38 X-MS-TrafficTypeDiagnostic: AM7PR08MB5527:|DB8PR08MB5146: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:2089;OLM:2089; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: YLZC3MSQxKEqnUwG3SsRECxV4EpKWMwHixsX3f21EYplK0v26fsEuZhznPchv/RGsJZwbvVHw01p5qV0qAgrNcPvCjHBfoTAdueSo3QhcsX7F6+0D8pQsAuS7ZQIIOrCJGyt+mwnOWq9sYuUTTRbxUvXPv/OmztOy8SkeWlhxfvHvhNq/k8GNIiOz756uz7xOPPLxqrLE7oNLQlz5fNQ7drDV/bwjPVRO9qkASAbj53QOXarWV7zsM5L14fuAFzoOKBG1iW6kDJqxXuI2XlZnBz0Z5I2ZKGHz5PetQqtr9Htfyq079750NF7f5sGWoO4YNQNYmOqo9XCiI/hv2J52nj9WbTXqYHUBvVwoNe5YUQgMVgf3KLykGapZek4qajFgRDVj3B5g2fjIPqpdhsGqXlF/NNDP0LtG1uwQwyj1Iqte7IKbfLHWtuefnw7j0pNdlPs/kE5QB0IKThkgVo4vDnZvMl1CcvfvweQRMXQinRbsHj/P624EN1T9g317utvE9USZ4TXjjnOiZ8A0XUdiQ2oBcCg3kvv3Pz73h/0dLiT5Q2HLyLemTOIiypER/PkfdtKGTLyJV2GVyC2QDwiGbEzaEfAyihqibsfQItfnOYdWfhbF66Hv+R3L5b13T4jXtBzA7XJHxcHoZh+NpGa6yhxpV0X4Vgvo/PPPgYDPVWedP1VHTrjT0f9zolzCbFoVlxSDT7FQJL/DgcV4xm4NmHRQkHc6GYDjkbZMWdJpKOASUpwvNnUWc2x5w8Eng2wMboae7lag9gik2rZp4ZQ/rrE04Vs0h04TSWhHP3Y+ZV6ziCoP8AQy7lXd7R1DMmAnLPgFprGyZtjtsVYr1/pT1KGDvdquVrl+yX8wY9oNWI= X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(46966006)(36840700001)(186003)(2906002)(47076005)(86362001)(82310400003)(4326008)(34020700004)(70206006)(508600001)(8676002)(426003)(70586007)(15650500001)(36860700001)(5660300002)(2616005)(54906003)(356005)(81166007)(336012)(36756003)(6916009)(7696005)(316002)(26005)(83380400001)(8936002)(1076003)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5527 Return-Path: Christopher.Jones@arm.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT026.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 65efa9a7-4f3a-4eb7-df9b-08d960c57a17 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fSQFd/oJwsqgrFCByOFVycNXvIdE8yZlx5zQZNXaUm6NeXWsQLtCFP7YqcO7fvhixlW9jl6cio6qpGrt3mvnXZPcTPo5CApCcoexWyYXpo7gtA1p7vhNFaelMWG8tQFr01jWCGGaOW7x9OzFIhvyLxaH12WvF935EJRlHwuIkwiDGf0dzo93edEiztVCTcwLaNckCGLP5oSxhNaJGi4CEZoIEZ8cwtlY7vQBEGJTuk187pjDpi5G5j2BGM0VYLK+DPGRlMWSyp4mtsipDlrjL45aRi+f/UTqDWqueKHqx9QWXMd6VohKTA/w5vdBNyibyDvUn+kgqypZztp1cjgvOS39P102QAtfhyelWbhkn99vRXU/I+m3owAsDzN532Hfy4S/FMl2lQtb37t8Ewc6g/fDDUTjCg0pGwyrIhg6cn690hvWxjOSHRjtgvjiCpWH5b/HQTtYFaIfM7wv15EwbGvFbRzkGVRYa7b8OdpO8fuXi2jWtfttltBS3FTYNX9hpmWSVHUNEmryuvxeImMw0I9RPJ5dp+OL3VFKICIv/Lpyvp+87UWrqJdAp0w2IAqJQXdo/SnOjqkdwjDmeLbBi+bFb0ImzNSCL32KehBhfXoMYB0GyhYWrv32kJY6mBM5IfAVZx2FTztB+Jd+0mLPYj8tBHz4o30iaGkP35w7gZBYARTcVauvQxXs7nRMfS3nRe2LJseMvIQ7sYs+WrEuQhMIFjTIBF4QJbpm1yvZyYEFFVzUtjX0bo9S1DX7W7wEaf0J418RoSwWhQHbyB5KMabcekH2viG15lyKfkcTNNo= X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(4636009)(36840700001)(46966006)(6916009)(2616005)(70206006)(70586007)(7696005)(26005)(83380400001)(81166007)(508600001)(36756003)(5660300002)(186003)(8936002)(316002)(86362001)(1076003)(36860700001)(8676002)(4326008)(15650500001)(47076005)(336012)(2906002)(426003)(54906003)(82310400003);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Aug 2021 14:52:40.7358 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cd120555-0875-45f6-07ac-08d960c57f38 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR03FT026.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR08MB5146 Content-Type: text/plain Bugzilla: 3565 (https://bugzilla.tianocore.org/show_bug.cgi?id=3565) Update the Acpiview GTDT parser to use Acpi64.h and as such rename all occurences of "SBSA Generic Watchdog" to "Arm Generic Watchdog". Signed-off-by: Chris Jones --- ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c | 14 +++++++------- ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c index d02fc4929d6fa5e04672276810b19d3f4c62efd2..d00eaafe60a5beba7ca8b833766fdfda98760cf7 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c @@ -1,11 +1,11 @@ /** @file GTDT table parser - Copyright (c) 2016 - 2020, ARM Limited. All rights reserved. + Copyright (c) 2016 - 2021, ARM Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent @par Reference(s): - - ACPI 6.3 Specification - January 2019 + - ACPI 6.4 Specification - January 2021 **/ #include @@ -155,7 +155,7 @@ STATIC CONST ACPI_PARSER GtBlockTimerParser[] = { /** An ACPI_PARSER array describing the Platform Watchdog. **/ -STATIC CONST ACPI_PARSER SBSAGenericWatchdogParser[] = { +STATIC CONST ACPI_PARSER ArmGenericWatchdogParser[] = { {L"Type", 1, 0, L"%d", NULL, NULL, NULL, NULL}, {L"Length", 2, 1, L"%d", NULL, NULL, NULL, NULL}, {L"Reserved", 1, 3, L"%x", NULL, NULL, NULL, NULL}, @@ -236,10 +236,10 @@ DumpWatchdogTimer ( ParseAcpi ( TRUE, 2, - "SBSA Generic Watchdog", + "Arm Generic Watchdog", Ptr, Length, - PARSER_PARAMS (SBSAGenericWatchdogParser) + PARSER_PARAMS (ArmGenericWatchdogParser) ); } @@ -343,10 +343,10 @@ ParseAcpiGtdt ( } switch (*PlatformTimerType) { - case EFI_ACPI_6_3_GTDT_GT_BLOCK: + case EFI_ACPI_6_4_GTDT_GT_BLOCK: DumpGTBlock (TimerPtr, *PlatformTimerLength); break; - case EFI_ACPI_6_3_GTDT_SBSA_GENERIC_WATCHDOG: + case EFI_ACPI_6_4_GTDT_ARM_GENERIC_WATCHDOG: DumpWatchdogTimer (TimerPtr, *PlatformTimerLength); break; default: diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c index b30ed3fc8597b229dd15b6ad4f2aab2e3d0ca583..dcc98f1f1345cdf2d085060f0967eecf7342a7c7 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c @@ -54,7 +54,7 @@ ACPI_TABLE_PARSER ParserList[] = { ParseAcpiDsdt}, {EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE, ParseAcpiFacs}, {EFI_ACPI_6_2_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE, ParseAcpiFadt}, - {EFI_ACPI_6_2_GENERIC_TIMER_DESCRIPTION_TABLE_SIGNATURE, ParseAcpiGtdt}, + {EFI_ACPI_6_4_GENERIC_TIMER_DESCRIPTION_TABLE_SIGNATURE, ParseAcpiGtdt}, {EFI_ACPI_6_3_HETEROGENEOUS_MEMORY_ATTRIBUTE_TABLE_SIGNATURE, ParseAcpiHmat}, {EFI_ACPI_6_2_IO_REMAPPING_TABLE_SIGNATURE, ParseAcpiIort}, {EFI_ACPI_6_2_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE, ParseAcpiMadt}, -- Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")