Commit b526ca43 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  acpi,msi-laptop: Fall back to EC polling mode for MSI laptop specific EC commands
  sony-laptop: rename SONY_LAPTOP_OLD to a more meaningful SONYPI_COMPAT
  asus-laptop: version bump and lindent
  asus-laptop: fix light sens init
  asus-laptop: add GPS support
  asus-laptop: notify ALL events
  ACPICA: Lindent
  ACPI: created a dedicated workqueue for notify() execution
  Revert "ACPICA: fix AML mutex re-entrancy"
  Revert "Execute AML Notify() requests on stack."
  Revert "ACPICA: revert "acpi_serialize" changes"
  ACPI: delete un-reliable concept of cooling mode
  ACPI: thermal trip points are read-only
parents 9b6a5174 f685648e

drivers/acpi/dispatcher/dsmethod.c

+7 −5
Original line number Diff line number Diff line
@@ -231,8 +231,10 @@ acpi_ds_begin_method_execution(struct acpi_namespace_node *method_node, 
		 * Obtain the method mutex if necessary. Do not acquire mutex for a

		 * recursive call.

		 */

		if (acpi_os_get_thread_id() !=

		    obj_desc->method.mutex->mutex.owner_thread_id) {

		if (!walk_state ||

		    !obj_desc->method.mutex->mutex.owner_thread ||

		    (walk_state->thread !=

		     obj_desc->method.mutex->mutex.owner_thread)) {

			/*

			 * Acquire the method mutex. This releases the interpreter if we

			 * block (and reacquires it before it returns)
@@ -246,14 +248,14 @@ acpi_ds_begin_method_execution(struct acpi_namespace_node *method_node, 
			}



			/* Update the mutex and walk info and save the original sync_level */

			obj_desc->method.mutex->mutex.owner_thread_id =

				acpi_os_get_thread_id();



			if (walk_state) {

				obj_desc->method.mutex->mutex.

				    original_sync_level =

				    walk_state->thread->current_sync_level;



				obj_desc->method.mutex->mutex.owner_thread =

				    walk_state->thread;

				walk_state->thread->current_sync_level =

				    obj_desc->method.sync_level;

			} else {
@@ -567,7 +569,7 @@ acpi_ds_terminate_control_method(union acpi_operand_object *method_desc, 


			acpi_os_release_mutex(method_desc->method.mutex->mutex.

					      os_mutex);

			method_desc->method.mutex->mutex.owner_thread_id = ACPI_MUTEX_NOT_ACQUIRED;

			method_desc->method.mutex->mutex.owner_thread = NULL;

		}

	}

drivers/acpi/dispatcher/dsopcode.c

+1 −2
Original line number Diff line number Diff line
@@ -866,8 +866,7 @@ acpi_ds_eval_data_object_operands(struct acpi_walk_state *walk_state, 
		    ((op->common.parent->common.aml_opcode != AML_PACKAGE_OP) &&

		     (op->common.parent->common.aml_opcode !=

		      AML_VAR_PACKAGE_OP)

		     && (op->common.parent->common.aml_opcode !=

			 AML_NAME_OP))) {

		     && (op->common.parent->common.aml_opcode != AML_NAME_OP))) {

			walk_state->result_obj = obj_desc;

		}

	}

drivers/acpi/dispatcher/dsutils.c

+3 −4
Original line number Diff line number Diff line
@@ -556,8 +556,7 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state, 
					 * indicate this to the interpreter, set the

					 * object to the root

					 */

					obj_desc =

					    ACPI_CAST_PTR(union

					obj_desc = ACPI_CAST_PTR(union

								 acpi_operand_object,

								 acpi_gbl_root_node);

					status = AE_OK;

drivers/acpi/dispatcher/dswstate.c

+3 −6
Original line number Diff line number Diff line
@@ -630,12 +630,9 @@ struct acpi_walk_state *acpi_ds_pop_walk_state(struct acpi_thread_state *thread) 
 *

 ******************************************************************************/



struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id,

						  union acpi_parse_object

						  *origin,

						  union acpi_operand_object

						  *method_desc,

						  struct acpi_thread_state

struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id, union acpi_parse_object

						  *origin, union acpi_operand_object

						  *method_desc, struct acpi_thread_state

						  *thread)

{

	struct acpi_walk_state *walk_state;

drivers/acpi/ec.c

+23 −16
Original line number Diff line number Diff line
@@ -147,9 +147,10 @@ static inline int acpi_ec_check_status(struct acpi_ec *ec, enum ec_event event, 
	return 0;

}



static int acpi_ec_wait(struct acpi_ec *ec, enum ec_event event, unsigned count)

static int acpi_ec_wait(struct acpi_ec *ec, enum ec_event event,

                        unsigned count, int force_poll)

{

	if (acpi_ec_mode == EC_POLL) {

	if (unlikely(force_poll) || acpi_ec_mode == EC_POLL) {

		unsigned long delay = jiffies + msecs_to_jiffies(ACPI_EC_DELAY);

		while (time_before(jiffies, delay)) {

			if (acpi_ec_check_status(ec, event, 0))
@@ -173,14 +174,15 @@ static int acpi_ec_wait(struct acpi_ec *ec, enum ec_event event, unsigned count) 


static int acpi_ec_transaction_unlocked(struct acpi_ec *ec, u8 command,

					const u8 * wdata, unsigned wdata_len,

					u8 * rdata, unsigned rdata_len)

					u8 * rdata, unsigned rdata_len,

					int force_poll)

{

	int result = 0;

	unsigned count = atomic_read(&ec->event_count);

	acpi_ec_write_cmd(ec, command);



	for (; wdata_len > 0; --wdata_len) {

		result = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0, count);

		result = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0, count, force_poll);

		if (result) {

			printk(KERN_ERR PREFIX

			       "write_cmd timeout, command = %d\n", command);
@@ -191,7 +193,7 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec, u8 command, 
	}



	if (!rdata_len) {

		result = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0, count);

		result = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0, count, force_poll);

		if (result) {

			printk(KERN_ERR PREFIX

			       "finish-write timeout, command = %d\n", command);
@@ -202,7 +204,7 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec, u8 command, 
	}



	for (; rdata_len > 0; --rdata_len) {

		result = acpi_ec_wait(ec, ACPI_EC_EVENT_OBF_1, count);

		result = acpi_ec_wait(ec, ACPI_EC_EVENT_OBF_1, count, force_poll);

		if (result) {

			printk(KERN_ERR PREFIX "read timeout, command = %d\n",

			       command);
@@ -217,7 +219,8 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec, u8 command, 


static int acpi_ec_transaction(struct acpi_ec *ec, u8 command,

			       const u8 * wdata, unsigned wdata_len,

			       u8 * rdata, unsigned rdata_len)

			       u8 * rdata, unsigned rdata_len,

			       int force_poll)

{

	int status;

	u32 glk;
@@ -240,7 +243,7 @@ static int acpi_ec_transaction(struct acpi_ec *ec, u8 command, 
	/* Make sure GPE is enabled before doing transaction */

	acpi_enable_gpe(NULL, ec->gpe, ACPI_NOT_ISR);



	status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0, 0);

	status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0, 0, 0);

	if (status) {

		printk(KERN_DEBUG PREFIX

		       "input buffer is not empty, aborting transaction\n");
@@ -249,7 +252,8 @@ static int acpi_ec_transaction(struct acpi_ec *ec, u8 command, 


	status = acpi_ec_transaction_unlocked(ec, command,

					      wdata, wdata_len,

					      rdata, rdata_len);

					      rdata, rdata_len,

					      force_poll);



      end:
@@ -267,12 +271,12 @@ static int acpi_ec_transaction(struct acpi_ec *ec, u8 command, 
int acpi_ec_burst_enable(struct acpi_ec *ec)

{

	u8 d;

	return acpi_ec_transaction(ec, ACPI_EC_BURST_ENABLE, NULL, 0, &d, 1);

	return acpi_ec_transaction(ec, ACPI_EC_BURST_ENABLE, NULL, 0, &d, 1, 0);

}



int acpi_ec_burst_disable(struct acpi_ec *ec)

{

	return acpi_ec_transaction(ec, ACPI_EC_BURST_DISABLE, NULL, 0, NULL, 0);

	return acpi_ec_transaction(ec, ACPI_EC_BURST_DISABLE, NULL, 0, NULL, 0, 0);

}



static int acpi_ec_read(struct acpi_ec *ec, u8 address, u8 * data)
@@ -281,7 +285,7 @@ static int acpi_ec_read(struct acpi_ec *ec, u8 address, u8 * data) 
	u8 d;



	result = acpi_ec_transaction(ec, ACPI_EC_COMMAND_READ,

				     &address, 1, &d, 1);

				     &address, 1, &d, 1, 0);

	*data = d;

	return result;

}
@@ -290,7 +294,7 @@ static int acpi_ec_write(struct acpi_ec *ec, u8 address, u8 data) 
{

	u8 wdata[2] = { address, data };

	return acpi_ec_transaction(ec, ACPI_EC_COMMAND_WRITE,

				   wdata, 2, NULL, 0);

				   wdata, 2, NULL, 0, 0);

}



/*
@@ -349,13 +353,15 @@ EXPORT_SYMBOL(ec_write); 


int ec_transaction(u8 command,

		   const u8 * wdata, unsigned wdata_len,

		   u8 * rdata, unsigned rdata_len)

		   u8 * rdata, unsigned rdata_len,

		   int force_poll)

{

	if (!first_ec)

		return -ENODEV;



	return acpi_ec_transaction(first_ec, command, wdata,

				   wdata_len, rdata, rdata_len);

				   wdata_len, rdata, rdata_len,

				   force_poll);

}



EXPORT_SYMBOL(ec_transaction);
@@ -374,7 +380,7 @@ static int acpi_ec_query(struct acpi_ec *ec, u8 * data) 
	 * bit to be cleared (and thus clearing the interrupt source).

	 */



	result = acpi_ec_transaction(ec, ACPI_EC_COMMAND_QUERY, NULL, 0, &d, 1);

	result = acpi_ec_transaction(ec, ACPI_EC_COMMAND_QUERY, NULL, 0, &d, 1, 0);

	if (result)

		return result;
@@ -410,6 +416,7 @@ static u32 acpi_ec_gpe_handler(void *data) 
	acpi_status status = AE_OK;

	u8 value;

	struct acpi_ec *ec = data;



	atomic_inc(&ec->event_count);



	if (acpi_ec_mode == EC_INTR) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE