[PATCH 3.8 01/91] ACPICA: Interpreter: Fix Store() when implicit conversion is not possible.
3.8.13.13 -stable review patch. If anyone has any objections, please let me
know.
--
From: Bob Moore
commit 3f654bad3257427bea7ba1c4d43a23d99a03622b upstream.
For the cases such as a store of a string to an existing package
object, implement the store as a CopyObject().
This is a small departure from the ACPI specification which states
that the control method should be aborted in this case. However,
ASLTS suite depends on this behavior.
Signed-off-by: Bob Moore
Signed-off-by: Lv Zheng
Signed-off-by: Rafael J. Wysocki
Signed-off-by: Kamal Mostafa
---
drivers/acpi/acpica/exstore.c | 29 -
1 file changed, 24 insertions(+), 5 deletions(-)
diff --git a/drivers/acpi/acpica/exstore.c b/drivers/acpi/acpica/exstore.c
index 90431f1..4ff37e8 100644
--- a/drivers/acpi/acpica/exstore.c
+++ b/drivers/acpi/acpica/exstore.c
@@ -487,14 +487,33 @@ acpi_ex_store_object_to_node(union acpi_operand_object
*source_desc,
default:
ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
- "Storing %s (%p) directly into node (%p) with
no implicit conversion\n",
+ "Storing [%s] (%p) directly into node [%s]
(%p)"
+ " with no implicit conversion\n",
acpi_ut_get_object_type_name(source_desc),
- source_desc, node));
+ source_desc,
+ acpi_ut_get_object_type_name(target_desc),
+ node));
- /* No conversions for all other types. Just attach the source
object */
+ /*
+* No conversions for all other types. Directly store a copy of
+* the source object. NOTE: This is a departure from the ACPI
+* spec, which states "If conversion is impossible, abort the
+* running control method".
+*
+* This code implements "If conversion is impossible, treat the
+* Store operation as a CopyObject".
+*/
+ status =
+ acpi_ut_copy_iobject_to_iobject(source_desc, _desc,
+ walk_state);
+ if (ACPI_FAILURE(status)) {
+ return_ACPI_STATUS(status);
+ }
- status = acpi_ns_attach_object(node, source_desc,
- source_desc->common.type);
+ status =
+ acpi_ns_attach_object(node, new_desc,
+ new_desc->common.type);
+ acpi_ut_remove_reference(new_desc);
break;
}
--
1.8.1.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH 3.8 01/91] ACPICA: Interpreter: Fix Store() when implicit conversion is not possible.
3.8.13.13 -stable review patch. If anyone has any objections, please let me
know.
--
From: Bob Moore robert.mo...@intel.com
commit 3f654bad3257427bea7ba1c4d43a23d99a03622b upstream.
For the cases such as a store of a string to an existing package
object, implement the store as a CopyObject().
This is a small departure from the ACPI specification which states
that the control method should be aborted in this case. However,
ASLTS suite depends on this behavior.
Signed-off-by: Bob Moore robert.mo...@intel.com
Signed-off-by: Lv Zheng lv.zh...@intel.com
Signed-off-by: Rafael J. Wysocki rafael.j.wyso...@intel.com
Signed-off-by: Kamal Mostafa ka...@canonical.com
---
drivers/acpi/acpica/exstore.c | 29 -
1 file changed, 24 insertions(+), 5 deletions(-)
diff --git a/drivers/acpi/acpica/exstore.c b/drivers/acpi/acpica/exstore.c
index 90431f1..4ff37e8 100644
--- a/drivers/acpi/acpica/exstore.c
+++ b/drivers/acpi/acpica/exstore.c
@@ -487,14 +487,33 @@ acpi_ex_store_object_to_node(union acpi_operand_object
*source_desc,
default:
ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
- Storing %s (%p) directly into node (%p) with
no implicit conversion\n,
+ Storing [%s] (%p) directly into node [%s]
(%p)
+ with no implicit conversion\n,
acpi_ut_get_object_type_name(source_desc),
- source_desc, node));
+ source_desc,
+ acpi_ut_get_object_type_name(target_desc),
+ node));
- /* No conversions for all other types. Just attach the source
object */
+ /*
+* No conversions for all other types. Directly store a copy of
+* the source object. NOTE: This is a departure from the ACPI
+* spec, which states If conversion is impossible, abort the
+* running control method.
+*
+* This code implements If conversion is impossible, treat the
+* Store operation as a CopyObject.
+*/
+ status =
+ acpi_ut_copy_iobject_to_iobject(source_desc, new_desc,
+ walk_state);
+ if (ACPI_FAILURE(status)) {
+ return_ACPI_STATUS(status);
+ }
- status = acpi_ns_attach_object(node, source_desc,
- source_desc-common.type);
+ status =
+ acpi_ns_attach_object(node, new_desc,
+ new_desc-common.type);
+ acpi_ut_remove_reference(new_desc);
break;
}
--
1.8.1.2
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
