Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/intel-public/acpica/dist Merge ACPICA 20100121



details:   https://anonhg.NetBSD.org/src/rev/db444f68e25d
branches:  trunk
changeset: 753719:db444f68e25d
user:      jruoho <jruoho%NetBSD.org@localhost>
date:      Thu Apr 08 04:31:48 2010 +0000

description:
Merge ACPICA 20100121

diffstat:

 sys/external/intel-public/acpica/dist/common/dmtbinfo.c           |  22 ++-
 sys/external/intel-public/acpica/dist/debugger/dbcmds.c           |  62 ++++--
 sys/external/intel-public/acpica/dist/debugger/dbexec.c           |   8 +-
 sys/external/intel-public/acpica/dist/debugger/dbinput.c          |   4 +-
 sys/external/intel-public/acpica/dist/debugger/dbutils.c          |   6 +-
 sys/external/intel-public/acpica/dist/disassembler/dmresrc.c      |   2 +-
 sys/external/intel-public/acpica/dist/disassembler/dmresrcl.c     |   2 +-
 sys/external/intel-public/acpica/dist/dispatcher/dsopcode.c       |   2 +-
 sys/external/intel-public/acpica/dist/events/evrgnini.c           |  18 +-
 sys/external/intel-public/acpica/dist/executer/exdump.c           |   2 +-
 sys/external/intel-public/acpica/dist/include/acdebug.h           |  12 +-
 sys/external/intel-public/acpica/dist/include/acdisasm.h          |  77 ++++---
 sys/external/intel-public/acpica/dist/include/acinterp.h          |  44 ++--
 sys/external/intel-public/acpica/dist/include/aclocal.h           |  32 +++-
 sys/external/intel-public/acpica/dist/include/acmacros.h          |  16 +-
 sys/external/intel-public/acpica/dist/include/acnamesp.h          |  39 +++-
 sys/external/intel-public/acpica/dist/include/acpiosxf.h          |   6 +-
 sys/external/intel-public/acpica/dist/include/acpixf.h            |   7 +-
 sys/external/intel-public/acpica/dist/include/acresrc.h           |   2 +-
 sys/external/intel-public/acpica/dist/include/actables.h          |   2 +-
 sys/external/intel-public/acpica/dist/include/actbl1.h            |   2 +-
 sys/external/intel-public/acpica/dist/include/actypes.h           |  36 +--
 sys/external/intel-public/acpica/dist/include/acutils.h           |  35 ++-
 sys/external/intel-public/acpica/dist/include/platform/acnetbsd.h |   4 +-
 sys/external/intel-public/acpica/dist/namespace/nsaccess.c        |   4 +-
 sys/external/intel-public/acpica/dist/namespace/nsdump.c          |   6 +-
 sys/external/intel-public/acpica/dist/namespace/nseval.c          |  77 ++++++-
 sys/external/intel-public/acpica/dist/namespace/nsinit.c          |  24 ++-
 sys/external/intel-public/acpica/dist/namespace/nsxfeval.c        |  93 +++++----
 sys/external/intel-public/acpica/dist/namespace/nsxfname.c        |  12 +-
 sys/external/intel-public/acpica/dist/parser/psloop.c             |  31 ++-
 sys/external/intel-public/acpica/dist/parser/psopcode.c           |   2 +-
 sys/external/intel-public/acpica/dist/resources/rsdump.c          |   2 +-
 sys/external/intel-public/acpica/dist/resources/rsutils.c         |   2 +-
 sys/external/intel-public/acpica/dist/resources/rsxface.c         |   4 +-
 sys/external/intel-public/acpica/dist/tables/tbfadt.c             |   2 +-
 sys/external/intel-public/acpica/dist/tables/tbutils.c            |   2 +-
 sys/external/intel-public/acpica/dist/tables/tbxface.c            |   2 +-
 sys/external/intel-public/acpica/dist/tables/tbxfroot.c           |   2 +-
 sys/external/intel-public/acpica/dist/utilities/utcache.c         |   2 +-
 sys/external/intel-public/acpica/dist/utilities/utdebug.c         |   4 +-
 sys/external/intel-public/acpica/dist/utilities/uteval.c          |   7 +-
 sys/external/intel-public/acpica/dist/utilities/utglobal.c        |   8 +-
 sys/external/intel-public/acpica/dist/utilities/utmisc.c          |  60 +++++-
 sys/external/intel-public/acpica/dist/utilities/uttrack.c         |   2 +-
 45 files changed, 540 insertions(+), 250 deletions(-)

diffs (truncated from 2156 to 300 lines):

diff -r 69711bd7d8c7 -r db444f68e25d sys/external/intel-public/acpica/dist/common/dmtbinfo.c
--- a/sys/external/intel-public/acpica/dist/common/dmtbinfo.c   Thu Apr 08 04:27:32 2010 +0000
+++ b/sys/external/intel-public/acpica/dist/common/dmtbinfo.c   Thu Apr 08 04:31:48 2010 +0000
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -178,6 +178,7 @@
 #define ACPI_HEST8_OFFSET(f)            (UINT8) ACPI_OFFSET (ACPI_HEST_AER_BRIDGE,f)
 #define ACPI_HEST9_OFFSET(f)            (UINT8) ACPI_OFFSET (ACPI_HEST_GENERIC,f)
 #define ACPI_HESTN_OFFSET(f)            (UINT8) ACPI_OFFSET (ACPI_HEST_NOTIFY,f)
+#define ACPI_HESTB_OFFSET(f)            (UINT8) ACPI_OFFSET (ACPI_HEST_IA_ERROR_BANK,f)
 #define ACPI_IVRSH_OFFSET(f)            (UINT8) ACPI_OFFSET (ACPI_IVRS_HEADER,f)
 #define ACPI_IVRS0_OFFSET(f)            (UINT8) ACPI_OFFSET (ACPI_IVRS_HARDWARE,f)
 #define ACPI_IVRS1_OFFSET(f)            (UINT8) ACPI_OFFSET (ACPI_IVRS_MEMORY,f)
@@ -905,6 +906,25 @@
 };
 
 
+/*
+ * IA32 Error Bank(s) - Follows the ACPI_HEST_IA_MACHINE_CHECK and
+ * ACPI_HEST_IA_CORRECTED structures.
+ */
+ACPI_DMTABLE_INFO           AcpiDmTableInfoHestBank[] =
+{
+    {ACPI_DMT_UINT8,    ACPI_HESTB_OFFSET (BankNumber),             "Bank Number"},
+    {ACPI_DMT_UINT8,    ACPI_HESTB_OFFSET (ClearStatusOnInit),      "Clear Status On Init"},
+    {ACPI_DMT_UINT8,    ACPI_HESTB_OFFSET (StatusFormat),           "Status Format"},
+    {ACPI_DMT_UINT8,    ACPI_HESTB_OFFSET (Reserved),               "Reserved"},
+    {ACPI_DMT_UINT32,   ACPI_HESTB_OFFSET (ControlRegister),        "Control Register"},
+    {ACPI_DMT_UINT64,   ACPI_HESTB_OFFSET (ControlData),            "Control Data"},
+    {ACPI_DMT_UINT32,   ACPI_HESTB_OFFSET (StatusRegister),         "Status Register"},
+    {ACPI_DMT_UINT32,   ACPI_HESTB_OFFSET (AddressRegister),        "Address Register"},
+    {ACPI_DMT_UINT32,   ACPI_HESTB_OFFSET (MiscRegister),           "Misc Register"},
+    {ACPI_DMT_EXIT,     0,                                          NULL}
+};
+
+
 /*******************************************************************************
  *
  * HPET - High Precision Event Timer table
diff -r 69711bd7d8c7 -r db444f68e25d sys/external/intel-public/acpica/dist/debugger/dbcmds.c
--- a/sys/external/intel-public/acpica/dist/debugger/dbcmds.c   Thu Apr 08 04:27:32 2010 +0000
+++ b/sys/external/intel-public/acpica/dist/debugger/dbcmds.c   Thu Apr 08 04:31:48 2010 +0000
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -130,6 +130,7 @@
 #define _COMPONENT          ACPI_CA_DEBUGGER
         ACPI_MODULE_NAME    ("dbcmds")
 
+
 /* Local prototypes */
 
 static ACPI_STATUS
@@ -382,7 +383,7 @@
     /* Search all nodes in namespace */
 
     (void) AcpiWalkNamespace (ACPI_TYPE_ANY, ACPI_ROOT_OBJECT, ACPI_UINT32_MAX,
-                    AcpiDbWalkForReferences, (void *) ObjDesc, NULL);
+                    AcpiDbWalkForReferences, NULL, (void *) ObjDesc, NULL);
 }
 
 
@@ -474,7 +475,7 @@
     /* Search all nodes in namespace */
 
     (void) AcpiWalkNamespace (ACPI_TYPE_ANY, ACPI_ROOT_OBJECT, ACPI_UINT32_MAX,
-                AcpiDbWalkForPredefinedNames, (void *) &Count, NULL);
+                AcpiDbWalkForPredefinedNames, NULL, (void *) &Count, NULL);
 
     AcpiOsPrintf ("Found %d predefined names in the namespace\n", Count);
 }
@@ -501,7 +502,7 @@
     void                    **ReturnValue)
 {
     ACPI_NAMESPACE_NODE     *Node = (ACPI_NAMESPACE_NODE *) ObjHandle;
-    UINT32                  *Count = (UINT32 *) Context;
+    ACPI_EXECUTE_WALK       *Info = (ACPI_EXECUTE_WALK *) Context;
     ACPI_BUFFER             ReturnObj;
     ACPI_STATUS             Status;
     char                    *Pathname;
@@ -542,7 +543,6 @@
 
     if (ObjInfo->Type == ACPI_TYPE_METHOD)
     {
-
         /* Setup default parameters */
 
         for (i = 0; i < ObjInfo->ParamCount; i++)
@@ -556,11 +556,9 @@
     }
 
     ACPI_FREE (ObjInfo);
-
     ReturnObj.Pointer = NULL;
     ReturnObj.Length = ACPI_ALLOCATE_BUFFER;
 
-
     /* Do the actual method execution */
 
     AcpiGbl_MethodExecuting = TRUE;
@@ -569,11 +567,21 @@
 
     AcpiOsPrintf ("%-32s returned %s\n", Pathname, AcpiFormatException (Status));
     AcpiGbl_MethodExecuting = FALSE;
+    ACPI_FREE (Pathname);
 
-    ACPI_FREE (Pathname);
-    (*Count)++;
+    /* Ignore status from method execution */
+
+    Status = AE_OK;
+
+    /* Update count, check if we have executed enough methods */
 
-    return (AE_OK);
+    Info->Count++;
+    if (Info->Count >= Info->MaxCount)
+    {
+        Status = AE_CTRL_TERMINATE;
+    }
+
+    return (Status);
 }
 
 
@@ -581,27 +589,37 @@
  *
  * FUNCTION:    AcpiDbBatchExecute
  *
- * PARAMETERS:  None
+ * PARAMETERS:  CountArg            - Max number of methods to execute
  *
  * RETURN:      None
  *
- * DESCRIPTION: Namespace batch execution.
+ * DESCRIPTION: Namespace batch execution. Execute predefined names in the
+ *              namespace, up to the max count, if specified.
  *
  ******************************************************************************/
 
 void
 AcpiDbBatchExecute (
-    void)
+    char                    *CountArg)
 {
-    UINT32                  Count = 0;
+    ACPI_EXECUTE_WALK       Info;
+
+
+    Info.Count = 0;
+    Info.MaxCount = ACPI_UINT32_MAX;
+
+    if (CountArg)
+    {
+        Info.MaxCount = ACPI_STRTOUL (CountArg, NULL, 0);
+    }
 
 
     /* Search all nodes in namespace */
 
     (void) AcpiWalkNamespace (ACPI_TYPE_ANY, ACPI_ROOT_OBJECT, ACPI_UINT32_MAX,
-                AcpiDbWalkForExecute, (void *) &Count, NULL);
+                AcpiDbWalkForExecute, NULL, (void *) &Info, NULL);
 
-    AcpiOsPrintf ("Executed %d predefined names in the namespace\n", Count);
+    AcpiOsPrintf ("Executed %d predefined names in the namespace\n", Info.Count);
 }
 
 
@@ -1143,15 +1161,13 @@
 
     /* Create and initialize the new object */
 
-    ObjDesc = AcpiUtCreateInternalObject (ACPI_TYPE_INTEGER);
+    ObjDesc = AcpiUtCreateIntegerObject ((UINT64) Value);
     if (!ObjDesc)
     {
         AcpiOsPrintf ("Could not create an internal object\n");
         return;
     }
 
-    ObjDesc->Integer.Value = Value;
-
     /* Store the new object into the target */
 
     switch (Type)
@@ -1303,7 +1319,7 @@
     /* Walk the namespace from the root */
 
     (void) AcpiWalkNamespace (Type, ACPI_ROOT_OBJECT, ACPI_UINT32_MAX,
-                AcpiDbWalkForSpecificObjects, (void *) &Info, NULL);
+                AcpiDbWalkForSpecificObjects, NULL, (void *) &Info, NULL);
 
     AcpiOsPrintf (
         "\nFound %u objects of type [%s] in the current ACPI Namespace\n",
@@ -1419,7 +1435,7 @@
     /* Walk the namespace from the root */
 
     (void) AcpiWalkNamespace (ACPI_TYPE_ANY, ACPI_ROOT_OBJECT, ACPI_UINT32_MAX,
-                        AcpiDbWalkAndMatchName, AcpiName, NULL);
+                        AcpiDbWalkAndMatchName, NULL, AcpiName, NULL);
 
     AcpiDbSetOutputDestination (ACPI_DB_CONSOLE_OUTPUT);
     return (AE_OK);
@@ -1920,7 +1936,7 @@
     /* Search all nodes in namespace */
 
     (void) AcpiWalkNamespace (ACPI_TYPE_ANY, ACPI_ROOT_OBJECT, ACPI_UINT32_MAX,
-                    AcpiDbIntegrityWalk, (void *) &Info, NULL);
+                    AcpiDbIntegrityWalk, NULL, (void *) &Info, NULL);
 
     AcpiOsPrintf ("Verified %d namespace nodes with %d Objects\n",
         Info.Nodes, Info.Objects);
@@ -2107,7 +2123,7 @@
     /* Search all nodes in namespace */
 
     (void) AcpiWalkNamespace (ACPI_TYPE_ANY, ACPI_ROOT_OBJECT, ACPI_UINT32_MAX,
-                    AcpiDbBusWalk, NULL, NULL);
+                    AcpiDbBusWalk, NULL, NULL, NULL);
 }
 
 #endif /* ACPI_DEBUGGER */
diff -r 69711bd7d8c7 -r db444f68e25d sys/external/intel-public/acpica/dist/debugger/dbexec.c
--- a/sys/external/intel-public/acpica/dist/debugger/dbexec.c   Thu Apr 08 04:27:32 2010 +0000
+++ b/sys/external/intel-public/acpica/dist/debugger/dbexec.c   Thu Apr 08 04:31:48 2010 +0000
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -243,7 +243,7 @@
                 default:
 
                     Params[i].Type           = ACPI_TYPE_INTEGER;
-                    Params[i].Integer.Value  = i * (ACPI_INTEGER) 0x1000;
+                    Params[i].Integer.Value  = i * (UINT64) 0x1000;
                     break;
                 }
             }
@@ -453,7 +453,7 @@
     if (*Name == '*')
     {
         (void) AcpiWalkNamespace (ACPI_TYPE_METHOD, ACPI_ROOT_OBJECT,
-                    ACPI_UINT32_MAX, AcpiDbExecutionWalk, NULL, NULL);
+                    ACPI_UINT32_MAX, AcpiDbExecutionWalk, NULL, NULL, NULL);
         return;
     }
     else
@@ -484,7 +484,7 @@
      * Allow any handlers in separate threads to complete.
      * (Such as Notify handlers invoked from AML executed above).
      */
-    AcpiOsSleep ((ACPI_INTEGER) 10);
+    AcpiOsSleep ((UINT64) 10);
 
 
 #ifdef ACPI_DEBUG_OUTPUT
diff -r 69711bd7d8c7 -r db444f68e25d sys/external/intel-public/acpica/dist/debugger/dbinput.c
--- a/sys/external/intel-public/acpica/dist/debugger/dbinput.c  Thu Apr 08 04:27:32 2010 +0000
+++ b/sys/external/intel-public/acpica/dist/debugger/dbinput.c  Thu Apr 08 04:31:48 2010 +0000
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -644,7 +644,7 @@
         break;
 
     case CMD_BATCH:
-        AcpiDbBatchExecute ();
+        AcpiDbBatchExecute (AcpiGbl_DbArgs[1]);
         break;
 
     case CMD_BREAKPOINT:
diff -r 69711bd7d8c7 -r db444f68e25d sys/external/intel-public/acpica/dist/debugger/dbutils.c
--- a/sys/external/intel-public/acpica/dist/debugger/dbutils.c  Thu Apr 08 04:27:32 2010 +0000
+++ b/sys/external/intel-public/acpica/dist/debugger/dbutils.c  Thu Apr 08 04:31:48 2010 +0000
@@ -8,7 +8,7 @@
  *



Home | Main Index | Thread Index | Old Index