niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

ACPI: property: Read buffer properties as integers

Browse source 
Instead of adding a new property type, read buffer properties as integers.
Even though the internal representation in ACPI is different, the data
type is the same (byte) than on 8-bit integers.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Sakari Ailus 2022-07-11 14:26:06 +03:00 • committed by Rafael J. Wysocki
parent 103e10c69c
commit 369af6bf2c
1 changed files with 32 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
drivers/acpi/property.c
View file

@ -1033,6 +1033,10 @@ static int acpi_data_prop_read_single(const struct acpi_device_data *data,
int ret = 0; \ int ret = 0; \
\ \
for (i = 0; i < __nval; i++) { \ for (i = 0; i < __nval; i++) { \
if (__items->type == ACPI_TYPE_BUFFER) { \
__val[i] = __items->buffer.pointer[i]; \
continue; \
} \
if (__items[i].type != ACPI_TYPE_INTEGER) { \ if (__items[i].type != ACPI_TYPE_INTEGER) { \
ret = -EPROTO; \ ret = -EPROTO; \
break; \ break; \
@ -1092,18 +1096,41 @@ static int acpi_data_prop_read(const struct acpi_device_data *data,
} }
ret = acpi_data_get_property_array(data, propname, ACPI_TYPE_ANY, &obj); ret = acpi_data_get_property_array(data, propname, ACPI_TYPE_ANY, &obj);
if (ret && proptype >= DEV_PROP_U8 && proptype <= DEV_PROP_U64)
ret = acpi_data_get_property(data, propname, ACPI_TYPE_BUFFER,
&obj);
if (ret) if (ret)
return ret; return ret;
if (!val) if (!val) {
return obj->package.count; if (obj->type == ACPI_TYPE_BUFFER)
return obj->buffer.length;
if (proptype != DEV_PROP_STRING && nval > obj->package.count) return obj->package.count;
return -EOVERFLOW; }
switch (proptype) {
case DEV_PROP_STRING:
break;
case DEV_PROP_U8 ... DEV_PROP_U64:
if (obj->type == ACPI_TYPE_BUFFER) {
if (nval > obj->buffer.length)
return -EOVERFLOW;
break;
}
fallthrough;
default:
if (nval > obj->package.count)
return -EOVERFLOW;
break;
}
if (nval == 0) if (nval == 0)
return -EINVAL; return -EINVAL;
items = obj->package.elements; if (obj->type != ACPI_TYPE_BUFFER)
items = obj->package.elements;
else
items = obj;
switch (proptype) { switch (proptype) {
case DEV_PROP_U8: case DEV_PROP_U8: