Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 977d5ad3 authored by Sakari Ailus's avatar Sakari Ailus Committed by Rafael J. Wysocki
Browse files

ACPI: Convert ACPI reference args to generic fwnode reference args 



Convert all users of struct acpi_reference_args to more generic
fwnode_reference_args. This will

 1) avoid an ACPI specific references to device nodes with integer
    arguments as well as

 2) allow making references to nodes other than device nodes in ACPI.

As a by-product, convert the fwnode interger arguments to u64. The
arguments were 64-bit integers on ACPI but the fwnode arguments were
just 32-bit.

Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent d72e90f3

drivers/acpi/property.c

+12 −24
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ static int acpi_data_get_property_array(const struct acpi_device_data *data, 
 */

int __acpi_node_get_property_reference(const struct fwnode_handle *fwnode,

	const char *propname, size_t index, size_t num_args,

	struct acpi_reference_args *args)

	struct fwnode_reference_args *args)

{

	const union acpi_object *element, *end;

	const union acpi_object *obj;
@@ -607,7 +607,7 @@ int __acpi_node_get_property_reference(const struct fwnode_handle *fwnode, 
		if (ret)

			return ret == -ENODEV ? -EINVAL : ret;



		args->adev = device;

		args->fwnode = acpi_fwnode_handle(device);

		args->nargs = 0;

		return 0;

	}
@@ -653,11 +653,11 @@ int __acpi_node_get_property_reference(const struct fwnode_handle *fwnode, 
					return -EINVAL;

			}



			if (nargs > MAX_ACPI_REFERENCE_ARGS)

			if (nargs > NR_FWNODE_REFERENCE_ARGS)

				return -EINVAL;



			if (idx == index) {

				args->adev = device;

				args->fwnode = acpi_fwnode_handle(device);

				args->nargs = nargs;

				for (i = 0; i < nargs; i++)

					args->args[i] = element[i].integer.value;
@@ -1089,7 +1089,7 @@ int acpi_graph_get_remote_endpoint(const struct fwnode_handle *__fwnode, 
{

	struct fwnode_handle *fwnode;

	unsigned int port_nr, endpoint_nr;

	struct acpi_reference_args args;

	struct fwnode_reference_args args;

	int ret;



	memset(&args, 0, sizeof(args));
@@ -1098,6 +1098,10 @@ int acpi_graph_get_remote_endpoint(const struct fwnode_handle *__fwnode, 
	if (ret)

		return ret;



	/* Ensure this is a device node. */

	if (!is_acpi_device_node(args.fwnode))

		return -ENODEV;



	/*

	 * Always require two arguments with the reference: port and

	 * endpoint indices.
@@ -1105,7 +1109,7 @@ int acpi_graph_get_remote_endpoint(const struct fwnode_handle *__fwnode, 
	if (args.nargs != 2)

		return -EPROTO;



	fwnode = acpi_fwnode_handle(args.adev);

	fwnode = args.fwnode;

	port_nr = args.args[0];

	endpoint_nr = args.args[1];
@@ -1209,24 +1213,8 @@ acpi_fwnode_get_reference_args(const struct fwnode_handle *fwnode, 
			       unsigned int args_count, unsigned int index,

			       struct fwnode_reference_args *args)

{

	struct acpi_reference_args acpi_args;

	unsigned int i;

	int ret;



	ret = __acpi_node_get_property_reference(fwnode, prop, index,

						 args_count, &acpi_args);

	if (ret < 0)

		return ret;

	if (!args)

		return 0;



	args->nargs = acpi_args.nargs;

	args->fwnode = acpi_fwnode_handle(acpi_args.adev);



	for (i = 0; i < NR_FWNODE_REFERENCE_ARGS; i++)

		args->args[i] = i < acpi_args.nargs ? acpi_args.args[i] : 0;



	return 0;

	return __acpi_node_get_property_reference(fwnode, prop, index,

						  args_count, args);

}



static struct fwnode_handle *

drivers/gpio/gpiolib-acpi.c

+7 −4
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ EXPORT_SYMBOL_GPL(devm_acpi_dev_remove_driver_gpios); 


static bool acpi_get_driver_gpio_data(struct acpi_device *adev,

				      const char *name, int index,

				      struct acpi_reference_args *args,

				      struct fwnode_reference_args *args,

				      unsigned int *quirks)

{

	const struct acpi_gpio_mapping *gm;
@@ -365,7 +365,7 @@ static bool acpi_get_driver_gpio_data(struct acpi_device *adev, 
		if (!strcmp(name, gm->name) && gm->data && index < gm->size) {

			const struct acpi_gpio_params *par = gm->data + index;



			args->adev = adev;

			args->fwnode = acpi_fwnode_handle(adev);

			args->args[0] = par->crs_entry_index;

			args->args[1] = par->line_index;

			args->args[2] = par->active_low;
@@ -528,7 +528,7 @@ static int acpi_gpio_property_lookup(struct fwnode_handle *fwnode, 
				     const char *propname, int index,

				     struct acpi_gpio_lookup *lookup)

{

	struct acpi_reference_args args;

	struct fwnode_reference_args args;

	unsigned int quirks = 0;

	int ret;
@@ -549,6 +549,8 @@ static int acpi_gpio_property_lookup(struct fwnode_handle *fwnode, 
	 * The property was found and resolved, so need to lookup the GPIO based

	 * on returned args.

	 */

	if (!to_acpi_device_node(args.fwnode))

		return -EINVAL;

	if (args.nargs != 3)

		return -EPROTO;
@@ -556,8 +558,9 @@ static int acpi_gpio_property_lookup(struct fwnode_handle *fwnode, 
	lookup->pin_index = args.args[1];

	lookup->active_low = !!args.args[2];



	lookup->info.adev = args.adev;

	lookup->info.adev = to_acpi_device_node(args.fwnode);

	lookup->info.quirks = quirks;



	return 0;

}

drivers/infiniband/hw/hns/hns_roce_hw_v1.c

+4 −6
Original line number Diff line number Diff line
@@ -1435,7 +1435,7 @@ static int hns_roce_v1_reset(struct hns_roce_dev *hr_dev, bool dereset) 
		}

		fwnode = &dsaf_node->fwnode;

	} else if (is_acpi_device_node(dev->fwnode)) {

		struct acpi_reference_args args;

		struct fwnode_reference_args args;



		ret = acpi_node_get_property_reference(dev->fwnode,

						       "dsaf-handle", 0, &args);
@@ -1443,7 +1443,7 @@ static int hns_roce_v1_reset(struct hns_roce_dev *hr_dev, bool dereset) 
			dev_err(dev, "could not find dsaf-handle\n");

			return ret;

		}

		fwnode = acpi_fwnode_handle(args.adev);

		fwnode = args.fwnode;

	} else {

		dev_err(dev, "cannot read data from DT or ACPI\n");

		return -ENXIO;
@@ -4835,16 +4835,14 @@ static int hns_roce_get_cfg(struct hns_roce_dev *hr_dev) 
				continue;

			pdev = of_find_device_by_node(net_node);

		} else if (is_acpi_device_node(dev->fwnode)) {

			struct acpi_reference_args args;

			struct fwnode_handle *fwnode;

			struct fwnode_reference_args args;



			ret = acpi_node_get_property_reference(dev->fwnode,

							       "eth-handle",

							       i, &args);

			if (ret)

				continue;

			fwnode = acpi_fwnode_handle(args.adev);

			pdev = hns_roce_find_pdev(fwnode);

			pdev = hns_roce_find_pdev(args.fwnode);

		} else {

			dev_err(dev, "cannot read data from DT or ACPI\n");

			return -ENXIO;

drivers/media/v4l2-core/v4l2-fwnode.c

+1 −1
Original line number Diff line number Diff line
@@ -739,7 +739,7 @@ static struct fwnode_handle *v4l2_fwnode_reference_get_int_prop( 
	const char * const *props, unsigned int nprops)

{

	struct fwnode_reference_args fwnode_args;

	unsigned int *args = fwnode_args.args;

	u64 *args = fwnode_args.args;

	struct fwnode_handle *child;

	int ret;

drivers/net/ethernet/apm/xgene/xgene_enet_hw.c

+3 −3
Original line number Diff line number Diff line
@@ -836,19 +836,19 @@ static void xgene_enet_adjust_link(struct net_device *ndev) 
#ifdef CONFIG_ACPI

static struct acpi_device *acpi_phy_find_device(struct device *dev)

{

	struct acpi_reference_args args;

	struct fwnode_reference_args args;

	struct fwnode_handle *fw_node;

	int status;



	fw_node = acpi_fwnode_handle(ACPI_COMPANION(dev));

	status = acpi_node_get_property_reference(fw_node, "phy-handle", 0,

						  &args);

	if (ACPI_FAILURE(status)) {

	if (ACPI_FAILURE(status) || !is_acpi_device_node(args.fwnode)) {

		dev_dbg(dev, "No matching phy in ACPI table\n");

		return NULL;

	}



	return args.adev;

	return to_acpi_device_node(args.fwnode);

}

#endif