X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ShellPkg%2FLibrary%2FUefiShellAcpiViewCommandLib%2FParsers%2FFadt%2FFadtParser.c;fp=ShellPkg%2FLibrary%2FUefiShellAcpiViewCommandLib%2FParsers%2FFadt%2FFadtParser.c;h=5b8cc174f16afb3d4feb6a518952e60c6564ee34;hb=d5cf0fba204d967c0df2c5404a472331656308e2;hp=e40c9ef8ee4b3285faf8c6edf3cb6236ee367397;hpb=c9416efeef0d4a0554db01f3fd1cdaede14856d7;p=mirror_edk2.git

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Fadt/FadtParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Fadt/FadtParser.c
index e40c9ef8ee..5b8cc174f1 100644
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Fadt/FadtParser.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Fadt/FadtParser.c
@@ -5,17 +5,21 @@
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
   @par Reference(s):
-    - ACPI 6.2 Specification - Errata A, September 2017
+    - ACPI 6.3 Specification - January 2019
 **/
 
 #include <IndustryStandard/Acpi.h>
 #include <Library/UefiLib.h>
 #include "AcpiParser.h"
 #include "AcpiTableParser.h"
+#include "AcpiView.h"
 
 // Local variables
 STATIC CONST UINT32* DsdtAddress;
 STATIC CONST UINT64* X_DsdtAddress;
+STATIC CONST UINT32* Flags;
+STATIC CONST UINT32* FirmwareCtrl;
+STATIC CONST UINT64* X_FirmwareCtrl;
 STATIC CONST UINT8*  FadtMinorRevision;
 STATIC ACPI_DESCRIPTION_HEADER_INFO AcpiHdrInfo;
 
@@ -24,6 +28,21 @@ STATIC ACPI_DESCRIPTION_HEADER_INFO AcpiHdrInfo;
 **/
 #define HW_REDUCED_ACPI   BIT20
 
+/**
+  Offset to the FACS signature from the start of the FACS.
+**/
+#define FACS_SIGNATURE_OFFSET   0
+
+/**
+  Offset to the FACS revision from the start of the FACS.
+**/
+#define FACS_VERSION_OFFSET     32
+
+/**
+  Offset to the FACS length from the start of the FACS.
+**/
+#define FACS_LENGTH_OFFSET      4
+
 /**
   Get the ACPI XSDT header info.
 **/
@@ -113,7 +132,8 @@ ValidateFlags (
 **/
 STATIC CONST ACPI_PARSER FadtParser[] = {
   PARSE_ACPI_HEADER (&AcpiHdrInfo),
-  {L"FIRMWARE_CTRL", 4, 36, L"0x%x", NULL, NULL, ValidateFirmwareCtrl, NULL},
+  {L"FIRMWARE_CTRL", 4, 36, L"0x%x", NULL, (VOID**)&FirmwareCtrl,
+    ValidateFirmwareCtrl, NULL},
   {L"DSDT", 4, 40, L"0x%x", NULL, (VOID**)&DsdtAddress, NULL, NULL},
   {L"Reserved", 1, 44, L"%x", NULL, NULL, NULL, NULL},
   {L"Preferred_PM_Profile", 1, 45, L"0x%x", NULL, NULL, NULL, NULL},
@@ -150,13 +170,13 @@ STATIC CONST ACPI_PARSER FadtParser[] = {
   {L"CENTURY", 1, 108, L"0x%x", NULL, NULL, NULL, NULL},
   {L"IAPC_BOOT_ARCH", 2, 109, L"0x%x", NULL, NULL, NULL, NULL},
   {L"Reserved", 1, 111, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Flags", 4, 112, L"0x%x", NULL, NULL, ValidateFlags, NULL},
+  {L"Flags", 4, 112, L"0x%x", NULL, (VOID**)&Flags, ValidateFlags, NULL},
   {L"RESET_REG", 12, 116, NULL, DumpGas, NULL, NULL, NULL},
   {L"RESET_VALUE", 1, 128, L"0x%x", NULL, NULL, NULL, NULL},
   {L"ARM_BOOT_ARCH", 2, 129, L"0x%x", NULL, NULL, NULL, NULL},
   {L"FADT Minor Version", 1, 131, L"0x%x", NULL, (VOID**)&FadtMinorRevision,
     NULL, NULL},
-  {L"X_FIRMWARE_CTRL", 8, 132, L"0x%lx", NULL, NULL,
+  {L"X_FIRMWARE_CTRL", 8, 132, L"0x%lx", NULL, (VOID**)&X_FirmwareCtrl,
     ValidateXFirmwareCtrl, NULL},
   {L"X_DSDT", 8, 140, L"0x%lx", NULL, (VOID**)&X_DsdtAddress, NULL, NULL},
   {L"X_PM1a_EVT_BLK", 12, 148, NULL, DumpGas, NULL, NULL, NULL},
@@ -192,7 +212,13 @@ ParseAcpiFadt (
   IN UINT8   AcpiTableRevision
   )
 {
-  UINT8*  DsdtPtr;
+  EFI_STATUS              Status;
+  UINT8*                  DsdtPtr;
+  UINT8*                  FirmwareCtrlPtr;
+  UINT32                  FacsSignature;
+  UINT32                  FacsLength;
+  UINT8                   FacsRevision;
+  PARSE_ACPI_TABLE_PROC   FacsParserProc;
 
   ParseAcpi (
     Trace,
@@ -214,6 +240,60 @@ ParseAcpiFadt (
     }
   }
 
+  // If X_FIRMWARE_CTRL is not zero then use X_FIRMWARE_CTRL and ignore
+  // FIRMWARE_CTRL, else use FIRMWARE_CTRL.
+  if ((X_FirmwareCtrl != NULL) && (*X_FirmwareCtrl != 0)) {
+    FirmwareCtrlPtr = (UINT8*)(UINTN)(*X_FirmwareCtrl);
+  } else if ((FirmwareCtrl != NULL) && (*FirmwareCtrl != 0)) {
+    FirmwareCtrlPtr = (UINT8*)(UINTN)(*FirmwareCtrl);
+  } else {
+    FirmwareCtrlPtr = NULL;
+    // if HW_REDUCED_ACPI flag is not set, both FIRMWARE_CTRL and
+    // X_FIRMWARE_CTRL cannot be zero, and the FACS Table must be
+    // present.
+    if ((Trace) &&
+        (Flags != NULL) &&
+        ((*Flags & EFI_ACPI_6_3_HW_REDUCED_ACPI) != 0)) {
+      IncrementErrorCount ();
+      Print (L"ERROR: No FACS table found, "
+               L"both X_FIRMWARE_CTRL and FIRMWARE_CTRL are zero.\n");
+    }
+  }
+
+  if (FirmwareCtrlPtr != NULL) {
+    // The FACS table does not have a standard ACPI table header. Therefore,
+    // the signature, length and version needs to be initially parsed.
+    // The FACS signature is 4 bytes starting at offset 0.
+    FacsSignature = *(UINT32*)(FirmwareCtrlPtr + FACS_SIGNATURE_OFFSET);
+
+    // The FACS length is 4 bytes starting at offset 4.
+    FacsLength = *(UINT32*)(FirmwareCtrlPtr + FACS_LENGTH_OFFSET);
+
+    // The FACS version is 1 byte starting at offset 32.
+    FacsRevision = *(UINT8*)(FirmwareCtrlPtr + FACS_VERSION_OFFSET);
+
+    Trace = ProcessTableReportOptions (
+              FacsSignature,
+              FirmwareCtrlPtr,
+              FacsLength
+              );
+
+    Status = GetParser (FacsSignature, &FacsParserProc);
+    if (EFI_ERROR (Status)) {
+      Print (
+        L"ERROR: No registered parser found for FACS.\n"
+        );
+      return;
+    }
+
+    FacsParserProc (
+      Trace,
+      FirmwareCtrlPtr,
+      FacsLength,
+      FacsRevision
+      );
+  }
+
   // If X_DSDT is not zero then use X_DSDT and ignore DSDT,
   // else use DSDT.
   if (*X_DsdtAddress != 0) {