Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aca209e5 authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'acpica' into release 



Conflicts:
	drivers/acpi/acpica/aclocal.h

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parents f6f94e2a 8df3fc98

drivers/acpi/acpica/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ acpi-y += exconfig.o exfield.o exnames.o exoparg6.o exresolv.o exstorob.o\ 
	 excreate.o  exmisc.o   exoparg2.o  exregion.o  exstore.o   exutils.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

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



acpi-$(ACPI_FUTURE_USAGE) += hwtimer.o
@@ -44,4 +44,5 @@ acpi-y += tbxface.o tbinstal.o tbutils.o tbfind.o tbfadt.o tbxfroot.o 


acpi-y += utalloc.o utdebug.o uteval.o utinit.o utmisc.o utxface.o \

		utcopy.o utdelete.o utglobal.o utmath.o utobject.o \

		utstate.o utmutex.o utobject.o utresrc.o utlock.o utids.o
 
		utstate.o utmutex.o utobject.o utresrc.o utlock.o utids.o \

		utosi.o utxferror.o

drivers/acpi/acpica/acdebug.h

+2 −0
Original line number Diff line number Diff line
@@ -105,6 +105,8 @@ void acpi_db_set_method_data(char *type_arg, char *index_arg, char *value_arg); 
acpi_status

acpi_db_display_objects(char *obj_type_arg, char *display_count_arg);



void acpi_db_display_interfaces(char *action_arg, char *interface_name_arg);



acpi_status acpi_db_find_name_in_namespace(char *name_arg);



void acpi_db_set_scope(char *name);

drivers/acpi/acpica/acglobal.h

+7 −1
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ struct acpi_table_fadt acpi_gbl_FADT; 
u32 acpi_current_gpe_count;

u32 acpi_gbl_trace_flags;

acpi_name acpi_gbl_trace_method_name;

u8 acpi_gbl_system_awake_and_running;



#endif
@@ -187,6 +188,10 @@ ACPI_EXTERN u8 acpi_gbl_integer_bit_width; 
ACPI_EXTERN u8 acpi_gbl_integer_byte_width;

ACPI_EXTERN u8 acpi_gbl_integer_nybble_width;



/* Mutex for _OSI support */



ACPI_EXTERN acpi_mutex acpi_gbl_osi_mutex;



/* Reader/Writer lock is used for namespace walk and dynamic table unload */



ACPI_EXTERN struct acpi_rw_lock acpi_gbl_namespace_rw_lock;
@@ -255,6 +260,7 @@ ACPI_EXTERN acpi_init_handler acpi_gbl_init_handler; 
ACPI_EXTERN acpi_tbl_handler acpi_gbl_table_handler;

ACPI_EXTERN void *acpi_gbl_table_handler_context;

ACPI_EXTERN struct acpi_walk_state *acpi_gbl_breakpoint_walk;

ACPI_EXTERN acpi_interface_handler acpi_gbl_interface_handler;



/* Owner ID support */
@@ -273,8 +279,8 @@ ACPI_EXTERN u8 acpi_gbl_debugger_configuration; 
ACPI_EXTERN u8 acpi_gbl_step_to_next_call;

ACPI_EXTERN u8 acpi_gbl_acpi_hardware_present;

ACPI_EXTERN u8 acpi_gbl_events_initialized;

ACPI_EXTERN u8 acpi_gbl_system_awake_and_running;

ACPI_EXTERN u8 acpi_gbl_osi_data;

ACPI_EXTERN struct acpi_interface_info *acpi_gbl_supported_interfaces;



#ifndef DEFINE_ACPI_GLOBALS

drivers/acpi/acpica/achware.h

+7 −0
Original line number Diff line number Diff line
@@ -121,6 +121,13 @@ acpi_hw_enable_runtime_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info, 
				 struct acpi_gpe_block_info *gpe_block,

				 void *context);



/*

 * hwpci - PCI configuration support

 */

acpi_status

acpi_hw_derive_pci_id(struct acpi_pci_id *pci_id,

		      acpi_handle root_pci_device, acpi_handle pci_region);



#ifdef	ACPI_FUTURE_USAGE

/*

 * hwtimer - ACPI Timer prototypes

drivers/acpi/acpica/aclocal.h

+9 −3
Original line number Diff line number Diff line
@@ -854,7 +854,7 @@ struct acpi_bit_register_info { 
	ACPI_BITMASK_POWER_BUTTON_STATUS   | \

	ACPI_BITMASK_SLEEP_BUTTON_STATUS   | \

	ACPI_BITMASK_RT_CLOCK_STATUS       | \

	ACPI_BITMASK_PCIEXP_WAKE_DISABLE   | \

	ACPI_BITMASK_PCIEXP_WAKE_STATUS    | \

	ACPI_BITMASK_WAKE_STATUS)



#define ACPI_BITMASK_TIMER_ENABLE               0x0001
@@ -909,15 +909,21 @@ struct acpi_bit_register_info { 
#define ACPI_OSI_WIN_VISTA              0x07

#define ACPI_OSI_WINSRV_2008            0x08

#define ACPI_OSI_WIN_VISTA_SP1          0x09

#define ACPI_OSI_WIN_7                  0x0A

#define ACPI_OSI_WIN_VISTA_SP2          0x0A

#define ACPI_OSI_WIN_7                  0x0B



#define ACPI_ALWAYS_ILLEGAL             0x00



struct acpi_interface_info {

	char *name;

	struct acpi_interface_info *next;

	u8 flags;

	u8 value;

};



#define ACPI_OSI_INVALID                0x01

#define ACPI_OSI_DYNAMIC                0x02



struct acpi_port_info {

	char *name;

	u16 start;
@@ -997,7 +1003,7 @@ struct acpi_port_info { 
struct acpi_db_method_info {

	acpi_handle main_thread_gate;

	acpi_handle thread_complete_gate;

	u32 *threads;

	acpi_thread_id *threads;

	u32 num_threads;

	u32 num_created;

	u32 num_completed;