diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-01-27 10:56:49 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-01-27 10:56:49 +0100 |
| commit | ff7a672f83b355365478a1fdfb60933ef34d8d02 (patch) | |
| tree | 567cc291244e8922502072962e90ff820d82a0a2 /drivers/acpi/acpica/exfield.c | |
| parent | cea79e7e2f24125b895bbfcdf98c8cfd1fb684d1 (diff) | |
| parent | be91c44288bea4d48d64604e9073801383776623 (diff) | |
| download | linux-ff7a672f83b355365478a1fdfb60933ef34d8d02.tar.gz linux-ff7a672f83b355365478a1fdfb60933ef34d8d02.tar.bz2 linux-ff7a672f83b355365478a1fdfb60933ef34d8d02.zip | |
Merge branch 'acpica'
* acpica:
ACPICA: Update version to 20200110
ACPICA: All acpica: Update copyrights to 2020 Including tool signons.
ACPICA: Update the list of maintainers
ACPICA: Update version to 20191213
ACPICA: Dispatcher: always generate buffer objects for ASL create_field() operator
ACPICA: acpisrc: add unix line ending support for non-windows build
ACPICA: Disassembler: create buffer fields in ACPI_PARSE_LOAD_PASS1
ACPICA: debugger: fix spelling mistake "adress" -> "address"
Diffstat (limited to 'drivers/acpi/acpica/exfield.c')
| -rw-r--r-- | drivers/acpi/acpica/exfield.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/acpi/acpica/exfield.c b/drivers/acpi/acpica/exfield.c index d3d2dbfba680..e85eb31e5075 100644 --- a/drivers/acpi/acpica/exfield.c +++ b/drivers/acpi/acpica/exfield.c @@ -3,7 +3,7 @@ * * Module Name: exfield - AML execution - field_unit read/write * - * Copyright (C) 2000 - 2019, Intel Corp. + * Copyright (C) 2000 - 2020, Intel Corp. * *****************************************************************************/ @@ -96,7 +96,8 @@ acpi_ex_get_protocol_buffer_length(u32 protocol_id, u32 *return_length) * RETURN: Status * * DESCRIPTION: Read from a named field. Returns either an Integer or a - * Buffer, depending on the size of the field. + * Buffer, depending on the size of the field and whether if a + * field is created by the create_field() operator. * ******************************************************************************/ @@ -154,12 +155,17 @@ acpi_ex_read_data_from_field(struct acpi_walk_state *walk_state, * the use of arithmetic operators on the returned value if the * field size is equal or smaller than an Integer. * + * However, all buffer fields created by create_field operator needs to + * remain as a buffer to match other AML interpreter implementations. + * * Note: Field.length is in bits. */ buffer_length = (acpi_size)ACPI_ROUND_BITS_UP_TO_BYTES(obj_desc->field.bit_length); - if (buffer_length > acpi_gbl_integer_byte_width) { + if (buffer_length > acpi_gbl_integer_byte_width || + (obj_desc->common.type == ACPI_TYPE_BUFFER_FIELD && + obj_desc->buffer_field.is_create_field)) { /* Field is too large for an Integer, create a Buffer instead */ |