Add node availability check for child node iteration on ACPI fwnode backend
cover Add node availability check for child node iteration on ACPI fwnode backend
Hello everyone,
This patch adds device node availability check to the child device node iteration in the ACPI fwnode backend.
The previous set including with the tree-wide changes can be found here <URL:https://lore.kernel.org/linux-acpi/CAJZ5v0gQ9vnT+Z8zryEausp-2xX7HocoBgwmiptxg7BGiU9C8g@mail.gmail.com/T/#t>. I'll post the other bits separately as they'll be merged at different
moments. The rest of the ACPI changes can also wait until v6.19.
since tree-wide set v2 <[email protected]>, WRT. this patch:
- Don't use kernel-doc functions to document static functions in .c files.
- Add empty lines between sections within a now non-kernel-doc comment.
since v1 <[email protected]> (entire tree-wide set):
- Move patch "ACPI: property: Make acpi_get_next_subnode() static" as first.
- Add missing parentheses and kernel-doc Return: section in acpi_get_next_present_subnode() documentation and move the Return
section: of fwnode_graph_get_endpoint_by_id() to the end of the documentation section (new patch for the latter).
- Use device_get_next_child_node() instead of fwnode_get_next_child_node() in flash LED driver drivers.
- Rework iterating port nodes in acpi_graph_get_next_endpoint() as suggested by Andy (new patch).
Sakari Ailus (1):
ACPI: property: Return present device nodes only on fwnode interface
drivers/acpi/property.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)
Signature · 1 line
2.47.3
PATCH 1/1 ACPI: property: Return present device nodes only on fwnode interface
fwnode_graph_get_next_subnode() may return fwnode backed by ACPI device nodes and there has been no check these devices are present in the system, unlike there has been on fwnode OF backend. In order to provide consistent behaviour towards callers, add a check for device presence by introducing a new function acpi_get_next_present_subnode(), used as the get_next_child_node() fwnode operation that also checks device node presence.
--- drivers/acpi/property.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)
drivers/acpi/property.c +23 -1
@@ -1318,6 +1318,28 @@ struct fwnode_handle *acpi_get_next_subnode(const struct fwnode_handle *fwnode,return NULL ; } +/* +* acpi_get_next_present_subnode - Return the next present child node handle for a fwnode +* @fwnode: Firmware node to find the next child node for. +* @child: Handle to one of the device's child nodes or a null handle. +* +* Like acpi_get_next_subnode(), but the device nodes returned by +* acpi_get_next_present_subnode() are guaranteed to be present. +* +* Returns: The next sub-node fwnode handle. +*/ +static struct fwnode_handle * +acpi_get_next_present_subnode (const struct fwnode_handle *fwnode, +struct fwnode_handle *child) +{ +do { + child =acpi_get_next_subnode (fwnode, child); + }while (is_acpi_device_node (child) && + !acpi_device_is_present (to_acpi_device_node (child))); + +return child; +} +/** * acpi_node_get_parent - Return parent fwnode of this fwnode * @fwnode: Firmware node whose parent to get
@@ -1662,7 +1684,7 @@ static int acpi_fwnode_irq_get(const struct fwnode_handle *fwnode, .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_next_child_node = acpi_get_next_present_subnode, \ .get_named_child_node = acpi_fwnode_get_named_child_node, \ .get_name = acpi_fwnode_get_name, \ .get_name_prefix = acpi_fwnode_get_name_prefix, \
Signature · 1 line
2.47.3
Rafael J. Wysocki
maintainerRe: [PATCH 1/1] ACPI: property: Return present device nodes only on fwnode interface
Quoted 50 lines · Sakari Ailus
fwnode_graph_get_next_subnode()may return fwnode backed by ACPI device nodes and there has been no check these devices are present in the system, unlike there has been on fwnode OF backend. In order to provide consistent behaviour towards callers, add a check for device presence by introducing a new functionacpi_get_next_present_subnode(), used as theget_next_child_node()fwnode operation that also checks device node presence.Signed-off-by Sakari Ailus <[email protected]>Reviewed-by Laurent Pinchart <[email protected]>Reviewed-by Jonathan Cameron <[email protected]>--- drivers/acpi/property.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)drivers/acpi/property.c +22
-0@@ -1318,6 +1318,28 @@ struct fwnode_handle *acpi_get_next_subnode(const struct fwnode_handle *fwnode,return NULL ; } +/* +* acpi_get_next_present_subnode - Return the next present child node handle for a fwnode +* @fwnode: Firmware node to find the next child node for. +* @child: Handle to one of the device's child nodes or a null handle. +* +* Like acpi_get_next_subnode(), but the device nodes returned by +* acpi_get_next_present_subnode() are guaranteed to be present. +* +* Returns: The next sub-node fwnode handle. +*/ +static struct fwnode_handle * +acpi_get_next_present_subnode (const struct fwnode_handle *fwnode, +struct fwnode_handle *child) +{ +do { + child =acpi_get_next_subnode (fwnode, child); + }while (is_acpi_device_node (child) && + !acpi_device_is_present (to_acpi_device_node (child))); + +return child; +} +/** * acpi_node_get_parent - Return parent fwnode of this fwnode * @fwnode: Firmware node whose parent to get
drivers/acpi/property.c static int acpi_fwnode_irq_get(const struct fwnode_handle *fwnode,
Quoted 9 lines
drivers/acpi/property.c +1
-2@@ -1662,7 +1684,7 @@ static int acpi_fwnode_irq_get(const struct fwnode_handle *fwnode, .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_next_child_node = acpi_get_next_present_subnode, \ .get_named_child_node = acpi_fwnode_get_named_child_node, \ .get_name = acpi_fwnode_get_name, \ .get_name_prefix = acpi_fwnode_get_name_prefix, \ --
Applied with some minor tweaks as 6.18 material, thanks!