ACPI: ACPICA 20060526

Restructured, flattened, and simplified the internal
interfaces for namespace object evaluation - resulting
in smaller code, less CPU stack use, and fewer
interfaces. (With assistance from Mikhail Kouzmich)

Fixed a problem with the CopyObject operator where the
first parameter was not typed correctly for the parser,
interpreter, compiler, and disassembler. Caused various
errors and unexpected behavior.

Fixed a problem where a ShiftLeft or ShiftRight of
more than 64 bits produced incorrect results with some
C compilers. Since the behavior of C compilers when
the shift value is larger than the datatype width is
apparently not well defined, the interpreter now detects
this condition and simply returns zero as expected in all
such cases. (BZ 395)

Fixed problem reports (Valery Podrezov) integrated: -
Update String-to-Integer conversion to match ACPI 3.0A spec
http://bugzilla.kernel.org/show_bug.cgi?id=5329
Allow interpreter to handle nested method declarations
http://bugzilla.kernel.org/show_bug.cgi?id=5361

Fixed problem reports (Fiodor Suietov) integrated: -
acpi_terminate() doesn't free debug memory allocation
list objects (BZ 355) - After Core Subsystem
shutdown, acpi_subsystem_status() returns AE_OK (BZ 356) -
acpi_os_unmap_memory() for RSDP can be invoked inconsistently
(BZ 357) - Resource Manager should return AE_TYPE for
non-device objects (BZ 358) - Incomplete cleanup branch
in AcpiNsEvaluateRelative (BZ 359) - Use acpi_os_free()
instead of ACPI_FREE in acpi_rs_set_srs_method_data (BZ 360)
- Incomplete cleanup branch in acpi_ps_parse_aml (BZ 361) -
Incomplete cleanup branch in acpi_ds_delete_walk_state (BZ 362)
- acpi_get_table_header returns AE_NO_ACPI_TABLES until DSDT
is loaded (BZ 365) - Status of the Global Initialization
Handler call not used (BZ 366) - Incorrect object parameter
to Global Initialization Handler (BZ 367)

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 39 insertions, 26 deletions

diff --git a/drivers/acpi/events/evregion.c b/drivers/acpi/events/evregion.c
index edf9d2e1dff9..094a17e4c86d 100644
--- a/drivers/acpi/events/evregion.c
+++ b/drivers/acpi/events/evregion.c
@@ -193,8 +193,8 @@ acpi_status acpi_ev_initialize_op_regions(void)
 acpi_status
 acpi_ev_execute_reg_method(union acpi_operand_object *region_obj, u32 function)
 {
-        struct acpi_parameter_info info;
-        union acpi_operand_object *params[3];
+        struct acpi_evaluate_info *info;
+        union acpi_operand_object *args[3];
         union acpi_operand_object *region_obj2;
         acpi_status status;
 
@@ -209,47 +209,60 @@ acpi_ev_execute_reg_method(union acpi_operand_object *region_obj, u32 function)
                 return_ACPI_STATUS(AE_OK);
         }
 
+        /* Allocate and initialize the evaluation information block */
+
+        info = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_evaluate_info));
+        if (!info) {
+                return_ACPI_STATUS(AE_NO_MEMORY);
+        }
+
+        info->prefix_node = region_obj2->extra.method_REG;
+        info->pathname = NULL;
+        info->parameters = args;
+        info->parameter_type = ACPI_PARAM_ARGS;
+        info->flags = ACPI_IGNORE_RETURN_VALUE;
+
         /*
          * The _REG method has two arguments:
          *
-         * Arg0, Integer: Operation region space ID
-         *          Same value as region_obj->Region.space_id
-         * Arg1, Integer: connection status
-         *          1 for connecting the handler,
-         *          0 for disconnecting the handler
-         *          Passed as a parameter
+         * Arg0 - Integer:
+         *  Operation region space ID Same value as region_obj->Region.space_id
+         *
+         * Arg1 - Integer:
+         *  connection status 1 for connecting the handler, 0 for disconnecting
+         *  the handler (Passed as a parameter)
          */
-        params[0] = acpi_ut_create_internal_object(ACPI_TYPE_INTEGER);
-        if (!params[0]) {
-                return_ACPI_STATUS(AE_NO_MEMORY);
+        args[0] = acpi_ut_create_internal_object(ACPI_TYPE_INTEGER);
+        if (!args[0]) {
+                status = AE_NO_MEMORY;
+                goto cleanup1;
         }
 
-        params[1] = acpi_ut_create_internal_object(ACPI_TYPE_INTEGER);
-        if (!params[1]) {
+        args[1] = acpi_ut_create_internal_object(ACPI_TYPE_INTEGER);
+        if (!args[1]) {
                 status = AE_NO_MEMORY;
-                goto cleanup;
+                goto cleanup2;
         }
 
         /* Setup the parameter objects */
 
-        params[0]->integer.value = region_obj->region.space_id;
-        params[1]->integer.value = function;
-        params[2] = NULL;
-
-        info.node = region_obj2->extra.method_REG;
-        info.parameters = params;
-        info.parameter_type = ACPI_PARAM_ARGS;
+        args[0]->integer.value = region_obj->region.space_id;
+        args[1]->integer.value = function;
+        args[2] = NULL;
 
         /* Execute the method, no return value */
 
         ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname
-                        (ACPI_TYPE_METHOD, info.node, NULL));
-        status = acpi_ns_evaluate_by_handle(&info);
+                        (ACPI_TYPE_METHOD, info->prefix_node, NULL));
+
+        status = acpi_ns_evaluate(info);
+        acpi_ut_remove_reference(args[1]);
 
-        acpi_ut_remove_reference(params[1]);
+      cleanup2:
+        acpi_ut_remove_reference(args[0]);
 
-      cleanup:
-        acpi_ut_remove_reference(params[0]);
+      cleanup1:
+        ACPI_FREE(info);
         return_ACPI_STATUS(status);
 }