ShellPkg: Update Acpiview GTDT parser to ACPI 6.4

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 <christopher.jones@arm.com>
Reviewed-by: Zhichao Gao <zhichao.gao@intel.com>
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c
index d02fc4929d6fa5e04672276810b19d3f4c62efd2..d00eaafe60a5beba7ca8b833766fdfda98760cf7 100644 (file)
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c
@@ -1,11 +1,11 @@
 /** @file\r
   GTDT table parser\r
 \r
-  Copyright (c) 2016 - 2020, ARM Limited. All rights reserved.\r
+  Copyright (c) 2016 - 2021, ARM Limited. All rights reserved.\r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
   @par Reference(s):\r
-    - ACPI 6.3 Specification - January 2019\r
+    - ACPI 6.4 Specification - January 2021\r
   **/\r
 \r
 #include <IndustryStandard/Acpi.h>\r
@@ -155,7 +155,7 @@ STATIC CONST ACPI_PARSER GtBlockTimerParser[] = {
 /**\r
   An ACPI_PARSER array describing the Platform Watchdog.\r
 **/\r
-STATIC CONST ACPI_PARSER SBSAGenericWatchdogParser[] = {\r
+STATIC CONST ACPI_PARSER ArmGenericWatchdogParser[] = {\r
   {L"Type", 1, 0, L"%d", NULL, NULL, NULL, NULL},\r
   {L"Length", 2, 1, L"%d", NULL, NULL, NULL, NULL},\r
   {L"Reserved", 1, 3, L"%x", NULL, NULL, NULL, NULL},\r
@@ -236,10 +236,10 @@ DumpWatchdogTimer (
   ParseAcpi (\r
     TRUE,\r
     2,\r
-    "SBSA Generic Watchdog",\r
+    "Arm Generic Watchdog",\r
     Ptr,\r
     Length,\r
-    PARSER_PARAMS (SBSAGenericWatchdogParser)\r
+    PARSER_PARAMS (ArmGenericWatchdogParser)\r
     );\r
 }\r
 \r
@@ -343,10 +343,10 @@ ParseAcpiGtdt (
     }\r
 \r
     switch (*PlatformTimerType) {\r
-      case EFI_ACPI_6_3_GTDT_GT_BLOCK:\r
+      case EFI_ACPI_6_4_GTDT_GT_BLOCK:\r
         DumpGTBlock (TimerPtr, *PlatformTimerLength);\r
         break;\r
-      case EFI_ACPI_6_3_GTDT_SBSA_GENERIC_WATCHDOG:\r
+      case EFI_ACPI_6_4_GTDT_ARM_GENERIC_WATCHDOG:\r
         DumpWatchdogTimer (TimerPtr, *PlatformTimerLength);\r
         break;\r
       default:\r

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c
index b30ed3fc8597b229dd15b6ad4f2aab2e3d0ca583..dcc98f1f1345cdf2d085060f0967eecf7342a7c7 100644 (file)
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c
@@ -54,7 +54,7 @@ ACPI_TABLE_PARSER ParserList[] = {
    ParseAcpiDsdt},\r
   {EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE, ParseAcpiFacs},\r
   {EFI_ACPI_6_2_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE, ParseAcpiFadt},\r
-  {EFI_ACPI_6_2_GENERIC_TIMER_DESCRIPTION_TABLE_SIGNATURE, ParseAcpiGtdt},\r
+  {EFI_ACPI_6_4_GENERIC_TIMER_DESCRIPTION_TABLE_SIGNATURE, ParseAcpiGtdt},\r
   {EFI_ACPI_6_3_HETEROGENEOUS_MEMORY_ATTRIBUTE_TABLE_SIGNATURE, ParseAcpiHmat},\r
   {EFI_ACPI_6_2_IO_REMAPPING_TABLE_SIGNATURE, ParseAcpiIort},\r
   {EFI_ACPI_6_2_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE, ParseAcpiMadt},\r