Attachment 155824 Details for Bug 241899 – Patch from acpi-test tree for package parameter support

[patch] Patch from acpi-test tree for package parameter support

rhel_acpipackage.patch (text/plain), 9.47 KB, created by Bryn M. Reeves on 2007-05-31 15:20:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bryn M. Reeves

Created: 2007-05-31 15:20:49 UTC

Size: 9.47 KB

patch

obsolete

>This patch fixes the ACPI 'package' related error: "Packages as parameters
>not implemented!" (and a return of an AE_NOT_IMPLEMENTED exception) that is
>necessary for external package objects as method arguments.
>
>The patch is derived from Len Brown's ACPI -test- tree which fixed the
>'package' implementation with the incorporation of the 20070508 ACPI-CA
>code drop.  Only 'package' related content is included with this patch (i.e.
>other changes to the affected files were part of the 20070508 code drop
>but are not part of this patch's content).
>
>
>--- a/include/acpi/acutils.h	2006-09-19 21:42:06.000000000 -0600
>+++ b/include/acpi/acutils.h	2007-05-30 10:41:39.000000000 -0600
>@@ -5,7 +5,7 @@
>  *****************************************************************************/
> 
> /*
>- * Copyright (C) 2000 - 2006, R. Byron Moore
>+ * Copyright (C) 2000 - 2007, R. Byron Moore
>  * All rights reserved.
>  *
>  * Redistribution and use in source and binary forms, with or without
>@@ -392,6 +392,8 @@
> 
> u8 acpi_ut_valid_internal_object(void *object);
> 
>+union acpi_operand_object *acpi_ut_create_package_object(u32 count);
>+
> union acpi_operand_object *acpi_ut_create_buffer_object(acpi_size buffer_size);
> 
> union acpi_operand_object *acpi_ut_create_string_object(acpi_size string_size);
>--- a/drivers/acpi/utilities/utobject.c	2006-09-19 21:42:06.000000000 -0600
>+++ b/drivers/acpi/utilities/utobject.c	2007-05-30 10:41:14.000000000 -0600
>@@ -5,7 +5,7 @@
>  *****************************************************************************/
> 
> /*
>- * Copyright (C) 2000 - 2006, R. Byron Moore
>+ * Copyright (C) 2000 - 2007, R. Byron Moore
>  * All rights reserved.
>  *
>  * Redistribution and use in source and binary forms, with or without
>@@ -146,6 +146,48 @@
> 
> /*******************************************************************************
>  *
>+ * FUNCTION:    acpi_ut_create_package_object
>+ *
>+ * PARAMETERS:  Count               - Number of package elements
>+ *
>+ * RETURN:      Pointer to a new Package object, null on failure
>+ *
>+ * DESCRIPTION: Create a fully initialized package object
>+ *
>+ ******************************************************************************/
>+
>+union acpi_operand_object *acpi_ut_create_package_object(u32 count)
>+{
>+	union acpi_operand_object *package_desc;
>+	union acpi_operand_object **package_elements;
>+
>+	ACPI_FUNCTION_TRACE_U32(ut_create_package_object, count);
>+
>+	/* Create a new Package object */
>+
>+	package_desc = acpi_ut_create_internal_object(ACPI_TYPE_PACKAGE);
>+	if (!package_desc) {
>+		return_PTR(NULL);
>+	}
>+
>+	/*
>+	 * Create the element array. Count+1 allows the array to be null
>+	 * terminated.
>+	 */
>+	package_elements = ACPI_ALLOCATE_ZEROED((acpi_size)
>+						(count + 1) * sizeof(void *));
>+	if (!package_elements) {
>+		ACPI_FREE(package_desc);
>+		return_PTR(NULL);
>+	}
>+
>+	package_desc->package.count = count;
>+	package_desc->package.elements = package_elements;
>+	return_PTR(package_desc);
>+}
>+
>+/*******************************************************************************
>+ *
>  * FUNCTION:    acpi_ut_create_buffer_object
>  *
>  * PARAMETERS:  buffer_size            - Size of buffer to be created
>--- a/drivers/acpi/utilities/utcopy.c	2006-09-19 21:42:06.000000000 -0600
>+++ b/drivers/acpi/utilities/utcopy.c	2007-05-30 10:40:58.000000000 -0600
>@@ -5,7 +5,7 @@
>  *****************************************************************************/
> 
> /*
>- * Copyright (C) 2000 - 2006, R. Byron Moore
>+ * Copyright (C) 2000 - 2007, R. Byron Moore
>  * All rights reserved.
>  *
>  * Redistribution and use in source and binary forms, with or without
>@@ -68,6 +68,10 @@
> 				union acpi_operand_object **return_obj);
> 
> static acpi_status
>+acpi_ut_copy_epackage_to_ipackage(union acpi_object *external_object,
>+				  union acpi_operand_object **internal_object);
>+
>+static acpi_status
> acpi_ut_copy_simple_object(union acpi_operand_object *source_desc,
> 			   union acpi_operand_object *dest_desc);
> 
>@@ -518,77 +522,73 @@
> 	return_ACPI_STATUS(AE_NO_MEMORY);
> }
> 
>-#ifdef ACPI_FUTURE_IMPLEMENTATION
>-/* Code to convert packages that are parameters to control methods */
>-
> /*******************************************************************************
>  *
>  * FUNCTION:    acpi_ut_copy_epackage_to_ipackage
>  *
>- * PARAMETERS:  *internal_object   - Pointer to the object we are returning
>- *              *Buffer            - Where the object is returned
>- *              *space_used        - Where the length of the object is returned
>+ * PARAMETERS:  external_object     - The external object to be converted
>+ *              internal_object     - Where the internal object is returned
>  *
>  * RETURN:      Status
>  *
>- * DESCRIPTION: This function is called to place a package object in a user
>- *              buffer.  A package object by definition contains other objects.
>- *
>- *              The buffer is assumed to have sufficient space for the object.
>- *              The caller must have verified the buffer length needed using the
>- *              acpi_ut_get_object_size function before calling this function.
>+ * DESCRIPTION: Copy an external package object to an internal package.
>+ *              Handles nested packages.
>  *
>  ******************************************************************************/
> 
> static acpi_status
>-acpi_ut_copy_epackage_to_ipackage(union acpi_operand_object *internal_object,
>-				  u8 * buffer, u32 * space_used)
>+acpi_ut_copy_epackage_to_ipackage(union acpi_object *external_object,
>+				  union acpi_operand_object **internal_object)
> {
>-	u8 *free_space;
>-	union acpi_object *external_object;
>-	u32 length = 0;
>-	u32 this_index;
>-	u32 object_space = 0;
>-	union acpi_operand_object *this_internal_obj;
>-	union acpi_object *this_external_obj;
>+	acpi_status status = AE_OK;
>+	union acpi_operand_object *package_object;
>+	union acpi_operand_object **package_elements;
>+	acpi_native_uint i;
> 
> 	ACPI_FUNCTION_TRACE(ut_copy_epackage_to_ipackage);
> 
>-	/*
>-	 * First package at head of the buffer
>-	 */
>-	external_object = (union acpi_object *)buffer;
>+	/* Create the package object */
> 
>-	/*
>-	 * Free space begins right after the first package
>-	 */
>-	free_space = buffer + sizeof(union acpi_object);
>+	package_object =
>+	    acpi_ut_create_package_object(external_object->package.count);
>+	if (!package_object) {
>+		return_ACPI_STATUS(AE_NO_MEMORY);
>+	}
> 
>-	external_object->type = ACPI_GET_OBJECT_TYPE(internal_object);
>-	external_object->package.count = internal_object->package.count;
>-	external_object->package.elements = (union acpi_object *)free_space;
>+	package_elements = package_object->package.elements;
> 
> 	/*
>-	 * Build an array of ACPI_OBJECTS in the buffer
>-	 * and move the free space past it
>+	 * Recursive implementation. Probably ok, since nested external packages
>+	 * as parameters should be very rare.
> 	 */
>-	free_space +=
>-	    external_object->package.count * sizeof(union acpi_object);
>+	for (i = 0; i < external_object->package.count; i++) {
>+		status =
>+		    acpi_ut_copy_eobject_to_iobject(&external_object->package.
>+						    elements[i],
>+						    &package_elements[i]);
>+		if (ACPI_FAILURE(status)) {
> 
>-	/* Call walk_package */
>+			/* Truncate package and delete it */
> 
>-}
>+			package_object->package.count = i;
>+			package_elements[i] = NULL;
>+			acpi_ut_remove_reference(package_object);
>+			return_ACPI_STATUS(status);
>+		}
>+	}
> 
>-#endif				/* Future implementation */
>+	*internal_object = package_object;
>+	return_ACPI_STATUS(status);
>+}
> 
> /*******************************************************************************
>  *
>  * FUNCTION:    acpi_ut_copy_eobject_to_iobject
>  *
>- * PARAMETERS:  *internal_object   - The external object to be converted
>- *              *buffer_ptr     - Where the internal object is returned
>+ * PARAMETERS:  external_object     - The external object to be converted
>+ *              internal_object     - Where the internal object is returned
>  *
>- * RETURN:      Status          - the status of the call
>+ * RETURN:      Status              - the status of the call
>  *
>  * DESCRIPTION: Converts an external object to an internal object.
>  *
>@@ -603,16 +603,10 @@
> 	ACPI_FUNCTION_TRACE(ut_copy_eobject_to_iobject);
> 
> 	if (external_object->type == ACPI_TYPE_PACKAGE) {
>-		/*
>-		 * Packages as external input to control methods are not supported,
>-		 */
>-		ACPI_ERROR((AE_INFO,
>-			    "Packages as parameters not implemented!"));
>-
>-		return_ACPI_STATUS(AE_NOT_IMPLEMENTED);
>-	}
>-
>-	else {
>+		status =
>+		    acpi_ut_copy_epackage_to_ipackage(external_object,
>+						      internal_object);
>+	} else {
> 		/*
> 		 * Build a simple object (no nested objects)
> 		 */
>@@ -794,31 +788,19 @@
> 		 * Create and build the package object
> 		 */
> 		target_object =
>-		    acpi_ut_create_internal_object(ACPI_TYPE_PACKAGE);
>+		    acpi_ut_create_package_object(source_object->package.count);
> 		if (!target_object) {
> 			return (AE_NO_MEMORY);
> 		}
> 
>-		target_object->package.count = source_object->package.count;
> 		target_object->common.flags = source_object->common.flags;
> 
>-		/*
>-		 * Create the object array
>-		 */
>-		target_object->package.elements = ACPI_ALLOCATE_ZEROED(((acpi_size) source_object->package.count + 1) * sizeof(void *));
>-		if (!target_object->package.elements) {
>-			status = AE_NO_MEMORY;
>-			goto error_exit;
>-		}
>+		/* Pass the new package object back to the package walk routine */
> 
>-		/*
>-		 * Pass the new package object back to the package walk routine
>-		 */
> 		state->pkg.this_target_obj = target_object;
> 
>-		/*
>-		 * Store the object pointer in the parent package object
>-		 */
>+		/* Store the object pointer in the parent package object */
>+
> 		*this_target_ptr = target_object;
> 		break;
>

Actions: View | Diff

Attachments on bug 241899: 155824