ShellPkg: Parse I/O APIC and x2APIC structure

[mirror_edk2.git] / ShellPkg / Library / UefiShellAcpiViewCommandLib / Parsers / Madt / MadtParser.c

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtParser.c
index 438905cb24f58b8b82e8fe61280e72f765d578d8..2ba8c9ae521ac84b8742e23f30682050f27743e9 100644 (file)
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtParser.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtParser.c
@@ -1,7 +1,7 @@
 /** @file\r
   MADT table parser\r
 \r
-  Copyright (c) 2016 - 2019, ARM Limited. All rights reserved.\r
+  Copyright (c) 2016 - 2020, ARM Limited. All rights reserved.\r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
   @par Reference(s):\r
@@ -15,6 +15,7 @@
 #include <Library/UefiLib.h>\r
 #include "AcpiParser.h"\r
 #include "AcpiTableParser.h"\r
+#include "AcpiViewConfig.h"\r
 #include "MadtParser.h"\r
 \r
 // Local Variables\r
@@ -180,6 +181,57 @@ STATIC CONST ACPI_PARSER GicITSParser[] = {
   {L"Reserved", 4, 16, L"0x%x", NULL, NULL, NULL, NULL}\r
 };\r
 \r
+/**\r
+  An ACPI_PARSER array describing the IO APIC Structure.\r
+**/\r
+STATIC CONST ACPI_PARSER IoApic[] = {\r
+  {L"Type", 1, 0, L"0x%x", NULL, NULL, NULL, NULL},\r
+  {L"Length", 1, 1, L"%d", NULL, NULL, NULL, NULL},\r
+  {L"I/O APIC ID", 1, 2, L"0x%x", NULL, NULL, NULL, NULL},\r
+  {L"Reserved", 1, 3, L"0x%x", NULL, NULL, NULL, NULL},\r
+  {L"I/O APIC Address", 4, 4, L"0x%x", NULL, NULL, NULL, NULL},\r
+  {L"Global System Interrupt Base", 4, 8, L"0x%x", NULL, NULL, NULL, NULL}\r
+};\r
+\r
+/**\r
+  An ACPI_PARSER array describing the Interrupt Source Override Structure.\r
+**/\r
+STATIC CONST ACPI_PARSER InterruptSourceOverride[] = {\r
+  {L"Type", 1, 0, L"0x%x", NULL, NULL, NULL, NULL},\r
+  {L"Length", 1, 1, L"%d", NULL, NULL, NULL, NULL},\r
+  {L"Bus", 1, 2, L"0x%x", NULL, NULL, NULL, NULL},\r
+  {L"Source", 1, 3, L"0x%x", NULL, NULL, NULL, NULL},\r
+  {L"Global System Interrupt", 4, 4, L"0x%x", NULL, NULL, NULL, NULL},\r
+  {L"Flags", 2, 8, L"0x%x", NULL, NULL, NULL, NULL}\r
+};\r
+\r
+\r
+/**\r
+  An ACPI_PARSER array describing the Processor Local x2APIC Structure.\r
+**/\r
+STATIC CONST ACPI_PARSER ProcessorLocalX2Apic[] = {\r
+  {L"Type", 1, 0, L"0x%x", NULL, NULL, NULL, NULL},\r
+  {L"Length", 1, 1, L"%d", NULL, NULL, NULL, NULL},\r
+  {L"Reserved", 2, 2, L"0x%x", NULL, NULL, NULL, NULL},\r
+\r
+  {L"X2APIC ID", 4, 4, L"0x%x", NULL, NULL, NULL, NULL},\r
+  {L"Flags", 4, 8, L"0x%x", NULL, NULL, NULL, NULL},\r
+  {L"ACPI Processor UID", 4, 12, L"0x%x", NULL, NULL, NULL, NULL}\r
+};\r
+\r
+/**\r
+  An ACPI_PARSER array describing the Local x2APIC NMI Structure.\r
+**/\r
+STATIC CONST ACPI_PARSER LocalX2ApicNmi[] = {\r
+  {L"Type", 1, 0, L"0x%x", NULL, NULL, NULL, NULL},\r
+  {L"Length", 1, 1, L"%d", NULL, NULL, NULL, NULL},\r
+  {L"Flags", 2, 2, L"0x%x", NULL, NULL, NULL, NULL},\r
+\r
+  {L"ACPI Processor UID", 4, 4, L"0x%x", NULL, NULL, NULL, NULL},\r
+  {L"Local x2APIC LINT#", 1, 8, L"0x%x", NULL, NULL, NULL, NULL},\r
+  {L"Reserved", 3, 9, L"0x%x%x%x", Dump3Chars, NULL, NULL, NULL}\r
+};\r
+\r
 /**\r
   An ACPI_PARSER array describing the ACPI MADT Table.\r
 **/\r
@@ -273,28 +325,16 @@ ParseAcpiMadt (
       return;\r
     }\r
 \r
-    // Make sure forward progress is made.\r
-    if (*MadtInterruptControllerLength < 2) {\r
+    // Validate Interrupt Controller Structure length\r
+    if ((*MadtInterruptControllerLength == 0) ||\r
+        ((Offset + (*MadtInterruptControllerLength)) > AcpiTableLength)) {\r
       IncrementErrorCount ();\r
       Print (\r
-        L"ERROR: Structure length is too small: " \\r
-          L"MadtInterruptControllerLength = %d. " \\r
-          L"MadtInterruptControllerType = %d. MADT parsing aborted.\n",\r
+        L"ERROR: Invalid Interrupt Controller Structure length. " \\r
+          L"Length = %d. Offset = %d. AcpiTableLength = %d.\n",\r
         *MadtInterruptControllerLength,\r
-        *MadtInterruptControllerType\r
-        );\r
-      return;\r
-    }\r
-\r
-    // Make sure the MADT structure lies inside the table\r
-    if ((Offset + *MadtInterruptControllerLength) > AcpiTableLength) {\r
-      IncrementErrorCount ();\r
-      Print (\r
-        L"ERROR: Invalid MADT structure length. " \\r
-          L"MadtInterruptControllerLength = %d. " \\r
-          L"RemainingTableBufferLength = %d. MADT parsing aborted.\n",\r
-        *MadtInterruptControllerLength,\r
-        AcpiTableLength - Offset\r
+        Offset,\r
+        AcpiTableLength\r
         );\r
       return;\r
     }\r
@@ -368,6 +408,54 @@ ParseAcpiMadt (
         break;\r
       }\r
 \r
+      case EFI_ACPI_6_3_IO_APIC: {\r
+        ParseAcpi (\r
+          TRUE,\r
+          2,\r
+          "IO APIC",\r
+          InterruptContollerPtr,\r
+          *MadtInterruptControllerLength,\r
+          PARSER_PARAMS (IoApic)\r
+          );\r
+        break;\r
+      }\r
+\r
+      case EFI_ACPI_6_3_INTERRUPT_SOURCE_OVERRIDE: {\r
+        ParseAcpi (\r
+          TRUE,\r
+          2,\r
+          "INTERRUPT SOURCE OVERRIDE",\r
+          InterruptContollerPtr,\r
+          *MadtInterruptControllerLength,\r
+          PARSER_PARAMS (InterruptSourceOverride)\r
+          );\r
+        break;\r
+      }\r
+\r
+      case EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC: {\r
+        ParseAcpi (\r
+          TRUE,\r
+          2,\r
+          "PROCESSOR LOCAL X2APIC",\r
+          InterruptContollerPtr,\r
+          *MadtInterruptControllerLength,\r
+          PARSER_PARAMS (ProcessorLocalX2Apic)\r
+          );\r
+        break;\r
+      }\r
+\r
+      case EFI_ACPI_6_3_LOCAL_X2APIC_NMI: {\r
+        ParseAcpi (\r
+          TRUE,\r
+          2,\r
+          "LOCAL x2APIC NMI",\r
+          InterruptContollerPtr,\r
+          *MadtInterruptControllerLength,\r
+          PARSER_PARAMS (LocalX2ApicNmi)\r
+          );\r
+        break;\r
+      }\r
+\r
       default: {\r
         IncrementErrorCount ();\r
         Print (\r