vendor/acpica/20171110

11 files changed, 1186 insertions, 798 deletions

diff --git a/source/tools/acpiexec/aecommon.h b/source/tools/acpiexec/aecommon.h
index 00bf09b413124..968efd7ae0ebd 100644
--- a/source/tools/acpiexec/aecommon.h
+++ b/source/tools/acpiexec/aecommon.h
@@ -199,6 +199,10 @@ extern BOOLEAN              AcpiGbl_LoadTestTables;
 extern FILE                 *AcpiGbl_NamespaceInitFile;
 extern ACPI_CONNECTION_INFO AeMyContext;
 
+extern UINT8                Ssdt2Code[];
+extern UINT8                Ssdt3Code[];
+extern UINT8                Ssdt4Code[];
+
 
 #define TEST_OUTPUT_LEVEL(lvl)          if ((lvl) & OutputLevel)
 
@@ -264,18 +268,14 @@ ACPI_STATUS
 AeDisplayAllMethods (
     UINT32                  DisplayCount);
 
-ACPI_STATUS
-AeInstallEarlyHandlers (
-    void);
-
-ACPI_STATUS
-AeInstallLateHandlers (
-    void);
+/* aetests */
 
 void
 AeMiscellaneousTests (
     void);
 
+/* aeregion */
+
 ACPI_STATUS
 AeRegionHandler (
     UINT32                  Function,
@@ -285,6 +285,30 @@ AeRegionHandler (
     void                    *HandlerContext,
     void                    *RegionContext);
 
+/* aeinstall */
+
+ACPI_STATUS
+AeInstallDeviceHandlers (
+    void);
+
+void
+AeInstallRegionHandlers (
+    void);
+
+void
+AeOverrideRegionHandlers (
+    void);
+
+/* aehandlers */
+
+ACPI_STATUS
+AeInstallEarlyHandlers (
+    void);
+
+ACPI_STATUS
+AeInstallLateHandlers (
+    void);
+
 UINT32
 AeGpeHandler (
     ACPI_HANDLE             GpeDevice,
@@ -298,29 +322,50 @@ AeGlobalEventHandler (
     UINT32                  EventNumber,
     void                    *Context);
 
-/* aeregion */
+/* aeinitfile */
 
-ACPI_STATUS
-AeInstallDeviceHandlers (
+int
+AeOpenInitializationFile (
+    char                    *Filename);
+
+void
+AeDoObjectOverrides (
     void);
 
+ACPI_STATUS
+AeSetupConfiguration (
+    void                    *RegionAddr);
+
+/* aeexec */
+
 void
-AeInstallRegionHandlers (
+AeTestBufferArgument (
     void);
 
 void
-AeOverrideRegionHandlers (
+AeTestPackageArgument (
     void);
 
+ACPI_STATUS
+AeGetDevices (
+    ACPI_HANDLE             ObjHandle,
+    UINT32                  NestingLevel,
+    void                    *Context,
+    void                    **ReturnValue);
 
-/* aeinitfile */
+ACPI_STATUS
+ExecuteOSI (
+    char                    *OsiString,
+    UINT64                  ExpectedResult);
 
-int
-AeOpenInitializationFile (
-    char                    *Filename);
+void
+AeGenericRegisters (
+    void);
 
+#if (!ACPI_REDUCED_HARDWARE)
 void
-AeDoObjectOverrides (
+AfInstallGpeBlock (
     void);
+#endif /* !ACPI_REDUCED_HARDWARE */
 
 #endif /* _AECOMMON */
diff --git a/source/tools/acpiexec/aeexec.c b/source/tools/acpiexec/aeexec.c
index d609ec1cce405..b902e28485e52 100644
--- a/source/tools/acpiexec/aeexec.c
+++ b/source/tools/acpiexec/aeexec.c
@@ -1,6 +1,7 @@
 /******************************************************************************
  *
- * Module Name: aeexec - Support routines for AcpiExec utility
+ * Module Name: aeexec - Argument testing for control method execution.
+ *                       Also some other miscellaneous tests.
  *
  *****************************************************************************/
 
@@ -154,58 +155,6 @@
 #define _COMPONENT          ACPI_TOOLS
         ACPI_MODULE_NAME    ("aeexec")
 
-/* Local prototypes */
-
-static ACPI_STATUS
-AeSetupConfiguration (
-    void                    *RegionAddr);
-
-static void
-AeTestBufferArgument (
-    void);
-
-static void
-AeTestPackageArgument (
-    void);
-
-static ACPI_STATUS
-AeGetDevices (
-    ACPI_HANDLE             ObjHandle,
-    UINT32                  NestingLevel,
-    void                    *Context,
-    void                    **ReturnValue);
-
-static ACPI_STATUS
-ExecuteOSI (
-    char                    *OsiString,
-    UINT64                  ExpectedResult);
-
-static void
-AeMutexInterfaces (
-    void);
-
-static void
-AeHardwareInterfaces (
-    void);
-
-static void
-AeGenericRegisters (
-    void);
-
-static void
-AeTestSleepData (
-    void);
-
-#if (!ACPI_REDUCED_HARDWARE)
-static void
-AfInstallGpeBlock (
-    void);
-#endif /* !ACPI_REDUCED_HARDWARE */
-
-extern unsigned char Ssdt2Code[];
-extern unsigned char Ssdt3Code[];
-extern unsigned char Ssdt4Code[];
-
 
 /******************************************************************************
  *
@@ -220,7 +169,7 @@ extern unsigned char Ssdt4Code[];
  *
  *****************************************************************************/
 
-static ACPI_STATUS
+ACPI_STATUS
 AeSetupConfiguration (
     void                    *RegionAddr)
 {
@@ -256,7 +205,7 @@ AeSetupConfiguration (
  *
  *****************************************************************************/
 
-static void
+void
 AfInstallGpeBlock (
     void)
 {
@@ -337,9 +286,15 @@ AfInstallGpeBlock (
 #endif /* !ACPI_REDUCED_HARDWARE */
 
 
-/* Test using a Buffer object as a method argument */
+/******************************************************************************
+ *
+ * FUNCTION:    AeTestBufferArgument
+ *
+ * DESCRIPTION: Test using a Buffer object as a method argument
+ *
+ *****************************************************************************/
 
-static void
+void
 AeTestBufferArgument (
     void)
 {
@@ -369,11 +324,15 @@ static ACPI_OBJECT                 PkgElements[5];
 static ACPI_OBJECT                 Pkg2Elements[5];
 static ACPI_OBJECT_LIST            Params;
 
+/******************************************************************************
+ *
+ * FUNCTION:    AeTestPackageArgument
+ *
+ * DESCRIPTION: Test using a Package object as a method argument
+ *
+ *****************************************************************************/
 
-/*
- * Test using a Package object as an method argument
- */
-static void
+void
 AeTestPackageArgument (
     void)
 {
@@ -419,7 +378,15 @@ AeTestPackageArgument (
 }
 
 
-static ACPI_STATUS
+/******************************************************************************
+ *
+ * FUNCTION:    AeGetDevices
+ *
+ * DESCRIPTION: Stubbed at this time.
+ *
+ *****************************************************************************/
+
+ACPI_STATUS
 AeGetDevices (
     ACPI_HANDLE                     ObjHandle,
     UINT32                          NestingLevel,
@@ -444,7 +411,7 @@ AeGetDevices (
  *
  *****************************************************************************/
 
-static ACPI_STATUS
+ACPI_STATUS
 ExecuteOSI (
     char                    *OsiString,
     UINT64                  ExpectedResult)
@@ -531,7 +498,7 @@ ErrorExit:
 
 static ACPI_GENERIC_ADDRESS       GenericRegister;
 
-static void
+void
 AeGenericRegisters (
     void)
 {
@@ -560,431 +527,3 @@ AeGenericRegisters (
     Status = AcpiWrite (Value, &GenericRegister);
     ACPI_CHECK_OK (AcpiWrite, Status);
 }
-
-
-/******************************************************************************
- *
- * FUNCTION:    AeMutexInterfaces
- *
- * DESCRIPTION: Exercise the AML mutex access interfaces
- *
- *****************************************************************************/
-
-static void
-AeMutexInterfaces (
-    void)
-{
-    ACPI_STATUS             Status;
-    ACPI_HANDLE             MutexHandle;
-
-
-    /* Get a handle to an AML mutex */
-
-    Status = AcpiGetHandle (NULL, "\\MTX1", &MutexHandle);
-    if (Status == AE_NOT_FOUND)
-    {
-        return;
-    }
-
-    ACPI_CHECK_OK (AcpiGetHandle, Status);
-    if (ACPI_FAILURE (Status))
-    {
-        return;
-    }
-
-    /* Acquire the  mutex */
-
-    Status = AcpiAcquireMutex (NULL, "\\MTX1", 0xFFFF);
-    ACPI_CHECK_OK (AcpiAcquireMutex, Status);
-    if (ACPI_FAILURE (Status))
-    {
-        return;
-    }
-
-    /* Release mutex with different parameters */
-
-    Status = AcpiReleaseMutex (MutexHandle, NULL);
-    ACPI_CHECK_OK (AcpiReleaseMutex, Status);
-}
-
-
-/******************************************************************************
- *
- * FUNCTION:    AeHardwareInterfaces
- *
- * DESCRIPTION: Call various hardware support interfaces
- *
- *****************************************************************************/
-
-static void
-AeHardwareInterfaces (
-    void)
-{
-#if (!ACPI_REDUCED_HARDWARE)
-
-    ACPI_STATUS             Status;
-    UINT32                  Value;
-
-
-    /* If Hardware Reduced flag is set, we are all done */
-
-    if (AcpiGbl_ReducedHardware)
-    {
-        return;
-    }
-
-    Status = AcpiWriteBitRegister (ACPI_BITREG_WAKE_STATUS, 1);
-    ACPI_CHECK_OK (AcpiWriteBitRegister, Status);
-
-    Status = AcpiWriteBitRegister (ACPI_BITREG_GLOBAL_LOCK_ENABLE, 1);
-    ACPI_CHECK_OK (AcpiWriteBitRegister, Status);
-
-    Status = AcpiWriteBitRegister (ACPI_BITREG_SLEEP_ENABLE, 1);
-    ACPI_CHECK_OK (AcpiWriteBitRegister, Status);
-
-    Status = AcpiWriteBitRegister (ACPI_BITREG_ARB_DISABLE, 1);
-    ACPI_CHECK_OK (AcpiWriteBitRegister, Status);
-
-
-    Status = AcpiReadBitRegister (ACPI_BITREG_WAKE_STATUS, &Value);
-    ACPI_CHECK_OK (AcpiReadBitRegister, Status);
-
-    Status = AcpiReadBitRegister (ACPI_BITREG_GLOBAL_LOCK_ENABLE, &Value);
-    ACPI_CHECK_OK (AcpiReadBitRegister, Status);
-
-    Status = AcpiReadBitRegister (ACPI_BITREG_SLEEP_ENABLE, &Value);
-    ACPI_CHECK_OK (AcpiReadBitRegister, Status);
-
-    Status = AcpiReadBitRegister (ACPI_BITREG_ARB_DISABLE, &Value);
-    ACPI_CHECK_OK (AcpiReadBitRegister, Status);
-
-#endif /* !ACPI_REDUCED_HARDWARE */
-}
-
-
-/******************************************************************************
- *
- * FUNCTION:    AeTestSleepData
- *
- * DESCRIPTION: Exercise the sleep/wake support (_S0, _S1, etc.)
- *
- *****************************************************************************/
-
-static void
-AeTestSleepData (
-    void)
-{
-    int                     State;
-    UINT8                   TypeA;
-    UINT8                   TypeB;
-    ACPI_STATUS             Status;
-
-
-    /* Attempt to get sleep data for all known sleep states */
-
-    for (State = ACPI_STATE_S0; State <= ACPI_S_STATES_MAX; State++)
-    {
-        Status = AcpiGetSleepTypeData ((UINT8) State, &TypeA, &TypeB);
-
-        /* All sleep methods are optional */
-
-        if (Status != AE_NOT_FOUND)
-        {
-            ACPI_CHECK_OK (AcpiGetSleepTypeData, Status);
-        }
-    }
-}
-
-
-/******************************************************************************
- *
- * FUNCTION:    AeMiscellaneousTests
- *
- * DESCRIPTION: Various ACPICA validation tests.
- *
- *****************************************************************************/
-
-void
-AeMiscellaneousTests (
-    void)
-{
-    ACPI_BUFFER             ReturnBuf;
-    char                    Buffer[32];
-    ACPI_STATUS             Status;
-    ACPI_STATISTICS         Stats;
-    ACPI_HANDLE             Handle;
-
-#if (!ACPI_REDUCED_HARDWARE)
-    UINT32                  Temp;
-    UINT32                  LockHandle1;
-    UINT32                  LockHandle2;
-    ACPI_VENDOR_UUID        Uuid =
-        {0, {ACPI_INIT_UUID (0,0,0,0,0,0,0,0,0,0,0)}};
-#endif /* !ACPI_REDUCED_HARDWARE */
-
-
-    Status = AcpiGetHandle (NULL, "\\", &Handle);
-    ACPI_CHECK_OK (AcpiGetHandle, Status);
-
-    if (AcpiGbl_DoInterfaceTests)
-    {
-        /*
-         * Tests for AcpiLoadTable and AcpiUnloadParentTable
-         */
-
-        /* Attempt unload of DSDT, should fail */
-
-        Status = AcpiGetHandle (NULL, "\\_SB_", &Handle);
-        ACPI_CHECK_OK (AcpiGetHandle, Status);
-
-        Status = AcpiUnloadParentTable (Handle);
-        ACPI_CHECK_STATUS (AcpiUnloadParentTable, Status, AE_TYPE);
-
-        /* Load and unload SSDT4 */
-
-        Status = AcpiLoadTable ((ACPI_TABLE_HEADER *) Ssdt4Code);
-        ACPI_CHECK_OK (AcpiLoadTable, Status);
-
-        Status = AcpiGetHandle (NULL, "\\_T96", &Handle);
-        ACPI_CHECK_OK (AcpiGetHandle, Status);
-
-        Status = AcpiUnloadParentTable (Handle);
-        ACPI_CHECK_OK (AcpiUnloadParentTable, Status);
-
-        /* Re-load SSDT4 */
-
-        Status = AcpiLoadTable ((ACPI_TABLE_HEADER *) Ssdt4Code);
-        ACPI_CHECK_OK (AcpiLoadTable, Status);
-
-        /* Unload and re-load SSDT2 (SSDT2 is in the XSDT) */
-
-        Status = AcpiGetHandle (NULL, "\\_T99", &Handle);
-        ACPI_CHECK_OK (AcpiGetHandle, Status);
-
-        Status = AcpiUnloadParentTable (Handle);
-        ACPI_CHECK_OK (AcpiUnloadParentTable, Status);
-
-        Status = AcpiLoadTable ((ACPI_TABLE_HEADER *) Ssdt2Code);
-        ACPI_CHECK_OK (AcpiLoadTable, Status);
-
-        /* Load OEM9 table (causes table override) */
-
-        Status = AcpiLoadTable ((ACPI_TABLE_HEADER *) Ssdt3Code);
-        ACPI_CHECK_OK (AcpiLoadTable, Status);
-    }
-
-    AeHardwareInterfaces ();
-    AeGenericRegisters ();
-    AeSetupConfiguration (Ssdt3Code);
-
-    AeTestBufferArgument();
-    AeTestPackageArgument ();
-    AeMutexInterfaces ();
-    AeTestSleepData ();
-
-    /* Test _OSI install/remove */
-
-    Status = AcpiInstallInterface ("");
-    ACPI_CHECK_STATUS (AcpiInstallInterface, Status, AE_BAD_PARAMETER);
-
-    Status = AcpiInstallInterface ("TestString");
-    ACPI_CHECK_OK (AcpiInstallInterface, Status);
-
-    Status = AcpiInstallInterface ("TestString");
-    ACPI_CHECK_STATUS (AcpiInstallInterface, Status, AE_ALREADY_EXISTS);
-
-    Status = AcpiRemoveInterface ("Windows 2006");
-    ACPI_CHECK_OK (AcpiRemoveInterface, Status);
-
-    Status = AcpiRemoveInterface ("TestString");
-    ACPI_CHECK_OK (AcpiRemoveInterface, Status);
-
-    Status = AcpiRemoveInterface ("XXXXXX");
-    ACPI_CHECK_STATUS (AcpiRemoveInterface, Status, AE_NOT_EXIST);
-
-    Status = AcpiInstallInterface ("AnotherTestString");
-    ACPI_CHECK_OK (AcpiInstallInterface, Status);
-
-    /* Test _OSI execution */
-
-    Status = ExecuteOSI ("Extended Address Space Descriptor", ACPI_UINT64_MAX);
-    ACPI_CHECK_OK (ExecuteOSI, Status);
-
-    Status = ExecuteOSI ("Windows 2001", ACPI_UINT64_MAX);
-    ACPI_CHECK_OK (ExecuteOSI, Status);
-
-    Status = ExecuteOSI ("MichiganTerminalSystem", 0);
-    ACPI_CHECK_OK (ExecuteOSI, Status);
-
-
-    ReturnBuf.Length = 32;
-    ReturnBuf.Pointer = Buffer;
-
-    Status = AcpiGetName (ACPI_ROOT_OBJECT,
-        ACPI_FULL_PATHNAME_NO_TRAILING, &ReturnBuf);
-    ACPI_CHECK_OK (AcpiGetName, Status);
-
-    /* Get Devices */
-
-    Status = AcpiGetDevices (NULL, AeGetDevices, NULL, NULL);
-    ACPI_CHECK_OK (AcpiGetDevices, Status);
-
-    Status = AcpiGetStatistics (&Stats);
-    ACPI_CHECK_OK (AcpiGetStatistics, Status);
-
-
-#if (!ACPI_REDUCED_HARDWARE)
-
-    Status = AcpiInstallGlobalEventHandler (AeGlobalEventHandler, NULL);
-    ACPI_CHECK_OK (AcpiInstallGlobalEventHandler, Status);
-
-    /* If Hardware Reduced flag is set, we are all done */
-
-    if (AcpiGbl_ReducedHardware)
-    {
-        return;
-    }
-
-    Status = AcpiEnableEvent (ACPI_EVENT_GLOBAL, 0);
-    ACPI_CHECK_OK (AcpiEnableEvent, Status);
-
-    /*
-     * GPEs: Handlers, enable/disable, etc.
-     */
-    Status = AcpiInstallGpeHandler (NULL, 0,
-        ACPI_GPE_LEVEL_TRIGGERED, AeGpeHandler, NULL);
-    ACPI_CHECK_OK (AcpiInstallGpeHandler, Status);
-
-    Status = AcpiEnableGpe (NULL, 0);
-    ACPI_CHECK_OK (AcpiEnableGpe, Status);
-
-    Status = AcpiRemoveGpeHandler (NULL, 0, AeGpeHandler);
-    ACPI_CHECK_OK (AcpiRemoveGpeHandler, Status);
-
-    Status = AcpiInstallGpeHandler (NULL, 0,
-        ACPI_GPE_LEVEL_TRIGGERED, AeGpeHandler, NULL);
-    ACPI_CHECK_OK (AcpiInstallGpeHandler, Status);
-
-    Status = AcpiEnableGpe (NULL, 0);
-    ACPI_CHECK_OK (AcpiEnableGpe, Status);
-
-    Status = AcpiSetGpe (NULL, 0, ACPI_GPE_DISABLE);
-    ACPI_CHECK_OK (AcpiSetGpe, Status);
-
-    Status = AcpiSetGpe (NULL, 0, ACPI_GPE_ENABLE);
-    ACPI_CHECK_OK (AcpiSetGpe, Status);
-
-
-    Status = AcpiInstallGpeHandler (NULL, 1,
-        ACPI_GPE_EDGE_TRIGGERED, AeGpeHandler, NULL);
-    ACPI_CHECK_OK (AcpiInstallGpeHandler, Status);
-
-    Status = AcpiEnableGpe (NULL, 1);
-    ACPI_CHECK_OK (AcpiEnableGpe, Status);
-
-
-    Status = AcpiInstallGpeHandler (NULL, 2,
-        ACPI_GPE_LEVEL_TRIGGERED, AeGpeHandler, NULL);
-    ACPI_CHECK_OK (AcpiInstallGpeHandler, Status);
-
-    Status = AcpiEnableGpe (NULL, 2);
-    ACPI_CHECK_OK (AcpiEnableGpe, Status);
-
-
-    Status = AcpiInstallGpeHandler (NULL, 3,
-        ACPI_GPE_EDGE_TRIGGERED, AeGpeHandler, NULL);
-    ACPI_CHECK_OK (AcpiInstallGpeHandler, Status);
-
-    Status = AcpiInstallGpeHandler (NULL, 4,
-        ACPI_GPE_LEVEL_TRIGGERED, AeGpeHandler, NULL);
-    ACPI_CHECK_OK (AcpiInstallGpeHandler, Status);
-
-    Status = AcpiInstallGpeHandler (NULL, 5,
-        ACPI_GPE_EDGE_TRIGGERED, AeGpeHandler, NULL);
-    ACPI_CHECK_OK (AcpiInstallGpeHandler, Status);
-
-    Status = AcpiGetHandle (NULL, "\\_SB", &Handle);
-    ACPI_CHECK_OK (AcpiGetHandle, Status);
-
-    Status = AcpiSetupGpeForWake (Handle, NULL, 5);
-    ACPI_CHECK_OK (AcpiSetupGpeForWake, Status);
-
-    Status = AcpiSetGpeWakeMask (NULL, 5, ACPI_GPE_ENABLE);
-    ACPI_CHECK_OK (AcpiSetGpeWakeMask, Status);
-
-    Status = AcpiSetupGpeForWake (Handle, NULL, 6);
-    ACPI_CHECK_OK (AcpiSetupGpeForWake, Status);
-
-    Status = AcpiSetupGpeForWake (ACPI_ROOT_OBJECT, NULL, 6);
-    ACPI_CHECK_OK (AcpiSetupGpeForWake, Status);
-
-    Status = AcpiSetupGpeForWake (Handle, NULL, 9);
-    ACPI_CHECK_OK (AcpiSetupGpeForWake, Status);
-
-    Status = AcpiInstallGpeHandler (NULL, 0x19,
-        ACPI_GPE_LEVEL_TRIGGERED, AeGpeHandler, NULL);
-    ACPI_CHECK_OK (AcpiInstallGpeHandler, Status);
-
-    Status = AcpiEnableGpe (NULL, 0x19);
-    ACPI_CHECK_OK (AcpiEnableGpe, Status);
-
-
-    /* GPE block 1 */
-
-    Status = AcpiInstallGpeHandler (NULL, 101,
-        ACPI_GPE_LEVEL_TRIGGERED, AeGpeHandler, NULL);
-    ACPI_CHECK_OK (AcpiInstallGpeHandler, Status);
-
-    Status = AcpiEnableGpe (NULL, 101);
-    ACPI_CHECK_OK (AcpiEnableGpe, Status);
-
-    Status = AcpiDisableGpe (NULL, 101);
-    ACPI_CHECK_OK (AcpiDisableGpe, Status);
-
-    AfInstallGpeBlock ();
-
-    /* Here is where the GPEs are actually "enabled" */
-
-    Status = AcpiUpdateAllGpes ();
-    ACPI_CHECK_OK (AcpiUpdateAllGpes, Status);
-
-    Status = AcpiGetHandle (NULL, "RSRC", &Handle);
-    if (ACPI_SUCCESS (Status))
-    {
-        ReturnBuf.Length = ACPI_ALLOCATE_BUFFER;
-
-        Status = AcpiGetVendorResource (Handle, "_CRS", &Uuid, &ReturnBuf);
-        if (ACPI_SUCCESS (Status))
-        {
-            AcpiOsFree (ReturnBuf.Pointer);
-        }
-    }
-
-    /* Test global lock */
-
-    Status = AcpiAcquireGlobalLock (0xFFFF, &LockHandle1);
-    ACPI_CHECK_OK (AcpiAcquireGlobalLock, Status);
-
-    Status = AcpiAcquireGlobalLock (0x5, &LockHandle2);
-    ACPI_CHECK_OK (AcpiAcquireGlobalLock, Status);
-
-    Status = AcpiReleaseGlobalLock (LockHandle1);
-    ACPI_CHECK_OK (AcpiReleaseGlobalLock, Status);
-
-    Status = AcpiReleaseGlobalLock (LockHandle2);
-    ACPI_CHECK_OK (AcpiReleaseGlobalLock, Status);
-
-    /* Test timer interfaces */
-
-    Status = AcpiGetTimerResolution (&Temp);
-    ACPI_CHECK_OK (AcpiGetTimerResolution, Status);
-
-    Status = AcpiGetTimer (&Temp);
-    ACPI_CHECK_OK (AcpiGetTimer, Status);
-
-    Status = AcpiGetTimerDuration (0x1000, 0x2000, &Temp);
-    ACPI_CHECK_OK (AcpiGetTimerDuration, Status);
-
-
-#endif /* !ACPI_REDUCED_HARDWARE */
-}
diff --git a/source/tools/acpiexec/aeinstall.c b/source/tools/acpiexec/aeinstall.c
new file mode 100644
index 0000000000000..02ff928857eec
--- /dev/null
+++ b/source/tools/acpiexec/aeinstall.c
@@ -0,0 +1,457 @@
+/******************************************************************************
+ *
+ * Module Name: aeinstall - Installation of operation region handlers
+ *
+ *****************************************************************************/
+
+/******************************************************************************
+ *
+ * 1. Copyright Notice
+ *
+ * Some or all of this work - Copyright (c) 1999 - 2017, Intel Corp.
+ * All rights reserved.
+ *
+ * 2. License
+ *
+ * 2.1. This is your license from Intel Corp. under its intellectual property
+ * rights. You may have additional license terms from the party that provided
+ * you this software, covering your right to use that party's intellectual
+ * property rights.
+ *
+ * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a
+ * copy of the source code appearing in this file ("Covered Code") an
+ * irrevocable, perpetual, worldwide license under Intel's copyrights in the
+ * base code distributed originally by Intel ("Original Intel Code") to copy,
+ * make derivatives, distribute, use and display any portion of the Covered
+ * Code in any form, with the right to sublicense such rights; and
+ *
+ * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent
+ * license (with the right to sublicense), under only those claims of Intel
+ * patents that are infringed by the Original Intel Code, to make, use, sell,
+ * offer to sell, and import the Covered Code and derivative works thereof
+ * solely to the minimum extent necessary to exercise the above copyright
+ * license, and in no event shall the patent license extend to any additions
+ * to or modifications of the Original Intel Code. No other license or right
+ * is granted directly or by implication, estoppel or otherwise;
+ *
+ * The above copyright and patent license is granted only if the following
+ * conditions are met:
+ *
+ * 3. Conditions
+ *
+ * 3.1. Redistribution of Source with Rights to Further Distribute Source.
+ * Redistribution of source code of any substantial portion of the Covered
+ * Code or modification with rights to further distribute source must include
+ * the above Copyright Notice, the above License, this list of Conditions,
+ * and the following Disclaimer and Export Compliance provision. In addition,
+ * Licensee must cause all Covered Code to which Licensee contributes to
+ * contain a file documenting the changes Licensee made to create that Covered
+ * Code and the date of any change. Licensee must include in that file the
+ * documentation of any changes made by any predecessor Licensee. Licensee
+ * must include a prominent statement that the modification is derived,
+ * directly or indirectly, from Original Intel Code.
+ *
+ * 3.2. Redistribution of Source with no Rights to Further Distribute Source.
+ * Redistribution of source code of any substantial portion of the Covered
+ * Code or modification without rights to further distribute source must
+ * include the following Disclaimer and Export Compliance provision in the
+ * documentation and/or other materials provided with distribution. In
+ * addition, Licensee may not authorize further sublicense of source of any
+ * portion of the Covered Code, and must include terms to the effect that the
+ * license from Licensee to its licensee is limited to the intellectual
+ * property embodied in the software Licensee provides to its licensee, and
+ * not to intellectual property embodied in modifications its licensee may
+ * make.
+ *
+ * 3.3. Redistribution of Executable. Redistribution in executable form of any
+ * substantial portion of the Covered Code or modification must reproduce the
+ * above Copyright Notice, and the following Disclaimer and Export Compliance
+ * provision in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3.4. Intel retains all right, title, and interest in and to the Original
+ * Intel Code.
+ *
+ * 3.5. Neither the name Intel nor any other trademark owned or controlled by
+ * Intel shall be used in advertising or otherwise to promote the sale, use or
+ * other dealings in products derived from or relating to the Covered Code
+ * without prior written authorization from Intel.
+ *
+ * 4. Disclaimer and Export Compliance
+ *
+ * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED
+ * HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE
+ * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE,
+ * INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY
+ * UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY
+ * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A
+ * PARTICULAR PURPOSE.
+ *
+ * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES
+ * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR
+ * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT,
+ * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY
+ * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL
+ * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS
+ * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY
+ * LIMITED REMEDY.
+ *
+ * 4.3. Licensee shall not export, either directly or indirectly, any of this
+ * software or system incorporating such software without first obtaining any
+ * required license or other approval from the U. S. Department of Commerce or
+ * any other agency or department of the United States Government. In the
+ * event Licensee exports any such software from the United States or
+ * re-exports any such software from a foreign destination, Licensee shall
+ * ensure that the distribution and export/re-export of the software is in
+ * compliance with all laws, regulations, orders, or other restrictions of the
+ * U.S. Export Administration Regulations. Licensee agrees that neither it nor
+ * any of its subsidiaries will export/re-export any technical data, process,
+ * software, or service, directly or indirectly, to any country for which the
+ * United States government or any agency thereof requires an export license,
+ * other governmental approval, or letter of assurance, without first obtaining
+ * such license, approval or letter.
+ *
+ *****************************************************************************
+ *
+ * Alternatively, you may choose to be licensed under the terms of the
+ * following license:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Alternatively, you may choose to be licensed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ *****************************************************************************/
+
+#include "aecommon.h"
+
+#define _COMPONENT          ACPI_TOOLS
+        ACPI_MODULE_NAME    ("aeinstall")
+
+
+static ACPI_STATUS
+AeRegionInit (
+    ACPI_HANDLE             RegionHandle,
+    UINT32                  Function,
+    void                    *HandlerContext,
+    void                    **RegionContext);
+
+static ACPI_STATUS
+AeInstallEcHandler (
+    ACPI_HANDLE             ObjHandle,
+    UINT32                  Level,
+    void                    *Context,
+    void                    **ReturnValue);
+
+static ACPI_STATUS
+AeInstallPciHandler (
+    ACPI_HANDLE             ObjHandle,
+    UINT32                  Level,
+    void                    *Context,
+    void                    **ReturnValue);
+
+
+BOOLEAN                     AcpiGbl_DisplayRegionAccess = FALSE;
+ACPI_CONNECTION_INFO        AeMyContext;
+
+
+/*
+ * We will override some of the default region handlers, especially
+ * the SystemMemory handler, which must be implemented locally.
+ * These handlers are installed "early" - before any _REG methods
+ * are executed - since they are special in the sense that the ACPI spec
+ * declares that they must "always be available". Cannot override the
+ * DataTable region handler either -- needed for test execution.
+ *
+ * NOTE: The local region handler will simulate access to these address
+ * spaces by creating a memory buffer behind each operation region.
+ */
+static ACPI_ADR_SPACE_TYPE  DefaultSpaceIdList[] =
+{
+    ACPI_ADR_SPACE_SYSTEM_MEMORY,
+    ACPI_ADR_SPACE_SYSTEM_IO,
+    ACPI_ADR_SPACE_PCI_CONFIG,
+    ACPI_ADR_SPACE_EC
+};
+
+/*
+ * We will install handlers for some of the various address space IDs.
+ * Test one user-defined address space (used by aslts).
+ */
+#define ACPI_ADR_SPACE_USER_DEFINED1        0x80
+#define ACPI_ADR_SPACE_USER_DEFINED2        0xE4
+
+static ACPI_ADR_SPACE_TYPE  SpaceIdList[] =
+{
+    ACPI_ADR_SPACE_SMBUS,
+    ACPI_ADR_SPACE_CMOS,
+    ACPI_ADR_SPACE_PCI_BAR_TARGET,
+    ACPI_ADR_SPACE_IPMI,
+    ACPI_ADR_SPACE_GPIO,
+    ACPI_ADR_SPACE_GSBUS,
+    ACPI_ADR_SPACE_FIXED_HARDWARE,
+    ACPI_ADR_SPACE_USER_DEFINED1,
+    ACPI_ADR_SPACE_USER_DEFINED2
+};
+
+
+/******************************************************************************
+ *
+ * FUNCTION:    AeRegionInit
+ *
+ * PARAMETERS:  Region init handler
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Opregion init function.
+ *
+ *****************************************************************************/
+
+static ACPI_STATUS
+AeRegionInit (
+    ACPI_HANDLE                 RegionHandle,
+    UINT32                      Function,
+    void                        *HandlerContext,
+    void                        **RegionContext)
+{
+
+    if (Function == ACPI_REGION_DEACTIVATE)
+    {
+        *RegionContext = NULL;
+    }
+    else
+    {
+        *RegionContext = RegionHandle;
+    }
+
+    return (AE_OK);
+}
+
+
+/******************************************************************************
+ *
+ * FUNCTION:    AeOverrideRegionHandlers
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Override the default region handlers for memory, i/o, and
+ *              pci_config. Also install a handler for EC. This is part of
+ *              the "install early handlers" functionality.
+ *
+ *****************************************************************************/
+
+void
+AeOverrideRegionHandlers (
+    void)
+{
+    UINT32                  i;
+    ACPI_STATUS             Status;
+
+    /*
+     * Install handlers that will override the default handlers for some of
+     * the space IDs.
+     */
+    for (i = 0; i < ACPI_ARRAY_LENGTH (DefaultSpaceIdList); i++)
+    {
+        /* Install handler at the root object */
+
+        Status = AcpiInstallAddressSpaceHandler (ACPI_ROOT_OBJECT,
+            DefaultSpaceIdList[i], AeRegionHandler, AeRegionInit,
+            &AeMyContext);
+
+        if (ACPI_FAILURE (Status))
+        {
+            ACPI_EXCEPTION ((AE_INFO, Status,
+                "Could not install an OpRegion handler for %s space(%u)",
+                AcpiUtGetRegionName ((UINT8) DefaultSpaceIdList[i]),
+                DefaultSpaceIdList[i]));
+        }
+    }
+}
+
+
+/******************************************************************************
+ *
+ * FUNCTION:    AeInstallRegionHandlers
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Install handlers for the address spaces other than
+ *              SystemMemory, SystemIO, and PCI_CONFIG.
+ *
+ *****************************************************************************/
+
+void
+AeInstallRegionHandlers (
+    void)
+{
+    UINT32                  i;
+    ACPI_STATUS             Status;
+
+
+    /*
+     * Install handlers for some of the "device driver" address spaces
+     * such as SMBus, etc.
+     */
+    for (i = 0; i < ACPI_ARRAY_LENGTH (SpaceIdList); i++)
+    {
+        /* Install handler at the root object */
+
+        Status = AcpiInstallAddressSpaceHandler (ACPI_ROOT_OBJECT,
+            SpaceIdList[i], AeRegionHandler, AeRegionInit,
+            &AeMyContext);
+
+        if (ACPI_FAILURE (Status))
+        {
+            ACPI_EXCEPTION ((AE_INFO, Status,
+                "Could not install an OpRegion handler for %s space(%u)",
+                AcpiUtGetRegionName((UINT8) SpaceIdList[i]), SpaceIdList[i]));
+            return;
+        }
+    }
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AeInstallDeviceHandlers
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Install handlers for all EC and PCI devices in the namespace
+ *
+ ******************************************************************************/
+
+ACPI_STATUS
+AeInstallDeviceHandlers (
+    void)
+{
+
+    /* Find all Embedded Controller devices */
+
+    AcpiGetDevices ("PNP0C09", AeInstallEcHandler, NULL, NULL);
+
+    /* Install a PCI handler */
+
+    AcpiGetDevices ("PNP0A08", AeInstallPciHandler, NULL, NULL);
+    return (AE_OK);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AeInstallEcHandler
+ *
+ * PARAMETERS:  ACPI_WALK_NAMESPACE callback
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Walk entire namespace, install a handler for every EC
+ *              device found.
+ *
+ ******************************************************************************/
+
+static ACPI_STATUS
+AeInstallEcHandler (
+    ACPI_HANDLE             ObjHandle,
+    UINT32                  Level,
+    void                    *Context,
+    void                    **ReturnValue)
+{
+    ACPI_STATUS             Status;
+
+
+    /* Install the handler for this EC device */
+
+    Status = AcpiInstallAddressSpaceHandler (ObjHandle,
+        ACPI_ADR_SPACE_EC, AeRegionHandler, AeRegionInit, &AeMyContext);
+    if (ACPI_FAILURE (Status))
+    {
+        ACPI_EXCEPTION ((AE_INFO, Status,
+            "Could not install an OpRegion handler for EC device (%p)",
+            ObjHandle));
+    }
+
+    return (Status);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AeInstallPciHandler
+ *
+ * PARAMETERS:  ACPI_WALK_NAMESPACE callback
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Walk entire namespace, install a handler for every PCI
+ *              device found.
+ *
+ ******************************************************************************/
+
+static ACPI_STATUS
+AeInstallPciHandler (
+    ACPI_HANDLE             ObjHandle,
+    UINT32                  Level,
+    void                    *Context,
+    void                    **ReturnValue)
+{
+    ACPI_STATUS             Status;
+
+
+    /* Install memory and I/O handlers for the PCI device */
+
+    Status = AcpiInstallAddressSpaceHandler (ObjHandle,
+        ACPI_ADR_SPACE_SYSTEM_IO, AeRegionHandler, AeRegionInit,
+        &AeMyContext);
+    if (ACPI_FAILURE (Status))
+    {
+        ACPI_EXCEPTION ((AE_INFO, Status,
+            "Could not install an OpRegion handler for PCI device (%p)",
+            ObjHandle));
+    }
+
+    Status = AcpiInstallAddressSpaceHandler (ObjHandle,
+        ACPI_ADR_SPACE_SYSTEM_MEMORY, AeRegionHandler, AeRegionInit,
+        &AeMyContext);
+    if (ACPI_FAILURE (Status))
+    {
+        ACPI_EXCEPTION ((AE_INFO, Status,
+            "Could not install an OpRegion handler for PCI device (%p)",
+            ObjHandle));
+    }
+
+    return (AE_CTRL_TERMINATE);
+}
diff --git a/source/tools/acpiexec/aemain.c b/source/tools/acpiexec/aemain.c
index e9908e8488689..b3df425614a3b 100644
--- a/source/tools/acpiexec/aemain.c
+++ b/source/tools/acpiexec/aemain.c
@@ -810,11 +810,15 @@ EnterDebugger:
 
     AcpiTerminateDebugger ();
 
+    /* re-enable debug output for AcpiTerminate output */
+
+    AcpiGbl_DbOutputFlags = ACPI_DB_CONSOLE_OUTPUT;
+
 NormalExit:
     ExitCode = 0;
 
 ErrorExit:
-    (void) AcpiOsTerminate ();
+    (void) AcpiTerminate ();
     AcDeleteTableList (ListHead);
     return (ExitCode);
 }
diff --git a/source/tools/acpiexec/aeregion.c b/source/tools/acpiexec/aeregion.c
index 4076c06bdf0bc..69c3999f6b014 100644
--- a/source/tools/acpiexec/aeregion.c
+++ b/source/tools/acpiexec/aeregion.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Module Name: aeregion - Operation region support for acpiexec
+ * Module Name: aeregion - Handler for operation regions
  *
  *****************************************************************************/
 
@@ -155,283 +155,7 @@
         ACPI_MODULE_NAME    ("aeregion")
 
 
-/* Local prototypes */
-
-static ACPI_STATUS
-AeRegionInit (
-    ACPI_HANDLE             RegionHandle,
-    UINT32                  Function,
-    void                    *HandlerContext,
-    void                    **RegionContext);
-
-static ACPI_STATUS
-AeInstallEcHandler (
-    ACPI_HANDLE             ObjHandle,
-    UINT32                  Level,
-    void                    *Context,
-    void                    **ReturnValue);
-
-static ACPI_STATUS
-AeInstallPciHandler (
-    ACPI_HANDLE             ObjHandle,
-    UINT32                  Level,
-    void                    *Context,
-    void                    **ReturnValue);
-
-
 static AE_DEBUG_REGIONS     AeRegions;
-BOOLEAN                     AcpiGbl_DisplayRegionAccess = FALSE;
-ACPI_CONNECTION_INFO        AeMyContext;
-
-
-/*
- * We will override some of the default region handlers, especially
- * the SystemMemory handler, which must be implemented locally.
- * These handlers are installed "early" - before any _REG methods
- * are executed - since they are special in the sense that the ACPI spec
- * declares that they must "always be available". Cannot override the
- * DataTable region handler either -- needed for test execution.
- *
- * NOTE: The local region handler will simulate access to these address
- * spaces by creating a memory buffer behind each operation region.
- */
-static ACPI_ADR_SPACE_TYPE  DefaultSpaceIdList[] =
-{
-    ACPI_ADR_SPACE_SYSTEM_MEMORY,
-    ACPI_ADR_SPACE_SYSTEM_IO,
-    ACPI_ADR_SPACE_PCI_CONFIG,
-    ACPI_ADR_SPACE_EC
-};
-
-/*
- * We will install handlers for some of the various address space IDs.
- * Test one user-defined address space (used by aslts).
- */
-#define ACPI_ADR_SPACE_USER_DEFINED1        0x80
-#define ACPI_ADR_SPACE_USER_DEFINED2        0xE4
-
-static ACPI_ADR_SPACE_TYPE  SpaceIdList[] =
-{
-    ACPI_ADR_SPACE_SMBUS,
-    ACPI_ADR_SPACE_CMOS,
-    ACPI_ADR_SPACE_PCI_BAR_TARGET,
-    ACPI_ADR_SPACE_IPMI,
-    ACPI_ADR_SPACE_GPIO,
-    ACPI_ADR_SPACE_GSBUS,
-    ACPI_ADR_SPACE_FIXED_HARDWARE,
-    ACPI_ADR_SPACE_USER_DEFINED1,
-    ACPI_ADR_SPACE_USER_DEFINED2
-};
-
-
-/******************************************************************************
- *
- * FUNCTION:    AeRegionInit
- *
- * PARAMETERS:  Region init handler
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Opregion init function.
- *
- *****************************************************************************/
-
-static ACPI_STATUS
-AeRegionInit (
-    ACPI_HANDLE                 RegionHandle,
-    UINT32                      Function,
-    void                        *HandlerContext,
-    void                        **RegionContext)
-{
-
-    if (Function == ACPI_REGION_DEACTIVATE)
-    {
-        *RegionContext = NULL;
-    }
-    else
-    {
-        *RegionContext = RegionHandle;
-    }
-
-    return (AE_OK);
-}
-
-
-/******************************************************************************
- *
- * FUNCTION:    AeOverrideRegionHandlers
- *
- * PARAMETERS:  None
- *
- * RETURN:      None
- *
- * DESCRIPTION: Override the default region handlers for memory, i/o, and
- *              pci_config. Also install a handler for EC. This is part of
- *              the "install early handlers" functionality.
- *
- *****************************************************************************/
-
-void
-AeOverrideRegionHandlers (
-    void)
-{
-    UINT32                  i;
-    ACPI_STATUS             Status;
-
-    /*
-     * Install handlers that will override the default handlers for some of
-     * the space IDs.
-     */
-    for (i = 0; i < ACPI_ARRAY_LENGTH (DefaultSpaceIdList); i++)
-    {
-        /* Install handler at the root object */
-
-        Status = AcpiInstallAddressSpaceHandler (ACPI_ROOT_OBJECT,
-            DefaultSpaceIdList[i], AeRegionHandler,
-            AeRegionInit, &AeMyContext);
-
-        if (ACPI_FAILURE (Status))
-        {
-            ACPI_EXCEPTION ((AE_INFO, Status,
-                "Could not install an OpRegion handler for %s space(%u)",
-                AcpiUtGetRegionName ((UINT8) DefaultSpaceIdList[i]),
-                DefaultSpaceIdList[i]));
-        }
-    }
-}
-
-
-/******************************************************************************
- *
- * FUNCTION:    AeInstallRegionHandlers
- *
- * PARAMETERS:  None
- *
- * RETURN:      None
- *
- * DESCRIPTION: Install handlers for the address spaces other than memory,
- *              i/o, and pci_config.
- *
- *****************************************************************************/
-
-void
-AeInstallRegionHandlers (
-    void)
-{
-    UINT32                  i;
-    ACPI_STATUS             Status;
-
-    /*
-     * Install handlers for some of the "device driver" address spaces
-     * such as SMBus, etc.
-     */
-    for (i = 0; i < ACPI_ARRAY_LENGTH (SpaceIdList); i++)
-    {
-        /* Install handler at the root object */
-
-        Status = AcpiInstallAddressSpaceHandler (ACPI_ROOT_OBJECT,
-            SpaceIdList[i], AeRegionHandler,
-            AeRegionInit, &AeMyContext);
-
-        if (ACPI_FAILURE (Status))
-        {
-            ACPI_EXCEPTION ((AE_INFO, Status,
-                "Could not install an OpRegion handler for %s space(%u)",
-                AcpiUtGetRegionName((UINT8) SpaceIdList[i]), SpaceIdList[i]));
-            return;
-        }
-    }
-}
-
-
-/*******************************************************************************
- *
- * FUNCTION:    AeInstallDeviceHandlers,
- *              AeInstallEcHandler,
- *              AeInstallPciHandler
- *
- * PARAMETERS:  ACPI_WALK_NAMESPACE callback
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Walk entire namespace, install a handler for every EC
- *              and PCI device found.
- *
- ******************************************************************************/
-
-static ACPI_STATUS
-AeInstallEcHandler (
-    ACPI_HANDLE             ObjHandle,
-    UINT32                  Level,
-    void                    *Context,
-    void                    **ReturnValue)
-{
-    ACPI_STATUS             Status;
-
-
-    /* Install the handler for this EC device */
-
-    Status = AcpiInstallAddressSpaceHandler (ObjHandle, ACPI_ADR_SPACE_EC,
-        AeRegionHandler, AeRegionInit, &AeMyContext);
-    if (ACPI_FAILURE (Status))
-    {
-        ACPI_EXCEPTION ((AE_INFO, Status,
-            "Could not install an OpRegion handler for EC device (%p)",
-            ObjHandle));
-    }
-
-    return (Status);
-}
-
-
-static ACPI_STATUS
-AeInstallPciHandler (
-    ACPI_HANDLE             ObjHandle,
-    UINT32                  Level,
-    void                    *Context,
-    void                    **ReturnValue)
-{
-    ACPI_STATUS             Status;
-
-
-    /* Install memory and I/O handlers for the PCI device */
-
-    Status = AcpiInstallAddressSpaceHandler (ObjHandle, ACPI_ADR_SPACE_SYSTEM_IO,
-        AeRegionHandler, AeRegionInit, &AeMyContext);
-    if (ACPI_FAILURE (Status))
-    {
-        ACPI_EXCEPTION ((AE_INFO, Status,
-            "Could not install an OpRegion handler for PCI device (%p)",
-            ObjHandle));
-    }
-
-    Status = AcpiInstallAddressSpaceHandler (ObjHandle, ACPI_ADR_SPACE_SYSTEM_MEMORY,
-        AeRegionHandler, AeRegionInit, &AeMyContext);
-    if (ACPI_FAILURE (Status))
-    {
-        ACPI_EXCEPTION ((AE_INFO, Status,
-            "Could not install an OpRegion handler for PCI device (%p)",
-            ObjHandle));
-    }
-
-    return (AE_CTRL_TERMINATE);
-}
-
-
-ACPI_STATUS
-AeInstallDeviceHandlers (
-    void)
-{
-
-    /* Find all Embedded Controller devices */
-
-    AcpiGetDevices ("PNP0C09", AeInstallEcHandler, NULL, NULL);
-
-    /* Install a PCI handler */
-
-    AcpiGetDevices ("PNP0A08", AeInstallPciHandler, NULL, NULL);
-    return (AE_OK);
-}
 
 
 /******************************************************************************
diff --git a/source/tools/acpiexec/aetests.c b/source/tools/acpiexec/aetests.c
new file mode 100644
index 0000000000000..800305039f7c0
--- /dev/null
+++ b/source/tools/acpiexec/aetests.c
@@ -0,0 +1,596 @@
+/******************************************************************************
+ *
+ * Module Name: aetests - Miscellaneous tests for ACPICA public interfaces
+ *
+ *****************************************************************************/
+
+/******************************************************************************
+ *
+ * 1. Copyright Notice
+ *
+ * Some or all of this work - Copyright (c) 1999 - 2017, Intel Corp.
+ * All rights reserved.
+ *
+ * 2. License
+ *
+ * 2.1. This is your license from Intel Corp. under its intellectual property
+ * rights. You may have additional license terms from the party that provided
+ * you this software, covering your right to use that party's intellectual
+ * property rights.
+ *
+ * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a
+ * copy of the source code appearing in this file ("Covered Code") an
+ * irrevocable, perpetual, worldwide license under Intel's copyrights in the
+ * base code distributed originally by Intel ("Original Intel Code") to copy,
+ * make derivatives, distribute, use and display any portion of the Covered
+ * Code in any form, with the right to sublicense such rights; and
+ *
+ * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent
+ * license (with the right to sublicense), under only those claims of Intel
+ * patents that are infringed by the Original Intel Code, to make, use, sell,
+ * offer to sell, and import the Covered Code and derivative works thereof
+ * solely to the minimum extent necessary to exercise the above copyright
+ * license, and in no event shall the patent license extend to any additions
+ * to or modifications of the Original Intel Code. No other license or right
+ * is granted directly or by implication, estoppel or otherwise;
+ *
+ * The above copyright and patent license is granted only if the following
+ * conditions are met:
+ *
+ * 3. Conditions
+ *
+ * 3.1. Redistribution of Source with Rights to Further Distribute Source.
+ * Redistribution of source code of any substantial portion of the Covered
+ * Code or modification with rights to further distribute source must include
+ * the above Copyright Notice, the above License, this list of Conditions,
+ * and the following Disclaimer and Export Compliance provision. In addition,
+ * Licensee must cause all Covered Code to which Licensee contributes to
+ * contain a file documenting the changes Licensee made to create that Covered
+ * Code and the date of any change. Licensee must include in that file the
+ * documentation of any changes made by any predecessor Licensee. Licensee
+ * must include a prominent statement that the modification is derived,
+ * directly or indirectly, from Original Intel Code.
+ *
+ * 3.2. Redistribution of Source with no Rights to Further Distribute Source.
+ * Redistribution of source code of any substantial portion of the Covered
+ * Code or modification without rights to further distribute source must
+ * include the following Disclaimer and Export Compliance provision in the
+ * documentation and/or other materials provided with distribution. In
+ * addition, Licensee may not authorize further sublicense of source of any
+ * portion of the Covered Code, and must include terms to the effect that the
+ * license from Licensee to its licensee is limited to the intellectual
+ * property embodied in the software Licensee provides to its licensee, and
+ * not to intellectual property embodied in modifications its licensee may
+ * make.
+ *
+ * 3.3. Redistribution of Executable. Redistribution in executable form of any
+ * substantial portion of the Covered Code or modification must reproduce the
+ * above Copyright Notice, and the following Disclaimer and Export Compliance
+ * provision in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3.4. Intel retains all right, title, and interest in and to the Original
+ * Intel Code.
+ *
+ * 3.5. Neither the name Intel nor any other trademark owned or controlled by
+ * Intel shall be used in advertising or otherwise to promote the sale, use or
+ * other dealings in products derived from or relating to the Covered Code
+ * without prior written authorization from Intel.
+ *
+ * 4. Disclaimer and Export Compliance
+ *
+ * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED
+ * HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE
+ * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE,
+ * INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY
+ * UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY
+ * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A
+ * PARTICULAR PURPOSE.
+ *
+ * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES
+ * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR
+ * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT,
+ * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY
+ * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL
+ * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS
+ * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY
+ * LIMITED REMEDY.
+ *
+ * 4.3. Licensee shall not export, either directly or indirectly, any of this
+ * software or system incorporating such software without first obtaining any
+ * required license or other approval from the U. S. Department of Commerce or
+ * any other agency or department of the United States Government. In the
+ * event Licensee exports any such software from the United States or
+ * re-exports any such software from a foreign destination, Licensee shall
+ * ensure that the distribution and export/re-export of the software is in
+ * compliance with all laws, regulations, orders, or other restrictions of the
+ * U.S. Export Administration Regulations. Licensee agrees that neither it nor
+ * any of its subsidiaries will export/re-export any technical data, process,
+ * software, or service, directly or indirectly, to any country for which the
+ * United States government or any agency thereof requires an export license,
+ * other governmental approval, or letter of assurance, without first obtaining
+ * such license, approval or letter.
+ *
+ *****************************************************************************
+ *
+ * Alternatively, you may choose to be licensed under the terms of the
+ * following license:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Alternatively, you may choose to be licensed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ *****************************************************************************/
+
+#include "aecommon.h"
+
+#define _COMPONENT          ACPI_TOOLS
+        ACPI_MODULE_NAME    ("aetests")
+
+/* Local prototypes */
+
+static void
+AeMutexInterfaces (
+    void);
+
+static void
+AeHardwareInterfaces (
+    void);
+
+static void
+AeTestSleepData (
+    void);
+
+
+/******************************************************************************
+ *
+ * FUNCTION:    AeMiscellaneousTests
+ *
+ * DESCRIPTION: Various ACPICA validation tests.
+ *
+ *****************************************************************************/
+
+void
+AeMiscellaneousTests (
+    void)
+{
+    ACPI_BUFFER             ReturnBuf;
+    char                    Buffer[32];
+    ACPI_STATUS             Status;
+    ACPI_STATISTICS         Stats;
+    ACPI_HANDLE             Handle;
+
+#if (!ACPI_REDUCED_HARDWARE)
+    UINT32                  Temp;
+    UINT32                  LockHandle1;
+    UINT32                  LockHandle2;
+    ACPI_VENDOR_UUID        Uuid = {0, {ACPI_INIT_UUID (0,0,0,0,0,0,0,0,0,0,0)}};
+#endif /* !ACPI_REDUCED_HARDWARE */
+
+
+    Status = AcpiGetHandle (NULL, "\\", &Handle);
+    ACPI_CHECK_OK (AcpiGetHandle, Status);
+
+    if (AcpiGbl_DoInterfaceTests)
+    {
+        /*
+         * Tests for AcpiLoadTable and AcpiUnloadParentTable
+         */
+
+        /* Attempt unload of DSDT, should fail */
+
+        Status = AcpiGetHandle (NULL, "\\_SB_", &Handle);
+        ACPI_CHECK_OK (AcpiGetHandle, Status);
+
+        Status = AcpiUnloadParentTable (Handle);
+        ACPI_CHECK_STATUS (AcpiUnloadParentTable, Status, AE_TYPE);
+
+        /* Load and unload SSDT4 */
+
+        Status = AcpiLoadTable ((ACPI_TABLE_HEADER *) Ssdt4Code);
+        ACPI_CHECK_OK (AcpiLoadTable, Status);
+
+        Status = AcpiGetHandle (NULL, "\\_T96", &Handle);
+        ACPI_CHECK_OK (AcpiGetHandle, Status);
+
+        Status = AcpiUnloadParentTable (Handle);
+        ACPI_CHECK_OK (AcpiUnloadParentTable, Status);
+
+        /* Re-load SSDT4 */
+
+        Status = AcpiLoadTable ((ACPI_TABLE_HEADER *) Ssdt4Code);
+        ACPI_CHECK_OK (AcpiLoadTable, Status);
+
+        /* Unload and re-load SSDT2 (SSDT2 is in the XSDT) */
+
+        Status = AcpiGetHandle (NULL, "\\_T99", &Handle);
+        ACPI_CHECK_OK (AcpiGetHandle, Status);
+
+        Status = AcpiUnloadParentTable (Handle);
+        ACPI_CHECK_OK (AcpiUnloadParentTable, Status);
+
+        Status = AcpiLoadTable ((ACPI_TABLE_HEADER *) Ssdt2Code);
+        ACPI_CHECK_OK (AcpiLoadTable, Status);
+
+        /* Load OEM9 table (causes table override) */
+
+        Status = AcpiLoadTable ((ACPI_TABLE_HEADER *) Ssdt3Code);
+        ACPI_CHECK_OK (AcpiLoadTable, Status);
+    }
+
+    AeHardwareInterfaces ();
+    AeGenericRegisters ();
+    AeSetupConfiguration (Ssdt3Code);
+
+    AeTestBufferArgument();
+    AeTestPackageArgument ();
+    AeMutexInterfaces ();
+    AeTestSleepData ();
+
+    /* Test _OSI install/remove */
+
+    Status = AcpiInstallInterface ("");
+    ACPI_CHECK_STATUS (AcpiInstallInterface, Status, AE_BAD_PARAMETER);
+
+    Status = AcpiInstallInterface ("TestString");
+    ACPI_CHECK_OK (AcpiInstallInterface, Status);
+
+    Status = AcpiInstallInterface ("TestString");
+    ACPI_CHECK_STATUS (AcpiInstallInterface, Status, AE_ALREADY_EXISTS);
+
+    Status = AcpiRemoveInterface ("Windows 2006");
+    ACPI_CHECK_OK (AcpiRemoveInterface, Status);
+
+    Status = AcpiRemoveInterface ("TestString");
+    ACPI_CHECK_OK (AcpiRemoveInterface, Status);
+
+    Status = AcpiRemoveInterface ("XXXXXX");
+    ACPI_CHECK_STATUS (AcpiRemoveInterface, Status, AE_NOT_EXIST);
+
+    Status = AcpiInstallInterface ("AnotherTestString");
+    ACPI_CHECK_OK (AcpiInstallInterface, Status);
+
+    /* Test _OSI execution */
+
+    Status = ExecuteOSI ("Extended Address Space Descriptor", ACPI_UINT64_MAX);
+    ACPI_CHECK_OK (ExecuteOSI, Status);
+
+    Status = ExecuteOSI ("Windows 2001", ACPI_UINT64_MAX);
+    ACPI_CHECK_OK (ExecuteOSI, Status);
+
+    Status = ExecuteOSI ("MichiganTerminalSystem", 0);
+    ACPI_CHECK_OK (ExecuteOSI, Status);
+
+
+    ReturnBuf.Length = 32;
+    ReturnBuf.Pointer = Buffer;
+
+    Status = AcpiGetName (ACPI_ROOT_OBJECT,
+        ACPI_FULL_PATHNAME_NO_TRAILING, &ReturnBuf);
+    ACPI_CHECK_OK (AcpiGetName, Status);
+
+    /* Get Devices */
+
+    Status = AcpiGetDevices (NULL, AeGetDevices, NULL, NULL);
+    ACPI_CHECK_OK (AcpiGetDevices, Status);
+
+    Status = AcpiGetStatistics (&Stats);
+    ACPI_CHECK_OK (AcpiGetStatistics, Status);
+
+
+#if (!ACPI_REDUCED_HARDWARE)
+
+    Status = AcpiInstallGlobalEventHandler (AeGlobalEventHandler, NULL);
+    ACPI_CHECK_OK (AcpiInstallGlobalEventHandler, Status);
+
+    /* If Hardware Reduced flag is set, we are all done */
+
+    if (AcpiGbl_ReducedHardware)
+    {
+        return;
+    }
+
+    Status = AcpiEnableEvent (ACPI_EVENT_GLOBAL, 0);
+    ACPI_CHECK_OK (AcpiEnableEvent, Status);
+
+    /*
+     * GPEs: Handlers, enable/disable, etc.
+     */
+    Status = AcpiInstallGpeHandler (NULL, 0,
+        ACPI_GPE_LEVEL_TRIGGERED, AeGpeHandler, NULL);
+    ACPI_CHECK_OK (AcpiInstallGpeHandler, Status);
+
+    Status = AcpiEnableGpe (NULL, 0);
+    ACPI_CHECK_OK (AcpiEnableGpe, Status);
+
+    Status = AcpiRemoveGpeHandler (NULL, 0, AeGpeHandler);
+    ACPI_CHECK_OK (AcpiRemoveGpeHandler, Status);
+
+    Status = AcpiInstallGpeHandler (NULL, 0,
+        ACPI_GPE_LEVEL_TRIGGERED, AeGpeHandler, NULL);
+    ACPI_CHECK_OK (AcpiInstallGpeHandler, Status);
+
+    Status = AcpiEnableGpe (NULL, 0);
+    ACPI_CHECK_OK (AcpiEnableGpe, Status);
+
+    Status = AcpiSetGpe (NULL, 0, ACPI_GPE_DISABLE);
+    ACPI_CHECK_OK (AcpiSetGpe, Status);
+
+    Status = AcpiSetGpe (NULL, 0, ACPI_GPE_ENABLE);
+    ACPI_CHECK_OK (AcpiSetGpe, Status);
+
+
+    Status = AcpiInstallGpeHandler (NULL, 1,
+        ACPI_GPE_EDGE_TRIGGERED, AeGpeHandler, NULL);
+    ACPI_CHECK_OK (AcpiInstallGpeHandler, Status);
+
+    Status = AcpiEnableGpe (NULL, 1);
+    ACPI_CHECK_OK (AcpiEnableGpe, Status);
+
+
+    Status = AcpiInstallGpeHandler (NULL, 2,
+        ACPI_GPE_LEVEL_TRIGGERED, AeGpeHandler, NULL);
+    ACPI_CHECK_OK (AcpiInstallGpeHandler, Status);
+
+    Status = AcpiEnableGpe (NULL, 2);
+    ACPI_CHECK_OK (AcpiEnableGpe, Status);
+
+
+    Status = AcpiInstallGpeHandler (NULL, 3,
+        ACPI_GPE_EDGE_TRIGGERED, AeGpeHandler, NULL);
+    ACPI_CHECK_OK (AcpiInstallGpeHandler, Status);
+
+    Status = AcpiInstallGpeHandler (NULL, 4,
+        ACPI_GPE_LEVEL_TRIGGERED, AeGpeHandler, NULL);
+    ACPI_CHECK_OK (AcpiInstallGpeHandler, Status);
+
+    Status = AcpiInstallGpeHandler (NULL, 5,
+        ACPI_GPE_EDGE_TRIGGERED, AeGpeHandler, NULL);
+    ACPI_CHECK_OK (AcpiInstallGpeHandler, Status);
+
+    Status = AcpiGetHandle (NULL, "\\_SB", &Handle);
+    ACPI_CHECK_OK (AcpiGetHandle, Status);
+
+    Status = AcpiSetupGpeForWake (Handle, NULL, 5);
+    ACPI_CHECK_OK (AcpiSetupGpeForWake, Status);
+
+    Status = AcpiSetGpeWakeMask (NULL, 5, ACPI_GPE_ENABLE);
+    ACPI_CHECK_OK (AcpiSetGpeWakeMask, Status);
+
+    Status = AcpiSetupGpeForWake (Handle, NULL, 6);
+    ACPI_CHECK_OK (AcpiSetupGpeForWake, Status);
+
+    Status = AcpiSetupGpeForWake (ACPI_ROOT_OBJECT, NULL, 6);
+    ACPI_CHECK_OK (AcpiSetupGpeForWake, Status);
+
+    Status = AcpiSetupGpeForWake (Handle, NULL, 9);
+    ACPI_CHECK_OK (AcpiSetupGpeForWake, Status);
+
+    Status = AcpiInstallGpeHandler (NULL, 0x19,
+        ACPI_GPE_LEVEL_TRIGGERED, AeGpeHandler, NULL);
+    ACPI_CHECK_OK (AcpiInstallGpeHandler, Status);
+
+    Status = AcpiEnableGpe (NULL, 0x19);
+    ACPI_CHECK_OK (AcpiEnableGpe, Status);
+
+
+    /* GPE block 1 */
+
+    Status = AcpiInstallGpeHandler (NULL, 101,
+        ACPI_GPE_LEVEL_TRIGGERED, AeGpeHandler, NULL);
+    ACPI_CHECK_OK (AcpiInstallGpeHandler, Status);
+
+    Status = AcpiEnableGpe (NULL, 101);
+    ACPI_CHECK_OK (AcpiEnableGpe, Status);
+
+    Status = AcpiDisableGpe (NULL, 101);
+    ACPI_CHECK_OK (AcpiDisableGpe, Status);
+
+    AfInstallGpeBlock ();
+
+    /* Here is where the GPEs are actually "enabled" */
+
+    Status = AcpiUpdateAllGpes ();
+    ACPI_CHECK_OK (AcpiUpdateAllGpes, Status);
+
+    Status = AcpiGetHandle (NULL, "RSRC", &Handle);
+    if (ACPI_SUCCESS (Status))
+    {
+        ReturnBuf.Length = ACPI_ALLOCATE_BUFFER;
+
+        Status = AcpiGetVendorResource (Handle, "_CRS", &Uuid, &ReturnBuf);
+        if (ACPI_SUCCESS (Status))
+        {
+            AcpiOsFree (ReturnBuf.Pointer);
+        }
+    }
+
+    /* Test global lock */
+
+    Status = AcpiAcquireGlobalLock (0xFFFF, &LockHandle1);
+    ACPI_CHECK_OK (AcpiAcquireGlobalLock, Status);
+
+    Status = AcpiAcquireGlobalLock (0x5, &LockHandle2);
+    ACPI_CHECK_OK (AcpiAcquireGlobalLock, Status);
+
+    Status = AcpiReleaseGlobalLock (LockHandle1);
+    ACPI_CHECK_OK (AcpiReleaseGlobalLock, Status);
+
+    Status = AcpiReleaseGlobalLock (LockHandle2);
+    ACPI_CHECK_OK (AcpiReleaseGlobalLock, Status);
+
+    /* Test timer interfaces */
+
+    Status = AcpiGetTimerResolution (&Temp);
+    ACPI_CHECK_OK (AcpiGetTimerResolution, Status);
+
+    Status = AcpiGetTimer (&Temp);
+    ACPI_CHECK_OK (AcpiGetTimer, Status);
+
+    Status = AcpiGetTimerDuration (0x1000, 0x2000, &Temp);
+    ACPI_CHECK_OK (AcpiGetTimerDuration, Status);
+
+
+#endif /* !ACPI_REDUCED_HARDWARE */
+}
+
+
+/******************************************************************************
+ *
+ * FUNCTION:    AeMutexInterfaces
+ *
+ * DESCRIPTION: Exercise the AML mutex access interfaces
+ *
+ *****************************************************************************/
+
+static void
+AeMutexInterfaces (
+    void)
+{
+    ACPI_STATUS             Status;
+    ACPI_HANDLE             MutexHandle;
+
+
+    /* Get a handle to an AML mutex */
+
+    Status = AcpiGetHandle (NULL, "\\MTX1", &MutexHandle);
+    if (Status == AE_NOT_FOUND)
+    {
+        return;
+    }
+
+    ACPI_CHECK_OK (AcpiGetHandle, Status);
+    if (ACPI_FAILURE (Status))
+    {
+        return;
+    }
+
+    /* Acquire the  mutex */
+
+    Status = AcpiAcquireMutex (NULL, "\\MTX1", 0xFFFF);
+    ACPI_CHECK_OK (AcpiAcquireMutex, Status);
+    if (ACPI_FAILURE (Status))
+    {
+        return;
+    }
+
+    /* Release mutex with different parameters */
+
+    Status = AcpiReleaseMutex (MutexHandle, NULL);
+    ACPI_CHECK_OK (AcpiReleaseMutex, Status);
+}
+
+
+/******************************************************************************
+ *
+ * FUNCTION:    AeHardwareInterfaces
+ *
+ * DESCRIPTION: Call various hardware support interfaces
+ *
+ *****************************************************************************/
+
+static void
+AeHardwareInterfaces (
+    void)
+{
+#if (!ACPI_REDUCED_HARDWARE)
+
+    ACPI_STATUS             Status;
+    UINT32                  Value;
+
+
+    /* If Hardware Reduced flag is set, we are all done */
+
+    if (AcpiGbl_ReducedHardware)
+    {
+        return;
+    }
+
+    Status = AcpiWriteBitRegister (ACPI_BITREG_WAKE_STATUS, 1);
+    ACPI_CHECK_OK (AcpiWriteBitRegister, Status);
+
+    Status = AcpiWriteBitRegister (ACPI_BITREG_GLOBAL_LOCK_ENABLE, 1);
+    ACPI_CHECK_OK (AcpiWriteBitRegister, Status);
+
+    Status = AcpiWriteBitRegister (ACPI_BITREG_SLEEP_ENABLE, 1);
+    ACPI_CHECK_OK (AcpiWriteBitRegister, Status);
+
+    Status = AcpiWriteBitRegister (ACPI_BITREG_ARB_DISABLE, 1);
+    ACPI_CHECK_OK (AcpiWriteBitRegister, Status);
+
+
+    Status = AcpiReadBitRegister (ACPI_BITREG_WAKE_STATUS, &Value);
+    ACPI_CHECK_OK (AcpiReadBitRegister, Status);
+
+    Status = AcpiReadBitRegister (ACPI_BITREG_GLOBAL_LOCK_ENABLE, &Value);
+    ACPI_CHECK_OK (AcpiReadBitRegister, Status);
+
+    Status = AcpiReadBitRegister (ACPI_BITREG_SLEEP_ENABLE, &Value);
+    ACPI_CHECK_OK (AcpiReadBitRegister, Status);
+
+    Status = AcpiReadBitRegister (ACPI_BITREG_ARB_DISABLE, &Value);
+    ACPI_CHECK_OK (AcpiReadBitRegister, Status);
+
+#endif /* !ACPI_REDUCED_HARDWARE */
+}
+
+
+/******************************************************************************
+ *
+ * FUNCTION:    AeTestSleepData
+ *
+ * DESCRIPTION: Exercise the sleep/wake support (_S0, _S1, etc.)
+ *
+ *****************************************************************************/
+
+static void
+AeTestSleepData (
+    void)
+{
+    int                     State;
+    UINT8                   TypeA;
+    UINT8                   TypeB;
+    ACPI_STATUS             Status;
+
+
+    /* Attempt to get sleep data for all known sleep states */
+
+    for (State = ACPI_STATE_S0; State <= ACPI_S_STATES_MAX; State++)
+    {
+        Status = AcpiGetSleepTypeData ((UINT8) State, &TypeA, &TypeB);
+
+        /* All sleep methods are optional */
+
+        if (Status != AE_NOT_FOUND)
+        {
+            ACPI_CHECK_OK (AcpiGetSleepTypeData, Status);
+        }
+    }
+}
diff --git a/source/tools/acpisrc/astable.c b/source/tools/acpisrc/astable.c
index c4b023d81b13f..51840dd90d3c9 100644
--- a/source/tools/acpisrc/astable.c
+++ b/source/tools/acpisrc/astable.c
@@ -793,6 +793,8 @@ ACPI_TYPED_IDENTIFIER_TABLE           AcpiIdentifiers[] = {
     {"ACPI_MPST_POWER_STATE",               SRC_TYPE_STRUCT},
     {"ACPI_MCFG_ALLOCATION",                SRC_TYPE_STRUCT},
     {"ACPI_MSCT_PROXIMITY",                 SRC_TYPE_STRUCT},
+    {"ACPI_NFIT_CAPABILITIES",              SRC_TYPE_STRUCT},
+    {"ACPI_NFIT_DEVICE_HANDLE",             SRC_TYPE_STRUCT},
     {"ACPI_NFIT_HEADER",                    SRC_TYPE_STRUCT},
     {"ACPI_NFIT_SYSTEM_ADDRESS",            SRC_TYPE_STRUCT},
     {"ACPI_NFIT_MEMORY_MAP",                SRC_TYPE_STRUCT},
diff --git a/source/tools/acpixtract/acpixtract.h b/source/tools/acpixtract/acpixtract.h
index c998f6b72ba8c..d76cd1e2dec44 100644
--- a/source/tools/acpixtract/acpixtract.h
+++ b/source/tools/acpixtract/acpixtract.h
@@ -180,7 +180,7 @@
 #define AX_REQUIRED_TABLE           1
 
 #define AX_UTILITY_NAME             "ACPI Binary Table Extraction Utility"
-#define AX_SUPPORTED_OPTIONS        "ahlms:v^"
+#define AX_SUPPORTED_OPTIONS        "afhlms:v^"
 #define AX_MULTI_TABLE_FILENAME     "amltables.dat"
 #define AX_TABLE_INFO_FORMAT        "  %4.4s - %7u bytes written (0x%8.8X) - %s\n"
 
@@ -193,7 +193,7 @@
 
 #define AX_LINE_BUFFER_SIZE         256
 #define AX_MIN_BLOCK_HEADER_LENGTH  6   /* strlen ("DSDT @") */
-#define AX_IS_TABLE_BLOCK_HEADER    strstr (Gbl_LineBuffer, " @ ")
+#define AX_IS_TABLE_BLOCK_HEADER    (strlen (Gbl_LineBuffer) < AX_END_OF_HEX_DATA) && (strstr (Gbl_LineBuffer, " @ "))
 #define AX_END_OF_HEX_DATA          55
 
 
@@ -216,6 +216,7 @@ ACPI_GLOBAL (AX_TABLE_INFO, *Gbl_TableListHead);
 ACPI_GLOBAL (char,           Gbl_OutputFilename[32]);
 ACPI_GLOBAL (unsigned char,  Gbl_BinaryData[16]);
 ACPI_GLOBAL (unsigned int,   Gbl_TableCount);
+ACPI_GLOBAL (BOOLEAN,        Gbl_ForceExtraction);
 
 
 /*
diff --git a/source/tools/acpixtract/axmain.c b/source/tools/acpixtract/axmain.c
index e0a274cbcdc59..d957ecd519857 100644
--- a/source/tools/acpixtract/axmain.c
+++ b/source/tools/acpixtract/axmain.c
@@ -176,6 +176,7 @@ DisplayUsage (
     ACPI_USAGE_HEADER ("acpixtract [option] <InputFile>");
 
     ACPI_OPTION ("-a",                  "Extract all tables, not just DSDT/SSDT");
+    ACPI_OPTION ("-f",                  "Force extraction, even if there are errors");
     ACPI_OPTION ("-l",                  "List table summaries, do not extract");
     ACPI_OPTION ("-m",                  "Extract multiple DSDT/SSDTs to a single file");
     ACPI_OPTION ("-s <signature>",      "Extract all tables with <signature>");
@@ -208,6 +209,7 @@ main (
 
     Gbl_TableCount = 0;
     Gbl_TableListHead = NULL;
+    Gbl_ForceExtraction = FALSE;
     AxAction = AX_EXTRACT_AML_TABLES; /* Default: DSDT & SSDTs */
 
     ACPI_DEBUG_INITIALIZE (); /* For debug version only */
@@ -229,6 +231,11 @@ main (
         AxAction = AX_EXTRACT_ALL;          /* Extract all tables found */
         break;
 
+    case 'f':
+
+        Gbl_ForceExtraction = TRUE;           /* Ignore errors */
+        break;
+
     case 'l':
 
         AxAction = AX_LIST_ALL;             /* List tables only, do not extract */
diff --git a/source/tools/acpixtract/axutils.c b/source/tools/acpixtract/axutils.c
index 6f887668426ef..e358341630f52 100644
--- a/source/tools/acpixtract/axutils.c
+++ b/source/tools/acpixtract/axutils.c
@@ -201,6 +201,7 @@ AxIsFileAscii (
     FILE                    *Handle)
 {
     UINT8                   Byte;
+    UINT32                  Offset = 0;
 
 
     /* Read the entire file */
@@ -223,15 +224,27 @@ AxIsFileAscii (
 
         if (!ACPI_IS_ASCII (Byte))
         {
-            goto ErrorExit;
+            printf ("Found non-ascii char: %2.2X at file offset %u (0x%X)\n",
+                Byte, Offset, Offset);
+            if (!Gbl_ForceExtraction)
+            {
+                goto ErrorExit;
+            }
         }
 
         /* Ensure character is either printable or a "space" char */
 
         else if (!isprint (Byte) && !isspace (Byte))
         {
-            goto ErrorExit;
+            printf ("Found non-printable char: %2.2X at file offset %u (0x%X)\n",
+                Byte, Offset, Offset);
+            if (!Gbl_ForceExtraction)
+            {
+                goto ErrorExit;
+            }
         }
+
+        Offset++;
     }
 
     /* File is OK (100% ASCII) */
diff --git a/source/tools/examples/examples.c b/source/tools/examples/examples.c
index 313f64e582f6e..6ca0dbee87144 100644
--- a/source/tools/examples/examples.c
+++ b/source/tools/examples/examples.c
@@ -212,9 +212,6 @@ RegionInit (
 static void
 ExecuteMAIN (void);
 
-static void
-ExecuteOSI (void);
-
 ACPI_STATUS
 InitializeAcpiTables (
     void);
@@ -263,7 +260,7 @@ main (
     ACPI_EXCEPTION   ((AE_INFO, AE_AML_OPERAND_TYPE,
         "Example ACPICA exception message"));
 
-    ExecuteOSI ();
+    ExecuteOSI (NULL, 0);
     ExecuteMAIN ();
     return (0);
 }
@@ -540,8 +537,10 @@ InstallHandlers (void)
  *
  *****************************************************************************/
 
-static void
-ExecuteOSI (void)
+ACPI_STATUS
+ExecuteOSI (
+    char                    *OsiString,
+    UINT64                  ExpectedResult)
 {
     ACPI_STATUS             Status;
     ACPI_OBJECT_LIST        ArgList;
@@ -569,7 +568,7 @@ ExecuteOSI (void)
     if (ACPI_FAILURE (Status))
     {
         ACPI_EXCEPTION ((AE_INFO, Status, "While executing _OSI"));
-        return;
+        return (AE_OK);
     }
 
     /* Ensure that the return object is large enough */
@@ -598,6 +597,7 @@ ErrorExit:
     /* Free a buffer created via ACPI_ALLOCATE_BUFFER */
 
     AcpiOsFree (ReturnValue.Pointer);
+    return (AE_OK);
 }