Device properties framework updates for v4.14-rc1
- Introduce fwnode operations for all of the separate types of
"firmware nodes" that can be handled by the device properties
framework and drop the type field from struct fwnode_handle
(Sakari Ailus, Arnd Bergmann).
- Make the device properties framework use const fwnode arguments
where possible (Sakari Ailus).
- Add a helper for the consolidated handling of node references
to the device properties framework (Sakari Ailus).
- Switch over the ACPI part of the device properties framework
to the new UUID API (Andy Shevchenko).
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAABCAAGBQJZrcHoAAoJEILEb/54YlRxVH4P/i7MVmWxZW1qosqt8NbI+kqu
rjxBiQ1YaPuwWiZk5LMRQWIr4Y52v+8uwoVAoQbpfkpQpxpUtIApqFGGHkOK091S
6wcwdAJv78m7dQGJZ96nQkBdw+qCUG+s9L3KMfXYiipwyG7bg4BVcs5jZcIqcZ4F
2xecG6DMn4ESwFbZyVULWyQh50tSBztaHEG6AU2T/07yXU3RNJmwAVVZzpHdtA80
mDbWcCFjcmhrpPa0Aq6MrSMjKso1zd8Es+xwYhXsIQpD1l0HhLLQ0X4veSPcPG4B
aSNEYuribpvZ2FIRti7H7gi/F+Arm9vPdc9WHbOPLOIF1z+GJKiqjBuxUrfXKPqG
v1W3f1bcApe9DfmC5z1wZBi2d7thQOzRFfc8WRrMybQ6z1MAqqe5PfAlgpMFmL22
8ZCzzXIBUsfUjVlwYBvgkKvpLioEl88otWGdhewWY6F+DZ8+vPyvrpi15P36Xgos
ijX89cvyfze3m5GW08hQ6DTOVvaFoMyucYfSo6/MBamw9fbUgiEgBfUAsQyb3sRU
8g1KrwkAX8KFmoocX/AVjvwVBaKNdYeJ9Gy6EItAPxNl+F1q6vjkO0r/VeSrO1KW
3GRqw5MZP35DD9IRo4DTAjwtNVkgIUjpG/hfB7l3PFdDxWfeiM5tf2zMExhT0nIR
h8s8mn61KZp0gpsE02FS
=0rnk
-----END PGP SIGNATURE-----
Merge tag 'devprop-4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull device properties framework updates from Rafael Wysocki:
"These introduce fwnode operations for all of the separate types of
'firmware nodes' that can be handled by the device properties
framework, make the framework use const fwnode arguments all over, add
a helper for the consolidated handling of node references and switch
over the framework to the new UUID API.
Specifics:
- Introduce fwnode operations for all of the separate types of
'firmware nodes' that can be handled by the device properties
framework and drop the type field from struct fwnode_handle (Sakari
Ailus, Arnd Bergmann).
- Make the device properties framework use const fwnode arguments
where possible (Sakari Ailus).
- Add a helper for the consolidated handling of node references to
the device properties framework (Sakari Ailus).
- Switch over the ACPI part of the device properties framework to the
new UUID API (Andy Shevchenko)"
* tag 'devprop-4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI: device property: Switch to use new generic UUID API
device property: export irqchip_fwnode_ops
device property: Introduce fwnode_property_get_reference_args
device property: Constify fwnode property API
device property: Constify argument to pset fwnode backend
ACPI: Constify internal fwnode arguments
ACPI: Constify acpi_bus helper functions, switch to macros
ACPI: Prepare for constifying acpi_get_next_subnode() fwnode argument
device property: Get rid of struct fwnode_handle type field
ACPI: Use IS_ERR_OR_NULL() instead of non-NULL check in is_acpi_data_node()
This commit is contained in:
Linus Torvalds
commit
e7d0c41ecc
|
|
@ -19,21 +19,19 @@
|
|||
|
||||
#include "internal.h"
|
||||
|
||||
static int acpi_data_get_property_array(struct acpi_device_data *data,
|
||||
static int acpi_data_get_property_array(const struct acpi_device_data *data,
|
||||
const char *name,
|
||||
acpi_object_type type,
|
||||
const union acpi_object **obj);
|
||||
|
||||
/* ACPI _DSD device properties UUID: daffd814-6eba-4d8c-8a91-bc9bbf4aa301 */
|
||||
static const u8 prp_uuid[16] = {
|
||||
0x14, 0xd8, 0xff, 0xda, 0xba, 0x6e, 0x8c, 0x4d,
|
||||
0x8a, 0x91, 0xbc, 0x9b, 0xbf, 0x4a, 0xa3, 0x01
|
||||
};
|
||||
/* ACPI _DSD data subnodes UUID: dbb8e3e6-5886-4ba6-8795-1319f52a966b */
|
||||
static const u8 ads_uuid[16] = {
|
||||
0xe6, 0xe3, 0xb8, 0xdb, 0x86, 0x58, 0xa6, 0x4b,
|
||||
0x87, 0x95, 0x13, 0x19, 0xf5, 0x2a, 0x96, 0x6b
|
||||
};
|
||||
/* ACPI _DSD device properties GUID: daffd814-6eba-4d8c-8a91-bc9bbf4aa301 */
|
||||
static const guid_t prp_guid =
|
||||
GUID_INIT(0xdaffd814, 0x6eba, 0x4d8c,
|
||||
0x8a, 0x91, 0xbc, 0x9b, 0xbf, 0x4a, 0xa3, 0x01);
|
||||
/* ACPI _DSD data subnodes GUID: dbb8e3e6-5886-4ba6-8795-1319f52a966b */
|
||||
static const guid_t ads_guid =
|
||||
GUID_INIT(0xdbb8e3e6, 0x5886, 0x4ba6,
|
||||
0x87, 0x95, 0x13, 0x19, 0xf5, 0x2a, 0x96, 0x6b);
|
||||
|
||||
static bool acpi_enumerate_nondev_subnodes(acpi_handle scope,
|
||||
const union acpi_object *desc,
|
||||
|
|
@ -56,8 +54,7 @@ static bool acpi_nondev_subnode_extract(const union acpi_object *desc,
|
|||
return false;
|
||||
|
||||
dn->name = link->package.elements[0].string.pointer;
|
||||
dn->fwnode.type = FWNODE_ACPI_DATA;
|
||||
dn->fwnode.ops = &acpi_fwnode_ops;
|
||||
dn->fwnode.ops = &acpi_data_fwnode_ops;
|
||||
dn->parent = parent;
|
||||
INIT_LIST_HEAD(&dn->data.subnodes);
|
||||
|
||||
|
|
@ -190,22 +187,23 @@ static bool acpi_enumerate_nondev_subnodes(acpi_handle scope,
|
|||
{
|
||||
int i;
|
||||
|
||||
/* Look for the ACPI data subnodes UUID. */
|
||||
/* Look for the ACPI data subnodes GUID. */
|
||||
for (i = 0; i < desc->package.count; i += 2) {
|
||||
const union acpi_object *uuid, *links;
|
||||
const union acpi_object *guid, *links;
|
||||
|
||||
uuid = &desc->package.elements[i];
|
||||
guid = &desc->package.elements[i];
|
||||
links = &desc->package.elements[i + 1];
|
||||
|
||||
/*
|
||||
* The first element must be a UUID and the second one must be
|
||||
* The first element must be a GUID and the second one must be
|
||||
* a package.
|
||||
*/
|
||||
if (uuid->type != ACPI_TYPE_BUFFER || uuid->buffer.length != 16
|
||||
|| links->type != ACPI_TYPE_PACKAGE)
|
||||
if (guid->type != ACPI_TYPE_BUFFER ||
|
||||
guid->buffer.length != 16 ||
|
||||
links->type != ACPI_TYPE_PACKAGE)
|
||||
break;
|
||||
|
||||
if (memcmp(uuid->buffer.pointer, ads_uuid, sizeof(ads_uuid)))
|
||||
if (!guid_equal((guid_t *)guid->buffer.pointer, &ads_guid))
|
||||
continue;
|
||||
|
||||
return acpi_add_nondev_subnodes(scope, links, &data->subnodes,
|
||||
|
|
@ -298,26 +296,27 @@ static bool acpi_extract_properties(const union acpi_object *desc,
|
|||
if (desc->package.count % 2)
|
||||
return false;
|
||||
|
||||
/* Look for the device properties UUID. */
|
||||
/* Look for the device properties GUID. */
|
||||
for (i = 0; i < desc->package.count; i += 2) {
|
||||
const union acpi_object *uuid, *properties;
|
||||
const union acpi_object *guid, *properties;
|
||||
|
||||
uuid = &desc->package.elements[i];
|
||||
guid = &desc->package.elements[i];
|
||||
properties = &desc->package.elements[i + 1];
|
||||
|
||||
/*
|
||||
* The first element must be a UUID and the second one must be
|
||||
* The first element must be a GUID and the second one must be
|
||||
* a package.
|
||||
*/
|
||||
if (uuid->type != ACPI_TYPE_BUFFER || uuid->buffer.length != 16
|
||||
|| properties->type != ACPI_TYPE_PACKAGE)
|
||||
if (guid->type != ACPI_TYPE_BUFFER ||
|
||||
guid->buffer.length != 16 ||
|
||||
properties->type != ACPI_TYPE_PACKAGE)
|
||||
break;
|
||||
|
||||
if (memcmp(uuid->buffer.pointer, prp_uuid, sizeof(prp_uuid)))
|
||||
if (!guid_equal((guid_t *)guid->buffer.pointer, &prp_guid))
|
||||
continue;
|
||||
|
||||
/*
|
||||
* We found the matching UUID. Now validate the format of the
|
||||
* We found the matching GUID. Now validate the format of the
|
||||
* package immediately following it.
|
||||
*/
|
||||
if (!acpi_properties_format_valid(properties))
|
||||
|
|
@ -424,7 +423,7 @@ void acpi_free_properties(struct acpi_device *adev)
|
|||
* %-EINVAL if the property doesn't exist,
|
||||
* %-EPROTO if the property value type doesn't match @type.
|
||||
*/
|
||||
static int acpi_data_get_property(struct acpi_device_data *data,
|
||||
static int acpi_data_get_property(const struct acpi_device_data *data,
|
||||
const char *name, acpi_object_type type,
|
||||
const union acpi_object **obj)
|
||||
{
|
||||
|
|
@ -466,20 +465,21 @@ static int acpi_data_get_property(struct acpi_device_data *data,
|
|||
* @type: Expected property type.
|
||||
* @obj: Location to store the property value (if not %NULL).
|
||||
*/
|
||||
int acpi_dev_get_property(struct acpi_device *adev, const char *name,
|
||||
int acpi_dev_get_property(const struct acpi_device *adev, const char *name,
|
||||
acpi_object_type type, const union acpi_object **obj)
|
||||
{
|
||||
return adev ? acpi_data_get_property(&adev->data, name, type, obj) : -EINVAL;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(acpi_dev_get_property);
|
||||
|
||||
static struct acpi_device_data *acpi_device_data_of_node(struct fwnode_handle *fwnode)
|
||||
static const struct acpi_device_data *
|
||||
acpi_device_data_of_node(const struct fwnode_handle *fwnode)
|
||||
{
|
||||
if (fwnode->type == FWNODE_ACPI) {
|
||||
struct acpi_device *adev = to_acpi_device_node(fwnode);
|
||||
if (is_acpi_device_node(fwnode)) {
|
||||
const struct acpi_device *adev = to_acpi_device_node(fwnode);
|
||||
return &adev->data;
|
||||
} else if (fwnode->type == FWNODE_ACPI_DATA) {
|
||||
struct acpi_data_node *dn = to_acpi_data_node(fwnode);
|
||||
} else if (is_acpi_data_node(fwnode)) {
|
||||
const struct acpi_data_node *dn = to_acpi_data_node(fwnode);
|
||||
return &dn->data;
|
||||
}
|
||||
return NULL;
|
||||
|
|
@ -491,8 +491,8 @@ static struct acpi_device_data *acpi_device_data_of_node(struct fwnode_handle *f
|
|||
* @propname: Name of the property.
|
||||
* @valptr: Location to store a pointer to the property value (if not %NULL).
|
||||
*/
|
||||
int acpi_node_prop_get(struct fwnode_handle *fwnode, const char *propname,
|
||||
void **valptr)
|
||||
int acpi_node_prop_get(const struct fwnode_handle *fwnode,
|
||||
const char *propname, void **valptr)
|
||||
{
|
||||
return acpi_data_get_property(acpi_device_data_of_node(fwnode),
|
||||
propname, ACPI_TYPE_ANY,
|
||||
|
|
@ -518,7 +518,7 @@ int acpi_node_prop_get(struct fwnode_handle *fwnode, const char *propname,
|
|||
* %-EPROTO if the property is not a package or the type of its elements
|
||||
* doesn't match @type.
|
||||
*/
|
||||
static int acpi_data_get_property_array(struct acpi_device_data *data,
|
||||
static int acpi_data_get_property_array(const struct acpi_device_data *data,
|
||||
const char *name,
|
||||
acpi_object_type type,
|
||||
const union acpi_object **obj)
|
||||
|
|
@ -578,13 +578,13 @@ static int acpi_data_get_property_array(struct acpi_device_data *data,
|
|||
*
|
||||
* Return: %0 on success, negative error code on failure.
|
||||
*/
|
||||
int __acpi_node_get_property_reference(struct fwnode_handle *fwnode,
|
||||
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)
|
||||
{
|
||||
const union acpi_object *element, *end;
|
||||
const union acpi_object *obj;
|
||||
struct acpi_device_data *data;
|
||||
const struct acpi_device_data *data;
|
||||
struct acpi_device *device;
|
||||
int ret, idx = 0;
|
||||
|
||||
|
|
@ -680,7 +680,7 @@ int __acpi_node_get_property_reference(struct fwnode_handle *fwnode,
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(__acpi_node_get_property_reference);
|
||||
|
||||
static int acpi_data_prop_read_single(struct acpi_device_data *data,
|
||||
static int acpi_data_prop_read_single(const struct acpi_device_data *data,
|
||||
const char *propname,
|
||||
enum dev_prop_type proptype, void *val)
|
||||
{
|
||||
|
|
@ -819,7 +819,7 @@ static int acpi_copy_property_array_string(const union acpi_object *items,
|
|||
return nval;
|
||||
}
|
||||
|
||||
static int acpi_data_prop_read(struct acpi_device_data *data,
|
||||
static int acpi_data_prop_read(const struct acpi_device_data *data,
|
||||
const char *propname,
|
||||
enum dev_prop_type proptype,
|
||||
void *val, size_t nval)
|
||||
|
|
@ -873,7 +873,7 @@ static int acpi_data_prop_read(struct acpi_device_data *data,
|
|||
return ret;
|
||||
}
|
||||
|
||||
int acpi_dev_prop_read(struct acpi_device *adev, const char *propname,
|
||||
int acpi_dev_prop_read(const struct acpi_device *adev, const char *propname,
|
||||
enum dev_prop_type proptype, void *val, size_t nval)
|
||||
{
|
||||
return adev ? acpi_data_prop_read(&adev->data, propname, proptype, val, nval) : -EINVAL;
|
||||
|
|
@ -891,8 +891,9 @@ int acpi_dev_prop_read(struct acpi_device *adev, const char *propname,
|
|||
* of the property. Otherwise, read at most @nval values to the array at the
|
||||
* location pointed to by @val.
|
||||
*/
|
||||
int acpi_node_prop_read(struct fwnode_handle *fwnode, const char *propname,
|
||||
enum dev_prop_type proptype, void *val, size_t nval)
|
||||
int acpi_node_prop_read(const struct fwnode_handle *fwnode,
|
||||
const char *propname, enum dev_prop_type proptype,
|
||||
void *val, size_t nval)
|
||||
{
|
||||
return acpi_data_prop_read(acpi_device_data_of_node(fwnode),
|
||||
propname, proptype, val, nval);
|
||||
|
|
@ -903,13 +904,15 @@ int acpi_node_prop_read(struct fwnode_handle *fwnode, const char *propname,
|
|||
* @fwnode: Firmware node to find the next child node for.
|
||||
* @child: Handle to one of the device's child nodes or a null handle.
|
||||
*/
|
||||
struct fwnode_handle *acpi_get_next_subnode(struct fwnode_handle *fwnode,
|
||||
struct fwnode_handle *acpi_get_next_subnode(const struct fwnode_handle *fwnode,
|
||||
struct fwnode_handle *child)
|
||||
{
|
||||
struct acpi_device *adev = to_acpi_device_node(fwnode);
|
||||
struct list_head *head, *next;
|
||||
const struct acpi_device *adev = to_acpi_device_node(fwnode);
|
||||
struct acpi_device *child_adev = NULL;
|
||||
const struct list_head *head;
|
||||
struct list_head *next;
|
||||
|
||||
if (!child || child->type == FWNODE_ACPI) {
|
||||
if (!child || is_acpi_device_node(child)) {
|
||||
if (adev)
|
||||
head = &adev->children;
|
||||
else
|
||||
|
|
@ -919,26 +922,27 @@ struct fwnode_handle *acpi_get_next_subnode(struct fwnode_handle *fwnode,
|
|||
goto nondev;
|
||||
|
||||
if (child) {
|
||||
adev = to_acpi_device_node(child);
|
||||
next = adev->node.next;
|
||||
child_adev = to_acpi_device_node(child);
|
||||
next = child_adev->node.next;
|
||||
if (next == head) {
|
||||
child = NULL;
|
||||
goto nondev;
|
||||
}
|
||||
adev = list_entry(next, struct acpi_device, node);
|
||||
child_adev = list_entry(next, struct acpi_device, node);
|
||||
} else {
|
||||
adev = list_first_entry(head, struct acpi_device, node);
|
||||
child_adev = list_first_entry(head, struct acpi_device,
|
||||
node);
|
||||
}
|
||||
return acpi_fwnode_handle(adev);
|
||||
return acpi_fwnode_handle(child_adev);
|
||||
}
|
||||
|
||||
nondev:
|
||||
if (!child || child->type == FWNODE_ACPI_DATA) {
|
||||
struct acpi_data_node *data = to_acpi_data_node(fwnode);
|
||||
if (!child || is_acpi_data_node(child)) {
|
||||
const struct acpi_data_node *data = to_acpi_data_node(fwnode);
|
||||
struct acpi_data_node *dn;
|
||||
|
||||
if (adev)
|
||||
head = &adev->data.subnodes;
|
||||
if (child_adev)
|
||||
head = &child_adev->data.subnodes;
|
||||
else if (data)
|
||||
head = &data->data.subnodes;
|
||||
else
|
||||
|
|
@ -969,7 +973,7 @@ struct fwnode_handle *acpi_get_next_subnode(struct fwnode_handle *fwnode,
|
|||
* Returns parent node of an ACPI device or data firmware node or %NULL if
|
||||
* not available.
|
||||
*/
|
||||
struct fwnode_handle *acpi_node_get_parent(struct fwnode_handle *fwnode)
|
||||
struct fwnode_handle *acpi_node_get_parent(const struct fwnode_handle *fwnode)
|
||||
{
|
||||
if (is_acpi_data_node(fwnode)) {
|
||||
/* All data nodes have parent pointer so just return that */
|
||||
|
|
@ -998,8 +1002,8 @@ struct fwnode_handle *acpi_node_get_parent(struct fwnode_handle *fwnode)
|
|||
* %NULL if there is no next endpoint, ERR_PTR() in case of error. In case
|
||||
* of success the next endpoint is returned.
|
||||
*/
|
||||
struct fwnode_handle *acpi_graph_get_next_endpoint(struct fwnode_handle *fwnode,
|
||||
struct fwnode_handle *prev)
|
||||
struct fwnode_handle *acpi_graph_get_next_endpoint(
|
||||
const struct fwnode_handle *fwnode, struct fwnode_handle *prev)
|
||||
{
|
||||
struct fwnode_handle *port = NULL;
|
||||
struct fwnode_handle *endpoint;
|
||||
|
|
@ -1046,7 +1050,8 @@ struct fwnode_handle *acpi_graph_get_next_endpoint(struct fwnode_handle *fwnode,
|
|||
* the child node on success, NULL otherwise.
|
||||
*/
|
||||
static struct fwnode_handle *acpi_graph_get_child_prop_value(
|
||||
struct fwnode_handle *fwnode, const char *prop_name, unsigned int val)
|
||||
const struct fwnode_handle *fwnode, const char *prop_name,
|
||||
unsigned int val)
|
||||
{
|
||||
struct fwnode_handle *child;
|
||||
|
||||
|
|
@ -1075,17 +1080,18 @@ static struct fwnode_handle *acpi_graph_get_child_prop_value(
|
|||
* fields requested by the caller. Returns %0 in case of success and
|
||||
* negative errno otherwise.
|
||||
*/
|
||||
int acpi_graph_get_remote_endpoint(struct fwnode_handle *fwnode,
|
||||
int acpi_graph_get_remote_endpoint(const struct fwnode_handle *__fwnode,
|
||||
struct fwnode_handle **parent,
|
||||
struct fwnode_handle **port,
|
||||
struct fwnode_handle **endpoint)
|
||||
{
|
||||
struct fwnode_handle *fwnode;
|
||||
unsigned int port_nr, endpoint_nr;
|
||||
struct acpi_reference_args args;
|
||||
int ret;
|
||||
|
||||
memset(&args, 0, sizeof(args));
|
||||
ret = acpi_node_get_property_reference(fwnode, "remote-endpoint", 0,
|
||||
ret = acpi_node_get_property_reference(__fwnode, "remote-endpoint", 0,
|
||||
&args);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
|
@ -1127,7 +1133,7 @@ int acpi_graph_get_remote_endpoint(struct fwnode_handle *fwnode,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static bool acpi_fwnode_device_is_available(struct fwnode_handle *fwnode)
|
||||
static bool acpi_fwnode_device_is_available(const struct fwnode_handle *fwnode)
|
||||
{
|
||||
if (!is_acpi_device_node(fwnode))
|
||||
return false;
|
||||
|
|
@ -1135,16 +1141,17 @@ static bool acpi_fwnode_device_is_available(struct fwnode_handle *fwnode)
|
|||
return acpi_device_is_present(to_acpi_device_node(fwnode));
|
||||
}
|
||||
|
||||
static bool acpi_fwnode_property_present(struct fwnode_handle *fwnode,
|
||||
static bool acpi_fwnode_property_present(const struct fwnode_handle *fwnode,
|
||||
const char *propname)
|
||||
{
|
||||
return !acpi_node_prop_get(fwnode, propname, NULL);
|
||||
}
|
||||
|
||||
static int acpi_fwnode_property_read_int_array(struct fwnode_handle *fwnode,
|
||||
const char *propname,
|
||||
unsigned int elem_size,
|
||||
void *val, size_t nval)
|
||||
static int
|
||||
acpi_fwnode_property_read_int_array(const struct fwnode_handle *fwnode,
|
||||
const char *propname,
|
||||
unsigned int elem_size, void *val,
|
||||
size_t nval)
|
||||
{
|
||||
enum dev_prop_type type;
|
||||
|
||||
|
|
@ -1168,16 +1175,17 @@ static int acpi_fwnode_property_read_int_array(struct fwnode_handle *fwnode,
|
|||
return acpi_node_prop_read(fwnode, propname, type, val, nval);
|
||||
}
|
||||
|
||||
static int acpi_fwnode_property_read_string_array(struct fwnode_handle *fwnode,
|
||||
const char *propname,
|
||||
const char **val, size_t nval)
|
||||
static int
|
||||
acpi_fwnode_property_read_string_array(const struct fwnode_handle *fwnode,
|
||||
const char *propname, const char **val,
|
||||
size_t nval)
|
||||
{
|
||||
return acpi_node_prop_read(fwnode, propname, DEV_PROP_STRING,
|
||||
val, nval);
|
||||
}
|
||||
|
||||
static struct fwnode_handle *
|
||||
acpi_fwnode_get_named_child_node(struct fwnode_handle *fwnode,
|
||||
acpi_fwnode_get_named_child_node(const struct fwnode_handle *fwnode,
|
||||
const char *childname)
|
||||
{
|
||||
struct fwnode_handle *child;
|
||||
|
|
@ -1193,8 +1201,34 @@ acpi_fwnode_get_named_child_node(struct fwnode_handle *fwnode,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
static int
|
||||
acpi_fwnode_get_reference_args(const struct fwnode_handle *fwnode,
|
||||
const char *prop, const char *nargs_prop,
|
||||
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;
|
||||
}
|
||||
|
||||
static struct fwnode_handle *
|
||||
acpi_fwnode_graph_get_next_endpoint(struct fwnode_handle *fwnode,
|
||||
acpi_fwnode_graph_get_next_endpoint(const struct fwnode_handle *fwnode,
|
||||
struct fwnode_handle *prev)
|
||||
{
|
||||
struct fwnode_handle *endpoint;
|
||||
|
|
@ -1207,7 +1241,7 @@ acpi_fwnode_graph_get_next_endpoint(struct fwnode_handle *fwnode,
|
|||
}
|
||||
|
||||
static struct fwnode_handle *
|
||||
acpi_fwnode_graph_get_remote_endpoint(struct fwnode_handle *fwnode)
|
||||
acpi_fwnode_graph_get_remote_endpoint(const struct fwnode_handle *fwnode)
|
||||
{
|
||||
struct fwnode_handle *endpoint = NULL;
|
||||
|
||||
|
|
@ -1216,7 +1250,13 @@ acpi_fwnode_graph_get_remote_endpoint(struct fwnode_handle *fwnode)
|
|||
return endpoint;
|
||||
}
|
||||
|
||||
static int acpi_fwnode_graph_parse_endpoint(struct fwnode_handle *fwnode,
|
||||
static struct fwnode_handle *
|
||||
acpi_fwnode_get_parent(struct fwnode_handle *fwnode)
|
||||
{
|
||||
return acpi_node_get_parent(fwnode);
|
||||
}
|
||||
|
||||
static int acpi_fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode,
|
||||
struct fwnode_endpoint *endpoint)
|
||||
{
|
||||
struct fwnode_handle *port_fwnode = fwnode_get_parent(fwnode);
|
||||
|
|
@ -1229,16 +1269,27 @@ static int acpi_fwnode_graph_parse_endpoint(struct fwnode_handle *fwnode,
|
|||
return 0;
|
||||
}
|
||||
|
||||
const struct fwnode_operations acpi_fwnode_ops = {
|
||||
.device_is_available = acpi_fwnode_device_is_available,
|
||||
.property_present = acpi_fwnode_property_present,
|
||||
.property_read_int_array = acpi_fwnode_property_read_int_array,
|
||||
.property_read_string_array = acpi_fwnode_property_read_string_array,
|
||||
.get_parent = acpi_node_get_parent,
|
||||
.get_next_child_node = acpi_get_next_subnode,
|
||||
.get_named_child_node = acpi_fwnode_get_named_child_node,
|
||||
.graph_get_next_endpoint = acpi_fwnode_graph_get_next_endpoint,
|
||||
.graph_get_remote_endpoint = acpi_fwnode_graph_get_remote_endpoint,
|
||||
.graph_get_port_parent = acpi_node_get_parent,
|
||||
.graph_parse_endpoint = acpi_fwnode_graph_parse_endpoint,
|
||||
};
|
||||
#define DECLARE_ACPI_FWNODE_OPS(ops) \
|
||||
const struct fwnode_operations ops = { \
|
||||
.device_is_available = acpi_fwnode_device_is_available, \
|
||||
.property_present = acpi_fwnode_property_present, \
|
||||
.property_read_int_array = \
|
||||
acpi_fwnode_property_read_int_array, \
|
||||
.property_read_string_array = \
|
||||
acpi_fwnode_property_read_string_array, \
|
||||
.get_parent = acpi_node_get_parent, \
|
||||
.get_next_child_node = acpi_get_next_subnode, \
|
||||
.get_named_child_node = acpi_fwnode_get_named_child_node, \
|
||||
.get_reference_args = acpi_fwnode_get_reference_args, \
|
||||
.graph_get_next_endpoint = \
|
||||
acpi_fwnode_graph_get_next_endpoint, \
|
||||
.graph_get_remote_endpoint = \
|
||||
acpi_fwnode_graph_get_remote_endpoint, \
|
||||
.graph_get_port_parent = acpi_fwnode_get_parent, \
|
||||
.graph_parse_endpoint = acpi_fwnode_graph_parse_endpoint, \
|
||||
}; \
|
||||
EXPORT_SYMBOL_GPL(ops)
|
||||
|
||||
DECLARE_ACPI_FWNODE_OPS(acpi_device_fwnode_ops);
|
||||
DECLARE_ACPI_FWNODE_OPS(acpi_data_fwnode_ops);
|
||||
const struct fwnode_operations acpi_static_fwnode_ops;
|
||||
|
|
|
|||
|
|
@ -1549,8 +1549,7 @@ void acpi_init_device_object(struct acpi_device *device, acpi_handle handle,
|
|||
device->device_type = type;
|
||||
device->handle = handle;
|
||||
device->parent = acpi_bus_get_parent(handle);
|
||||
device->fwnode.type = FWNODE_ACPI;
|
||||
device->fwnode.ops = &acpi_fwnode_ops;
|
||||
device->fwnode.ops = &acpi_device_fwnode_ops;
|
||||
acpi_set_device_status(device, sta);
|
||||
acpi_device_get_busid(device);
|
||||
acpi_set_pnp_ids(handle, &device->pnp, type);
|
||||
|
|
|
|||
|
|
@ -25,19 +25,25 @@ struct property_set {
|
|||
const struct property_entry *properties;
|
||||
};
|
||||
|
||||
static inline bool is_pset_node(struct fwnode_handle *fwnode)
|
||||
static const struct fwnode_operations pset_fwnode_ops;
|
||||
|
||||
static inline bool is_pset_node(const struct fwnode_handle *fwnode)
|
||||
{
|
||||
return !IS_ERR_OR_NULL(fwnode) && fwnode->type == FWNODE_PDATA;
|
||||
return !IS_ERR_OR_NULL(fwnode) && fwnode->ops == &pset_fwnode_ops;
|
||||
}
|
||||
|
||||
static inline struct property_set *to_pset_node(struct fwnode_handle *fwnode)
|
||||
{
|
||||
return is_pset_node(fwnode) ?
|
||||
container_of(fwnode, struct property_set, fwnode) : NULL;
|
||||
}
|
||||
#define to_pset_node(__fwnode) \
|
||||
({ \
|
||||
typeof(__fwnode) __to_pset_node_fwnode = __fwnode; \
|
||||
\
|
||||
is_pset_node(__to_pset_node_fwnode) ? \
|
||||
container_of(__to_pset_node_fwnode, \
|
||||
struct property_set, fwnode) : \
|
||||
NULL; \
|
||||
})
|
||||
|
||||
static const struct property_entry *pset_prop_get(struct property_set *pset,
|
||||
const char *name)
|
||||
static const struct property_entry *
|
||||
pset_prop_get(const struct property_set *pset, const char *name)
|
||||
{
|
||||
const struct property_entry *prop;
|
||||
|
||||
|
|
@ -51,7 +57,7 @@ static const struct property_entry *pset_prop_get(struct property_set *pset,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
static const void *pset_prop_find(struct property_set *pset,
|
||||
static const void *pset_prop_find(const struct property_set *pset,
|
||||
const char *propname, size_t length)
|
||||
{
|
||||
const struct property_entry *prop;
|
||||
|
|
@ -71,7 +77,7 @@ static const void *pset_prop_find(struct property_set *pset,
|
|||
return pointer;
|
||||
}
|
||||
|
||||
static int pset_prop_read_u8_array(struct property_set *pset,
|
||||
static int pset_prop_read_u8_array(const struct property_set *pset,
|
||||
const char *propname,
|
||||
u8 *values, size_t nval)
|
||||
{
|
||||
|
|
@ -86,7 +92,7 @@ static int pset_prop_read_u8_array(struct property_set *pset,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int pset_prop_read_u16_array(struct property_set *pset,
|
||||
static int pset_prop_read_u16_array(const struct property_set *pset,
|
||||
const char *propname,
|
||||
u16 *values, size_t nval)
|
||||
{
|
||||
|
|
@ -101,7 +107,7 @@ static int pset_prop_read_u16_array(struct property_set *pset,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int pset_prop_read_u32_array(struct property_set *pset,
|
||||
static int pset_prop_read_u32_array(const struct property_set *pset,
|
||||
const char *propname,
|
||||
u32 *values, size_t nval)
|
||||
{
|
||||
|
|
@ -116,7 +122,7 @@ static int pset_prop_read_u32_array(struct property_set *pset,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int pset_prop_read_u64_array(struct property_set *pset,
|
||||
static int pset_prop_read_u64_array(const struct property_set *pset,
|
||||
const char *propname,
|
||||
u64 *values, size_t nval)
|
||||
{
|
||||
|
|
@ -131,7 +137,7 @@ static int pset_prop_read_u64_array(struct property_set *pset,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int pset_prop_count_elems_of_size(struct property_set *pset,
|
||||
static int pset_prop_count_elems_of_size(const struct property_set *pset,
|
||||
const char *propname, size_t length)
|
||||
{
|
||||
const struct property_entry *prop;
|
||||
|
|
@ -143,7 +149,7 @@ static int pset_prop_count_elems_of_size(struct property_set *pset,
|
|||
return prop->length / length;
|
||||
}
|
||||
|
||||
static int pset_prop_read_string_array(struct property_set *pset,
|
||||
static int pset_prop_read_string_array(const struct property_set *pset,
|
||||
const char *propname,
|
||||
const char **strings, size_t nval)
|
||||
{
|
||||
|
|
@ -187,18 +193,18 @@ struct fwnode_handle *dev_fwnode(struct device *dev)
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(dev_fwnode);
|
||||
|
||||
static bool pset_fwnode_property_present(struct fwnode_handle *fwnode,
|
||||
static bool pset_fwnode_property_present(const struct fwnode_handle *fwnode,
|
||||
const char *propname)
|
||||
{
|
||||
return !!pset_prop_get(to_pset_node(fwnode), propname);
|
||||
}
|
||||
|
||||
static int pset_fwnode_read_int_array(struct fwnode_handle *fwnode,
|
||||
static int pset_fwnode_read_int_array(const struct fwnode_handle *fwnode,
|
||||
const char *propname,
|
||||
unsigned int elem_size, void *val,
|
||||
size_t nval)
|
||||
{
|
||||
struct property_set *node = to_pset_node(fwnode);
|
||||
const struct property_set *node = to_pset_node(fwnode);
|
||||
|
||||
if (!val)
|
||||
return pset_prop_count_elems_of_size(node, propname, elem_size);
|
||||
|
|
@ -217,9 +223,10 @@ static int pset_fwnode_read_int_array(struct fwnode_handle *fwnode,
|
|||
return -ENXIO;
|
||||
}
|
||||
|
||||
static int pset_fwnode_property_read_string_array(struct fwnode_handle *fwnode,
|
||||
const char *propname,
|
||||
const char **val, size_t nval)
|
||||
static int
|
||||
pset_fwnode_property_read_string_array(const struct fwnode_handle *fwnode,
|
||||
const char *propname,
|
||||
const char **val, size_t nval)
|
||||
{
|
||||
return pset_prop_read_string_array(to_pset_node(fwnode), propname,
|
||||
val, nval);
|
||||
|
|
@ -249,7 +256,8 @@ EXPORT_SYMBOL_GPL(device_property_present);
|
|||
* @fwnode: Firmware node whose property to check
|
||||
* @propname: Name of the property
|
||||
*/
|
||||
bool fwnode_property_present(struct fwnode_handle *fwnode, const char *propname)
|
||||
bool fwnode_property_present(const struct fwnode_handle *fwnode,
|
||||
const char *propname)
|
||||
{
|
||||
bool ret;
|
||||
|
||||
|
|
@ -431,7 +439,7 @@ int device_property_match_string(struct device *dev, const char *propname,
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(device_property_match_string);
|
||||
|
||||
static int fwnode_property_read_int_array(struct fwnode_handle *fwnode,
|
||||
static int fwnode_property_read_int_array(const struct fwnode_handle *fwnode,
|
||||
const char *propname,
|
||||
unsigned int elem_size, void *val,
|
||||
size_t nval)
|
||||
|
|
@ -467,7 +475,7 @@ static int fwnode_property_read_int_array(struct fwnode_handle *fwnode,
|
|||
* %-EOVERFLOW if the size of the property is not as expected,
|
||||
* %-ENXIO if no suitable firmware interface is present.
|
||||
*/
|
||||
int fwnode_property_read_u8_array(struct fwnode_handle *fwnode,
|
||||
int fwnode_property_read_u8_array(const struct fwnode_handle *fwnode,
|
||||
const char *propname, u8 *val, size_t nval)
|
||||
{
|
||||
return fwnode_property_read_int_array(fwnode, propname, sizeof(u8),
|
||||
|
|
@ -493,7 +501,7 @@ EXPORT_SYMBOL_GPL(fwnode_property_read_u8_array);
|
|||
* %-EOVERFLOW if the size of the property is not as expected,
|
||||
* %-ENXIO if no suitable firmware interface is present.
|
||||
*/
|
||||
int fwnode_property_read_u16_array(struct fwnode_handle *fwnode,
|
||||
int fwnode_property_read_u16_array(const struct fwnode_handle *fwnode,
|
||||
const char *propname, u16 *val, size_t nval)
|
||||
{
|
||||
return fwnode_property_read_int_array(fwnode, propname, sizeof(u16),
|
||||
|
|
@ -519,7 +527,7 @@ EXPORT_SYMBOL_GPL(fwnode_property_read_u16_array);
|
|||
* %-EOVERFLOW if the size of the property is not as expected,
|
||||
* %-ENXIO if no suitable firmware interface is present.
|
||||
*/
|
||||
int fwnode_property_read_u32_array(struct fwnode_handle *fwnode,
|
||||
int fwnode_property_read_u32_array(const struct fwnode_handle *fwnode,
|
||||
const char *propname, u32 *val, size_t nval)
|
||||
{
|
||||
return fwnode_property_read_int_array(fwnode, propname, sizeof(u32),
|
||||
|
|
@ -545,7 +553,7 @@ EXPORT_SYMBOL_GPL(fwnode_property_read_u32_array);
|
|||
* %-EOVERFLOW if the size of the property is not as expected,
|
||||
* %-ENXIO if no suitable firmware interface is present.
|
||||
*/
|
||||
int fwnode_property_read_u64_array(struct fwnode_handle *fwnode,
|
||||
int fwnode_property_read_u64_array(const struct fwnode_handle *fwnode,
|
||||
const char *propname, u64 *val, size_t nval)
|
||||
{
|
||||
return fwnode_property_read_int_array(fwnode, propname, sizeof(u64),
|
||||
|
|
@ -571,7 +579,7 @@ EXPORT_SYMBOL_GPL(fwnode_property_read_u64_array);
|
|||
* %-EOVERFLOW if the size of the property is not as expected,
|
||||
* %-ENXIO if no suitable firmware interface is present.
|
||||
*/
|
||||
int fwnode_property_read_string_array(struct fwnode_handle *fwnode,
|
||||
int fwnode_property_read_string_array(const struct fwnode_handle *fwnode,
|
||||
const char *propname, const char **val,
|
||||
size_t nval)
|
||||
{
|
||||
|
|
@ -603,7 +611,7 @@ EXPORT_SYMBOL_GPL(fwnode_property_read_string_array);
|
|||
* %-EPROTO or %-EILSEQ if the property is not a string,
|
||||
* %-ENXIO if no suitable firmware interface is present.
|
||||
*/
|
||||
int fwnode_property_read_string(struct fwnode_handle *fwnode,
|
||||
int fwnode_property_read_string(const struct fwnode_handle *fwnode,
|
||||
const char *propname, const char **val)
|
||||
{
|
||||
int ret = fwnode_property_read_string_array(fwnode, propname, val, 1);
|
||||
|
|
@ -627,7 +635,7 @@ EXPORT_SYMBOL_GPL(fwnode_property_read_string);
|
|||
* %-EPROTO if the property is not an array of strings,
|
||||
* %-ENXIO if no suitable firmware interface is present.
|
||||
*/
|
||||
int fwnode_property_match_string(struct fwnode_handle *fwnode,
|
||||
int fwnode_property_match_string(const struct fwnode_handle *fwnode,
|
||||
const char *propname, const char *string)
|
||||
{
|
||||
const char **values;
|
||||
|
|
@ -657,6 +665,34 @@ out:
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(fwnode_property_match_string);
|
||||
|
||||
/**
|
||||
* fwnode_property_get_reference_args() - Find a reference with arguments
|
||||
* @fwnode: Firmware node where to look for the reference
|
||||
* @prop: The name of the property
|
||||
* @nargs_prop: The name of the property telling the number of
|
||||
* arguments in the referred node. NULL if @nargs is known,
|
||||
* otherwise @nargs is ignored. Only relevant on OF.
|
||||
* @nargs: Number of arguments. Ignored if @nargs_prop is non-NULL.
|
||||
* @index: Index of the reference, from zero onwards.
|
||||
* @args: Result structure with reference and integer arguments.
|
||||
*
|
||||
* Obtain a reference based on a named property in an fwnode, with
|
||||
* integer arguments.
|
||||
*
|
||||
* Caller is responsible to call fwnode_handle_put() on the returned
|
||||
* args->fwnode pointer.
|
||||
*
|
||||
*/
|
||||
int fwnode_property_get_reference_args(const struct fwnode_handle *fwnode,
|
||||
const char *prop, const char *nargs_prop,
|
||||
unsigned int nargs, unsigned int index,
|
||||
struct fwnode_reference_args *args)
|
||||
{
|
||||
return fwnode_call_int_op(fwnode, get_reference_args, prop, nargs_prop,
|
||||
nargs, index, args);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(fwnode_property_get_reference_args);
|
||||
|
||||
static int property_copy_string_array(struct property_entry *dst,
|
||||
const struct property_entry *src)
|
||||
{
|
||||
|
|
@ -900,7 +936,6 @@ int device_add_properties(struct device *dev,
|
|||
if (IS_ERR(p))
|
||||
return PTR_ERR(p);
|
||||
|
||||
p->fwnode.type = FWNODE_PDATA;
|
||||
p->fwnode.ops = &pset_fwnode_ops;
|
||||
set_secondary_fwnode(dev, &p->fwnode);
|
||||
return 0;
|
||||
|
|
@ -935,7 +970,7 @@ EXPORT_SYMBOL_GPL(fwnode_get_next_parent);
|
|||
* Return parent firmware node of the given node if possible or %NULL if no
|
||||
* parent was available.
|
||||
*/
|
||||
struct fwnode_handle *fwnode_get_parent(struct fwnode_handle *fwnode)
|
||||
struct fwnode_handle *fwnode_get_parent(const struct fwnode_handle *fwnode)
|
||||
{
|
||||
return fwnode_call_ptr_op(fwnode, get_parent);
|
||||
}
|
||||
|
|
@ -946,8 +981,9 @@ EXPORT_SYMBOL_GPL(fwnode_get_parent);
|
|||
* @fwnode: Firmware node to find the next child node for.
|
||||
* @child: Handle to one of the node's child nodes or a %NULL handle.
|
||||
*/
|
||||
struct fwnode_handle *fwnode_get_next_child_node(struct fwnode_handle *fwnode,
|
||||
struct fwnode_handle *child)
|
||||
struct fwnode_handle *
|
||||
fwnode_get_next_child_node(const struct fwnode_handle *fwnode,
|
||||
struct fwnode_handle *child)
|
||||
{
|
||||
return fwnode_call_ptr_op(fwnode, get_next_child_node, child);
|
||||
}
|
||||
|
|
@ -978,8 +1014,9 @@ EXPORT_SYMBOL_GPL(device_get_next_child_node);
|
|||
* @fwnode: Firmware node to find the named child node for.
|
||||
* @childname: String to match child node name against.
|
||||
*/
|
||||
struct fwnode_handle *fwnode_get_named_child_node(struct fwnode_handle *fwnode,
|
||||
const char *childname)
|
||||
struct fwnode_handle *
|
||||
fwnode_get_named_child_node(const struct fwnode_handle *fwnode,
|
||||
const char *childname)
|
||||
{
|
||||
return fwnode_call_ptr_op(fwnode, get_named_child_node, childname);
|
||||
}
|
||||
|
|
@ -1025,7 +1062,7 @@ EXPORT_SYMBOL_GPL(fwnode_handle_put);
|
|||
* fwnode_device_is_available - check if a device is available for use
|
||||
* @fwnode: Pointer to the fwnode of the device.
|
||||
*/
|
||||
bool fwnode_device_is_available(struct fwnode_handle *fwnode)
|
||||
bool fwnode_device_is_available(const struct fwnode_handle *fwnode)
|
||||
{
|
||||
return fwnode_call_bool_op(fwnode, device_is_available);
|
||||
}
|
||||
|
|
@ -1163,7 +1200,7 @@ EXPORT_SYMBOL(device_get_mac_address);
|
|||
* are available.
|
||||
*/
|
||||
struct fwnode_handle *
|
||||
fwnode_graph_get_next_endpoint(struct fwnode_handle *fwnode,
|
||||
fwnode_graph_get_next_endpoint(const struct fwnode_handle *fwnode,
|
||||
struct fwnode_handle *prev)
|
||||
{
|
||||
return fwnode_call_ptr_op(fwnode, graph_get_next_endpoint, prev);
|
||||
|
|
@ -1177,7 +1214,7 @@ EXPORT_SYMBOL_GPL(fwnode_graph_get_next_endpoint);
|
|||
* Return: the firmware node of the device the @endpoint belongs to.
|
||||
*/
|
||||
struct fwnode_handle *
|
||||
fwnode_graph_get_port_parent(struct fwnode_handle *endpoint)
|
||||
fwnode_graph_get_port_parent(const struct fwnode_handle *endpoint)
|
||||
{
|
||||
struct fwnode_handle *port, *parent;
|
||||
|
||||
|
|
@ -1197,7 +1234,7 @@ EXPORT_SYMBOL_GPL(fwnode_graph_get_port_parent);
|
|||
* Extracts firmware node of a remote device the @fwnode points to.
|
||||
*/
|
||||
struct fwnode_handle *
|
||||
fwnode_graph_get_remote_port_parent(struct fwnode_handle *fwnode)
|
||||
fwnode_graph_get_remote_port_parent(const struct fwnode_handle *fwnode)
|
||||
{
|
||||
struct fwnode_handle *endpoint, *parent;
|
||||
|
||||
|
|
@ -1216,7 +1253,8 @@ EXPORT_SYMBOL_GPL(fwnode_graph_get_remote_port_parent);
|
|||
*
|
||||
* Extracts firmware node of a remote port the @fwnode points to.
|
||||
*/
|
||||
struct fwnode_handle *fwnode_graph_get_remote_port(struct fwnode_handle *fwnode)
|
||||
struct fwnode_handle *
|
||||
fwnode_graph_get_remote_port(const struct fwnode_handle *fwnode)
|
||||
{
|
||||
return fwnode_get_next_parent(fwnode_graph_get_remote_endpoint(fwnode));
|
||||
}
|
||||
|
|
@ -1229,7 +1267,7 @@ EXPORT_SYMBOL_GPL(fwnode_graph_get_remote_port);
|
|||
* Extracts firmware node of a remote endpoint the @fwnode points to.
|
||||
*/
|
||||
struct fwnode_handle *
|
||||
fwnode_graph_get_remote_endpoint(struct fwnode_handle *fwnode)
|
||||
fwnode_graph_get_remote_endpoint(const struct fwnode_handle *fwnode)
|
||||
{
|
||||
return fwnode_call_ptr_op(fwnode, graph_get_remote_endpoint);
|
||||
}
|
||||
|
|
@ -1244,8 +1282,9 @@ EXPORT_SYMBOL_GPL(fwnode_graph_get_remote_endpoint);
|
|||
* Return: Remote fwnode handle associated with remote endpoint node linked
|
||||
* to @node. Use fwnode_node_put() on it when done.
|
||||
*/
|
||||
struct fwnode_handle *fwnode_graph_get_remote_node(struct fwnode_handle *fwnode,
|
||||
u32 port_id, u32 endpoint_id)
|
||||
struct fwnode_handle *
|
||||
fwnode_graph_get_remote_node(const struct fwnode_handle *fwnode, u32 port_id,
|
||||
u32 endpoint_id)
|
||||
{
|
||||
struct fwnode_handle *endpoint = NULL;
|
||||
|
||||
|
|
@ -1281,7 +1320,7 @@ EXPORT_SYMBOL_GPL(fwnode_graph_get_remote_node);
|
|||
* information in @endpoint. The caller must hold a reference to
|
||||
* @fwnode.
|
||||
*/
|
||||
int fwnode_graph_parse_endpoint(struct fwnode_handle *fwnode,
|
||||
int fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode,
|
||||
struct fwnode_endpoint *endpoint)
|
||||
{
|
||||
memset(endpoint, 0, sizeof(*endpoint));
|
||||
|
|
|
|||
|
|
@ -828,23 +828,23 @@ static void of_fwnode_put(struct fwnode_handle *fwnode)
|
|||
of_node_put(to_of_node(fwnode));
|
||||
}
|
||||
|
||||
static bool of_fwnode_device_is_available(struct fwnode_handle *fwnode)
|
||||
static bool of_fwnode_device_is_available(const struct fwnode_handle *fwnode)
|
||||
{
|
||||
return of_device_is_available(to_of_node(fwnode));
|
||||
}
|
||||
|
||||
static bool of_fwnode_property_present(struct fwnode_handle *fwnode,
|
||||
static bool of_fwnode_property_present(const struct fwnode_handle *fwnode,
|
||||
const char *propname)
|
||||
{
|
||||
return of_property_read_bool(to_of_node(fwnode), propname);
|
||||
}
|
||||
|
||||
static int of_fwnode_property_read_int_array(struct fwnode_handle *fwnode,
|
||||
static int of_fwnode_property_read_int_array(const struct fwnode_handle *fwnode,
|
||||
const char *propname,
|
||||
unsigned int elem_size, void *val,
|
||||
size_t nval)
|
||||
{
|
||||
struct device_node *node = to_of_node(fwnode);
|
||||
const struct device_node *node = to_of_node(fwnode);
|
||||
|
||||
if (!val)
|
||||
return of_property_count_elems_of_size(node, propname,
|
||||
|
|
@ -864,24 +864,26 @@ static int of_fwnode_property_read_int_array(struct fwnode_handle *fwnode,
|
|||
return -ENXIO;
|
||||
}
|
||||
|
||||
static int of_fwnode_property_read_string_array(struct fwnode_handle *fwnode,
|
||||
const char *propname,
|
||||
const char **val, size_t nval)
|
||||
static int
|
||||
of_fwnode_property_read_string_array(const struct fwnode_handle *fwnode,
|
||||
const char *propname, const char **val,
|
||||
size_t nval)
|
||||
{
|
||||
struct device_node *node = to_of_node(fwnode);
|
||||
const struct device_node *node = to_of_node(fwnode);
|
||||
|
||||
return val ?
|
||||
of_property_read_string_array(node, propname, val, nval) :
|
||||
of_property_count_strings(node, propname);
|
||||
}
|
||||
|
||||
static struct fwnode_handle *of_fwnode_get_parent(struct fwnode_handle *fwnode)
|
||||
static struct fwnode_handle *
|
||||
of_fwnode_get_parent(const struct fwnode_handle *fwnode)
|
||||
{
|
||||
return of_fwnode_handle(of_get_parent(to_of_node(fwnode)));
|
||||
}
|
||||
|
||||
static struct fwnode_handle *
|
||||
of_fwnode_get_next_child_node(struct fwnode_handle *fwnode,
|
||||
of_fwnode_get_next_child_node(const struct fwnode_handle *fwnode,
|
||||
struct fwnode_handle *child)
|
||||
{
|
||||
return of_fwnode_handle(of_get_next_available_child(to_of_node(fwnode),
|
||||
|
|
@ -889,10 +891,10 @@ of_fwnode_get_next_child_node(struct fwnode_handle *fwnode,
|
|||
}
|
||||
|
||||
static struct fwnode_handle *
|
||||
of_fwnode_get_named_child_node(struct fwnode_handle *fwnode,
|
||||
of_fwnode_get_named_child_node(const struct fwnode_handle *fwnode,
|
||||
const char *childname)
|
||||
{
|
||||
struct device_node *node = to_of_node(fwnode);
|
||||
const struct device_node *node = to_of_node(fwnode);
|
||||
struct device_node *child;
|
||||
|
||||
for_each_available_child_of_node(node, child)
|
||||
|
|
@ -902,8 +904,38 @@ of_fwnode_get_named_child_node(struct fwnode_handle *fwnode,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
static int
|
||||
of_fwnode_get_reference_args(const struct fwnode_handle *fwnode,
|
||||
const char *prop, const char *nargs_prop,
|
||||
unsigned int nargs, unsigned int index,
|
||||
struct fwnode_reference_args *args)
|
||||
{
|
||||
struct of_phandle_args of_args;
|
||||
unsigned int i;
|
||||
int ret;
|
||||
|
||||
if (nargs_prop)
|
||||
ret = of_parse_phandle_with_args(to_of_node(fwnode), prop,
|
||||
nargs_prop, index, &of_args);
|
||||
else
|
||||
ret = of_parse_phandle_with_fixed_args(to_of_node(fwnode), prop,
|
||||
nargs, index, &of_args);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
if (!args)
|
||||
return 0;
|
||||
|
||||
args->nargs = of_args.args_count;
|
||||
args->fwnode = of_fwnode_handle(of_args.np);
|
||||
|
||||
for (i = 0; i < NR_FWNODE_REFERENCE_ARGS; i++)
|
||||
args->args[i] = i < of_args.args_count ? of_args.args[i] : 0;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct fwnode_handle *
|
||||
of_fwnode_graph_get_next_endpoint(struct fwnode_handle *fwnode,
|
||||
of_fwnode_graph_get_next_endpoint(const struct fwnode_handle *fwnode,
|
||||
struct fwnode_handle *prev)
|
||||
{
|
||||
return of_fwnode_handle(of_graph_get_next_endpoint(to_of_node(fwnode),
|
||||
|
|
@ -911,7 +943,7 @@ of_fwnode_graph_get_next_endpoint(struct fwnode_handle *fwnode,
|
|||
}
|
||||
|
||||
static struct fwnode_handle *
|
||||
of_fwnode_graph_get_remote_endpoint(struct fwnode_handle *fwnode)
|
||||
of_fwnode_graph_get_remote_endpoint(const struct fwnode_handle *fwnode)
|
||||
{
|
||||
return of_fwnode_handle(of_parse_phandle(to_of_node(fwnode),
|
||||
"remote-endpoint", 0));
|
||||
|
|
@ -934,10 +966,10 @@ of_fwnode_graph_get_port_parent(struct fwnode_handle *fwnode)
|
|||
return of_fwnode_handle(of_get_next_parent(np));
|
||||
}
|
||||
|
||||
static int of_fwnode_graph_parse_endpoint(struct fwnode_handle *fwnode,
|
||||
static int of_fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode,
|
||||
struct fwnode_endpoint *endpoint)
|
||||
{
|
||||
struct device_node *node = to_of_node(fwnode);
|
||||
const struct device_node *node = to_of_node(fwnode);
|
||||
struct device_node *port_node = of_get_parent(node);
|
||||
|
||||
endpoint->local_fwnode = fwnode;
|
||||
|
|
@ -960,8 +992,10 @@ const struct fwnode_operations of_fwnode_ops = {
|
|||
.get_parent = of_fwnode_get_parent,
|
||||
.get_next_child_node = of_fwnode_get_next_child_node,
|
||||
.get_named_child_node = of_fwnode_get_named_child_node,
|
||||
.get_reference_args = of_fwnode_get_reference_args,
|
||||
.graph_get_next_endpoint = of_fwnode_graph_get_next_endpoint,
|
||||
.graph_get_remote_endpoint = of_fwnode_graph_get_remote_endpoint,
|
||||
.graph_get_port_parent = of_fwnode_graph_get_port_parent,
|
||||
.graph_parse_endpoint = of_fwnode_graph_parse_endpoint,
|
||||
};
|
||||
EXPORT_SYMBOL_GPL(of_fwnode_ops);
|
||||
|
|
|
|||
|
|
@ -395,35 +395,55 @@ struct acpi_data_node {
|
|||
struct completion kobj_done;
|
||||
};
|
||||
|
||||
static inline bool is_acpi_node(struct fwnode_handle *fwnode)
|
||||
extern const struct fwnode_operations acpi_device_fwnode_ops;
|
||||
extern const struct fwnode_operations acpi_data_fwnode_ops;
|
||||
extern const struct fwnode_operations acpi_static_fwnode_ops;
|
||||
|
||||
static inline bool is_acpi_node(const struct fwnode_handle *fwnode)
|
||||
{
|
||||
return !IS_ERR_OR_NULL(fwnode) && (fwnode->type == FWNODE_ACPI
|
||||
|| fwnode->type == FWNODE_ACPI_DATA);
|
||||
return !IS_ERR_OR_NULL(fwnode) &&
|
||||
(fwnode->ops == &acpi_device_fwnode_ops
|
||||
|| fwnode->ops == &acpi_data_fwnode_ops);
|
||||
}
|
||||
|
||||
static inline bool is_acpi_device_node(struct fwnode_handle *fwnode)
|
||||
static inline bool is_acpi_device_node(const struct fwnode_handle *fwnode)
|
||||
{
|
||||
return !IS_ERR_OR_NULL(fwnode) && fwnode->type == FWNODE_ACPI;
|
||||
return !IS_ERR_OR_NULL(fwnode) &&
|
||||
fwnode->ops == &acpi_device_fwnode_ops;
|
||||
}
|
||||
|
||||
static inline struct acpi_device *to_acpi_device_node(struct fwnode_handle *fwnode)
|
||||
#define to_acpi_device_node(__fwnode) \
|
||||
({ \
|
||||
typeof(__fwnode) __to_acpi_device_node_fwnode = __fwnode; \
|
||||
\
|
||||
is_acpi_device_node(__to_acpi_device_node_fwnode) ? \
|
||||
container_of(__to_acpi_device_node_fwnode, \
|
||||
struct acpi_device, fwnode) : \
|
||||
NULL; \
|
||||
})
|
||||
|
||||
static inline bool is_acpi_data_node(const struct fwnode_handle *fwnode)
|
||||
{
|
||||
return is_acpi_device_node(fwnode) ?
|
||||
container_of(fwnode, struct acpi_device, fwnode) : NULL;
|
||||
return !IS_ERR_OR_NULL(fwnode) && fwnode->ops == &acpi_data_fwnode_ops;
|
||||
}
|
||||
|
||||
static inline bool is_acpi_data_node(struct fwnode_handle *fwnode)
|
||||
#define to_acpi_data_node(__fwnode) \
|
||||
({ \
|
||||
typeof(__fwnode) __to_acpi_data_node_fwnode = __fwnode; \
|
||||
\
|
||||
is_acpi_data_node(__to_acpi_data_node_fwnode) ? \
|
||||
container_of(__to_acpi_data_node_fwnode, \
|
||||
struct acpi_data_node, fwnode) : \
|
||||
NULL; \
|
||||
})
|
||||
|
||||
static inline bool is_acpi_static_node(const struct fwnode_handle *fwnode)
|
||||
{
|
||||
return fwnode && fwnode->type == FWNODE_ACPI_DATA;
|
||||
return !IS_ERR_OR_NULL(fwnode) &&
|
||||
fwnode->ops == &acpi_static_fwnode_ops;
|
||||
}
|
||||
|
||||
static inline struct acpi_data_node *to_acpi_data_node(struct fwnode_handle *fwnode)
|
||||
{
|
||||
return is_acpi_data_node(fwnode) ?
|
||||
container_of(fwnode, struct acpi_data_node, fwnode) : NULL;
|
||||
}
|
||||
|
||||
static inline bool acpi_data_node_match(struct fwnode_handle *fwnode,
|
||||
static inline bool acpi_data_node_match(const struct fwnode_handle *fwnode,
|
||||
const char *name)
|
||||
{
|
||||
return is_acpi_data_node(fwnode) ?
|
||||
|
|
|
|||
|
|
@ -57,9 +57,6 @@ static inline acpi_handle acpi_device_handle(struct acpi_device *adev)
|
|||
acpi_fwnode_handle(adev) : NULL)
|
||||
#define ACPI_HANDLE(dev) acpi_device_handle(ACPI_COMPANION(dev))
|
||||
|
||||
|
||||
extern const struct fwnode_operations acpi_fwnode_ops;
|
||||
|
||||
static inline struct fwnode_handle *acpi_alloc_fwnode_static(void)
|
||||
{
|
||||
struct fwnode_handle *fwnode;
|
||||
|
|
@ -68,15 +65,14 @@ static inline struct fwnode_handle *acpi_alloc_fwnode_static(void)
|
|||
if (!fwnode)
|
||||
return NULL;
|
||||
|
||||
fwnode->type = FWNODE_ACPI_STATIC;
|
||||
fwnode->ops = &acpi_fwnode_ops;
|
||||
fwnode->ops = &acpi_static_fwnode_ops;
|
||||
|
||||
return fwnode;
|
||||
}
|
||||
|
||||
static inline void acpi_free_fwnode_static(struct fwnode_handle *fwnode)
|
||||
{
|
||||
if (WARN_ON(!fwnode || fwnode->type != FWNODE_ACPI_STATIC))
|
||||
if (WARN_ON(!is_acpi_static_node(fwnode)))
|
||||
return;
|
||||
|
||||
kfree(fwnode);
|
||||
|
|
@ -1034,13 +1030,14 @@ struct acpi_reference_args {
|
|||
};
|
||||
|
||||
#ifdef CONFIG_ACPI
|
||||
int acpi_dev_get_property(struct acpi_device *adev, const char *name,
|
||||
int acpi_dev_get_property(const 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,
|
||||
int __acpi_node_get_property_reference(const 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,
|
||||
static inline int acpi_node_get_property_reference(
|
||||
const struct fwnode_handle *fwnode,
|
||||
const char *name, size_t index,
|
||||
struct acpi_reference_args *args)
|
||||
{
|
||||
|
|
@ -1048,22 +1045,25 @@ static inline int acpi_node_get_property_reference(struct fwnode_handle *fwnode,
|
|||
MAX_ACPI_REFERENCE_ARGS, args);
|
||||
}
|
||||
|
||||
int acpi_node_prop_get(struct fwnode_handle *fwnode, const char *propname,
|
||||
int acpi_node_prop_get(const struct fwnode_handle *fwnode, const char *propname,
|
||||
void **valptr);
|
||||
int acpi_dev_prop_read_single(struct acpi_device *adev, const char *propname,
|
||||
enum dev_prop_type proptype, void *val);
|
||||
int acpi_node_prop_read(struct fwnode_handle *fwnode, const char *propname,
|
||||
enum dev_prop_type proptype, void *val, size_t nval);
|
||||
int acpi_dev_prop_read(struct acpi_device *adev, const char *propname,
|
||||
int acpi_dev_prop_read_single(struct acpi_device *adev,
|
||||
const char *propname, enum dev_prop_type proptype,
|
||||
void *val);
|
||||
int acpi_node_prop_read(const struct fwnode_handle *fwnode,
|
||||
const char *propname, enum dev_prop_type proptype,
|
||||
void *val, size_t nval);
|
||||
int acpi_dev_prop_read(const struct acpi_device *adev, const char *propname,
|
||||
enum dev_prop_type proptype, void *val, size_t nval);
|
||||
|
||||
struct fwnode_handle *acpi_get_next_subnode(struct fwnode_handle *fwnode,
|
||||
struct fwnode_handle *acpi_get_next_subnode(const struct fwnode_handle *fwnode,
|
||||
struct fwnode_handle *child);
|
||||
struct fwnode_handle *acpi_node_get_parent(struct fwnode_handle *fwnode);
|
||||
struct fwnode_handle *acpi_node_get_parent(const struct fwnode_handle *fwnode);
|
||||
|
||||
struct fwnode_handle *acpi_graph_get_next_endpoint(struct fwnode_handle *fwnode,
|
||||
struct fwnode_handle *prev);
|
||||
int acpi_graph_get_remote_endpoint(struct fwnode_handle *fwnode,
|
||||
struct fwnode_handle *
|
||||
acpi_graph_get_next_endpoint(const struct fwnode_handle *fwnode,
|
||||
struct fwnode_handle *prev);
|
||||
int acpi_graph_get_remote_endpoint(const struct fwnode_handle *fwnode,
|
||||
struct fwnode_handle **remote,
|
||||
struct fwnode_handle **port,
|
||||
struct fwnode_handle **endpoint);
|
||||
|
|
@ -1131,35 +1131,36 @@ static inline int acpi_dev_get_property(struct acpi_device *adev,
|
|||
}
|
||||
|
||||
static inline int
|
||||
__acpi_node_get_property_reference(struct fwnode_handle *fwnode,
|
||||
__acpi_node_get_property_reference(const 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)
|
||||
static inline int
|
||||
acpi_node_get_property_reference(const struct fwnode_handle *fwnode,
|
||||
const char *name, size_t index,
|
||||
struct acpi_reference_args *args)
|
||||
{
|
||||
return -ENXIO;
|
||||
}
|
||||
|
||||
static inline int acpi_node_prop_get(struct fwnode_handle *fwnode,
|
||||
static inline int acpi_node_prop_get(const struct fwnode_handle *fwnode,
|
||||
const char *propname,
|
||||
void **valptr)
|
||||
{
|
||||
return -ENXIO;
|
||||
}
|
||||
|
||||
static inline int acpi_dev_prop_get(struct acpi_device *adev,
|
||||
static inline int acpi_dev_prop_get(const struct acpi_device *adev,
|
||||
const char *propname,
|
||||
void **valptr)
|
||||
{
|
||||
return -ENXIO;
|
||||
}
|
||||
|
||||
static inline int acpi_dev_prop_read_single(struct acpi_device *adev,
|
||||
static inline int acpi_dev_prop_read_single(const struct acpi_device *adev,
|
||||
const char *propname,
|
||||
enum dev_prop_type proptype,
|
||||
void *val)
|
||||
|
|
@ -1167,7 +1168,7 @@ static inline int acpi_dev_prop_read_single(struct acpi_device *adev,
|
|||
return -ENXIO;
|
||||
}
|
||||
|
||||
static inline int acpi_node_prop_read(struct fwnode_handle *fwnode,
|
||||
static inline int acpi_node_prop_read(const struct fwnode_handle *fwnode,
|
||||
const char *propname,
|
||||
enum dev_prop_type proptype,
|
||||
void *val, size_t nval)
|
||||
|
|
@ -1175,7 +1176,7 @@ static inline int acpi_node_prop_read(struct fwnode_handle *fwnode,
|
|||
return -ENXIO;
|
||||
}
|
||||
|
||||
static inline int acpi_dev_prop_read(struct acpi_device *adev,
|
||||
static inline int acpi_dev_prop_read(const struct acpi_device *adev,
|
||||
const char *propname,
|
||||
enum dev_prop_type proptype,
|
||||
void *val, size_t nval)
|
||||
|
|
@ -1184,26 +1185,27 @@ static inline int acpi_dev_prop_read(struct acpi_device *adev,
|
|||
}
|
||||
|
||||
static inline struct fwnode_handle *
|
||||
acpi_get_next_subnode(struct fwnode_handle *fwnode, struct fwnode_handle *child)
|
||||
acpi_get_next_subnode(const struct fwnode_handle *fwnode,
|
||||
struct fwnode_handle *child)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static inline struct fwnode_handle *
|
||||
acpi_node_get_parent(struct fwnode_handle *fwnode)
|
||||
acpi_node_get_parent(const struct fwnode_handle *fwnode)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static inline struct fwnode_handle *
|
||||
acpi_graph_get_next_endpoint(struct fwnode_handle *fwnode,
|
||||
acpi_graph_get_next_endpoint(const struct fwnode_handle *fwnode,
|
||||
struct fwnode_handle *prev)
|
||||
{
|
||||
return ERR_PTR(-ENXIO);
|
||||
}
|
||||
|
||||
static inline int
|
||||
acpi_graph_get_remote_endpoint(struct fwnode_handle *fwnode,
|
||||
acpi_graph_get_remote_endpoint(const struct fwnode_handle *fwnode,
|
||||
struct fwnode_handle **remote,
|
||||
struct fwnode_handle **port,
|
||||
struct fwnode_handle **endpoint)
|
||||
|
|
|
|||
|
|
@ -14,20 +14,9 @@
|
|||
|
||||
#include <linux/types.h>
|
||||
|
||||
enum fwnode_type {
|
||||
FWNODE_INVALID = 0,
|
||||
FWNODE_OF,
|
||||
FWNODE_ACPI,
|
||||
FWNODE_ACPI_DATA,
|
||||
FWNODE_ACPI_STATIC,
|
||||
FWNODE_PDATA,
|
||||
FWNODE_IRQCHIP
|
||||
};
|
||||
|
||||
struct fwnode_operations;
|
||||
|
||||
struct fwnode_handle {
|
||||
enum fwnode_type type;
|
||||
struct fwnode_handle *secondary;
|
||||
const struct fwnode_operations *ops;
|
||||
};
|
||||
|
|
@ -44,6 +33,20 @@ struct fwnode_endpoint {
|
|||
const struct fwnode_handle *local_fwnode;
|
||||
};
|
||||
|
||||
#define NR_FWNODE_REFERENCE_ARGS 8
|
||||
|
||||
/**
|
||||
* struct fwnode_reference_args - Fwnode reference with additional arguments
|
||||
* @fwnode:- A reference to the base fwnode
|
||||
* @nargs: Number of elements in @args array
|
||||
* @args: Integer arguments on the fwnode
|
||||
*/
|
||||
struct fwnode_reference_args {
|
||||
struct fwnode_handle *fwnode;
|
||||
unsigned int nargs;
|
||||
unsigned int args[NR_FWNODE_REFERENCE_ARGS];
|
||||
};
|
||||
|
||||
/**
|
||||
* struct fwnode_operations - Operations for fwnode interface
|
||||
* @get: Get a reference to an fwnode.
|
||||
|
|
@ -57,6 +60,7 @@ struct fwnode_endpoint {
|
|||
* @get_parent: Return the parent of an fwnode.
|
||||
* @get_next_child_node: Return the next child node in an iteration.
|
||||
* @get_named_child_node: Return a child node with a given name.
|
||||
* @get_reference_args: Return a reference pointed to by a property, with args
|
||||
* @graph_get_next_endpoint: Return an endpoint node in an iteration.
|
||||
* @graph_get_remote_endpoint: Return the remote endpoint node of a local
|
||||
* endpoint node.
|
||||
|
|
@ -66,30 +70,36 @@ struct fwnode_endpoint {
|
|||
struct fwnode_operations {
|
||||
void (*get)(struct fwnode_handle *fwnode);
|
||||
void (*put)(struct fwnode_handle *fwnode);
|
||||
bool (*device_is_available)(struct fwnode_handle *fwnode);
|
||||
bool (*property_present)(struct fwnode_handle *fwnode,
|
||||
bool (*device_is_available)(const struct fwnode_handle *fwnode);
|
||||
bool (*property_present)(const struct fwnode_handle *fwnode,
|
||||
const char *propname);
|
||||
int (*property_read_int_array)(struct fwnode_handle *fwnode,
|
||||
int (*property_read_int_array)(const struct fwnode_handle *fwnode,
|
||||
const char *propname,
|
||||
unsigned int elem_size, void *val,
|
||||
size_t nval);
|
||||
int (*property_read_string_array)(struct fwnode_handle *fwnode_handle,
|
||||
const char *propname,
|
||||
const char **val, size_t nval);
|
||||
struct fwnode_handle *(*get_parent)(struct fwnode_handle *fwnode);
|
||||
int
|
||||
(*property_read_string_array)(const struct fwnode_handle *fwnode_handle,
|
||||
const char *propname, const char **val,
|
||||
size_t nval);
|
||||
struct fwnode_handle *(*get_parent)(const struct fwnode_handle *fwnode);
|
||||
struct fwnode_handle *
|
||||
(*get_next_child_node)(struct fwnode_handle *fwnode,
|
||||
(*get_next_child_node)(const struct fwnode_handle *fwnode,
|
||||
struct fwnode_handle *child);
|
||||
struct fwnode_handle *
|
||||
(*get_named_child_node)(struct fwnode_handle *fwnode, const char *name);
|
||||
(*get_named_child_node)(const struct fwnode_handle *fwnode,
|
||||
const char *name);
|
||||
int (*get_reference_args)(const struct fwnode_handle *fwnode,
|
||||
const char *prop, const char *nargs_prop,
|
||||
unsigned int nargs, unsigned int index,
|
||||
struct fwnode_reference_args *args);
|
||||
struct fwnode_handle *
|
||||
(*graph_get_next_endpoint)(struct fwnode_handle *fwnode,
|
||||
(*graph_get_next_endpoint)(const struct fwnode_handle *fwnode,
|
||||
struct fwnode_handle *prev);
|
||||
struct fwnode_handle *
|
||||
(*graph_get_remote_endpoint)(struct fwnode_handle *fwnode);
|
||||
(*graph_get_remote_endpoint)(const struct fwnode_handle *fwnode);
|
||||
struct fwnode_handle *
|
||||
(*graph_get_port_parent)(struct fwnode_handle *fwnode);
|
||||
int (*graph_parse_endpoint)(struct fwnode_handle *fwnode,
|
||||
int (*graph_parse_endpoint)(const struct fwnode_handle *fwnode,
|
||||
struct fwnode_endpoint *endpoint);
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -265,9 +265,11 @@ static inline struct fwnode_handle *of_node_to_fwnode(struct device_node *node)
|
|||
return node ? &node->fwnode : NULL;
|
||||
}
|
||||
|
||||
extern const struct fwnode_operations irqchip_fwnode_ops;
|
||||
|
||||
static inline bool is_fwnode_irqchip(struct fwnode_handle *fwnode)
|
||||
{
|
||||
return fwnode && fwnode->type == FWNODE_IRQCHIP;
|
||||
return fwnode && fwnode->ops == &irqchip_fwnode_ops;
|
||||
}
|
||||
|
||||
extern void irq_domain_update_bus_token(struct irq_domain *domain,
|
||||
|
|
|
|||
|
|
@ -104,7 +104,6 @@ extern const struct fwnode_operations of_fwnode_ops;
|
|||
static inline void of_node_init(struct device_node *node)
|
||||
{
|
||||
kobject_init(&node->kobj, &of_node_ktype);
|
||||
node->fwnode.type = FWNODE_OF;
|
||||
node->fwnode.ops = &of_fwnode_ops;
|
||||
}
|
||||
|
||||
|
|
@ -152,7 +151,7 @@ void of_core_init(void);
|
|||
|
||||
static inline bool is_of_node(const struct fwnode_handle *fwnode)
|
||||
{
|
||||
return !IS_ERR_OR_NULL(fwnode) && fwnode->type == FWNODE_OF;
|
||||
return !IS_ERR_OR_NULL(fwnode) && fwnode->ops == &of_fwnode_ops;
|
||||
}
|
||||
|
||||
#define to_of_node(__fwnode) \
|
||||
|
|
|
|||
|
|
@ -51,46 +51,52 @@ int device_property_read_string(struct device *dev, const char *propname,
|
|||
int device_property_match_string(struct device *dev,
|
||||
const char *propname, const char *string);
|
||||
|
||||
bool fwnode_device_is_available(struct fwnode_handle *fwnode);
|
||||
bool fwnode_property_present(struct fwnode_handle *fwnode, const char *propname);
|
||||
int fwnode_property_read_u8_array(struct fwnode_handle *fwnode,
|
||||
bool fwnode_device_is_available(const struct fwnode_handle *fwnode);
|
||||
bool fwnode_property_present(const struct fwnode_handle *fwnode,
|
||||
const char *propname);
|
||||
int fwnode_property_read_u8_array(const struct fwnode_handle *fwnode,
|
||||
const char *propname, u8 *val,
|
||||
size_t nval);
|
||||
int fwnode_property_read_u16_array(struct fwnode_handle *fwnode,
|
||||
int fwnode_property_read_u16_array(const struct fwnode_handle *fwnode,
|
||||
const char *propname, u16 *val,
|
||||
size_t nval);
|
||||
int fwnode_property_read_u32_array(struct fwnode_handle *fwnode,
|
||||
int fwnode_property_read_u32_array(const struct fwnode_handle *fwnode,
|
||||
const char *propname, u32 *val,
|
||||
size_t nval);
|
||||
int fwnode_property_read_u64_array(struct fwnode_handle *fwnode,
|
||||
int fwnode_property_read_u64_array(const struct fwnode_handle *fwnode,
|
||||
const char *propname, u64 *val,
|
||||
size_t nval);
|
||||
int fwnode_property_read_string_array(struct fwnode_handle *fwnode,
|
||||
int fwnode_property_read_string_array(const struct fwnode_handle *fwnode,
|
||||
const char *propname, const char **val,
|
||||
size_t nval);
|
||||
int fwnode_property_read_string(struct fwnode_handle *fwnode,
|
||||
int fwnode_property_read_string(const struct fwnode_handle *fwnode,
|
||||
const char *propname, const char **val);
|
||||
int fwnode_property_match_string(struct fwnode_handle *fwnode,
|
||||
int fwnode_property_match_string(const struct fwnode_handle *fwnode,
|
||||
const char *propname, const char *string);
|
||||
int fwnode_property_get_reference_args(const struct fwnode_handle *fwnode,
|
||||
const char *prop, const char *nargs_prop,
|
||||
unsigned int nargs, unsigned int index,
|
||||
struct fwnode_reference_args *args);
|
||||
|
||||
struct fwnode_handle *fwnode_get_parent(struct fwnode_handle *fwnode);
|
||||
struct fwnode_handle *fwnode_get_next_parent(struct fwnode_handle *fwnode);
|
||||
struct fwnode_handle *fwnode_get_next_child_node(struct fwnode_handle *fwnode,
|
||||
struct fwnode_handle *child);
|
||||
struct fwnode_handle *fwnode_get_parent(const struct fwnode_handle *fwnode);
|
||||
struct fwnode_handle *fwnode_get_next_parent(
|
||||
struct fwnode_handle *fwnode);
|
||||
struct fwnode_handle *fwnode_get_next_child_node(
|
||||
const struct fwnode_handle *fwnode, struct fwnode_handle *child);
|
||||
|
||||
#define fwnode_for_each_child_node(fwnode, child) \
|
||||
for (child = fwnode_get_next_child_node(fwnode, NULL); child; \
|
||||
child = fwnode_get_next_child_node(fwnode, child))
|
||||
|
||||
struct fwnode_handle *device_get_next_child_node(struct device *dev,
|
||||
struct fwnode_handle *child);
|
||||
struct fwnode_handle *device_get_next_child_node(
|
||||
struct device *dev, struct fwnode_handle *child);
|
||||
|
||||
#define device_for_each_child_node(dev, child) \
|
||||
for (child = device_get_next_child_node(dev, NULL); child; \
|
||||
child = device_get_next_child_node(dev, child))
|
||||
|
||||
struct fwnode_handle *fwnode_get_named_child_node(struct fwnode_handle *fwnode,
|
||||
const char *childname);
|
||||
struct fwnode_handle *fwnode_get_named_child_node(
|
||||
const struct fwnode_handle *fwnode, const char *childname);
|
||||
struct fwnode_handle *device_get_named_child_node(struct device *dev,
|
||||
const char *childname);
|
||||
|
||||
|
|
@ -129,31 +135,31 @@ static inline int device_property_read_u64(struct device *dev,
|
|||
return device_property_read_u64_array(dev, propname, val, 1);
|
||||
}
|
||||
|
||||
static inline bool fwnode_property_read_bool(struct fwnode_handle *fwnode,
|
||||
static inline bool fwnode_property_read_bool(const struct fwnode_handle *fwnode,
|
||||
const char *propname)
|
||||
{
|
||||
return fwnode_property_present(fwnode, propname);
|
||||
}
|
||||
|
||||
static inline int fwnode_property_read_u8(struct fwnode_handle *fwnode,
|
||||
static inline int fwnode_property_read_u8(const struct fwnode_handle *fwnode,
|
||||
const char *propname, u8 *val)
|
||||
{
|
||||
return fwnode_property_read_u8_array(fwnode, propname, val, 1);
|
||||
}
|
||||
|
||||
static inline int fwnode_property_read_u16(struct fwnode_handle *fwnode,
|
||||
static inline int fwnode_property_read_u16(const struct fwnode_handle *fwnode,
|
||||
const char *propname, u16 *val)
|
||||
{
|
||||
return fwnode_property_read_u16_array(fwnode, propname, val, 1);
|
||||
}
|
||||
|
||||
static inline int fwnode_property_read_u32(struct fwnode_handle *fwnode,
|
||||
static inline int fwnode_property_read_u32(const struct fwnode_handle *fwnode,
|
||||
const char *propname, u32 *val)
|
||||
{
|
||||
return fwnode_property_read_u32_array(fwnode, propname, val, 1);
|
||||
}
|
||||
|
||||
static inline int fwnode_property_read_u64(struct fwnode_handle *fwnode,
|
||||
static inline int fwnode_property_read_u64(const struct fwnode_handle *fwnode,
|
||||
const char *propname, u64 *val)
|
||||
{
|
||||
return fwnode_property_read_u64_array(fwnode, propname, val, 1);
|
||||
|
|
@ -274,19 +280,20 @@ int device_get_phy_mode(struct device *dev);
|
|||
void *device_get_mac_address(struct device *dev, char *addr, int alen);
|
||||
|
||||
struct fwnode_handle *fwnode_graph_get_next_endpoint(
|
||||
struct fwnode_handle *fwnode, struct fwnode_handle *prev);
|
||||
const struct fwnode_handle *fwnode, struct fwnode_handle *prev);
|
||||
struct fwnode_handle *
|
||||
fwnode_graph_get_port_parent(struct fwnode_handle *fwnode);
|
||||
fwnode_graph_get_port_parent(const struct fwnode_handle *fwnode);
|
||||
struct fwnode_handle *fwnode_graph_get_remote_port_parent(
|
||||
struct fwnode_handle *fwnode);
|
||||
const struct fwnode_handle *fwnode);
|
||||
struct fwnode_handle *fwnode_graph_get_remote_port(
|
||||
struct fwnode_handle *fwnode);
|
||||
const struct fwnode_handle *fwnode);
|
||||
struct fwnode_handle *fwnode_graph_get_remote_endpoint(
|
||||
struct fwnode_handle *fwnode);
|
||||
struct fwnode_handle *fwnode_graph_get_remote_node(struct fwnode_handle *fwnode,
|
||||
u32 port, u32 endpoint);
|
||||
const struct fwnode_handle *fwnode);
|
||||
struct fwnode_handle *
|
||||
fwnode_graph_get_remote_node(const struct fwnode_handle *fwnode, u32 port,
|
||||
u32 endpoint);
|
||||
|
||||
int fwnode_graph_parse_endpoint(struct fwnode_handle *fwnode,
|
||||
int fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode,
|
||||
struct fwnode_endpoint *endpoint);
|
||||
|
||||
#endif /* _LINUX_PROPERTY_H_ */
|
||||
|
|
|
|||
|
|
@ -41,6 +41,9 @@ static inline void debugfs_add_domain_dir(struct irq_domain *d) { }
|
|||
static inline void debugfs_remove_domain_dir(struct irq_domain *d) { }
|
||||
#endif
|
||||
|
||||
const struct fwnode_operations irqchip_fwnode_ops;
|
||||
EXPORT_SYMBOL_GPL(irqchip_fwnode_ops);
|
||||
|
||||
/**
|
||||
* irq_domain_alloc_fwnode - Allocate a fwnode_handle suitable for
|
||||
* identifying an irq domain
|
||||
|
|
@ -86,7 +89,7 @@ struct fwnode_handle *__irq_domain_alloc_fwnode(unsigned int type, int id,
|
|||
fwid->type = type;
|
||||
fwid->name = n;
|
||||
fwid->data = data;
|
||||
fwid->fwnode.type = FWNODE_IRQCHIP;
|
||||
fwid->fwnode.ops = &irqchip_fwnode_ops;
|
||||
return &fwid->fwnode;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(__irq_domain_alloc_fwnode);
|
||||
|
|
@ -193,10 +196,8 @@ struct irq_domain *__irq_domain_add(struct fwnode_handle *fwnode, int size,
|
|||
}
|
||||
|
||||
if (!domain->name) {
|
||||
if (fwnode) {
|
||||
pr_err("Invalid fwnode type (%d) for irqdomain\n",
|
||||
fwnode->type);
|
||||
}
|
||||
if (fwnode)
|
||||
pr_err("Invalid fwnode type for irqdomain\n");
|
||||
domain->name = kasprintf(GFP_KERNEL, "unknown-%d",
|
||||
atomic_inc_return(&unknown_domains));
|
||||
if (!domain->name) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue