svn commit: r238367 - in vendor-sys/acpica/dist: . generate/release
generate/unix generate/unix/acpibin generate/unix/acpiexec
generate/unix/acpihelp generate/unix/acpinames
generate/unix/iasl sour...
Jung-uk Kim
jkim at FreeBSD.org
Wed Jul 11 16:51:48 UTC 2012
Author: jkim
Date: Wed Jul 11 16:51:47 2012
New Revision: 238367
URL: http://svn.freebsd.org/changeset/base/238367
Log:
Import ACPICA 20120711.
Added:
vendor-sys/acpica/dist/Makefile (contents, props changed)
vendor-sys/acpica/dist/generate/unix/Makefile.common (contents, props changed)
vendor-sys/acpica/dist/source/components/tables/tbxfload.c (contents, props changed)
vendor-sys/acpica/dist/source/components/utilities/utexcep.c (contents, props changed)
Modified:
vendor-sys/acpica/dist/changes.txt
vendor-sys/acpica/dist/generate/release/build.sh
vendor-sys/acpica/dist/generate/unix/Makefile
vendor-sys/acpica/dist/generate/unix/acpibin/Makefile
vendor-sys/acpica/dist/generate/unix/acpiexec/Makefile
vendor-sys/acpica/dist/generate/unix/acpihelp/Makefile
vendor-sys/acpica/dist/generate/unix/acpinames/Makefile
vendor-sys/acpica/dist/generate/unix/iasl/Makefile
vendor-sys/acpica/dist/source/compiler/Makefile
vendor-sys/acpica/dist/source/compiler/aslmain.c
vendor-sys/acpica/dist/source/components/debugger/dbcmds.c
vendor-sys/acpica/dist/source/components/debugger/dbinput.c
vendor-sys/acpica/dist/source/components/events/evxfgpe.c
vendor-sys/acpica/dist/source/components/executer/exprep.c
vendor-sys/acpica/dist/source/components/executer/exresolv.c
vendor-sys/acpica/dist/source/components/executer/exstore.c
vendor-sys/acpica/dist/source/components/executer/exutils.c
vendor-sys/acpica/dist/source/components/hardware/hwsleep.c
vendor-sys/acpica/dist/source/components/hardware/hwxfsleep.c
vendor-sys/acpica/dist/source/components/namespace/nspredef.c
vendor-sys/acpica/dist/source/components/parser/psxface.c
vendor-sys/acpica/dist/source/components/resources/rscreate.c
vendor-sys/acpica/dist/source/components/resources/rsutils.c
vendor-sys/acpica/dist/source/components/tables/tbfadt.c
vendor-sys/acpica/dist/source/components/tables/tbinstal.c
vendor-sys/acpica/dist/source/components/tables/tbutils.c
vendor-sys/acpica/dist/source/components/tables/tbxface.c
vendor-sys/acpica/dist/source/components/tables/tbxfroot.c
vendor-sys/acpica/dist/source/components/utilities/utdecode.c
vendor-sys/acpica/dist/source/components/utilities/utglobal.c
vendor-sys/acpica/dist/source/components/utilities/utmisc.c
vendor-sys/acpica/dist/source/components/utilities/utobject.c
vendor-sys/acpica/dist/source/components/utilities/utresrc.c
vendor-sys/acpica/dist/source/components/utilities/utxferror.c
vendor-sys/acpica/dist/source/include/acdebug.h
vendor-sys/acpica/dist/source/include/acexcep.h
vendor-sys/acpica/dist/source/include/acglobal.h
vendor-sys/acpica/dist/source/include/acmacros.h
vendor-sys/acpica/dist/source/include/acobject.h
vendor-sys/acpica/dist/source/include/acoutput.h
vendor-sys/acpica/dist/source/include/acpixf.h
vendor-sys/acpica/dist/source/include/actbl1.h
vendor-sys/acpica/dist/source/include/platform/acenv.h
vendor-sys/acpica/dist/source/tools/acpibin/Makefile
vendor-sys/acpica/dist/source/tools/acpiexec/Makefile
vendor-sys/acpica/dist/source/tools/acpiexec/aecommon.h
vendor-sys/acpica/dist/source/tools/acpiexec/aeexec.c
vendor-sys/acpica/dist/source/tools/acpiexec/aemain.c
vendor-sys/acpica/dist/source/tools/acpiexec/aetables.h
vendor-sys/acpica/dist/source/tools/acpihelp/Makefile
vendor-sys/acpica/dist/source/tools/acpihelp/acpihelp.h
vendor-sys/acpica/dist/source/tools/acpihelp/ahdecode.c
vendor-sys/acpica/dist/source/tools/acpihelp/ahmain.c
vendor-sys/acpica/dist/source/tools/acpinames/Makefile
vendor-sys/acpica/dist/source/tools/acpisrc/asfile.c
vendor-sys/acpica/dist/source/tools/acpisrc/astable.c
Added: vendor-sys/acpica/dist/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ vendor-sys/acpica/dist/Makefile Wed Jul 11 16:51:47 2012 (r238367)
@@ -0,0 +1,16 @@
+#
+# Common make for acpica tools and utilities
+#
+
+#
+# Note: This makefile is intended to be used from within the native
+# ACPICA directory structure, from under top level acpica directory.
+# It specifically places all the object files for each tool in separate
+# generate/unix subdirectories, not within the various ACPICA source
+# code directories. This prevents collisions between different
+# compilations of the same source file with different compile options.
+#
+BUILD_DIRECTORY_PATH = "generate/unix"
+
+include generate/unix/Makefile.config
+include generate/unix/Makefile.common
Modified: vendor-sys/acpica/dist/changes.txt
==============================================================================
--- vendor-sys/acpica/dist/changes.txt Wed Jul 11 16:27:02 2012 (r238366)
+++ vendor-sys/acpica/dist/changes.txt Wed Jul 11 16:51:47 2012 (r238367)
@@ -1,4 +1,82 @@
----------------------------------------
+11 July 2012. Summary of changes for version 20120711:
+
+This release is available at https://www.acpica.org/downloads The ACPI 5.0
+specification is available at www.acpi.info
+
+1) ACPICA Kernel-resident Subsystem:
+
+Fixed a possible fault in the return package object repair code. Fixes a
+problem that can occur when a lone package object is wrapped with an outer
+package object in order to force conformance to the ACPI specification. Can
+affect these predefined names: _ALR, _MLS, _PSS, _TRT, _TSS, _PRT, _HPX, _DLM,
+_CSD, _PSD, _TSD.
+
+Removed code to disable/enable bus master arbitration (ARB_DIS bit in the
+PM2_CNT register) in the ACPICA sleep/wake interfaces. Management of the
+ARB_DIS bit must be implemented in the host-dependent C3 processor power state
+support. Note, ARB_DIS is obsolete and only applies to older chipsets, both
+Intel and other vendors. (for Intel: ICH4-M and earlier)
+
+This change removes the code to disable/enable bus master arbitration during
+suspend/resume. Use of the ARB_DIS bit in the optional PM2_CNT register causes
+resume problems on some machines. The change has been in use for over seven
+years within Linux.
+
+Implemented two new external interfaces to support host-directed dynamic ACPI
+table load and unload. They are intended to simplify the host implementation
+of hot-plug support:
+ AcpiLoadTable: Load an SSDT from a buffer into the namespace.
+ AcpiUnloadParentTable: Unload an SSDT via a named object owned by the table.
+See the ACPICA reference for additional details. Adds one new file,
+components/tables/tbxfload.c
+
+Implemented and deployed two new interfaces for errors and warnings that are
+known to be caused by BIOS/firmware issues:
+ AcpiBiosError: Prints "ACPI Firmware Error" message.
+ AcpiBiosWarning: Prints "ACPI Firmware Warning" message.
+Deployed these new interfaces in the ACPICA Table Manager code for ACPI table
+and FADT errors. Additional deployment to be completed as appropriate in the
+future. The associated conditional macros are ACPI_BIOS_ERROR and
+ACPI_BIOS_WARNING. See the ACPICA reference for additional details. ACPICA BZ
+843.
+
+Implicit notify support: ensure that no memory allocation occurs within a
+critical region. This fix moves a memory allocation outside of the time that a
+spinlock is held. Fixes issues on systems that do not allow this behavior.
+Jung-uk Kim.
+
+Split exception code utilities and tables into a new file, utilities/utexcep.c
+
+Example Code and Data Size: These are the sizes for the OS-independent
+acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The debug
+version of the code includes the debug output trace mechanism and has a much
+larger code and data size.
+
+ Previous Release:
+ Non-Debug Version: 93.1K Code, 25.1K Data, 118.2K Total
+ Debug Version: 172.9K Code, 73.6K Data, 246.5K Total
+ Current Release:
+ Non-Debug Version: 93.5K Code, 25.3K Data, 118.8K Total
+ Debug Version: 173.7K Code, 74.0K Data, 247.7K Total
+
+
+2) iASL Compiler/Disassembler and Tools:
+
+iASL: Fixed a parser problem for hosts where EOF is defined as -1 instead of
+0. Jung-uk Kim.
+
+Debugger: Enhanced the "tables" command to emit additional information about
+the current set of ACPI tables, including the owner ID and flags decode.
+
+Debugger: Reimplemented the "unload" command to use the new
+AcpiUnloadParentTable external interface. This command was disable previously
+due to need for an unload interface.
+
+AcpiHelp: Added a new option to decode ACPICA exception codes. The -e option
+will decode 16-bit hex status codes (ACPI_STATUS) to name strings.
+
+----------------------------------------
20 June 2012. Summary of changes for version 20120620:
This release is available at https://www.acpica.org/downloads
Modified: vendor-sys/acpica/dist/generate/release/build.sh
==============================================================================
--- vendor-sys/acpica/dist/generate/release/build.sh Wed Jul 11 16:27:02 2012 (r238366)
+++ vendor-sys/acpica/dist/generate/release/build.sh Wed Jul 11 16:51:47 2012 (r238367)
@@ -254,6 +254,7 @@ generate_source_package ()
#
# Copy generic UNIX makefiles
#
+ cp Makefile $TEMP_DIR
cp generate/unix/readme.txt $TEMP_DIR/generate/unix/readme.txt
cp generate/unix/Makefile* $TEMP_DIR/generate/unix
cp generate/unix/acpibin/Makefile $TEMP_DIR/generate/unix/acpibin
Modified: vendor-sys/acpica/dist/generate/unix/Makefile
==============================================================================
--- vendor-sys/acpica/dist/generate/unix/Makefile Wed Jul 11 16:27:02 2012 (r238366)
+++ vendor-sys/acpica/dist/generate/unix/Makefile Wed Jul 11 16:51:47 2012 (r238367)
@@ -4,107 +4,13 @@
#
# Note: This makefile is intended to be used from within the native
-# ACPICA directory structure, from under generate/unix. It specifically
-# places all object files in a generate/unix subdirectory, not within
-# the various ACPICA source directories. This prevents collisions
-# between different compilations of the same source file with different
-# compile options, and prevents pollution of the source code.
+# ACPICA directory structure, from under the generate/unix directory.
+# It specifically places all the object files for each tool in separate
+# generate/unix subdirectories, not within the various ACPICA source
+# code directories. This prevents collisions between different
+# compilations of the same source file with different compile options.
#
-include Makefile.config
-
-#
-# Get the OS machine architecture. Anything with a "64" in the returned
-# string will be treated as a 64-bit OS. Otherwise, the default is 32-bit.
-#
-HARDWARE_NAME := $(shell uname -m)
-
-#
-# Main rule will only generate versions that are appropriate for the running
-# OS, either 64-bit or 32-bit.
-#
-all: ${PROGS}
-${PROGS}: FORCE
- @cd $@; \
- if [ $(findstring 64,$(HARDWARE_NAME)) ]; then \
- mkdir -p obj64; \
- make BITS=64; \
- echo "64-bit version of $@:"; \
- ls -al obj64/$@; \
- else \
- mkdir -p obj32; \
- make BITS=32; \
- echo "32-bit version of $@:"; \
- ls -al obj32/$@; \
- fi;
-
-#
-# Make 32-bit and 64-bit versions of all the tools
-#
-both: 32 64
-
-#
-# Make only 32-bit versions of all the tools
-#
-32: FORCE
- @for toolname in ${PROGS}; do \
- (cd $$toolname; \
- pwd; \
- mkdir -p obj32; \
- make BITS=32; \
- echo "32-bit version of $$toolname:"; \
- ls -al obj32/$$toolname \
- ); \
- done;
-
-#
-# Make only 64-bit versions of all the tools
-#
-64: FORCE
- @for toolname in ${PROGS}; do \
- (cd $$toolname; \
- pwd; \
- mkdir -p obj64; \
- make BITS=64; \
- echo "64-bit version of $$toolname:"; \
- ls -al obj64/$$toolname \
- ); \
- done;
-
-clean: FORCE
- @for toolname in ${PROGS}; do \
- (cd $$toolname; \
- pwd; \
- if [ -d "obj32" ] ; then \
- make BITS=32 clean; \
- rmdir obj32; \
- fi; \
- if [ -d "obj64" ] ; then \
- make BITS=64 clean; \
- rmdir obj64; \
- fi; \
- ); \
- done;
-
-#
-# Install all tools, either 32-bit or 64-bit as appropriate for the host OS
-#
-install: FORCE
- @for toolname in ${PROGS}; do \
- (cd $$toolname; \
- pwd; \
- if [ $(findstring 64,$(HARDWARE_NAME)) ]; then \
- make BITS=64 install; \
- echo "Installed 64-bit version of $$toolname"; \
- else \
- make BITS=32 install; \
- echo "Installed 32-bit version of $$toolname"; \
- fi; \
- ); \
- done;
-
-machine: FORCE
- @echo "Machine architecture: $(HARDWARE_NAME), $(XBITS)";
- @echo "Findstring: $(findstring 64, $(HARDWARE_NAME))";
-
-FORCE:
+BUILD_DIRECTORY_PATH = "."
+include Makefile.config
+include Makefile.common
Added: vendor-sys/acpica/dist/generate/unix/Makefile.common
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ vendor-sys/acpica/dist/generate/unix/Makefile.common Wed Jul 11 16:51:47 2012 (r238367)
@@ -0,0 +1,100 @@
+#
+# Common make for acpica tools and utilities
+#
+
+#
+# Get the OS machine architecture. Anything with a "64" in the returned
+# string will be treated as a 64-bit OS. Otherwise, the default is 32-bit.
+#
+HARDWARE_NAME := $(shell uname -m)
+
+#
+# Main rule will only generate versions that are appropriate for the running
+# OS, either 64-bit or 32-bit.
+#
+all: ${PROGS}
+${PROGS}: FORCE
+ @cd $(BUILD_DIRECTORY_PATH)/$@; \
+ if [ $(findstring 64,$(HARDWARE_NAME)) ]; then \
+ mkdir -p obj64; \
+ make BITS=64; \
+ echo "64-bit version of $@:"; \
+ ls -al obj64/$@; \
+ else \
+ mkdir -p obj32; \
+ make BITS=32; \
+ echo "32-bit version of $@:"; \
+ ls -al obj32/$@; \
+ fi;
+
+#
+# Make 32-bit and 64-bit versions of all the tools
+#
+both: 32 64
+
+#
+# Make only 32-bit versions of all the tools
+#
+32: FORCE
+ @for toolname in ${PROGS}; do \
+ (cd $(BUILD_DIRECTORY_PATH)/$$toolname; \
+ pwd; \
+ mkdir -p obj32; \
+ make BITS=32; \
+ echo "32-bit version of $$toolname:"; \
+ ls -al obj32/$$toolname \
+ ); \
+ done;
+
+#
+# Make only 64-bit versions of all the tools
+#
+64: FORCE
+ @for toolname in ${PROGS}; do \
+ (cd $(BUILD_DIRECTORY_PATH)/$$toolname; \
+ pwd; \
+ mkdir -p obj64; \
+ make BITS=64; \
+ echo "64-bit version of $$toolname:"; \
+ ls -al obj64/$$toolname \
+ ); \
+ done;
+
+clean: FORCE
+ @for toolname in ${PROGS}; do \
+ (cd $(BUILD_DIRECTORY_PATH)/$$toolname; \
+ pwd; \
+ if [ -d "obj32" ] ; then \
+ make BITS=32 clean; \
+ rmdir obj32; \
+ fi; \
+ if [ -d "obj64" ] ; then \
+ make BITS=64 clean; \
+ rmdir obj64; \
+ fi; \
+ ); \
+ done;
+
+#
+# Install all tools, either 32-bit or 64-bit as appropriate for the host OS
+#
+install: FORCE
+ @for toolname in ${PROGS}; do \
+ (cd $(BUILD_DIRECTORY_PATH)/$$toolname; \
+ pwd; \
+ if [ $(findstring 64,$(HARDWARE_NAME)) ]; then \
+ make BITS=64 install; \
+ echo "Installed 64-bit version of $$toolname"; \
+ else \
+ make BITS=32 install; \
+ echo "Installed 32-bit version of $$toolname"; \
+ fi; \
+ ); \
+ done;
+
+machine: FORCE
+ @echo "Machine architecture: $(HARDWARE_NAME), $(XBITS)";
+ @echo "Findstring: $(findstring 64, $(HARDWARE_NAME))";
+
+FORCE:
+
Modified: vendor-sys/acpica/dist/generate/unix/acpibin/Makefile
==============================================================================
--- vendor-sys/acpica/dist/generate/unix/acpibin/Makefile Wed Jul 11 16:27:02 2012 (r238366)
+++ vendor-sys/acpica/dist/generate/unix/acpibin/Makefile Wed Jul 11 16:51:47 2012 (r238367)
@@ -32,6 +32,7 @@ OBJECTS = \
$(OBJDIR)/utcache.o \
$(OBJDIR)/utdebug.o \
$(OBJDIR)/utdecode.o \
+ $(OBJDIR)/utexcep.o \
$(OBJDIR)/utglobal.o \
$(OBJDIR)/utlock.o \
$(OBJDIR)/utmath.o \
Modified: vendor-sys/acpica/dist/generate/unix/acpiexec/Makefile
==============================================================================
--- vendor-sys/acpica/dist/generate/unix/acpiexec/Makefile Wed Jul 11 16:27:02 2012 (r238366)
+++ vendor-sys/acpica/dist/generate/unix/acpiexec/Makefile Wed Jul 11 16:51:47 2012 (r238367)
@@ -172,6 +172,7 @@ OBJECTS = \
$(OBJDIR)/tbinstal.o \
$(OBJDIR)/tbutils.o \
$(OBJDIR)/tbxface.o \
+ $(OBJDIR)/tbxfload.o \
$(OBJDIR)/tbxfroot.o \
$(OBJDIR)/utaddress.o \
$(OBJDIR)/utalloc.o \
@@ -181,6 +182,7 @@ OBJECTS = \
$(OBJDIR)/utdecode.o \
$(OBJDIR)/utdelete.o \
$(OBJDIR)/uteval.o \
+ $(OBJDIR)/utexcep.o \
$(OBJDIR)/utglobal.o \
$(OBJDIR)/utids.o \
$(OBJDIR)/utinit.o \
Modified: vendor-sys/acpica/dist/generate/unix/acpihelp/Makefile
==============================================================================
--- vendor-sys/acpica/dist/generate/unix/acpihelp/Makefile Wed Jul 11 16:27:02 2012 (r238366)
+++ vendor-sys/acpica/dist/generate/unix/acpihelp/Makefile Wed Jul 11 16:51:47 2012 (r238367)
@@ -19,7 +19,8 @@ PROG = $(OBJDIR)/acpihelp
#
vpath %.c \
$(ACPIHELP) \
- $(ACPICA_COMMON)
+ $(ACPICA_COMMON) \
+ $(ACPICA_UTILITIES)
HEADERS = \
$(wildcard $(ACPIHELP)/*.h)
@@ -31,7 +32,8 @@ OBJECTS = \
$(OBJDIR)/ahdecode.o \
$(OBJDIR)/ahpredef.o \
$(OBJDIR)/ahmain.o \
- $(OBJDIR)/getopt.o
+ $(OBJDIR)/getopt.o \
+ $(OBJDIR)/utexcep.o
#
# Flags specific to acpihelp
Modified: vendor-sys/acpica/dist/generate/unix/acpinames/Makefile
==============================================================================
--- vendor-sys/acpica/dist/generate/unix/acpinames/Makefile Wed Jul 11 16:27:02 2012 (r238366)
+++ vendor-sys/acpica/dist/generate/unix/acpinames/Makefile Wed Jul 11 16:51:47 2012 (r238367)
@@ -81,6 +81,7 @@ OBJECTS = \
$(OBJDIR)/tbinstal.o \
$(OBJDIR)/tbutils.o \
$(OBJDIR)/tbxface.o \
+ $(OBJDIR)/tbxfload.o \
$(OBJDIR)/tbxfroot.o \
$(OBJDIR)/utaddress.o \
$(OBJDIR)/utalloc.o \
@@ -88,6 +89,7 @@ OBJECTS = \
$(OBJDIR)/utdebug.o \
$(OBJDIR)/utdecode.o \
$(OBJDIR)/utdelete.o \
+ $(OBJDIR)/utexcep.o \
$(OBJDIR)/utglobal.o \
$(OBJDIR)/utlock.o \
$(OBJDIR)/utmath.o \
Modified: vendor-sys/acpica/dist/generate/unix/iasl/Makefile
==============================================================================
--- vendor-sys/acpica/dist/generate/unix/iasl/Makefile Wed Jul 11 16:27:02 2012 (r238366)
+++ vendor-sys/acpica/dist/generate/unix/iasl/Makefile Wed Jul 11 16:51:47 2012 (r238367)
@@ -169,6 +169,7 @@ OBJECTS = \
$(OBJDIR)/utdebug.o \
$(OBJDIR)/utdecode.o \
$(OBJDIR)/utdelete.o \
+ $(OBJDIR)/utexcep.o \
$(OBJDIR)/utglobal.o \
$(OBJDIR)/utinit.o \
$(OBJDIR)/utlock.o \
Modified: vendor-sys/acpica/dist/source/compiler/Makefile
==============================================================================
--- vendor-sys/acpica/dist/source/compiler/Makefile Wed Jul 11 16:27:02 2012 (r238366)
+++ vendor-sys/acpica/dist/source/compiler/Makefile Wed Jul 11 16:51:47 2012 (r238367)
@@ -201,6 +201,7 @@ OBJECTS = \
utdebug.o \
utdecode.o \
utdelete.o \
+ utexcep.o \
utglobal.o \
utinit.o \
utlock.o \
Modified: vendor-sys/acpica/dist/source/compiler/aslmain.c
==============================================================================
--- vendor-sys/acpica/dist/source/compiler/aslmain.c Wed Jul 11 16:27:02 2012 (r238366)
+++ vendor-sys/acpica/dist/source/compiler/aslmain.c Wed Jul 11 16:51:47 2012 (r238367)
@@ -96,7 +96,7 @@ AslDoResponseFile (
#define ASL_TOKEN_SEPARATORS " \t\n"
-#define ASL_SUPPORTED_OPTIONS "@:2b|c|d^D:e:fgh^i|I:l^mno|p:P^r:s|t|T:G^v|w|x:z"
+#define ASL_SUPPORTED_OPTIONS "@:2b|c|d^D:e:fgh^i|I:l^mno|p:P^r:s|t|T:G^v^w|x:z"
/*******************************************************************************
@@ -119,6 +119,7 @@ Options (
printf ("\nGlobal:\n");
ACPI_OPTION ("-@ <file>", "Specify command file");
ACPI_OPTION ("-I <dir>", "Specify additional include directory");
+ ACPI_OPTION ("-v", "Display compiler version");
printf ("\nPreprocessor:\n");
ACPI_OPTION ("-D <symbol>", "Define symbol for preprocessor use");
@@ -751,9 +752,13 @@ AslDoOptions (
break;
- case 'v': /* Verbosity settings */
+ case 'v': /* Version and verbosity settings */
switch (AcpiGbl_Optarg[0])
{
+ case '^':
+ printf (ACPI_COMMON_SIGNON (ASL_COMPILER_NAME));
+ exit (0);
+
case 'a':
/* Disable All error/warning messages */
Modified: vendor-sys/acpica/dist/source/components/debugger/dbcmds.c
==============================================================================
--- vendor-sys/acpica/dist/source/components/debugger/dbcmds.c Wed Jul 11 16:27:02 2012 (r238366)
+++ vendor-sys/acpica/dist/source/components/debugger/dbcmds.c Wed Jul 11 16:51:47 2012 (r238367)
@@ -254,12 +254,53 @@ AcpiDbDisplayTableInfo (
ACPI_STATUS Status;
+ /* Header */
+
+ AcpiOsPrintf ("Idx ID Status Type Sig Address Len Header\n");
+
/* Walk the entire root table list */
for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++)
{
TableDesc = &AcpiGbl_RootTableList.Tables[i];
- AcpiOsPrintf ("%u ", i);
+
+ /* Index and Table ID */
+
+ AcpiOsPrintf ("%3u %.2u ", i, TableDesc->OwnerId);
+
+ /* Decode the table flags */
+
+ if (!(TableDesc->Flags & ACPI_TABLE_IS_LOADED))
+ {
+ AcpiOsPrintf ("NotLoaded ");
+ }
+ else
+ {
+ AcpiOsPrintf (" Loaded ");
+ }
+
+ switch (TableDesc->Flags & ACPI_TABLE_ORIGIN_MASK)
+ {
+ case ACPI_TABLE_ORIGIN_UNKNOWN:
+ AcpiOsPrintf ("Unknown ");
+ break;
+
+ case ACPI_TABLE_ORIGIN_MAPPED:
+ AcpiOsPrintf ("Mapped ");
+ break;
+
+ case ACPI_TABLE_ORIGIN_ALLOCATED:
+ AcpiOsPrintf ("Allocated ");
+ break;
+
+ case ACPI_TABLE_ORIGIN_OVERRIDE:
+ AcpiOsPrintf ("Override ");
+ break;
+
+ default:
+ AcpiOsPrintf ("INVALID ");
+ break;
+ }
/* Make sure that the table is mapped */
@@ -290,55 +331,45 @@ AcpiDbDisplayTableInfo (
*
* FUNCTION: AcpiDbUnloadAcpiTable
*
- * PARAMETERS: TableArg - Name of the table to be unloaded
- * InstanceArg - Which instance of the table to unload (if
- * there are multiple tables of the same type)
+ * PARAMETERS: ObjectName - Namespace pathname for an object that
+ * is owned by the table to be unloaded
*
- * RETURN: Nonde
+ * RETURN: None
*
- * DESCRIPTION: Unload an ACPI table.
- * Instance is not implemented
+ * DESCRIPTION: Unload an ACPI table, via any namespace node that is owned
+ * by the table.
*
******************************************************************************/
void
AcpiDbUnloadAcpiTable (
- char *TableArg,
- char *InstanceArg)
+ char *ObjectName)
{
-/* TBD: Need to reimplement for new data structures */
-
-#if 0
- UINT32 i;
+ ACPI_NAMESPACE_NODE *Node;
ACPI_STATUS Status;
- /* Search all tables for the target type */
+ /* Translate name to an Named object */
- for (i = 0; i < (ACPI_TABLE_ID_MAX+1); i++)
+ Node = AcpiDbConvertToNode (ObjectName);
+ if (!Node)
{
- if (!ACPI_STRNCMP (TableArg, AcpiGbl_TableData[i].Signature,
- AcpiGbl_TableData[i].SigLength))
- {
- /* Found the table, unload it */
-
- Status = AcpiUnloadTable (i);
- if (ACPI_SUCCESS (Status))
- {
- AcpiOsPrintf ("[%s] unloaded and uninstalled\n", TableArg);
- }
- else
- {
- AcpiOsPrintf ("%s, while unloading [%s]\n",
- AcpiFormatException (Status), TableArg);
- }
-
- return;
- }
+ AcpiOsPrintf ("Could not find [%s] in namespace\n",
+ ObjectName);
+ return;
}
- AcpiOsPrintf ("Unknown table type [%s]\n", TableArg);
-#endif
+ Status = AcpiUnloadParentTable (ACPI_CAST_PTR (ACPI_HANDLE, Node));
+ if (ACPI_SUCCESS (Status))
+ {
+ AcpiOsPrintf ("Parent of [%s] (%p) unloaded and uninstalled\n",
+ ObjectName, Node);
+ }
+ else
+ {
+ AcpiOsPrintf ("%s, while unloading parent table of [%s]\n",
+ AcpiFormatException (Status), ObjectName);
+ }
}
Modified: vendor-sys/acpica/dist/source/components/debugger/dbinput.c
==============================================================================
--- vendor-sys/acpica/dist/source/components/debugger/dbinput.c Wed Jul 11 16:27:02 2012 (r238366)
+++ vendor-sys/acpica/dist/source/components/debugger/dbinput.c Wed Jul 11 16:51:47 2012 (r238367)
@@ -250,7 +250,7 @@ AcpiDbDisplayHelp (
AcpiOsPrintf (" Stack Display CPU stack usage\n");
AcpiOsPrintf (" Tables Info about current ACPI table(s)\n");
AcpiOsPrintf (" Tables Display info about loaded ACPI tables\n");
- AcpiOsPrintf (" Unload <TableSig> [Instance] Unload an ACPI table\n");
+ AcpiOsPrintf (" Unload <Namepath> Unload an ACPI table via namespace object\n");
AcpiOsPrintf (" ! <CommandNumber> Execute command from history buffer\n");
AcpiOsPrintf (" !! Execute last command again\n");
@@ -894,7 +894,7 @@ AcpiDbCommandDispatch (
break;
case CMD_UNLOAD:
- AcpiDbUnloadAcpiTable (AcpiGbl_DbArgs[1], AcpiGbl_DbArgs[2]);
+ AcpiDbUnloadAcpiTable (AcpiGbl_DbArgs[1]);
break;
case CMD_EXIT:
Modified: vendor-sys/acpica/dist/source/components/events/evxfgpe.c
==============================================================================
--- vendor-sys/acpica/dist/source/components/events/evxfgpe.c Wed Jul 11 16:27:02 2012 (r238366)
+++ vendor-sys/acpica/dist/source/components/events/evxfgpe.c Wed Jul 11 16:51:47 2012 (r238367)
@@ -83,7 +83,7 @@ AcpiUpdateAllGpes (
ACPI_STATUS Status;
- ACPI_FUNCTION_TRACE (AcpiUpdateGpes);
+ ACPI_FUNCTION_TRACE (AcpiUpdateAllGpes);
Status = AcpiUtAcquireMutex (ACPI_MTX_EVENTS);
@@ -298,7 +298,8 @@ AcpiSetupGpeForWake (
ACPI_STATUS Status;
ACPI_GPE_EVENT_INFO *GpeEventInfo;
ACPI_NAMESPACE_NODE *DeviceNode;
- ACPI_GPE_NOTIFY_INFO *NewNotify, *Notify;
+ ACPI_GPE_NOTIFY_INFO *Notify;
+ ACPI_GPE_NOTIFY_INFO *NewNotify;
ACPI_CPU_FLAGS Flags;
@@ -334,6 +335,11 @@ AcpiSetupGpeForWake (
return_ACPI_STATUS (AE_BAD_PARAMETER);
}
+ /*
+ * Allocate a new notify object up front, in case it is needed.
+ * Memory allocation while holding a spinlock is a big no-no
+ * on some hosts.
+ */
NewNotify = ACPI_ALLOCATE_ZEROED (sizeof (ACPI_GPE_NOTIFY_INFO));
if (!NewNotify)
{
@@ -401,8 +407,12 @@ AcpiSetupGpeForWake (
GpeEventInfo->Flags |= ACPI_GPE_CAN_WAKE;
Status = AE_OK;
+
UnlockAndExit:
AcpiOsReleaseLock (AcpiGbl_GpeLock, Flags);
+
+ /* Delete the notify object if it was not used above */
+
if (NewNotify)
{
ACPI_FREE (NewNotify);
Modified: vendor-sys/acpica/dist/source/components/executer/exprep.c
==============================================================================
--- vendor-sys/acpica/dist/source/components/executer/exprep.c Wed Jul 11 16:27:02 2012 (r238366)
+++ vendor-sys/acpica/dist/source/components/executer/exprep.c Wed Jul 11 16:51:47 2012 (r238367)
@@ -418,8 +418,8 @@ AcpiExPrepCommonFieldObject (
*
* RETURN: Status
*
- * DESCRIPTION: Construct an ACPI_OPERAND_OBJECT of type DefField and
- * connect it to the parent Node.
+ * DESCRIPTION: Construct an object of type ACPI_OPERAND_OBJECT with a
+ * subtype of DefField and connect it to the parent Node.
*
******************************************************************************/
Modified: vendor-sys/acpica/dist/source/components/executer/exresolv.c
==============================================================================
--- vendor-sys/acpica/dist/source/components/executer/exresolv.c Wed Jul 11 16:27:02 2012 (r238366)
+++ vendor-sys/acpica/dist/source/components/executer/exresolv.c Wed Jul 11 16:51:47 2012 (r238367)
@@ -165,7 +165,7 @@ AcpiExResolveObjectToValue (
StackDesc = *StackPtr;
- /* This is an ACPI_OPERAND_OBJECT */
+ /* This is an object of type ACPI_OPERAND_OBJECT */
switch (StackDesc->Common.Type)
{
Modified: vendor-sys/acpica/dist/source/components/executer/exstore.c
==============================================================================
--- vendor-sys/acpica/dist/source/components/executer/exstore.c Wed Jul 11 16:27:02 2012 (r238366)
+++ vendor-sys/acpica/dist/source/components/executer/exstore.c Wed Jul 11 16:51:47 2012 (r238367)
@@ -68,15 +68,15 @@ AcpiExStoreObjectToIndex (
* FUNCTION: AcpiExStore
*
* PARAMETERS: *SourceDesc - Value to be stored
- * *DestDesc - Where to store it. Must be an NS node
- * or an ACPI_OPERAND_OBJECT of type
+ * *DestDesc - Where to store it. Must be an NS node
+ * or ACPI_OPERAND_OBJECT of type
* Reference;
* WalkState - Current walk state
*
* RETURN: Status
*
* DESCRIPTION: Store the value described by SourceDesc into the location
- * described by DestDesc. Called by various interpreter
+ * described by DestDesc. Called by various interpreter
* functions to store the result of an operation into
* the destination operand -- not just simply the actual "Store"
* ASL operator.
Modified: vendor-sys/acpica/dist/source/components/executer/exutils.c
==============================================================================
--- vendor-sys/acpica/dist/source/components/executer/exutils.c Wed Jul 11 16:27:02 2012 (r238366)
+++ vendor-sys/acpica/dist/source/components/executer/exutils.c Wed Jul 11 16:51:47 2012 (r238367)
@@ -121,7 +121,7 @@ AcpiExEnterInterpreter (
*
* DESCRIPTION: Reacquire the interpreter execution region from within the
* interpreter code. Failure to enter the interpreter region is a
- * fatal system error. Used in conjuction with
+ * fatal system error. Used in conjunction with
* RelinquishInterpreter
*
******************************************************************************/
Modified: vendor-sys/acpica/dist/source/components/hardware/hwsleep.c
==============================================================================
--- vendor-sys/acpica/dist/source/components/hardware/hwsleep.c Wed Jul 11 16:27:02 2012 (r238366)
+++ vendor-sys/acpica/dist/source/components/hardware/hwsleep.c Wed Jul 11 16:51:47 2012 (r238367)
@@ -99,20 +99,6 @@ AcpiHwLegacySleep (
return_ACPI_STATUS (Status);
}
- if (SleepState != ACPI_STATE_S5)
- {
- /*
- * Disable BM arbitration. This feature is contained within an
- * optional register (PM2 Control), so ignore a BAD_ADDRESS
- * exception.
- */
- Status = AcpiWriteBitRegister (ACPI_BITREG_ARB_DISABLE, 1);
- if (ACPI_FAILURE (Status) && (Status != AE_BAD_ADDRESS))
- {
- return_ACPI_STATUS (Status);
- }
- }
-
/*
* 1) Disable/Clear all GPEs
* 2) Enable all wakeup GPEs
@@ -380,17 +366,6 @@ AcpiHwLegacyWake (
AcpiGbl_FixedEventInfo[ACPI_EVENT_POWER_BUTTON].StatusRegisterId,
ACPI_CLEAR_STATUS);
- /*
- * Enable BM arbitration. This feature is contained within an
- * optional register (PM2 Control), so ignore a BAD_ADDRESS
- * exception.
- */
- Status = AcpiWriteBitRegister (ACPI_BITREG_ARB_DISABLE, 0);
- if (ACPI_FAILURE (Status) && (Status != AE_BAD_ADDRESS))
- {
- return_ACPI_STATUS (Status);
- }
-
AcpiHwExecuteSleepMethod (METHOD_PATHNAME__SST, ACPI_SST_WORKING);
return_ACPI_STATUS (Status);
}
Modified: vendor-sys/acpica/dist/source/components/hardware/hwxfsleep.c
==============================================================================
--- vendor-sys/acpica/dist/source/components/hardware/hwxfsleep.c Wed Jul 11 16:27:02 2012 (r238366)
+++ vendor-sys/acpica/dist/source/components/hardware/hwxfsleep.c Wed Jul 11 16:51:47 2012 (r238367)
@@ -101,6 +101,14 @@ AcpiSetFirmwareWakingVector (
ACPI_FUNCTION_TRACE (AcpiSetFirmwareWakingVector);
+ /*
+ * According to the ACPI specification 2.0c and later, the 64-bit
+ * waking vector should be cleared and the 32-bit waking vector should
+ * be used, unless we want the wake-up code to be called by the BIOS in
+ * Protected Mode. Some systems (for example HP dv5-1004nr) are known
+ * to fail to resume if the 64-bit vector is used.
+ */
+
/* Set the 32-bit vector */
AcpiGbl_FACS->FirmwareWakingVector = PhysicalAddress;
Modified: vendor-sys/acpica/dist/source/components/namespace/nspredef.c
==============================================================================
--- vendor-sys/acpica/dist/source/components/namespace/nspredef.c Wed Jul 11 16:27:02 2012 (r238366)
+++ vendor-sys/acpica/dist/source/components/namespace/nspredef.c Wed Jul 11 16:51:47 2012 (r238367)
@@ -681,7 +681,7 @@ AcpiNsCheckPackage (
{
/* Create the new outer package and populate it */
- Status = AcpiNsWrapWithPackage (Data, *Elements, ReturnObjectPtr);
+ Status = AcpiNsWrapWithPackage (Data, ReturnObject, ReturnObjectPtr);
if (ACPI_FAILURE (Status))
{
return (Status);
Modified: vendor-sys/acpica/dist/source/components/parser/psxface.c
==============================================================================
--- vendor-sys/acpica/dist/source/components/parser/psxface.c Wed Jul 11 16:27:02 2012 (r238366)
+++ vendor-sys/acpica/dist/source/components/parser/psxface.c Wed Jul 11 16:51:47 2012 (r238367)
@@ -348,8 +348,8 @@ AcpiPsExecuteMethod (
}
/*
- * Start method evaluation with an implicit return of zero. This is done
- * for Windows compatibility.
+ * Start method evaluation with an implicit return of zero.
+ * This is done for Windows compatibility.
*/
if (AcpiGbl_EnableInterpreterSlack)
{
Modified: vendor-sys/acpica/dist/source/components/resources/rscreate.c
==============================================================================
--- vendor-sys/acpica/dist/source/components/resources/rscreate.c Wed Jul 11 16:27:02 2012 (r238366)
+++ vendor-sys/acpica/dist/source/components/resources/rscreate.c Wed Jul 11 16:51:47 2012 (r238367)
@@ -209,8 +209,8 @@ AcpiRsCreateResourceList (
*
* FUNCTION: AcpiRsCreatePciRoutingTable
*
- * PARAMETERS: PackageObject - Pointer to an ACPI_OPERAND_OBJECT
- * package
+ * PARAMETERS: PackageObject - Pointer to a package containing one
+ * of more ACPI_OPERAND_OBJECTs
* OutputBuffer - Pointer to the user's buffer
*
* RETURN: Status AE_OK if okay, else a valid ACPI_STATUS code.
@@ -218,7 +218,7 @@ AcpiRsCreateResourceList (
* AE_BUFFER_OVERFLOW and OutputBuffer->Length will point
* to the size buffer needed.
*
- * DESCRIPTION: Takes the ACPI_OPERAND_OBJECT package and creates a
+ * DESCRIPTION: Takes the ACPI_OPERAND_OBJECT package and creates a
* linked list of PCI interrupt descriptions
*
* NOTE: It is the caller's responsibility to ensure that the start of the
Modified: vendor-sys/acpica/dist/source/components/resources/rsutils.c
==============================================================================
--- vendor-sys/acpica/dist/source/components/resources/rsutils.c Wed Jul 11 16:27:02 2012 (r238366)
+++ vendor-sys/acpica/dist/source/components/resources/rsutils.c Wed Jul 11 16:51:47 2012 (r238367)
@@ -181,7 +181,7 @@ AcpiRsMoveData (
/*
* 16-, 32-, and 64-bit cases must use the move macros that perform
- * endian conversion and/or accomodate hardware that cannot perform
+ * endian conversion and/or accommodate hardware that cannot perform
* misaligned memory transfers
*/
case ACPI_RSC_MOVE16:
Modified: vendor-sys/acpica/dist/source/components/tables/tbfadt.c
==============================================================================
--- vendor-sys/acpica/dist/source/components/tables/tbfadt.c Wed Jul 11 16:27:02 2012 (r238366)
+++ vendor-sys/acpica/dist/source/components/tables/tbfadt.c Wed Jul 11 16:51:47 2012 (r238367)
@@ -192,7 +192,7 @@ static ACPI_FADT_PM_INFO FadtPmInfoTa
*
* PARAMETERS: GenericAddress - GAS struct to be initialized
* SpaceId - ACPI Space ID for this register
- * ByteWidth - Width of this register, in bytes
+ * ByteWidth - Width of this register
* Address - Address of the register
*
* RETURN: None
@@ -338,7 +338,7 @@ AcpiTbCreateLocalFadt (
*/
if (Length > sizeof (ACPI_TABLE_FADT))
{
- ACPI_WARNING ((AE_INFO,
+ ACPI_BIOS_WARNING ((AE_INFO,
"FADT (revision %u) is longer than ACPI 5.0 version, "
"truncating length %u to %u",
Table->Revision, Length, (UINT32) sizeof (ACPI_TABLE_FADT)));
@@ -486,8 +486,9 @@ AcpiTbConvertFadt (
if (Address64->Address && Address32 &&
(Address64->Address != (UINT64) Address32))
{
- ACPI_ERROR ((AE_INFO,
- "32/64X address mismatch in %s: 0x%8.8X/0x%8.8X%8.8X, using 32",
+ ACPI_BIOS_ERROR ((AE_INFO,
+ "32/64X address mismatch in FADT/%s: "
+ "0x%8.8X/0x%8.8X%8.8X, using 32",
FadtInfoTable[i].Name, Address32,
ACPI_FORMAT_UINT64 (Address64->Address)));
}
@@ -546,7 +547,7 @@ AcpiTbValidateFadt (
if (AcpiGbl_FADT.Facs &&
(AcpiGbl_FADT.XFacs != (UINT64) AcpiGbl_FADT.Facs))
{
- ACPI_WARNING ((AE_INFO,
+ ACPI_BIOS_WARNING ((AE_INFO,
"32/64X FACS address mismatch in FADT - "
"0x%8.8X/0x%8.8X%8.8X, using 32",
AcpiGbl_FADT.Facs, ACPI_FORMAT_UINT64 (AcpiGbl_FADT.XFacs)));
@@ -557,7 +558,7 @@ AcpiTbValidateFadt (
if (AcpiGbl_FADT.Dsdt &&
(AcpiGbl_FADT.XDsdt != (UINT64) AcpiGbl_FADT.Dsdt))
{
- ACPI_WARNING ((AE_INFO,
+ ACPI_BIOS_WARNING ((AE_INFO,
"32/64X DSDT address mismatch in FADT - "
"0x%8.8X/0x%8.8X%8.8X, using 32",
AcpiGbl_FADT.Dsdt, ACPI_FORMAT_UINT64 (AcpiGbl_FADT.XDsdt)));
@@ -593,8 +594,8 @@ AcpiTbValidateFadt (
if (Address64->Address &&
(Address64->BitWidth != ACPI_MUL_8 (Length)))
{
- ACPI_WARNING ((AE_INFO,
- "32/64X length mismatch in %s: %u/%u",
+ ACPI_BIOS_WARNING ((AE_INFO,
+ "32/64X length mismatch in FADT/%s: %u/%u",
Name, ACPI_MUL_8 (Length), Address64->BitWidth));
}
@@ -606,9 +607,9 @@ AcpiTbValidateFadt (
*/
if (!Address64->Address || !Length)
{
- ACPI_ERROR ((AE_INFO,
- "Required field %s has zero address and/or length:"
- " 0x%8.8X%8.8X/0x%X",
+ ACPI_BIOS_ERROR ((AE_INFO,
+ "Required FADT field %s has zero address and/or length: "
+ "0x%8.8X%8.8X/0x%X",
Name, ACPI_FORMAT_UINT64 (Address64->Address), Length));
}
}
@@ -622,8 +623,8 @@ AcpiTbValidateFadt (
if ((Address64->Address && !Length) ||
(!Address64->Address && Length))
{
- ACPI_WARNING ((AE_INFO,
- "Optional field %s has zero address or length: "
+ ACPI_BIOS_WARNING ((AE_INFO,
+ "Optional FADT field %s has zero address or length: "
"0x%8.8X%8.8X/0x%X",
Name, ACPI_FORMAT_UINT64 (Address64->Address), Length));
}
@@ -674,8 +675,8 @@ AcpiTbSetupFadtRegisters (
(FadtInfoTable[i].DefaultLength > 0) &&
(FadtInfoTable[i].DefaultLength != Target64->BitWidth))
{
- ACPI_WARNING ((AE_INFO,
- "Invalid length for %s: %u, using default %u",
+ ACPI_BIOS_WARNING ((AE_INFO,
+ "Invalid length for FADT/%s: %u, using default %u",
FadtInfoTable[i].Name, Target64->BitWidth,
FadtInfoTable[i].DefaultLength));
Modified: vendor-sys/acpica/dist/source/components/tables/tbinstal.c
==============================================================================
--- vendor-sys/acpica/dist/source/components/tables/tbinstal.c Wed Jul 11 16:27:02 2012 (r238366)
+++ vendor-sys/acpica/dist/source/components/tables/tbinstal.c Wed Jul 11 16:51:47 2012 (r238367)
@@ -157,8 +157,9 @@ AcpiTbAddTable (
(!ACPI_COMPARE_NAME (TableDesc->Pointer->Signature, ACPI_SIG_SSDT)) &&
(ACPI_STRNCMP (TableDesc->Pointer->Signature, "OEM", 3)))
{
- ACPI_ERROR ((AE_INFO,
- "Table has invalid signature [%4.4s] (0x%8.8X), must be SSDT or OEMx",
+ ACPI_BIOS_ERROR ((AE_INFO,
+ "Table has invalid signature [%4.4s] (0x%8.8X), "
+ "must be SSDT or OEMx",
AcpiUtValidAcpiName (*(UINT32 *) TableDesc->Pointer->Signature) ?
TableDesc->Pointer->Signature : "????",
*(UINT32 *) TableDesc->Pointer->Signature));
Modified: vendor-sys/acpica/dist/source/components/tables/tbutils.c
==============================================================================
--- vendor-sys/acpica/dist/source/components/tables/tbutils.c Wed Jul 11 16:27:02 2012 (r238366)
+++ vendor-sys/acpica/dist/source/components/tables/tbutils.c Wed Jul 11 16:51:47 2012 (r238367)
@@ -287,8 +287,9 @@ AcpiTbVerifyChecksum (
if (Checksum)
{
- ACPI_WARNING ((AE_INFO,
- "Incorrect checksum in table [%4.4s] - 0x%2.2X, should be 0x%2.2X",
+ ACPI_BIOS_WARNING ((AE_INFO,
+ "Incorrect checksum in table [%4.4s] - 0x%2.2X, "
+ "should be 0x%2.2X",
Table->Signature, Table->Checksum,
(UINT8) (Table->Checksum - Checksum)));
@@ -356,8 +357,9 @@ AcpiTbCheckDsdtHeader (
if (AcpiGbl_OriginalDsdtHeader.Length != AcpiGbl_DSDT->Length ||
AcpiGbl_OriginalDsdtHeader.Checksum != AcpiGbl_DSDT->Checksum)
{
- ACPI_ERROR ((AE_INFO,
- "The DSDT has been corrupted or replaced - old, new headers below"));
+ ACPI_BIOS_ERROR ((AE_INFO,
+ "The DSDT has been corrupted or replaced - "
+ "old, new headers below"));
AcpiTbPrintTableHeader (0, &AcpiGbl_OriginalDsdtHeader);
AcpiTbPrintTableHeader (0, AcpiGbl_DSDT);
@@ -465,7 +467,7 @@ AcpiTbInstallTable (
if (Signature &&
!ACPI_COMPARE_NAME (Table->Signature, Signature))
{
- ACPI_ERROR ((AE_INFO,
+ ACPI_BIOS_ERROR ((AE_INFO,
"Invalid signature 0x%X for ACPI table, expected [%s]",
*ACPI_CAST_PTR (UINT32, Table->Signature), Signature));
goto UnmapAndExit;
@@ -584,7 +586,7 @@ AcpiTbGetRootTableEntry (
{
/* Will truncate 64-bit address to 32 bits, issue warning */
- ACPI_WARNING ((AE_INFO,
+ ACPI_BIOS_WARNING ((AE_INFO,
"64-bit Physical Address in XSDT is too large (0x%8.8X%8.8X),"
" truncating",
ACPI_FORMAT_UINT64 (Address64)));
@@ -686,7 +688,8 @@ AcpiTbParseRootTable (
if (Length < sizeof (ACPI_TABLE_HEADER))
{
- ACPI_ERROR ((AE_INFO, "Invalid length 0x%X in RSDT/XSDT", Length));
+ ACPI_BIOS_ERROR ((AE_INFO,
+ "Invalid table length 0x%X in RSDT/XSDT", Length));
return_ACPI_STATUS (AE_INVALID_TABLE_LENGTH);
}
Modified: vendor-sys/acpica/dist/source/components/tables/tbxface.c
==============================================================================
--- vendor-sys/acpica/dist/source/components/tables/tbxface.c Wed Jul 11 16:27:02 2012 (r238366)
+++ vendor-sys/acpica/dist/source/components/tables/tbxface.c Wed Jul 11 16:51:47 2012 (r238367)
@@ -1,7 +1,6 @@
/******************************************************************************
*
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-vendor
mailing list