ACPI: ACPICA 20060331 (793c2388) · Commits · 戴 / test

Implemented header file support for the following additional ACPI tables: ASF!, BOOT, CPEP, DBGP, MCFG, SPCR, SPMI, TCPA, and WDRT. With this support, all current and known ACPI tables are now defined in the ACPICA headers and are available for use by device drivers and other software. Implemented support to allow tables that contain ACPI names with invalid characters to be loaded. Previously, this would cause the table load to fail, but since there are several known cases of such tables on existing machines, this change was made to enable ACPI support for them. Also, this matches the behavior of the Microsoft ACPI implementation. https://bugzilla.novell.com/show_bug.cgi?id=147621 Fixed a couple regressions introduced during the memory optimization in the 20060317 release. The namespace node definition required additional reorganization and an internal datatype that had been changed to 8-bit was restored to 32-bit. (Valery Podrezov) Fixed a problem where a null pointer passed to acpi_ut_delete_generic_state() could be passed through to acpi_os_release_object which is unexpected. Such null pointers are now trapped and ignored, matching the behavior of the previous implementation before the deployment of acpi_os_release_object(). (Valery Podrezov, Fiodor Suietov) Fixed a memory mapping leak during the deletion of a SystemMemory operation region where a cached memory mapping was not deleted. This became a noticeable problem for operation regions that are defined within frequently used control methods. (Dana Meyers) Reorganized the ACPI table header files into two main files: one for the ACPI tables consumed by the ACPICA core, and another for the miscellaneous ACPI tables that are consumed by the drivers and other software. The various FADT definitions were merged into one common section and three different tables (ACPI 1.0, 1.0+, and 2.0) Signed-off-by:

Bob Moore <robert.moore@intel.com> Signed-off-by:

Len Brown <len.brown@intel.com>

arch/i386/kernel/acpi/boot.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -621,9 +621,9 @@ extern u32 pmtmr_ioport;

		static int __init acpi_parse_fadt(unsigned long phys, unsigned long size)
		{
		struct fadt_descriptor_rev2 *fadt = NULL;
		struct fadt_descriptor *fadt = NULL;

		fadt = (struct fadt_descriptor_rev2 *)__acpi_map_table(phys, size);
		fadt = (struct fadt_descriptor *)__acpi_map_table(phys, size);
		if (!fadt) {
		printk(KERN_WARNING PREFIX "Unable to map FADT\n");
		return 0;

drivers/acpi/bus.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ ACPI_MODULE_NAME("acpi_bus")
		extern void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger);
		#endif

		FADT_DESCRIPTOR acpi_fadt;
		struct fadt_descriptor acpi_fadt;
		EXPORT_SYMBOL(acpi_fadt);

		struct acpi_device *acpi_root;

drivers/acpi/dispatcher/dsmethod.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -502,7 +502,7 @@ void acpi_ds_terminate_control_method(struct acpi_walk_state *walk_state)
		* Delete any namespace entries created immediately underneath
		* the method
		*/
		if (method_node->child) {
		if (method_node && method_node->child) {
		acpi_ns_delete_namespace_subtree(method_node);
		}

drivers/acpi/dispatcher/dswexec.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,6 @@
		#include <acpi/acinterp.h>
		#include <acpi/acnamesp.h>
		#include <acpi/acdebug.h>
		#include <acpi/acdisasm.h>

		#define _COMPONENT ACPI_DISPATCHER
		ACPI_MODULE_NAME("dswexec")

drivers/acpi/events/evrgnini.c

+12 −1

Original line number	Diff line number	Diff line
		@@ -75,7 +75,18 @@ acpi_ev_system_memory_region_setup(acpi_handle handle,

		if (function == ACPI_REGION_DEACTIVATE) {
		if (*region_context) {
		ACPI_FREE(*region_context);
		local_region_context =
		(struct acpi_mem_space_context )region_context;

		/* Delete a cached mapping if present */

		if (local_region_context->mapped_length) {
		acpi_os_unmap_memory(local_region_context->
		mapped_logical_address,
		local_region_context->
		mapped_length);
		}
		ACPI_FREE(local_region_context);
		*region_context = NULL;
		}
		return_ACPI_STATUS(AE_OK);

Admin message