aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2013-08-08 03:29:32 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-08-08 09:36:09 -0400
commit63660e05ec719613b518547b40a1c501c10f0bc4 (patch)
treee58f3d9585d048748e4cd51194d45bd4bf9cb9ea /drivers/acpi
parentb268cee867ed193379762fdf94005c5bb79317a8 (diff)
ACPICA: DeRefOf operator: Update to fully resolve FieldUnit and BufferField refs.
Previously, references to these objects were resolved only to the actual FieldUnit or BufferField object. The correct behavior is to resolve these references to an actual value. The problem is that DerefOf did not resolve these objects to actual values. An "Integer" object is simple, return the value. But a field in an operation region will require a read operation. For a BufferField, the appropriate data must be extracted from the parent buffer. NOTE: It appears that this issues is present in Windows7 but not Windows8. Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/acpica/exoparg1.c35
1 files changed, 32 insertions, 3 deletions
diff --git a/drivers/acpi/acpica/exoparg1.c b/drivers/acpi/acpica/exoparg1.c
index 814b4a3d656a..3482df4a69f9 100644
--- a/drivers/acpi/acpica/exoparg1.c
+++ b/drivers/acpi/acpica/exoparg1.c
@@ -990,11 +990,40 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
990 acpi_namespace_node 990 acpi_namespace_node
991 *) 991 *)
992 return_desc); 992 return_desc);
993 } 993 if (!return_desc) {
994 break;
995 }
996
997 /*
998 * June 2013:
999 * buffer_fields/field_units require additional resolution
1000 */
1001 switch (return_desc->common.type) {
1002 case ACPI_TYPE_BUFFER_FIELD:
1003 case ACPI_TYPE_LOCAL_REGION_FIELD:
1004 case ACPI_TYPE_LOCAL_BANK_FIELD:
1005 case ACPI_TYPE_LOCAL_INDEX_FIELD:
1006
1007 status =
1008 acpi_ex_read_data_from_field
1009 (walk_state, return_desc,
1010 &temp_desc);
1011 if (ACPI_FAILURE(status)) {
1012 goto cleanup;
1013 }
994 1014
995 /* Add another reference to the object! */ 1015 return_desc = temp_desc;
1016 break;
996 1017
997 acpi_ut_add_reference(return_desc); 1018 default:
1019
1020 /* Add another reference to the object */
1021
1022 acpi_ut_add_reference
1023 (return_desc);
1024 break;
1025 }
1026 }
998 break; 1027 break;
999 1028
1000 default: 1029 default: