Commit aff8c277 authored by Robert Moore's avatar Robert Moore Committed by Len Brown
Browse files

[ACPI] ACPICA 20050902 

Fixed a problem with the internal Owner ID allocation and
deallocation mechanisms for control method execution and
recursive method invocation.  This should eliminate the
OWNER_ID_LIMIT exceptions and "Invalid OwnerId" messages
seen on some systems.  Recursive method invocation depth
is currently limited to 255.  (Alexey Starikovskiy)

http://bugzilla.kernel.org/show_bug.cgi?id=4892

Completely eliminated all vestiges of support for the
"module-level executable code" until this support is
fully implemented and debugged.  This should eliminate the
NO_RETURN_VALUE exceptions seen during table load on some
systems that invoke this support.

http://bugzilla.kernel.org/show_bug.cgi?id=5162



Fixed a problem within the resource manager code where
the transaction flags for a 64-bit address descriptor were
handled incorrectly in the type-specific flag byte.

Consolidated duplicate code within the address descriptor
resource manager code, reducing overall subsystem code size.

Signed-off-by: default avatarRobert Moore <Robert.Moore@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent a94f1881

drivers/acpi/dispatcher/dsmethod.c

+38 −31
Original line number Diff line number Diff line
@@ -207,6 +207,13 @@ acpi_ds_begin_method_execution(struct acpi_namespace_node *method_node, 
		return_ACPI_STATUS(AE_NULL_ENTRY);

	}



	/* Prevent wraparound of thread count */



	if (obj_desc->method.thread_count == ACPI_UINT8_MAX) {

		ACPI_REPORT_ERROR(("Method reached maximum reentrancy limit (255)\n"));

		return_ACPI_STATUS(AE_AML_METHOD_LIMIT);

	}



	/*

	 * If there is a concurrency limit on this method, we need to

	 * obtain a unit from the method semaphore.
@@ -236,6 +243,18 @@ acpi_ds_begin_method_execution(struct acpi_namespace_node *method_node, 
						  ACPI_WAIT_FOREVER);

	}



	/*

	 * Allocate an Owner ID for this method, only if this is the first thread

	 * to begin concurrent execution. We only need one owner_id, even if the

	 * method is invoked recursively.

	 */

	if (!obj_desc->method.owner_id) {

		status = acpi_ut_allocate_owner_id(&obj_desc->method.owner_id);

		if (ACPI_FAILURE(status)) {

			return_ACPI_STATUS(status);

		}

	}



	/*

	 * Increment the method parse tree thread count since it has been

	 * reentered one more time (even if it is the same thread)
@@ -289,11 +308,6 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread, 
		return_ACPI_STATUS(AE_NULL_OBJECT);

	}



	status = acpi_ut_allocate_owner_id(&obj_desc->method.owner_id);

	if (ACPI_FAILURE(status)) {

		return_ACPI_STATUS(status);

	}



	/* Init for new method, wait on concurrency semaphore */



	status = acpi_ds_begin_method_execution(method_node, obj_desc,
@@ -346,8 +360,7 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread, 
	/*

	 * The resolved arguments were put on the previous walk state's operand

	 * stack. Operands on the previous walk state stack always

	 * start at index 0.

	 * Null terminate the list of arguments

	 * start at index 0. Also, null terminate the list of arguments

	 */

	this_walk_state->operands[this_walk_state->num_operands] = NULL;
@@ -380,21 +393,20 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread, 


	if (obj_desc->method.method_flags & AML_METHOD_INTERNAL_ONLY) {

		status = obj_desc->method.implementation(next_walk_state);

		return_ACPI_STATUS(status);

	}



	return_ACPI_STATUS(AE_OK);



	/* On error, we must delete the new walk state */

	return_ACPI_STATUS(status);



      cleanup:

	acpi_ut_release_owner_id(&obj_desc->method.owner_id);

	if (next_walk_state && (next_walk_state->method_desc)) {

	/* Decrement the thread count on the method parse tree */



	if (next_walk_state && (next_walk_state->method_desc)) {

		next_walk_state->method_desc->method.thread_count--;

	}

	(void)acpi_ds_terminate_control_method(next_walk_state);



	/* On error, we must delete the new walk state */



	acpi_ds_terminate_control_method(next_walk_state);

	acpi_ds_delete_walk_state(next_walk_state);

	return_ACPI_STATUS(status);

}
@@ -479,7 +491,7 @@ acpi_ds_restart_control_method(struct acpi_walk_state *walk_state, 
 *

 * PARAMETERS:  walk_state          - State of the method

 *

 * RETURN:      Status

 * RETURN:      None

 *

 * DESCRIPTION: Terminate a control method.  Delete everything that the method

 *              created, delete all locals and arguments, and delete the parse
@@ -487,7 +499,7 @@ acpi_ds_restart_control_method(struct acpi_walk_state *walk_state, 
 *

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



acpi_status acpi_ds_terminate_control_method(struct acpi_walk_state *walk_state)

void acpi_ds_terminate_control_method(struct acpi_walk_state *walk_state)

{

	union acpi_operand_object *obj_desc;

	struct acpi_namespace_node *method_node;
@@ -496,14 +508,14 @@ acpi_status acpi_ds_terminate_control_method(struct acpi_walk_state *walk_state) 
	ACPI_FUNCTION_TRACE_PTR("ds_terminate_control_method", walk_state);



	if (!walk_state) {

		return (AE_BAD_PARAMETER);

		return_VOID;

	}



	/* The current method object was saved in the walk state */



	obj_desc = walk_state->method_desc;

	if (!obj_desc) {

		return_ACPI_STATUS(AE_OK);

		return_VOID;

	}



	/* Delete all arguments and locals */
@@ -517,7 +529,7 @@ acpi_status acpi_ds_terminate_control_method(struct acpi_walk_state *walk_state) 
	 */

	status = acpi_ut_acquire_mutex(ACPI_MTX_PARSER);

	if (ACPI_FAILURE(status)) {

		return_ACPI_STATUS(status);

		return_VOID;

	}



	/* Signal completion of the execution of this method if necessary */
@@ -528,7 +540,6 @@ acpi_status acpi_ds_terminate_control_method(struct acpi_walk_state *walk_state) 
					     semaphore, 1);

		if (ACPI_FAILURE(status)) {

			ACPI_REPORT_ERROR(("Could not signal method semaphore\n"));

			status = AE_OK;



			/* Ignore error and continue cleanup */

		}
@@ -539,9 +550,8 @@ acpi_status acpi_ds_terminate_control_method(struct acpi_walk_state *walk_state) 
				  "*** Not deleting method namespace, there are still %d threads\n",

				  walk_state->method_desc->method.

				  thread_count));

	}

	} else {		/* This is the last executing thread */



	if (!walk_state->method_desc->method.thread_count) {

		/*

		 * Support to dynamically change a method from not_serialized to

		 * Serialized if it appears that the method is written foolishly and
@@ -574,7 +584,7 @@ acpi_status acpi_ds_terminate_control_method(struct acpi_walk_state *walk_state) 
		 */

		status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);

		if (ACPI_FAILURE(status)) {

			return_ACPI_STATUS(status);

			goto exit;

		}



		if (method_node->child) {
@@ -590,12 +600,9 @@ acpi_status acpi_ds_terminate_control_method(struct acpi_walk_state *walk_state) 
		status = acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);

		acpi_ut_release_owner_id(&walk_state->method_desc->method.

					 owner_id);



		if (ACPI_FAILURE(status)) {

			return_ACPI_STATUS(status);

		}

	}



	status = acpi_ut_release_mutex(ACPI_MTX_PARSER);

	return_ACPI_STATUS(status);

      exit:

	(void)acpi_ut_release_mutex(ACPI_MTX_PARSER);

	return_VOID;

}

