Commit 04afb405 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 

* 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (22 commits)
  ACPI: fix early DSDT dmi check warnings on ia64
  ACPICA: Update version to 20100428.
  ACPICA: Update/clarify some parameter names associated with acpi_handle
  ACPICA: Rename acpi_ex_system_do_suspend->acpi_ex_system_do_sleep
  ACPICA: Prevent possible allocation overrun during object copy
  ACPICA: Split large file, evgpeblk
  ACPICA: Add GPE support for dynamically loaded ACPI tables
  ACPICA: Clarify/rename some root table descriptor fields
  ACPICA: Update version to 20100331.
  ACPICA: Minimize the differences between linux GPE code and ACPICA code base
  ACPI: add boot option acpi=copy_dsdt to fix corrupt DSDT
  ACPICA: Update DSDT copy/detection.
  ACPICA: Add subsystem option to force copy of DSDT to local memory
  ACPICA: Add detection of corrupted/replaced DSDT
  ACPICA: Add write support for DataTable operation regions
  ACPICA: Fix for acpi_reallocate_root_table for incorrect root table copy
  ACPICA: Update comments/headers, no functional change
  ACPICA: Update version to 20100304
  ACPICA: Fix for possible fault in acpi_ex_release_mutex
  ACPICA: Standardize integer output for ACPICA warnings/errors
  ...
parents 7f06a8b2 cce4f632

Documentation/kernel-parameters.txt

+1 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ and is between 256 and 4096 characters. It is defined in the file 
			strict -- Be less tolerant of platforms that are not

				strictly ACPI specification compliant.

			rsdt -- prefer RSDT over (default) XSDT

			copy_dsdt -- copy DSDT to memory



			See also Documentation/power/pm.txt, pci=noacpi

arch/x86/kernel/acpi/boot.c

+4 −0
Original line number Diff line number Diff line
@@ -1613,6 +1613,10 @@ static int __init parse_acpi(char *arg) 
	/* "acpi=noirq" disables ACPI interrupt routing */

	else if (strcmp(arg, "noirq") == 0) {

		acpi_noirq_set();

	}

	/* "acpi=copy_dsdt" copys DSDT */

	else if (strcmp(arg, "copy_dsdt") == 0) {

		acpi_gbl_copy_dsdt_locally = 1;

	} else {

		/* Core will printk when we return error. */

		return -EINVAL;

drivers/acpi/acpica/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -14,12 +14,12 @@ acpi-y := dsfield.o dsmthdat.o dsopcode.o dswexec.o dswscope.o \ 


acpi-y += evevent.o  evregion.o  evsci.o    evxfevnt.o \

	 evmisc.o   evrgnini.o  evxface.o  evxfregn.o \

	 evgpe.o    evgpeblk.o

	 evgpe.o    evgpeblk.o evgpeinit.o  evgpeutil.o



acpi-y += exconfig.o  exfield.o  exnames.o   exoparg6.o  exresolv.o  exstorob.o\

	 exconvrt.o  exfldio.o  exoparg1.o  exprep.o    exresop.o   exsystem.o\

	 excreate.o  exmisc.o   exoparg2.o  exregion.o  exstore.o   exutils.o \

	 exdump.o    exmutex.o  exoparg3.o  exresnte.o  exstoren.o

	 exdump.o    exmutex.o  exoparg3.o  exresnte.o  exstoren.o  exdebug.o



acpi-y += hwacpi.o  hwgpe.o  hwregs.o  hwsleep.o hwxface.o hwvalid.o

drivers/acpi/acpica/acevents.h

+36 −15
Original line number Diff line number Diff line
@@ -73,8 +73,10 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node *node, 
			     u32 notify_value);



/*

 * evgpe - GPE handling and dispatch

 * evgpe - Low-level GPE support

 */

u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info *gpe_xrupt_list);



acpi_status

acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info);
@@ -85,19 +87,13 @@ acpi_status acpi_ev_disable_gpe(struct acpi_gpe_event_info *gpe_event_info); 
struct acpi_gpe_event_info *acpi_ev_get_gpe_event_info(acpi_handle gpe_device,

						       u32 gpe_number);



struct acpi_gpe_event_info *acpi_ev_low_get_gpe_info(u32 gpe_number,

						     struct acpi_gpe_block_info

						     *gpe_block);



/*

 * evgpeblk

 * evgpeblk - Upper-level GPE block support

 */

u8 acpi_ev_valid_gpe_event(struct acpi_gpe_event_info *gpe_event_info);



acpi_status

acpi_ev_walk_gpe_list(acpi_gpe_callback gpe_walk_callback, void *context);



acpi_status

acpi_ev_delete_gpe_handlers(struct acpi_gpe_xrupt_info *gpe_xrupt_info,

			    struct acpi_gpe_block_info *gpe_block,

			    void *context);



acpi_status

acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device,

			 struct acpi_generic_address *gpe_block_address,
@@ -116,12 +112,37 @@ u32 
acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info,

		     u32 gpe_number);



u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info *gpe_xrupt_list);

/*

 * evgpeinit - GPE initialization and update

 */

acpi_status acpi_ev_gpe_initialize(void);



void acpi_ev_update_gpes(acpi_owner_id table_owner_id);



acpi_status

acpi_ev_check_for_wake_only_gpe(struct acpi_gpe_event_info *gpe_event_info);

acpi_ev_match_gpe_method(acpi_handle obj_handle,

			 u32 level, void *context, void **return_value);



acpi_status acpi_ev_gpe_initialize(void);

acpi_status

acpi_ev_match_prw_and_gpe(acpi_handle obj_handle,

			  u32 level, void *context, void **return_value);



/*

 * evgpeutil - GPE utilities

 */

acpi_status

acpi_ev_walk_gpe_list(acpi_gpe_callback gpe_walk_callback, void *context);



u8 acpi_ev_valid_gpe_event(struct acpi_gpe_event_info *gpe_event_info);



struct acpi_gpe_xrupt_info *acpi_ev_get_gpe_xrupt_block(u32 interrupt_number);



acpi_status acpi_ev_delete_gpe_xrupt(struct acpi_gpe_xrupt_info *gpe_xrupt);



acpi_status

acpi_ev_delete_gpe_handlers(struct acpi_gpe_xrupt_info *gpe_xrupt_info,

			    struct acpi_gpe_block_info *gpe_block,

			    void *context);



/*

 * evregion - Address Space handling

drivers/acpi/acpica/acglobal.h

+21 −4
Original line number Diff line number Diff line
@@ -112,6 +112,19 @@ u8 ACPI_INIT_GLOBAL(acpi_gbl_leave_wake_gpes_disabled, TRUE); 
 */

u8 ACPI_INIT_GLOBAL(acpi_gbl_use_default_register_widths, TRUE);



/*

 * Optionally enable output from the AML Debug Object.

 */

u8 ACPI_INIT_GLOBAL(acpi_gbl_enable_aml_debug_object, FALSE);



/*

 * Optionally copy the entire DSDT to local memory (instead of simply

 * mapping it.) There are some BIOSs that corrupt or replace the original

 * DSDT, creating the need for this option. Default is FALSE, do not copy

 * the DSDT.

 */

u8 ACPI_INIT_GLOBAL(acpi_gbl_copy_dsdt_locally, FALSE);



/* acpi_gbl_FADT is a local copy of the FADT, converted to a common format. */



struct acpi_table_fadt acpi_gbl_FADT;
@@ -145,11 +158,10 @@ ACPI_EXTERN u32 acpi_gbl_trace_dbg_layer; 
 ****************************************************************************/



/*

 * acpi_gbl_root_table_list is the master list of ACPI tables found in the

 * RSDT/XSDT.

 *

 * acpi_gbl_root_table_list is the master list of ACPI tables that were

 * found in the RSDT/XSDT.

 */

ACPI_EXTERN struct acpi_internal_rsdt acpi_gbl_root_table_list;

ACPI_EXTERN struct acpi_table_list acpi_gbl_root_table_list;

ACPI_EXTERN struct acpi_table_facs *acpi_gbl_FACS;



/* These addresses are calculated from the FADT Event Block addresses */
@@ -160,6 +172,11 @@ ACPI_EXTERN struct acpi_generic_address acpi_gbl_xpm1a_enable; 
ACPI_EXTERN struct acpi_generic_address acpi_gbl_xpm1b_status;

ACPI_EXTERN struct acpi_generic_address acpi_gbl_xpm1b_enable;



/* DSDT information. Used to check for DSDT corruption */



ACPI_EXTERN struct acpi_table_header *acpi_gbl_DSDT;

ACPI_EXTERN struct acpi_table_header acpi_gbl_original_dsdt_header;



/*

 * Handle both ACPI 1.0 and ACPI 2.0 Integer widths. The integer width is

 * determined by the revision of the DSDT: If the DSDT revision is less than

CRA Git | Maintained and supported by SUSTech CRA and CCSE