Commit c51a4de8 authored by Bob Moore's avatar Bob Moore Committed by Len Brown
Browse files

[ACPI] ACPICA 20051117 



Fixed a problem in the AML parser where the method thread
count could be decremented below zero if any errors
occurred during the method parse phase. This should
eliminate AE_AML_METHOD_LIMIT exceptions seen on some
machines. This also fixed a related regression with the
mechanism that detects and corrects methods that cannot
properly handle reentrancy (related to the deployment of
the new OwnerId mechanism.)

Eliminated the pre-parsing of control methods (to detect
errors) during table load. Related to the problem above,
this was causing unwind issues if any errors occurred
during the parse, and it seemed to be overkill. A table
load should not be aborted if there are problems with
any single control method, thus rendering this feature
rather pointless.

Fixed a problem with the new table-driven resource manager
where an internal buffer overflow could occur for small
resource templates.

Implemented a new external interface, acpi_get_vendor_resource()
This interface will find and return a vendor-defined
resource descriptor within a _CRS or _PRS
method via an ACPI 3.0 UUID match. (from Bjorn Helgaas)

Removed the length limit (200) on string objects as
per the upcoming ACPI 3.0A specification. This affects
the following areas of the interpreter: 1) any implicit
conversion of a Buffer to a String, 2) a String object
result of the ASL Concatentate operator, 3) the String
object result of the ASL ToString operator.

Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 96db255c

drivers/acpi/dispatcher/dsinit.c

+16 −9
Original line number Diff line number Diff line
@@ -117,14 +117,6 @@ acpi_ds_init_one_object(acpi_handle obj_handle, 


	case ACPI_TYPE_METHOD:



		/*

		 * Print a dot for each method unless we are going to print

		 * the entire pathname

		 */

		if (!(acpi_dbg_level & ACPI_LV_INIT_NAMES)) {

			ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT, "."));

		}



		/*

		 * Set the execution data width (32 or 64) based upon the

		 * revision number of the parent ACPI table.
@@ -134,6 +126,21 @@ acpi_ds_init_one_object(acpi_handle obj_handle, 
		if (info->table_desc->pointer->revision == 1) {

			node->flags |= ANOBJ_DATA_WIDTH_32;

		}

#ifdef ACPI_INIT_PARSE_METHODS

		/*

		 * Note 11/2005: Removed this code to parse all methods during table

		 * load because it causes problems if there are any errors during the

		 * parse. Also, it seems like overkill and we probably don't want to

		 * abort a table load because of an issue with a single method.

		 */



		/*

		 * Print a dot for each method unless we are going to print

		 * the entire pathname

		 */

		if (!(acpi_dbg_level & ACPI_LV_INIT_NAMES)) {

			ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT, "."));

		}



		/*

		 * Always parse methods to detect errors, we will delete
@@ -149,7 +156,7 @@ acpi_ds_init_one_object(acpi_handle obj_handle, 


			/* This parse failed, but we will continue parsing more methods */

		}



#endif

		info->method_count++;

		break;

drivers/acpi/dispatcher/dswload.c

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state, 
	op->named.name = node->name.integer;



#if (defined (ACPI_NO_METHOD_EXECUTION) || defined (ACPI_CONSTANT_EVAL_ONLY))

	op->named.path = (u8 *) path;

	op->named.path = ACPI_CAST_PTR(u8, path);

#endif



	/*

drivers/acpi/executer/exconvrt.c

+3 −9
Original line number Diff line number Diff line
@@ -504,18 +504,12 @@ acpi_ex_convert_to_string(union acpi_operand_object * obj_desc, 
		}



		/*

		 * Perform the conversion.

		 * Create a new string object and string buffer

		 * (-1 because of extra separator included in string_length from above)

		 */

		string_length--;

		if (string_length > ACPI_MAX_STRING_CONVERSION) {	/* ACPI limit */

			return_ACPI_STATUS(AE_AML_STRING_LIMIT);

		}



		/* Create a new string object and string buffer */



		return_desc =

		    acpi_ut_create_string_object((acpi_size) string_length);

		    acpi_ut_create_string_object((acpi_size)

						 (string_length - 1));

		if (!return_desc) {

			return_ACPI_STATUS(AE_NO_MEMORY);

		}

drivers/acpi/executer/exdump.c

+8 −7
Original line number Diff line number Diff line
@@ -117,12 +117,13 @@ static struct acpi_exdump_info acpi_ex_dump_event[2] = { 
	{ACPI_EXD_POINTER, ACPI_EXD_OFFSET(event.semaphore), "Semaphore"}

};



static struct acpi_exdump_info acpi_ex_dump_method[7] = {

static struct acpi_exdump_info acpi_ex_dump_method[8] = {

	{ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_method), NULL},

	{ACPI_EXD_UINT8, ACPI_EXD_OFFSET(method.param_count), "param_count"},

	{ACPI_EXD_UINT8, ACPI_EXD_OFFSET(method.concurrency), "Concurrency"},

	{ACPI_EXD_POINTER, ACPI_EXD_OFFSET(method.semaphore), "Semaphore"},

	{ACPI_EXD_UINT8, ACPI_EXD_OFFSET(method.owner_id), "Owner Id"},

	{ACPI_EXD_UINT8, ACPI_EXD_OFFSET(method.thread_count), "Thread Count"},

	{ACPI_EXD_UINT32, ACPI_EXD_OFFSET(method.aml_length), "Aml Length"},

	{ACPI_EXD_POINTER, ACPI_EXD_OFFSET(method.aml_start), "Aml Start"}

};
@@ -339,7 +340,7 @@ acpi_ex_dump_object(union acpi_operand_object *obj_desc, 
	count = info->offset;



	while (count) {

		target = ((u8 *) obj_desc) + info->offset;

		target = ACPI_ADD_PTR(u8, obj_desc, info->offset);

		name = info->name;



		switch (info->opcode) {
@@ -360,20 +361,19 @@ acpi_ex_dump_object(union acpi_operand_object *obj_desc, 
		case ACPI_EXD_UINT16:



			acpi_os_printf("%20s : %4.4X\n", name,

				       *ACPI_CAST_PTR(u16, target));

				       ACPI_GET16(target));

			break;



		case ACPI_EXD_UINT32:



			acpi_os_printf("%20s : %8.8X\n", name,

				       *ACPI_CAST_PTR(u32, target));

				       ACPI_GET32(target));

			break;



		case ACPI_EXD_UINT64:



			acpi_os_printf("%20s : %8.8X%8.8X\n", "Value",

				       ACPI_FORMAT_UINT64(*ACPI_CAST_PTR

							  (u64, target)));

				       ACPI_FORMAT_UINT64(ACPI_GET64(target)));

			break;



		case ACPI_EXD_POINTER:
@@ -969,7 +969,8 @@ acpi_ex_dump_package_obj(union acpi_operand_object *obj_desc, 
		acpi_os_printf("[Buffer] Length %.2X = ",

			       obj_desc->buffer.length);

		if (obj_desc->buffer.length) {

			acpi_ut_dump_buffer((u8 *) obj_desc->buffer.pointer,

			acpi_ut_dump_buffer(ACPI_CAST_PTR

					    (u8, obj_desc->buffer.pointer),

					    obj_desc->buffer.length,

					    DB_DWORD_DISPLAY, _COMPONENT);

		} else {

drivers/acpi/executer/exmisc.c

+15 −23
Original line number Diff line number Diff line
@@ -205,11 +205,9 @@ acpi_ex_concat_template(union acpi_operand_object *operand0, 
	ACPI_MEMCPY(new_buf, operand0->buffer.pointer, length0);

	ACPI_MEMCPY(new_buf + length0, operand1->buffer.pointer, length1);



	/* Compute the new checksum */

	/* Set the end_tag checksum to zero, means "ignore checksum" */



	new_buf[return_desc->buffer.length - 1] =

	    acpi_ut_generate_checksum(return_desc->buffer.pointer,

				      (return_desc->buffer.length - 1));

	new_buf[return_desc->buffer.length - 1] = 0;



	/* Return the completed resource template */
@@ -242,7 +240,6 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0, 
	union acpi_operand_object *return_desc;

	char *new_buf;

	acpi_status status;

	acpi_size new_length;



	ACPI_FUNCTION_TRACE("ex_do_concatenate");
@@ -269,7 +266,7 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0, 
		break;



	default:

		ACPI_REPORT_ERROR(("Concat - invalid obj type: %X\n",

		ACPI_REPORT_ERROR(("Concatanate - invalid object type: %X\n",

				   ACPI_GET_OBJECT_TYPE(operand0)));

		status = AE_AML_INTERNAL;

	}
@@ -309,8 +306,7 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0, 


		/* Copy the first integer, LSB first */



		ACPI_MEMCPY(new_buf,

			    &operand0->integer.value,

		ACPI_MEMCPY(new_buf, &operand0->integer.value,

			    acpi_gbl_integer_byte_width);



		/* Copy the second integer (LSB first) after the first */
@@ -324,14 +320,11 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0, 


		/* Result of two Strings is a String */



		new_length = (acpi_size) operand0->string.length +

		    (acpi_size) local_operand1->string.length;

		if (new_length > ACPI_MAX_STRING_CONVERSION) {

			status = AE_AML_STRING_LIMIT;

			goto cleanup;

		}



		return_desc = acpi_ut_create_string_object(new_length);

		return_desc = acpi_ut_create_string_object((acpi_size)

							   (operand0->string.

							    length +

							    local_operand1->

							    string.length));

		if (!return_desc) {

			status = AE_NO_MEMORY;

			goto cleanup;
@@ -351,11 +344,10 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0, 
		/* Result of two Buffers is a Buffer */



		return_desc = acpi_ut_create_buffer_object((acpi_size)

							   operand0->buffer.

							   (operand0->buffer.

							    length +

							   (acpi_size)

							    local_operand1->

							   buffer.length);

							    buffer.length));

		if (!return_desc) {

			status = AE_NO_MEMORY;

			goto cleanup;
@@ -365,8 +357,8 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0, 


		/* Concatenate the buffers */



		ACPI_MEMCPY(new_buf,

			    operand0->buffer.pointer, operand0->buffer.length);

		ACPI_MEMCPY(new_buf, operand0->buffer.pointer,

			    operand0->buffer.length);

		ACPI_MEMCPY(new_buf + operand0->buffer.length,

			    local_operand1->buffer.pointer,

			    local_operand1->buffer.length);

CRA Git | Maintained and supported by SUSTech CRA and CCSE