ShellPkg: Update Acpiview PCCT parser to ACPI 6.4

Bugzilla: 3563 (https://bugzilla.tianocore.org/show_bug.cgi?id=3563)

Update the Acpiview PCCT parser to use Acpi64.h.

Signed-off-by: Chris Jones <christopher.jones@arm.com>
Reviewed-by: Zhichao Gao <zhichao.gao@intel.com>
Reviewed-by: Sami Mujawar <sami.mujawar <sami.mujawar@arm.com>

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pcct/PcctParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pcct/PcctParser.c
index ca553d5953f05651d8df4c95d1e39a73eded5129..7d3a2dd10dc928265bad3711e929d96c1ed40b1d 100644 (file)
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pcct/PcctParser.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pcct/PcctParser.c
@@ -1,11 +1,11 @@
 /** @file\r
   PCCT table parser\r
 \r
-  Copyright (c) 2020, Arm Limited.\r
+  Copyright (c) 2021, Arm Limited.\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 <Library/BaseMemoryLib.h>\r
@@ -93,9 +93,9 @@ ValidatePccType0Gas (
 {\r
   switch (*(UINT8*)Ptr) {\r
 #if !(defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64))\r
-    case EFI_ACPI_6_3_SYSTEM_IO:\r
+    case EFI_ACPI_6_4_SYSTEM_IO:\r
 #endif //if not (defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64))\r
-    case EFI_ACPI_6_3_SYSTEM_MEMORY:\r
+    case EFI_ACPI_6_4_SYSTEM_MEMORY:\r
       return;\r
     default:\r
       IncrementErrorCount ();\r
@@ -120,10 +120,10 @@ ValidatePccGas (
 {\r
   switch (*(UINT8*)Ptr) {\r
 #if !(defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64))\r
-    case EFI_ACPI_6_3_SYSTEM_IO:\r
+    case EFI_ACPI_6_4_SYSTEM_IO:\r
 #endif //if not (defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64))\r
-    case EFI_ACPI_6_3_FUNCTIONAL_FIXED_HARDWARE:\r
-    case EFI_ACPI_6_3_SYSTEM_MEMORY:\r
+    case EFI_ACPI_6_4_FUNCTIONAL_FIXED_HARDWARE:\r
+    case EFI_ACPI_6_4_SYSTEM_MEMORY:\r
       return;\r
     default:\r
       IncrementErrorCount ();\r
@@ -148,10 +148,10 @@ ValidatePccDoorbellGas (
 {\r
   // For slave subspaces this field is optional, if not present the field\r
   // should just contain zeros.\r
-  if (*PccSubspaceType == EFI_ACPI_6_3_PCCT_SUBSPACE_TYPE_4_EXTENDED_PCC) {\r
+  if (*PccSubspaceType == EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_4_EXTENDED_PCC) {\r
     if (IsZeroBuffer (\r
           Ptr,\r
-          sizeof (EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE)\r
+          sizeof (EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE)\r
           )) {\r
       return;\r
     }\r
@@ -180,14 +180,14 @@ ValidatePccIntAckGas (
   // edge driven the register may be omitted. A value of 0x0 on all\r
   // 12 bytes of the GAS structure indicates the register is not\r
   // present.\r
-  if (((*PccGlobalFlags & EFI_ACPI_6_3_PCCT_FLAGS_PLATFORM_INTERRUPT) !=\r
-       EFI_ACPI_6_3_PCCT_FLAGS_PLATFORM_INTERRUPT) ||\r
+  if (((*PccGlobalFlags & EFI_ACPI_6_4_PCCT_FLAGS_PLATFORM_INTERRUPT) !=\r
+       EFI_ACPI_6_4_PCCT_FLAGS_PLATFORM_INTERRUPT) ||\r
       ((*ExtendedPccSubspaceInterruptFlags &\r
-       EFI_ACPI_6_3_PCCT_SUBSPACE_PLATFORM_INTERRUPT_FLAGS_MODE) ==\r
-       EFI_ACPI_6_3_PCCT_SUBSPACE_PLATFORM_INTERRUPT_FLAGS_MODE)) {\r
+       EFI_ACPI_6_4_PCCT_SUBSPACE_PLATFORM_INTERRUPT_FLAGS_MODE) ==\r
+       EFI_ACPI_6_4_PCCT_SUBSPACE_PLATFORM_INTERRUPT_FLAGS_MODE)) {\r
     if (IsZeroBuffer (\r
           Ptr,\r
-          sizeof (EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE)\r
+          sizeof (EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE)\r
           )) {\r
       return;\r
     }\r
@@ -212,7 +212,7 @@ ValidatePccErrStatusGas (
   )\r
 {\r
   // This field is ignored by the OSPM on slave channels.\r
-  if (*PccSubspaceType == EFI_ACPI_6_3_PCCT_SUBSPACE_TYPE_4_EXTENDED_PCC) {\r
+  if (*PccSubspaceType == EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_4_EXTENDED_PCC) {\r
     return;\r
   }\r
 \r
@@ -236,9 +236,9 @@ ValidatePlatInterrupt (
 {\r
   // If a slave subspace is present in the PCCT, then the global Platform\r
   // Interrupt flag must be set to 1.\r
-  if ((*PccSubspaceType == EFI_ACPI_6_3_PCCT_SUBSPACE_TYPE_4_EXTENDED_PCC) &&\r
-      ((*PccGlobalFlags & EFI_ACPI_6_3_PCCT_FLAGS_PLATFORM_INTERRUPT) !=\r
-        EFI_ACPI_6_3_PCCT_FLAGS_PLATFORM_INTERRUPT)) {\r
+  if ((*PccSubspaceType == EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_4_EXTENDED_PCC) &&\r
+      ((*PccGlobalFlags & EFI_ACPI_6_4_PCCT_FLAGS_PLATFORM_INTERRUPT) !=\r
+        EFI_ACPI_6_4_PCCT_FLAGS_PLATFORM_INTERRUPT)) {\r
     IncrementErrorCount ();\r
     Print (\r
       L"\nError: Global Platform interrupt flag must be set to 1" \\r
@@ -563,31 +563,31 @@ ParseAcpiPcct (
     }\r
 \r
     switch (*PccSubspaceType) {\r
-      case EFI_ACPI_6_3_PCCT_SUBSPACE_TYPE_GENERIC:\r
+      case EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_GENERIC:\r
         DumpPccSubspaceType0 (\r
           PccSubspacePtr,\r
           *PccSubspaceLength\r
           );\r
         break;\r
-      case EFI_ACPI_6_3_PCCT_SUBSPACE_TYPE_1_HW_REDUCED_COMMUNICATIONS:\r
+      case EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_1_HW_REDUCED_COMMUNICATIONS:\r
         DumpPccSubspaceType1 (\r
           PccSubspacePtr,\r
           *PccSubspaceLength\r
           );\r
         break;\r
-      case EFI_ACPI_6_3_PCCT_SUBSPACE_TYPE_2_HW_REDUCED_COMMUNICATIONS:\r
+      case EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_2_HW_REDUCED_COMMUNICATIONS:\r
         DumpPccSubspaceType2 (\r
           PccSubspacePtr,\r
           *PccSubspaceLength\r
           );\r
         break;\r
-      case EFI_ACPI_6_3_PCCT_SUBSPACE_TYPE_3_EXTENDED_PCC:\r
+      case EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_3_EXTENDED_PCC:\r
         DumpPccSubspaceType3 (\r
           PccSubspacePtr,\r
           *PccSubspaceLength\r
           );\r
         break;\r
-      case EFI_ACPI_6_3_PCCT_SUBSPACE_TYPE_4_EXTENDED_PCC:\r
+      case EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_4_EXTENDED_PCC:\r
         DumpPccSubspaceType4 (\r
           PccSubspacePtr,\r
           *PccSubspaceLength\r

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c
index dcc98f1f1345cdf2d085060f0967eecf7342a7c7..f274fd282b9a30f85ec6e220b6b963da3a351ea5 100644 (file)
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   Main file for 'acpiview' Shell command function.\r
 \r
-  Copyright (c) 2016 - 2020, Arm Limited. All rights reserved.<BR>\r
+  Copyright (c) 2016 - 2021, Arm Limited. All rights reserved.<BR>\r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 **/\r
 \r
@@ -60,7 +60,7 @@ ACPI_TABLE_PARSER ParserList[] = {
   {EFI_ACPI_6_2_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE, ParseAcpiMadt},\r
   {EFI_ACPI_6_2_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BASE_ADDRESS_DESCRIPTION_TABLE_SIGNATURE,\r
    ParseAcpiMcfg},\r
-  {EFI_ACPI_6_2_PLATFORM_COMMUNICATIONS_CHANNEL_TABLE_SIGNATURE,\r
+  {EFI_ACPI_6_4_PLATFORM_COMMUNICATIONS_CHANNEL_TABLE_SIGNATURE,\r
    ParseAcpiPcct},\r
   {EFI_ACPI_6_2_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_STRUCTURE_SIGNATURE,\r
    ParseAcpiPptt},\r