WebSVN – Kolibri OS – Diff – /drivers/devman/acpica/common/dmtbdump.c

 /******************************************************************************
+ *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2011, Intel Corp.
  * All rights reserved.
+ *
  * 2. License
+ *
 #define _COMPONENT          ACPI_CA_DISASSEMBLER
+        ACPI_MODULE_NAME    ("dmtbdump")
+static void
+AcpiDmValidateFadtLength (
+    UINT32                  Revision,
-        ACPI_MODULE_NAME    ("dmtbdump")
+    UINT32                  Length);
 /*******************************************************************************
+ *
  * FUNCTION:    AcpiDmDumpRsdp
  *
+ * PARAMETERS:  Table               - A RSDP
  * PARAMETERS:  Table               - A RSDP
  * RETURN:      Length of the table (there is not always a length field,
- * RETURN:      Length of the table (there is no length field, use revision)
+ *              use revision or length if available (ACPI 2.0+))
+ *
  * DESCRIPTION: Format the contents of a RSDP
+ *
  ******************************************************************************/
+UINT32
-UINT32
+AcpiDmDumpRsdp (
+    ACPI_TABLE_HEADER       *Table)
 AcpiDmDumpRsdp (
-    ACPI_TABLE_HEADER       *Table)
+    ACPI_TABLE_RSDP         *Rsdp = ACPI_CAST_PTR (ACPI_TABLE_RSDP, Table);
-{
+    UINT32                  Length = sizeof (ACPI_RSDP_COMMON);
-    UINT32                  Length = ACPI_RSDP_REV0_SIZE;
+    UINT8                   Checksum;
     /* Dump the common ACPI 1.0 portion */
+    AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoRsdp1);
+    /* Validate the first checksum */
+    Checksum = AcpiDmGenerateChecksum (Rsdp, sizeof (ACPI_RSDP_COMMON),
+                Rsdp->Checksum);
+    if (Checksum != Rsdp->Checksum)
+    {
-    /* Dump the common ACPI 1.0 portion */
+        AcpiOsPrintf ("/* Incorrect Checksum above, should be 0x%2.2X */\n",
+            Checksum);
+    }
+    /* The RSDP for ACPI 2.0+ contains more data and has a Length field */
+    if (Rsdp->Revision > 0)
+    {
+        Length = Rsdp->Length;
+        AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoRsdp2);
+        /* Validate the extended checksum over entire RSDP */
-    AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoRsdp1);
+        Checksum = AcpiDmGenerateChecksum (Rsdp, sizeof (ACPI_TABLE_RSDP),
                     Rsdp->ExtendedChecksum);
+ *
  * RETURN:      None
+ *
  * DESCRIPTION: Format the contents of a FADT
+ *
+ * NOTE:        We cannot depend on the FADT version to indicate the actual
+ *              contents of the FADT because of BIOS bugs. The table length
+ *              is the only reliable indicator.
+ *
  ******************************************************************************/
 void
 AcpiDmDumpFadt (
     ACPI_TABLE_HEADER       *Table)
 {
-    /* Common ACPI 1.0 portion of FADT */
+    /* Always dump the minimum FADT revision 1 fields (ACPI 1.0) */
+    AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoFadt1);
     AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoFadt1);
     /* Check for FADT revision 2 fields (ACPI 1.0B MS extensions) */
     /* Check for ACPI 1.0B MS extensions (FADT revision 2) */
+    if ((Table->Length > ACPI_FADT_V1_SIZE) &&
-    if (Table->Revision == 2)
+        (Table->Length <= ACPI_FADT_V2_SIZE))
+    {
         AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoFadt2);
+    }
-    /* Check for ACPI 2.0+ extended data (FADT revision 3+) */
+    /* Check for FADT revision 3 fields and up (ACPI 2.0+ extended data) */
+    else if (Table->Length > ACPI_FADT_V2_SIZE)
+    {
+        AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoFadt3);
+    }
+    /* Validate various fields in the FADT, including length */
+    AcpiTbCreateLocalFadt (Table, Table->Length);
+    /* Validate FADT length against the revision */
+    AcpiDmValidateFadtLength (Table->Revision, Table->Length);
+}
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiDmValidateFadtLength
+ *
+ * PARAMETERS:  Revision            - FADT revision (Header->Revision)
+ *              Length              - FADT length (Header->Length
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Check the FADT revision against the expected table length for
+ *              that revision. Issue a warning if the length is not what was
+ *              expected. This seems to be such a common BIOS bug that the
+ *              FADT revision has been rendered virtually meaningless.
+ *
+ ******************************************************************************/
+static void
+AcpiDmValidateFadtLength (
+    UINT32                  Revision,
+    UINT32                  Length)
+{
+    UINT32                  ExpectedLength;
+    switch (Revision)
+    {
+    case 0:
+        AcpiOsPrintf ("// ACPI Warning: Invalid FADT revision: 0\n");
+        return;
+    case 1:
+        ExpectedLength = ACPI_FADT_V1_SIZE;
+        break;
+    case 2:
+        ExpectedLength = ACPI_FADT_V2_SIZE;
+        break;
+    case 3:
+    case 4:
+        ExpectedLength = ACPI_FADT_V3_SIZE;
+        break;
+    default:
+        return;
+    }
-    else if (Table->Length >= sizeof (ACPI_TABLE_FADT))
+    if (Length == ExpectedLength)
+    {
                 sizeof (ACPI_DMAR_DEVICE_SCOPE));
             while (PathOffset < ScopeTable->Length)
+            {
                 AcpiDmLineHeader ((PathOffset + ScopeOffset + Offset), 2, "PCI Path");
-                AcpiOsPrintf ("[%2.2X, %2.2X]\n", PciPath[0], PciPath[1]);
+                AcpiOsPrintf ("%2.2X,%2.2X\n", PciPath[0], PciPath[1]);
                 /* Point to next PCI Path entry */
     SubTable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset);
     while (Offset < Table->Length)
+    {
         AcpiOsPrintf ("\n");
         Status = AcpiDmDumpTable (Length, Offset, SubTable,
-                    sizeof (ACPI_WHEA_HEADER), AcpiDmTableInfoEinj0);
+                    sizeof (ACPI_WHEA_HEADER), AcpiDmTableInfoErst0);
         if (ACPI_FAILURE (Status))
+        {
             return;
+        }
+}
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiDmDumpSlic
+ *
+ * PARAMETERS:  Table               - A SLIC table
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Format the contents of a SLIC
+ *
+ ******************************************************************************/
+void
+AcpiDmDumpSlic (
+    ACPI_TABLE_HEADER       *Table)
+{
+    ACPI_STATUS             Status;
+    UINT32                  Offset = sizeof (ACPI_TABLE_SLIC);
+    ACPI_SLIC_HEADER        *SubTable;
+    ACPI_DMTABLE_INFO       *InfoTable;
+    /* There is no main SLIC table, only subtables */
+    SubTable = ACPI_ADD_PTR (ACPI_SLIC_HEADER, Table, Offset);
+    while (Offset < Table->Length)
+    {
+        /* Common sub-table header */
+        AcpiOsPrintf ("\n");
+        Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
+                    SubTable->Length, AcpiDmTableInfoSlicHdr);
+        if (ACPI_FAILURE (Status))
+        {
+            return;
+        }
+        switch (SubTable->Type)
+        {
+        case ACPI_SLIC_TYPE_PUBLIC_KEY:
+            InfoTable = AcpiDmTableInfoSlic0;
+            break;
+        case ACPI_SLIC_TYPE_WINDOWS_MARKER:
+            InfoTable = AcpiDmTableInfoSlic1;
+            break;
+        default:
+            AcpiOsPrintf ("\n**** Unknown SLIC sub-table type 0x%X\n", SubTable->Type);
+            /* Attempt to continue */
+            if (!SubTable->Length)
+            {
+                AcpiOsPrintf ("Invalid zero length subtable\n");
+                return;
+            }
+            goto NextSubTable;
+        }
+        AcpiOsPrintf ("\n");
+        Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
+                    SubTable->Length, InfoTable);
+        if (ACPI_FAILURE (Status))
+        {
+            return;
+        }
+NextSubTable:
+        /* Point to next sub-table */
+        Offset += SubTable->Length;
+        SubTable = ACPI_ADD_PTR (ACPI_SLIC_HEADER, SubTable, SubTable->Length);
+    }
+}
 /*******************************************************************************
+ *
  * FUNCTION:    AcpiDmDumpSlit
+ *
  * PARAMETERS:  Table               - An SLIT
-            AcpiOsPrintf ("%2.2X ", Row[j]);
+            AcpiOsPrintf ("%2.2X", Row[j]);
             Offset++;
             /* Display up to 16 bytes per output row */
-            if (j && (((j+1) % 16) == 0) && ((j+1) < Localities))
+            if ((j+1) < Localities)
+            {
+                AcpiOsPrintf (" ");
+                if (j && (((j+1) % 16) == 0))
-            {
+                {
+                    AcpiOsPrintf ("\\\n"); /* With line continuation char */
-                AcpiOsPrintf ("\n");
+                    AcpiDmLineHeader (Offset, 0, NULL);
                 AcpiDmLineHeader (Offset, 0, "");
+            }

Subversion Repositories Kolibri OS

(root)/drivers/devman/acpica/common/dmtbdump.c – Rev 1498 → 2216