Commit 3f62d526 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'device-properties' and 'acpi-misc' 

* device-properties:
  ACPI / property: Allow holes in reference properties

* acpi-misc:
  MAINTAINERS: Add ARM64-specific ACPI maintainers entry
parents 72d39926 b60e4ea4 daeb2016

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -316,6 +316,14 @@ W: https://01.org/linux-acpi 
S:	Supported

F:	drivers/acpi/fan.c



ACPI FOR ARM64 (ACPI/arm64)

M:	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>

M:	Hanjun Guo <hanjun.guo@linaro.org>

M:	Sudeep Holla <sudeep.holla@arm.com>

L:	linux-acpi@vger.kernel.org

S:	Maintained

F:	drivers/acpi/arm64



ACPI THERMAL DRIVER

M:	Zhang Rui <rui.zhang@intel.com>

L:	linux-acpi@vger.kernel.org

drivers/acpi/property.c

+68 −49
Original line number Diff line number Diff line
@@ -468,10 +468,11 @@ static int acpi_data_get_property_array(struct acpi_device_data *data, 
}



/**

 * acpi_data_get_property_reference - returns handle to the referenced object

 * @data: ACPI device data object containing the property

 * __acpi_node_get_property_reference - returns handle to the referenced object

 * @fwnode: Firmware node to get the property from

 * @propname: Name of the property

 * @index: Index of the reference to return

 * @num_args: Maximum number of arguments after each reference

 * @args: Location to store the returned reference with optional arguments

 *

 * Find property with @name, verifify that it is a package containing at least
@@ -482,17 +483,40 @@ static int acpi_data_get_property_array(struct acpi_device_data *data, 
 * If there's more than one reference in the property value package, @index is

 * used to select the one to return.

 *

 * It is possible to leave holes in the property value set like in the

 * example below:

 *

 * Package () {

 *     "cs-gpios",

 *     Package () {

 *        ^GPIO, 19, 0, 0,

 *        ^GPIO, 20, 0, 0,

 *        0,

 *        ^GPIO, 21, 0, 0,

 *     }

 * }

 *

 * Calling this function with index %2 return %-ENOENT and with index %3

 * returns the last entry. If the property does not contain any more values

 * %-ENODATA is returned. The NULL entry must be single integer and

 * preferably contain value %0.

 *

 * Return: %0 on success, negative error code on failure.

 */

static int acpi_data_get_property_reference(struct acpi_device_data *data,

					    const char *propname, size_t index,

int __acpi_node_get_property_reference(struct fwnode_handle *fwnode,

	const char *propname, size_t index, size_t num_args,

	struct acpi_reference_args *args)

{

	const union acpi_object *element, *end;

	const union acpi_object *obj;

	struct acpi_device_data *data;

	struct acpi_device *device;

	int ret, idx = 0;



	data = acpi_device_data_of_node(fwnode);

	if (!data)

		return -EINVAL;



	ret = acpi_data_get_property(data, propname, ACPI_TYPE_ANY, &obj);

	if (ret)

		return ret;
@@ -532,18 +556,17 @@ static int acpi_data_get_property_reference(struct acpi_device_data *data, 
	while (element < end) {

		u32 nargs, i;



		if (element->type != ACPI_TYPE_LOCAL_REFERENCE)

			return -EPROTO;



		ret = acpi_bus_get_device(element->reference.handle, &device);

		if (element->type == ACPI_TYPE_LOCAL_REFERENCE) {

			ret = acpi_bus_get_device(element->reference.handle,

						  &device);

			if (ret)

				return -ENODEV;



		element++;

			nargs = 0;

			element++;



			/* assume following integer elements are all args */

		for (i = 0; element + i < end; i++) {

			for (i = 0; element + i < end && i < num_args; i++) {

				int type = element[i].type;



				if (type == ACPI_TYPE_INTEGER)
@@ -554,7 +577,10 @@ static int acpi_data_get_property_reference(struct acpi_device_data *data, 
					return -EPROTO;

			}



		if (idx++ == index) {

			if (nargs > MAX_ACPI_REFERENCE_ARGS)

				return -EPROTO;



			if (idx == index) {

				args->adev = device;

				args->nargs = nargs;

				for (i = 0; i < nargs; i++)
@@ -564,27 +590,20 @@ static int acpi_data_get_property_reference(struct acpi_device_data *data, 
			}



			element += nargs;

	}



		} else if (element->type == ACPI_TYPE_INTEGER) {

			if (idx == index)

				return -ENOENT;

			element++;

		} else {

			return -EPROTO;

		}



/**

 * acpi_node_get_property_reference - get a handle to the referenced object.

 * @fwnode: Firmware node to get the property from.

 * @propname: Name of the property.

 * @index: Index of the reference to return.

 * @args: Location to store the returned reference with optional arguments.

 */

int acpi_node_get_property_reference(struct fwnode_handle *fwnode,

				     const char *name, size_t index,

				     struct acpi_reference_args *args)

{

	struct acpi_device_data *data = acpi_device_data_of_node(fwnode);

		idx++;

	}



	return data ? acpi_data_get_property_reference(data, name, index, args) : -EINVAL;

	return -ENODATA;

}

EXPORT_SYMBOL_GPL(acpi_node_get_property_reference);

EXPORT_SYMBOL_GPL(__acpi_node_get_property_reference);



static int acpi_data_prop_read_single(struct acpi_device_data *data,

				      const char *propname,

include/linux/acpi.h

+19 −3
Original line number Diff line number Diff line
@@ -934,10 +934,18 @@ struct acpi_reference_args { 
#ifdef CONFIG_ACPI

int acpi_dev_get_property(struct acpi_device *adev, const char *name,

			  acpi_object_type type, const union acpi_object **obj);

int acpi_node_get_property_reference(struct fwnode_handle *fwnode,

				     const char *name, size_t index,

int __acpi_node_get_property_reference(struct fwnode_handle *fwnode,

				const char *name, size_t index, size_t num_args,

				struct acpi_reference_args *args);



static inline int acpi_node_get_property_reference(struct fwnode_handle *fwnode,

				const char *name, size_t index,

				struct acpi_reference_args *args)

{

	return __acpi_node_get_property_reference(fwnode, name, index,

		MAX_ACPI_REFERENCE_ARGS, args);

}



int acpi_node_prop_get(struct fwnode_handle *fwnode, const char *propname,

		       void **valptr);

int acpi_dev_prop_read_single(struct acpi_device *adev, const char *propname,
@@ -1012,6 +1020,14 @@ static inline int acpi_dev_get_property(struct acpi_device *adev, 
	return -ENXIO;

}



static inline int

__acpi_node_get_property_reference(struct fwnode_handle *fwnode,

				const char *name, size_t index, size_t num_args,

				struct acpi_reference_args *args)

{

	return -ENXIO;

}



static inline int acpi_node_get_property_reference(struct fwnode_handle *fwnode,

				const char *name, size_t index,

				struct acpi_reference_args *args)