drivers/acpi/dispatcher/dswload.c

+5 −0
Original line number Diff line number Diff line
@@ -486,8 +486,10 @@ acpi_ds_load2_begin_op(struct acpi_walk_state * walk_state, 
		if ((!(walk_state->op_info->flags & AML_NSOPCODE) &&

		     (walk_state->opcode != AML_INT_NAMEPATH_OP)) ||

		    (!(walk_state->op_info->flags & AML_NAMED))) {

#ifdef ACPI_ENABLE_MODULE_LEVEL_CODE

			if ((walk_state->op_info->class == AML_CLASS_EXECUTE) ||

			    (walk_state->op_info->class == AML_CLASS_CONTROL)) {



				ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,

						  "Begin/EXEC: %s (fl %8.8X)\n",

						  walk_state->op_info->name,
@@ -499,6 +501,7 @@ acpi_ds_load2_begin_op(struct acpi_walk_state * walk_state, 
				    acpi_ds_exec_begin_op(walk_state, out_op);

				return_ACPI_STATUS(status);

			}

#endif

			return_ACPI_STATUS(AE_OK);

		}
@@ -731,6 +734,7 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state) 


	if (!(walk_state->op_info->flags & AML_NSOBJECT)) {

#ifndef ACPI_NO_METHOD_EXECUTION

#ifdef ACPI_ENABLE_MODULE_LEVEL_CODE

		/* No namespace object. Executable opcode? */



		if ((walk_state->op_info->class == AML_CLASS_EXECUTE) ||
@@ -745,6 +749,7 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state) 
			status = acpi_ds_exec_end_op(walk_state);

			return_ACPI_STATUS(status);

		}

#endif

#endif

		return_ACPI_STATUS(AE_OK);

	}

