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

ACPICA: Move Package-to-Buffer repair code into common ToBuffer function 



Move code specific to _FDE and _GTM into the generic repair code.

Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent d9765911

drivers/acpi/acpica/nspredef.c

+7 −4
Original line number Diff line number Diff line
@@ -215,6 +215,8 @@ acpi_ns_check_predefined_names(struct acpi_namespace_node *node, 
	data->node_flags = node->flags;

	data->pathname = pathname;



	/* TBD: For variable-length Packages, remove NULL elements here */



	/*

	 * Check that the type of the return object is what is expected for

	 * this predefined name
@@ -223,10 +225,11 @@ acpi_ns_check_predefined_names(struct acpi_namespace_node *node, 
					   predefined->info.expected_btypes,

					   ACPI_NOT_PACKAGE_ELEMENT);

	if (ACPI_SUCCESS(status)) {



		/* For returned Package objects, check the type of all sub-objects */



		if (return_object->common.type == ACPI_TYPE_PACKAGE) {

		/*

		 * For returned Package objects, check the type of all sub-objects.

		 * Note: Package may have been created by call above.

		 */

		if ((*return_object_ptr)->common.type == ACPI_TYPE_PACKAGE) {

			status = acpi_ns_check_package(data, return_object_ptr);

		}

	}

drivers/acpi/acpica/nsrepair.c

+41 −2
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ acpi_ns_convert_to_string(union acpi_operand_object *original_object, 
 *

 * RETURN:      Status. AE_OK if conversion was successful.

 *

 * DESCRIPTION: Attempt to convert a Integer/String object to a Buffer.

 * DESCRIPTION: Attempt to convert a Integer/String/Package object to a Buffer.

 *

 ******************************************************************************/
@@ -360,6 +360,10 @@ acpi_ns_convert_to_buffer(union acpi_operand_object *original_object, 
{

	union acpi_operand_object *new_object;

	acpi_status status;

	union acpi_operand_object **elements;

	u32 *dword_buffer;

	u32 count;

	u32 i;



	switch (original_object->common.type) {

	case ACPI_TYPE_INTEGER:
@@ -393,6 +397,40 @@ acpi_ns_convert_to_buffer(union acpi_operand_object *original_object, 
			    original_object->string.length);

		break;



	case ACPI_TYPE_PACKAGE:



		/* All elements of the Package must be integers */



		elements = original_object->package.elements;

		count = original_object->package.count;



		for (i = 0; i < count; i++) {

			if ((!*elements) ||

			    ((*elements)->common.type != ACPI_TYPE_INTEGER)) {

				return (AE_AML_OPERAND_TYPE);

			}

			elements++;

		}



		/* Create the new buffer object to replace the Package */



		new_object = acpi_ut_create_buffer_object(ACPI_MUL_4(count));

		if (!new_object) {

			return (AE_NO_MEMORY);

		}



		/* Copy the package elements (integers) to the buffer as DWORDs */



		elements = original_object->package.elements;

		dword_buffer = ACPI_CAST_PTR(u32, new_object->buffer.pointer);



		for (i = 0; i < count; i++) {

			*dword_buffer = (u32) (*elements)->integer.value;

			dword_buffer++;

			elements++;

		}

		break;



	default:

		return (AE_AML_OPERAND_TYPE);

	}
@@ -441,7 +479,8 @@ acpi_ns_convert_to_package(union acpi_operand_object *original_object, 
		buffer = original_object->buffer.pointer;



		while (length--) {

			*elements = acpi_ut_create_integer_object(*buffer);

			*elements =

			    acpi_ut_create_integer_object((u64) *buffer);

			if (!*elements) {

				acpi_ut_remove_reference(new_object);

				return (AE_NO_MEMORY);

drivers/acpi/acpica/nsrepair2.c

+0 −43
Original line number Diff line number Diff line
@@ -250,11 +250,9 @@ acpi_ns_repair_FDE(struct acpi_predefined_data *data, 
		   union acpi_operand_object **return_object_ptr)

{

	union acpi_operand_object *return_object = *return_object_ptr;

	union acpi_operand_object **elements;

	union acpi_operand_object *buffer_object;

	u8 *byte_buffer;

	u32 *dword_buffer;

	u32 count;

	u32 i;



	switch (return_object->common.type) {
@@ -302,47 +300,6 @@ acpi_ns_repair_FDE(struct acpi_predefined_data *data, 
				      "Expanded Byte Buffer to expected DWord Buffer"));

		break;



	case ACPI_TYPE_PACKAGE:



		/* All elements of the Package must be integers */



		elements = return_object->package.elements;

		count =

		    ACPI_MIN(ACPI_FDE_FIELD_COUNT,

			     return_object->package.count);



		for (i = 0; i < count; i++) {

			if ((!*elements) ||

			    ((*elements)->common.type != ACPI_TYPE_INTEGER)) {

				return (AE_AML_OPERAND_TYPE);

			}

			elements++;

		}



		/* Create the new buffer object to replace the Package */



		buffer_object =

		    acpi_ut_create_buffer_object(ACPI_FDE_DWORD_BUFFER_SIZE);

		if (!buffer_object) {

			return (AE_NO_MEMORY);

		}



		/* Copy the package elements (integers) to the buffer */



		elements = return_object->package.elements;

		dword_buffer =

		    ACPI_CAST_PTR(u32, buffer_object->buffer.pointer);



		for (i = 0; i < count; i++) {

			*dword_buffer = (u32) (*elements)->integer.value;

			dword_buffer++;

			elements++;

		}



		ACPI_INFO_PREDEFINED((AE_INFO, data->pathname, data->node_flags,

				      "Converted Package to expected Buffer"));

		break;



	default:

		return (AE_AML_OPERAND_TYPE);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE