Add checking code for GenAcpiTable tools.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2237 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 167 insertions, 0 deletions

diff --git a/Tools/CCode/Source/GenAcpiTable/GenAcpiTable.c b/Tools/CCode/Source/GenAcpiTable/GenAcpiTable.c
index 457ac65fef..ec866d3370 100644
--- a/Tools/CCode/Source/GenAcpiTable/GenAcpiTable.c
+++ b/Tools/CCode/Source/GenAcpiTable/GenAcpiTable.c
@@ -30,6 +30,15 @@ Abstract:
 #include "EfiUtilityMsgs.h"

 

 //

+// Acpi Table definition

+//

+#include "Acpi.h"

+#include "Acpi1_0.h"

+#include "Acpi2_0.h"

+#include "Acpi3_0.h"

+#include "MemoryMappedConfigurationSpaceAccessTable.h"

+

+//

 // Version of this utility

 //

 #define UTILITY_NAME  "GenAcpiTable"

@@ -103,6 +112,13 @@ ParseCommandLine (
 

 static

 STATUS

+CheckAcpiTable (

+  VOID      *AcpiTable,

+  UINT32    Length

+  );

+

+static

+STATUS

 CheckPE32File (

   INT8      *FileName,

   FILE      *Fptr,

@@ -303,6 +319,15 @@ Returns:
         Error (NULL, 0, 0, InFileName, "failed to .data section");

         goto Finish;

       }

+

+      //

+      // Check Acpi Table

+      //

+      if (CheckAcpiTable (Buffer, SectionHeader.Misc.VirtualSize) != STATUS_SUCCESS) {

+        Error (NULL, 0, 0, InFileName, "failed to check ACPI table");

+        goto Finish;

+      }

+

       //

       // Now open our output file

       //

@@ -350,6 +375,147 @@ Finish:
 

 static

 STATUS

+CheckAcpiTable (

+  VOID      *AcpiTable,

+  UINT32    Length

+  )

+/*++

+

+Routine Description:

+  

+  Check Acpi Table 

+

+Arguments:

+

+  AcpiTable     Buffer for AcpiSection

+  Length        AcpiSection Length

+

+Returns:

+

+  0             success

+  non-zero      otherwise

+

+--*/

+{

+  EFI_ACPI_DESCRIPTION_HEADER                   *AcpiHeader;

+  EFI_ACPI_3_0_FIRMWARE_ACPI_CONTROL_STRUCTURE  *Facs;

+  UINT32                                        ExpectedLength;

+

+  AcpiHeader = (EFI_ACPI_DESCRIPTION_HEADER *)AcpiTable;

+

+  //

+  // Generic check for AcpiTable length.

+  //

+  if (AcpiHeader->Length > Length) {

+    Error (NULL, 0, 0, "CheckAcpiTable", "failed to pass AcpiTable Length check");

+    return STATUS_ERROR;

+  }

+

+  //

+  // Currently, we only check must-have tables: FADT, FACS, DSDT,

+  // and some important tables: MADT, MCFG.

+  //

+  switch (AcpiHeader->Signature) {

+

+  //

+  // "FACP" Fixed ACPI Description Table

+  //

+  case EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE:

+    switch (AcpiHeader->Revision) {

+    case EFI_ACPI_1_0_FIXED_ACPI_DESCRIPTION_TABLE_REVISION:

+      ExpectedLength = sizeof(EFI_ACPI_1_0_FIXED_ACPI_DESCRIPTION_TABLE);

+      break;

+    case EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE_REVISION:

+      ExpectedLength = sizeof(EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE);

+      break;

+    case EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_TABLE_REVISION:

+      ExpectedLength = sizeof(EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_TABLE);

+      break;

+    default:

+      Error (NULL, 0, 0, "CheckAcpiTable", "failed to pass FACP revision check");

+      return STATUS_ERROR;

+    }

+    if (ExpectedLength != AcpiHeader->Length) {

+      Error (NULL, 0, 0, "CheckAcpiTable", "failed to pass FACP Length check");

+      return STATUS_ERROR;

+    }

+    break;

+

+  //

+  // "FACS" Firmware ACPI Control Structure

+  //

+  case EFI_ACPI_3_0_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE:

+    Facs = (EFI_ACPI_3_0_FIRMWARE_ACPI_CONTROL_STRUCTURE *)AcpiTable;

+    if ((Facs->Version != 0) &&

+        (Facs->Version != EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE_VERSION) &&

+        (Facs->Version != EFI_ACPI_3_0_FIRMWARE_ACPI_CONTROL_STRUCTURE_VERSION)){

+      Error (NULL, 0, 0, "CheckAcpiTable", "failed to pass FACS version check");

+      return STATUS_ERROR;

+    }

+    if ((Facs->Length != sizeof(EFI_ACPI_1_0_FIRMWARE_ACPI_CONTROL_STRUCTURE)) &&

+        (Facs->Length != sizeof(EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE)) &&

+        (Facs->Length != sizeof(EFI_ACPI_3_0_FIRMWARE_ACPI_CONTROL_STRUCTURE))) {

+      Error (NULL, 0, 0, "CheckAcpiTable", "failed to pass FACS Length check");

+      return STATUS_ERROR;

+    }

+    break;

+

+  //

+  // "DSDT" Differentiated System Description Table

+  //

+  case EFI_ACPI_3_0_DIFFERENTIATED_SYSTEM_DESCRIPTION_TABLE_SIGNATURE:

+    if (AcpiHeader->Revision > EFI_ACPI_3_0_DIFFERENTIATED_SYSTEM_DESCRIPTION_TABLE_REVISION) {

+      Error (NULL, 0, 0, "CheckAcpiTable", "failed to pass DSDT revision check");

+      return STATUS_ERROR;

+    }

+    if (AcpiHeader->Length <= sizeof(EFI_ACPI_DESCRIPTION_HEADER)) {

+      Error (NULL, 0, 0, "CheckAcpiTable", "failed to pass DSDT Length check");

+      return STATUS_ERROR;

+    }

+    break;

+

+  //

+  // "APIC" Multiple APIC Description Table

+  //

+  case EFI_ACPI_3_0_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE:

+    if ((AcpiHeader->Revision != EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION) &&

+        (AcpiHeader->Revision != EFI_ACPI_2_0_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION) &&

+        (AcpiHeader->Revision != EFI_ACPI_3_0_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION)) {

+      Error (NULL, 0, 0, "CheckAcpiTable", "failed to pass APIC revision check");

+      return STATUS_ERROR;

+    }

+    if (AcpiHeader->Length <= sizeof(EFI_ACPI_DESCRIPTION_HEADER) + sizeof(UINT32) + sizeof(UINT32)) {

+      Error (NULL, 0, 0, "CheckAcpiTable", "failed to pass APIC Length check");

+      return STATUS_ERROR;

+    }

+    break;

+

+  //

+  // "MCFG" PCI Express Memory Mapped Configuration Space Base Address Description Table

+  //

+  case EFI_ACPI_3_0_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BASE_ADDRESS_DESCRIPTION_TABLE_SIGNATURE:

+    if (AcpiHeader->Revision != EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_SPACE_ACCESS_TABLE_REVISION) {

+      Error (NULL, 0, 0, "CheckAcpiTable", "failed to pass MCFG revision check");

+      return STATUS_ERROR;

+    }

+    if (AcpiHeader->Length <= sizeof(EFI_ACPI_DESCRIPTION_HEADER) + sizeof(UINT64)) {

+      Error (NULL, 0, 0, "CheckAcpiTable", "failed to pass MCFG Length check");

+      return STATUS_ERROR;

+    }

+    break;

+

+  //

+  // Other table pass check

+  //

+  default:

+    break;

+  }

+

+  return STATUS_SUCCESS;

+}

+

+static

+STATUS

 CheckPE32File (

   INT8      *FileName,

   FILE      *Fptr,

diff --git a/Tools/CCode/Source/GenAcpiTable/build.xml b/Tools/CCode/Source/GenAcpiTable/build.xml
index a60871bdcc..b7712521c6 100644
--- a/Tools/CCode/Source/GenAcpiTable/build.xml
+++ b/Tools/CCode/Source/GenAcpiTable/build.xml
@@ -45,6 +45,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         excludes="*.xml *.inf"/>

 

       <includepath path="${PACKAGE_DIR}/Include"/>

+      <includepath path="${PACKAGE_DIR}/Include/IndustryStandard"/>

       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>

       <includepath path="${PACKAGE_DIR}/Common"/>

       <libset dir="${LIB_DIR}" libs="CommonTools"/>