drivers/acpi/parser/psparse.c

+9 −14
Original line number Diff line number Diff line
@@ -438,7 +438,6 @@ acpi_ps_next_parse_state(struct acpi_walk_state *walk_state, 
acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)

{

	acpi_status status;

	acpi_status terminate_status;

	struct acpi_thread_state *thread;

	struct acpi_thread_state *prev_walk_list = acpi_gbl_current_walk_list;

	struct acpi_walk_state *previous_walk_state;
@@ -508,6 +507,10 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state) 
						 walk_state->method_node, NULL,

						 status);



			/* Ensure proper cleanup */



			walk_state->parse_flags |= ACPI_PARSE_EXECUTE;



			/* Check for possible multi-thread reentrancy problem */



			if ((status == AE_ALREADY_EXISTS) &&
@@ -524,14 +527,6 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state) 
			}

		}



		if (walk_state->method_desc) {

			/* Decrement the thread count on the method parse tree */



			if (walk_state->method_desc->method.thread_count) {

				walk_state->method_desc->method.thread_count--;

			}

		}



		/* We are done with this walk, move on to the parent if any */



		walk_state = acpi_ds_pop_walk_state(thread);
@@ -546,13 +541,13 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state) 
		 */

		if ((walk_state->parse_flags & ACPI_PARSE_MODE_MASK) ==

		    ACPI_PARSE_EXECUTE) {

			terminate_status =

			    acpi_ds_terminate_control_method(walk_state);

			if (ACPI_FAILURE(terminate_status)) {

				ACPI_REPORT_ERROR(("Could not terminate control method properly\n"));

			if (walk_state->method_desc) {

				/* Decrement the thread count on the method parse tree */



				/* Ignore error and continue */

				walk_state->method_desc->method.thread_count--;

			}



			acpi_ds_terminate_control_method(walk_state);

		}



		/* Delete this walk state and all linked control states */

drivers/acpi/parser/psxface.c

+0 −14
Original line number Diff line number Diff line
@@ -98,16 +98,6 @@ acpi_status acpi_ps_execute_method(struct acpi_parameter_info *info) 
		return_ACPI_STATUS(status);

	}



	/*

	 * Get a new owner_id for objects created by this method. Namespace

	 * objects (such as Operation Regions) can be created during the

	 * first pass parse.

	 */

	status = acpi_ut_allocate_owner_id(&info->obj_desc->method.owner_id);

	if (ACPI_FAILURE(status)) {

		return_ACPI_STATUS(status);

	}



	/*

	 * The caller "owns" the parameters, so give each one an extra

	 * reference
@@ -139,10 +129,6 @@ acpi_status acpi_ps_execute_method(struct acpi_parameter_info *info) 
	status = acpi_ps_execute_pass(info);



      cleanup:

	if (info->obj_desc->method.owner_id) {

		acpi_ut_release_owner_id(&info->obj_desc->method.owner_id);

	}



	/* Take away the extra reference that we gave the parameters above */



	acpi_ps_update_parameter_list(info, REF_DECREMENT);

drivers/acpi/resources/rsaddr.c

+257 −285

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE