Device property improvements, add %pfw format specifier
Subsystems (8)
Sakari Ailus
reviewerv5 cover Device property improvements, add %pfw format specifier
Hi all,
This set adds functionality into the device property API (counting a node's parents as well as obtaining its name) in order to support printing fwnode names using a new conversion specifier "%pfw". The names that are produced are equivalent to its OF counterpart "%pOF" on OF systems for the two supported modifiers ("f" and "P").
Printing a node's name is something that's been available on OF for a long time and if something is converted to device property API (such as the V4L2 fwnode framework) it always got removed of a nice feature that was sometimes essential in debugging. With this set, that no longer is the case.
since v4:
- Improved documentation for fwnode_get_nth_parent().
- Removed comma from the guardian entry in fwnode_pointer() testcase.
since v3:
- Remove underscores in argument name of fwnode_count_parents().
- Re-introduce "%pO?" error string.
- Unwrap a call to string() in fwnode_string().
- Removed a useless Depends-on: on a patch that was merged long ago.
- Unwrap a Fixes: line.
- Added a patch to move fwnode_get_parent() up to make the review of the following patch easier.
since v2:
- Better comments in acpi_fwnode_get_name_prefix().
- Added swnode implementation.
- Fixed swnode refcounting in get_parent() ("swnode: Get reference to parent swnode in get_parent op")
- Make argument to to_software_node() const (a new patch)
- Factored out confusingly named kobject_string() that had a single caller.
- Cleaner fwnode_count_parents() implementation (as discussed in review).
- Made fwnode_count_parents() argument const.
- Added tests (last patch in the set).
since v1:
- Add patch to remove support for %pf and %pF (depends on another patch removing all use of %pf and %pF) (now 4th patch)
- Fix kerneldoc argument documentation for fwnode_get_name (2nd patch)
- Align kerneldoc style with the rest of drivers/base/property.c (no extra newline after function name)
- Make checkpatch.pl complain about "%pf" not followed by "w" (6th patch)
- WARN_ONCE() on use of invalid conversion specifiers ("%pf" not followed by "w")
Sakari Ailus (11):
software node: Get reference to parent swnode in get_parent op software node: Make argument to to_software_node const device property: Move fwnode_get_parent() up
device property: Add functions for accessing node's parents device property: Add fwnode_get_name for returning the name of a node device property: Add a function to obtain a node's prefix lib/vsprintf: Remove support for %pF and %pf in favour of %pS and %ps lib/vsprintf: Make use of fwnode API to obtain node names and
separators
lib/vsprintf: OF nodes are first and foremost, struct device_nodes lib/vsprintf: Add %pfw conversion specifier for printing fwnode names lib/test_printf: Add tests for %pfw printk modifier
Documentation/core-api/printk-formats.rst | 34 ++++++--- drivers/acpi/property.c | 48 +++++++++++++ drivers/base/property.c | 83 +++++++++++++++++++-- drivers/base/swnode.c | 55 +++++++++++++- drivers/of/property.c | 16 +++++ include/linux/fwnode.h | 4 ++ include/linux/property.h | 8 ++- lib/test_printf.c | 37 ++++++++++ lib/vsprintf.c | 88 ++++++++++++++--------- scripts/checkpatch.pl | 4 +- 10 files changed, 319 insertions(+), 58 deletions(-)
Signature · 1 line
2.20.1
Sakari Ailus
reviewerPATCH v5 1/11 software node: Get reference to parent swnode in get_parent op
The software_node_get_parent() returned a pointer to the parent swnode, but did not take a reference to it, leading the caller to put a reference that was not taken. Take that reference now.
--- drivers/base/swnode.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/base/swnode.c +4 -1
@@ -520,7 +520,10 @@ software_node_get_parent(const struct fwnode_handle *fwnode) {struct swnode *swnode =to_swnode (fwnode); -return swnode ? (swnode->parent ? &swnode->parent->fwnode :NULL ) :NULL ; +if (!swnode || !swnode->parent) +return NULL ; + +return fwnode_handle_get (&swnode->parent->fwnode); } static struct fwnode_handle *
Signature · 1 line
2.20.1
Sakari Ailus
reviewerPATCH v5 2/11 software node: Make argument to to_software_node const
In reply to Sakari Ailusto_software_node() does not need to modify the fwnode_handle it operates on; therefore make it const. This allows passing a const fwnode_handle to to_software_node().
--- drivers/base/swnode.c | 4 ++-- include/linux/property.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-)
drivers/base/swnode.c +2 -2
@@ -71,9 +71,9 @@ software_node_to_swnode(const struct software_node *node)return swnode; } -const struct software_node *to_software_node (struct fwnode_handle *fwnode) +const struct software_node *to_software_node (const struct fwnode_handle *fwnode) { -struct swnode *swnode =to_swnode (fwnode); +const struct swnode *swnode =to_swnode (fwnode);return swnode ? swnode->node :NULL ; }
include/linux/property.h +2 -1
@@ -418,7 +418,8 @@ struct software_node { };bool is_software_node (const struct fwnode_handle *fwnode); -const struct software_node *to_software_node (struct fwnode_handle *fwnode); +const struct software_node * +to_software_node (const struct fwnode_handle *fwnode);struct fwnode_handle *software_node_fwnode (const struct software_node *node);int software_node_register_nodes (const struct software_node *nodes);
Signature · 1 line
2.20.1
Sakari Ailus
reviewerPATCH v5 3/11 device property: Move fwnode_get_parent() up
In reply to Sakari AilusMove fwnode_get_parent() above fwnode_get_next_parent(), making the order the same as in the header file.
--- drivers/base/property.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
drivers/base/property.c +13 -13
@@ -556,6 +556,19 @@ int device_add_properties(struct device *dev, }EXPORT_SYMBOL_GPL (device_add_properties); +/** +* fwnode_get_parent - Return parent firwmare node +* @fwnode: Firmware whose parent is retrieved +* +* Return parent firmware node of the given node if possible or %NULL if no +* parent was available. +*/ +struct fwnode_handle *fwnode_get_parent (const struct fwnode_handle *fwnode) +{ +return fwnode_call_ptr_op (fwnode, get_parent); +} +EXPORT_SYMBOL_GPL (fwnode_get_parent); +/** * fwnode_get_next_parent - Iterate to the node's parent * @fwnode: Firmware whose parent is retrieved
@@ -577,19 +590,6 @@ struct fwnode_handle *fwnode_get_next_parent(struct fwnode_handle *fwnode) }EXPORT_SYMBOL_GPL (fwnode_get_next_parent); -/** -* fwnode_get_parent - Return parent firwmare node -* @fwnode: Firmware whose parent is retrieved -* -* Return parent firmware node of the given node if possible or %NULL if no -* parent was available. -*/ -struct fwnode_handle *fwnode_get_parent (const struct fwnode_handle *fwnode) -{ -return fwnode_call_ptr_op (fwnode, get_parent); -} -EXPORT_SYMBOL_GPL (fwnode_get_parent); -/** * fwnode_get_next_child_node - Return the next child node handle for a node * @fwnode: Firmware node to find the next child node for.
Signature · 1 line
2.20.1
Sakari Ailus
reviewerPATCH v5 4/11 device property: Add functions for accessing node's parents
In reply to Sakari AilusAdd two convenience functions for accessing node's parents:
fwnode_count_parents() returns the number of parent nodes a given node has. fwnode_get_nth_parent() returns node's parent at a given distance from the node itself.
--- drivers/base/property.c | 46 ++++++++++++++++++++++++++++++++++++++++ include/linux/property.h | 3 +++ 2 files changed, 49 insertions(+)
drivers/base/property.c +46 -0
@@ -590,6 +590,52 @@ struct fwnode_handle *fwnode_get_next_parent(struct fwnode_handle *fwnode) }EXPORT_SYMBOL_GPL (fwnode_get_next_parent); +/** +* fwnode_count_parents - Return the number of parents a node has +* @fwnode: The node the parents of which are to be counted +* +* Returns the number of parents a node has. +*/ +unsigned int fwnode_count_parents (const struct fwnode_handle *fwnode) +{ +struct fwnode_handle *__fwnode; +unsigned int count; + + __fwnode =fwnode_get_parent (fwnode); + +for (count =0 ; __fwnode; count++) + __fwnode =fwnode_get_next_parent (__fwnode); + +return count; +} +EXPORT_SYMBOL_GPL (fwnode_count_parents); + +/** +* fwnode_get_nth_parent - Return an nth parent of a node +* @fwnode: The node the parent of which is requested +* @depth: Distance of the parent from the node +* +* Returns the nth parent of a node. If there is no parent at the requested +* @depth, %NULL is returned. If @depth is 0, the functionality is equivalent to +* fwnode_handle_get(). For @depth == 1, it is fwnode_get_parent() and so on. +* +* The caller is responsible for calling fwnode_handle_put() for the returned +* node. +*/ +struct fwnode_handle *fwnode_get_nth_parent (struct fwnode_handle *fwnode, +unsigned int depth) +{ +unsigned int i; + +fwnode_handle_get (fwnode); + +for (i =0 ; i < depth && fwnode; i++) + fwnode =fwnode_get_next_parent (fwnode); + +return fwnode; +} +EXPORT_SYMBOL_GPL (fwnode_get_nth_parent); +/** * fwnode_get_next_child_node - Return the next child node handle for a node * @fwnode: Firmware node to find the next child node for.
include/linux/property.h +3 -0
@@ -83,6 +83,9 @@ struct fwnode_handle *fwnode_find_reference(const struct fwnode_handle *fwnode,struct fwnode_handle *fwnode_get_parent (const struct fwnode_handle *fwnode);struct fwnode_handle *fwnode_get_next_parent (struct fwnode_handle *fwnode); +unsigned int fwnode_count_parents (const struct fwnode_handle *fwn); +struct fwnode_handle *fwnode_get_nth_parent (struct fwnode_handle *fwn, +unsigned int depth);struct fwnode_handle *fwnode_get_next_child_node (const struct fwnode_handle *fwnode,struct fwnode_handle *child); struct fwnode_handle *fwnode_get_next_available_child_node(
Signature · 1 line
2.20.1
Sakari Ailus
reviewerPATCH v5 5/11 device property: Add fwnode_get_name for returning the name of a node
In reply to Sakari AilusThe fwnode framework did not have means to obtain the name of a node. Add that now, in form of the fwnode_get_name() function and a corresponding get_name fwnode op. OF and ACPI support is included.
--- drivers/acpi/property.c | 26 ++++++++++++++++++++++++++ drivers/base/property.c | 11 +++++++++++ drivers/base/swnode.c | 20 ++++++++++++++++++++ drivers/of/property.c | 6 ++++++ include/linux/fwnode.h | 2 ++ include/linux/property.h | 1 + 6 files changed, 66 insertions(+)
drivers/acpi/property.c +26 -0
@@ -1311,6 +1311,31 @@ acpi_fwnode_get_reference_args(const struct fwnode_handle *fwnode, args_count, args); } +static const char *acpi_fwnode_get_name (const struct fwnode_handle *fwnode) +{ +const struct acpi_device *adev; +struct fwnode_handle *parent; + +/* Is this the root node? */ + parent =fwnode_get_parent (fwnode); +if (!parent) +return "\\" ; + +fwnode_handle_put (parent); + +if (is_acpi_data_node (fwnode)) { +const struct acpi_data_node *dn =to_acpi_data_node (fwnode); + +return dn->name; + } + + adev =to_acpi_device_node (fwnode); +if (WARN_ON (!adev)) +return NULL ; + +return acpi_device_bid (adev); +} +static struct fwnode_handle *acpi_fwnode_get_parent (struct fwnode_handle *fwnode) {
@@ -1351,6 +1376,7 @@ acpi_fwnode_device_get_match_data(const struct fwnode_handle *fwnode, .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_name = acpi_fwnode_get_name, \ .get_reference_args = acpi_fwnode_get_reference_args, \ .graph_get_next_endpoint = \ acpi_graph_get_next_endpoint, \
drivers/base/property.c +11 -0
@@ -556,6 +556,17 @@ int device_add_properties(struct device *dev, }EXPORT_SYMBOL_GPL (device_add_properties); +/** +* fwnode_get_name - Return the name of a node +* @fwnode: The firmware node +* +* Returns a pointer to the node name. +*/ +const char *fwnode_get_name (const struct fwnode_handle *fwnode) +{ +return fwnode_call_ptr_op (fwnode, get_name); +} +/** * fwnode_get_parent - Return parent firwmare node * @fwnode: Firmware whose parent is retrieved
drivers/base/swnode.c +20 -0
@@ -515,6 +515,25 @@ static int software_node_read_string_array(const struct fwnode_handle *fwnode, propname, val, nval); } +static const char * +software_node_get_name (const struct fwnode_handle *fwnode) +{ +const struct software_node *softnode =to_software_node (fwnode); +const struct swnode *swnode =software_node_to_swnode (softnode); +struct fwnode_handle *parent; + +if (!swnode) +return "(null)" ; + + parent =fwnode_get_parent (&swnode->fwnode); +if (!parent) +return "" ; + +fwnode_handle_put (parent); + +return kobject_name (&swnode->kobj); +} +static struct fwnode_handle *software_node_get_parent (const struct fwnode_handle *fwnode) {
@@ -615,6 +634,7 @@ static const struct fwnode_operations software_node_ops = { .property_present = software_node_property_present, .property_read_int_array = software_node_read_int_array, .property_read_string_array = software_node_read_string_array, + .get_name = software_node_get_name, .get_parent = software_node_get_parent, .get_next_child_node = software_node_get_next_child, .get_named_child_node = software_node_get_named_child_node,
drivers/of/property.c +6 -0
@@ -872,6 +872,11 @@ of_fwnode_property_read_string_array(const struct fwnode_handle *fwnode,of_property_count_strings (node, propname); } +static const char *of_fwnode_get_name (const struct fwnode_handle *fwnode) +{ +return kbasename (to_of_node (fwnode)->full_name); +} +static struct fwnode_handle *of_fwnode_get_parent (const struct fwnode_handle *fwnode) {
@@ -993,6 +998,7 @@ const struct fwnode_operations of_fwnode_ops = { .property_present = of_fwnode_property_present, .property_read_int_array = of_fwnode_property_read_int_array, .property_read_string_array = of_fwnode_property_read_string_array, + .get_name = of_fwnode_get_name, .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,
include/linux/fwnode.h +2 -0
@@ -56,6 +56,7 @@ struct fwnode_reference_args {* otherwise. * @property_read_string_array: Read an array of string properties. Return zero * on success, a negative error code otherwise. +* @get_name: Return the name of an fwnode. * @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.
@@ -82,6 +83,7 @@ struct fwnode_operations { (*property_read_string_array)(const struct fwnode_handle *fwnode_handle, const char *propname, const char **val, size_t nval); +const char *(*get_name)(const struct fwnode_handle *fwnode);struct fwnode_handle *(*get_parent)(const struct fwnode_handle *fwnode);struct fwnode_handle * (*get_next_child_node)(const struct fwnode_handle *fwnode,
include/linux/property.h +1 -0
@@ -80,6 +80,7 @@ struct fwnode_handle *fwnode_find_reference(const struct fwnode_handle *fwnode,const char *name, unsigned int index); +const char *fwnode_get_name (const struct fwnode_handle *fwnode);struct fwnode_handle *fwnode_get_parent (const struct fwnode_handle *fwnode);struct fwnode_handle *fwnode_get_next_parent (struct fwnode_handle *fwnode);
Signature · 1 line
2.20.1
Heikki Krogerus
reviewerRe: [PATCH v5 05/11] device property: Add fwnode_get_name for returning the name of a node
Hi Sakari,
drivers/base/swnode.c static int software_node_read_string_array(const struct fwnode_handle *fwnode, · line 522
Quoted 13 lines · Sakari Ailus
drivers/base/swnode.c +5
-0@@ -515,6 +515,25 @@ static int software_node_read_string_array(const struct fwnode_handle *fwnode, propname, val, nval); } +static const char * +software_node_get_name (const struct fwnode_handle *fwnode) +{ +const struct software_node *softnode =to_software_node (fwnode); +const struct swnode *swnode =software_node_to_swnode (softnode);
Why not just:
struct swnode *swnode = to_swnode(fwnode);
drivers/base/swnode.c static int software_node_read_string_array(const struct fwnode_handle *fwnode, · line 530
Quoted 8 lines
drivers/base/swnode.c +8
-0+struct fwnode_handle *parent; + +if (!swnode) +return "(null)" ; + + parent =fwnode_get_parent (&swnode->fwnode); +if (!parent) +return "" ;
Please note that there is no root software node object (the kset is the root), so you will get "" with most nodes. I'm assuming that is not the intention, or is it?
Quoted 9 lines
drivers/base/swnode.c +5
-0+fwnode_handle_put (parent); + +return kobject_name (&swnode->kobj); +} +static struct fwnode_handle *software_node_get_parent (const struct fwnode_handle *fwnode) {
drivers/base/swnode.c static const struct fwnode_operations software_node_ops = { · line 640
Quoted 7 lines
drivers/base/swnode.c +1
-0@@ -615,6 +634,7 @@ static const struct fwnode_operations software_node_ops = { .property_present = software_node_property_present, .property_read_int_array = software_node_read_int_array, .property_read_string_array = software_node_read_string_array, + .get_name = software_node_get_name, .get_parent = software_node_get_parent, .get_next_child_node = software_node_get_next_child, .get_named_child_node = software_node_get_named_child_node,
thanks,
Signature · 1 line
heikki
Sakari Ailus
reviewerRe: [PATCH v5 05/11] device property: Add fwnode_get_name for returning the name of a node
Moi,
Thanks for the comments.
Quoted 19 lines · Heikki Krogerus
Hi Sakari,
drivers/base/swnode.c static int software_node_read_string_array(const struct fwnode_handle *fwnode, · line 522
Quoted 13 lines · Sakari Ailus
drivers/base/swnode.c +5
-0@@ -515,6 +515,25 @@ static int software_node_read_string_array(const struct fwnode_handle *fwnode, propname, val, nval); } +static const char * +software_node_get_name (const struct fwnode_handle *fwnode) +{ +const struct software_node *softnode =to_software_node (fwnode); +const struct swnode *swnode =software_node_to_swnode (softnode);Why not just:
Quoted 1 line
struct swnode *swnode = to_swnode(fwnode);
Fixed.
Quoted 13 lines
drivers/base/swnode.c static int software_node_read_string_array(const struct fwnode_handle *fwnode, · line 530
Quoted 9 lines
drivers/base/swnode.c +8
-0+struct fwnode_handle *parent; + +if (!swnode) +return "(null)" ; + + parent =fwnode_get_parent (&swnode->fwnode); +if (!parent) +return "" ;Please note that there is no root software node object (the kset is the root), so you will get "" with most nodes. I'm assuming that is not the intention, or is it?
Good point.
In practice this will happen rarely outside the tests, but indeed the root node would usually not be a software node. I'll drop the above three lines checking for the parent node, and change nodes created in the test accordingly.
Signature · 4 lines
Terveisin, Sakari Ailus [email protected]
Sakari Ailus
reviewerPATCH v5 6/11 device property: Add a function to obtain a node's prefix
In reply to Sakari AilusThe prefix is used for printing purpose before a node, and it also works as a separator between two nodes.
--- drivers/acpi/property.c | 22 ++++++++++++++++++++++ drivers/base/property.c | 12 ++++++++++++ drivers/base/swnode.c | 26 ++++++++++++++++++++++++++ drivers/of/property.c | 10 ++++++++++ include/linux/fwnode.h | 2 ++ include/linux/property.h | 1 + 6 files changed, 73 insertions(+)
drivers/acpi/property.c +22 -0
@@ -1336,6 +1336,27 @@ static const char *acpi_fwnode_get_name(const struct fwnode_handle *fwnode)return acpi_device_bid (adev); } +static const char * +acpi_fwnode_get_name_prefix (const struct fwnode_handle *fwnode) +{ +struct fwnode_handle *parent; + +/* Is this the root node? */ + parent =fwnode_get_parent (fwnode); +if (!parent) +return "" ; + +/* Is this 2nd node from the root? */ + parent =fwnode_get_next_parent (parent); +if (!parent) +return "" ; + +fwnode_handle_put (parent); + +/* ACPI device or data node. */ +return "." ; +} +static struct fwnode_handle *acpi_fwnode_get_parent (struct fwnode_handle *fwnode) {
@@ -1377,6 +1398,7 @@ acpi_fwnode_device_get_match_data(const struct fwnode_handle *fwnode, .get_next_child_node = acpi_get_next_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, \ .get_reference_args = acpi_fwnode_get_reference_args, \ .graph_get_next_endpoint = \ acpi_graph_get_next_endpoint, \
drivers/base/property.c +12 -0
@@ -567,6 +567,18 @@ const char *fwnode_get_name(const struct fwnode_handle *fwnode)return fwnode_call_ptr_op (fwnode, get_name); } +/** +* fwnode_get_name_prefix - Return the prefix of node for printing purposes +* @fwnode: The firmware node +* +* Returns the prefix of a node, intended to be printed right before the node. +* The prefix works also as a separator between the nodes. +*/ +const char *fwnode_get_name_prefix (const struct fwnode_handle *fwnode) +{ +return fwnode_call_ptr_op (fwnode, get_name_prefix); +} +/** * fwnode_get_parent - Return parent firwmare node * @fwnode: Firmware whose parent is retrieved
drivers/base/swnode.c +26 -0
@@ -534,6 +534,31 @@ software_node_get_name(const struct fwnode_handle *fwnode)return kobject_name (&swnode->kobj); } +static const char * +software_node_get_name_prefix (const struct fwnode_handle *fwnode) +{ +struct fwnode_handle *parent; +const char *prefix; + + parent =fwnode_get_parent (fwnode); +if (!parent) +return "" ; + + parent =fwnode_get_next_parent (parent); +if (!parent) +return "/" ; + +/* Figure out the prefix from the parents. */ +while (is_software_node (parent)) + parent =fwnode_get_next_parent (parent); + + prefix =fwnode_get_name_prefix (parent); +fwnode_handle_put (parent); + +/* Guess something if prefix was NULL. */ +return prefix ?:"/" ; +} +static struct fwnode_handle *software_node_get_parent (const struct fwnode_handle *fwnode) {
@@ -635,6 +660,7 @@ static const struct fwnode_operations software_node_ops = { .property_read_int_array = software_node_read_int_array, .property_read_string_array = software_node_read_string_array, .get_name = software_node_get_name, + .get_name_prefix = software_node_get_name_prefix, .get_parent = software_node_get_parent, .get_next_child_node = software_node_get_next_child, .get_named_child_node = software_node_get_named_child_node,
drivers/of/property.c +10 -0
@@ -877,6 +877,15 @@ static const char *of_fwnode_get_name(const struct fwnode_handle *fwnode)return kbasename (to_of_node (fwnode)->full_name); } +static const char *of_fwnode_get_name_prefix (const struct fwnode_handle *fwnode) +{ +/* Root needs no prefix here (its name is "/"). */ +if (!to_of_node (fwnode)->parent) +return "" ; + +return "/" ; +} +static struct fwnode_handle *of_fwnode_get_parent (const struct fwnode_handle *fwnode) {
@@ -999,6 +1008,7 @@ const struct fwnode_operations of_fwnode_ops = { .property_read_int_array = of_fwnode_property_read_int_array, .property_read_string_array = of_fwnode_property_read_string_array, .get_name = of_fwnode_get_name, + .get_name_prefix = of_fwnode_get_name_prefix, .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,
include/linux/fwnode.h +2 -0
@@ -57,6 +57,7 @@ struct fwnode_reference_args {* @property_read_string_array: Read an array of string properties. Return zero * on success, a negative error code otherwise. * @get_name: Return the name of an fwnode. +* @get_name_prefix: Get a prefix for a node (for printing purposes). * @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.
@@ -84,6 +85,7 @@ struct fwnode_operations { const char *propname, const char **val, size_t nval);const char *(*get_name)(const struct fwnode_handle *fwnode); +const char *(*get_name_prefix)(const struct fwnode_handle *fwnode);struct fwnode_handle *(*get_parent)(const struct fwnode_handle *fwnode);struct fwnode_handle * (*get_next_child_node)(const struct fwnode_handle *fwnode,
include/linux/property.h +1 -0
@@ -81,6 +81,7 @@ struct fwnode_handle *fwnode_find_reference(const struct fwnode_handle *fwnode, unsigned int index);const char *fwnode_get_name (const struct fwnode_handle *fwnode); +const char *fwnode_get_name_prefix (const struct fwnode_handle *fwnode);struct fwnode_handle *fwnode_get_parent (const struct fwnode_handle *fwnode);struct fwnode_handle *fwnode_get_next_parent (struct fwnode_handle *fwnode);
Signature · 1 line
2.20.1
Sakari Ailus
reviewerPATCH v5 7/11 lib/vsprintf: Remove support for %pF and %pf in favour of %pS and %ps
In reply to Sakari Ailus%pS and %ps are now the preferred conversion specifiers to print function names. The functionality is equivalent; remove the old, deprecated %pF and %pf support.
--- Documentation/core-api/printk-formats.rst | 10 ---------- lib/vsprintf.c | 8 ++------ scripts/checkpatch.pl | 1 - 3 files changed, 2 insertions(+), 17 deletions(-)
Documentation/core-api/printk-formats.rst +0 -10
@@ -86,8 +86,6 @@ Symbols/Function Pointers %pS versatile_init+0x0/0x110 %ps versatile_init - %pF versatile_init+0x0/0x110 - %pf versatile_init %pSR versatile_init+0x9/0x110 (with __builtin_extract_return_addr() translation) %pB prev_fn_of_versatile_init+0x88/0x88
@@ -97,14 +95,6 @@ The ``S`` and ``s`` specifiers are used for printing a pointer in symbolic format. They result in the symbol name with (S) or without (s) offsets. If KALLSYMS are disabled then the symbol address is printed instead. -Note, that the ``F`` and ``f`` specifiers are identical to ``S`` (``s``) -and thus deprecated. We have ``F`` and ``f`` because on ia64, ppc64 and -parisc64 function pointers are indirect and, in fact, are function -descriptors, which require additional dereferencing before we can lookup -the symbol. As of now, ``S`` and ``s`` perform dereferencing on those -platforms (when needed), so ``F`` and ``f`` exist for compatibility -reasons only. - The ``B`` specifier results in the symbol name with offsets and should be used when printing stack backtraces. The specifier takes into consideration the effect of compiler optimisations which may occur
lib/vsprintf.c +2 -6
@@ -909,7 +909,7 @@ char *symbol_string(char *buf, char *end, void *ptr,#ifdef CONFIG_KALLSYMS if (*fmt =='B' )sprint_backtrace (sym, value); -else if (*fmt !='f' && *fmt !='s' ) +else if (*fmt !='s' )sprint_symbol (sym, value);else sprint_symbol_no_offset (sym, value);
@@ -2007,9 +2007,7 @@ static char *kobject_string(char *buf, char *end, void *ptr,* * - 'S' For symbolic direct pointers (or function descriptors) with offset * - 's' For symbolic direct pointers (or function descriptors) without offset -* - 'F' Same as 'S' -* - 'f' Same as 's' -* - '[FfSs]R' as above with __builtin_extract_return_addr() translation +* - '[Ss]R' as above with __builtin_extract_return_addr() translation * - 'B' For backtraced symbolic direct pointers with offset * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref] * - 'r' For raw struct resource, e.g., [mem 0x0-0x1f flags 0x201]
@@ -2112,8 +2110,6 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr, struct printf_spec spec) {switch (*fmt) { -case 'F' : -case 'f' :case 'S' :case 's' : ptr =dereference_symbol_descriptor (ptr);
scripts/checkpatch.pl +0 -1
@@ -6012,7 +6012,6 @@ sub process { my $ext_type = "Invalid"; my $use = ""; if ($bad_specifier =~ /p[Ff]/) { - $ext_type = "Deprecated"; $use = " - use %pS instead"; $use =~ s/pS/ps/ if ($bad_specifier =~ /pf/); }
Signature · 1 line
2.20.1
Sakari Ailus
reviewerPATCH v5 8/11 lib/vsprintf: Make use of fwnode API to obtain node names and separators
In reply to Sakari AilusInstead of implementing our own means of discovering parent nodes, node names or counting how many parents a node has, use the newly added functions in the fwnode API to obtain that information.
--- lib/vsprintf.c | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-)
lib/vsprintf.c +16 -22
@@ -38,6 +38,7 @@#include <net/addrconf.h> #include <linux/siphash.h> #include <linux/compiler.h> +#include <linux/property.h> #ifdef CONFIG_BLOCK #include <linux/blkdev.h> #endif
@@ -1863,32 +1864,24 @@ char *flags_string(char *buf, char *end, void *flags_ptr,return format_flags (buf, end, flags, names); } -static const char *device_node_name_for_depth (const struct device_node *np,int depth) -{ -for ( ; np && depth; depth--) - np = np->parent; - -return kbasename (np->full_name); -} -static noinline_for_stack -char *device_node_gen_full_name(const struct device_node *np, char *buf, char *end) +char *fwnode_full_name_string(struct fwnode_handle *fwnode, char *buf, +char *end) {int depth; -const struct device_node *parent = np->parent; -/* special case for root node */ -if (!parent) -return string_nocheck (buf, end,"/" , default_str_spec); +for (depth =fwnode_count_parents (fwnode); depth >=0 ; depth--) { +struct fwnode_handle *__fwnode = +fwnode_get_nth_parent (fwnode, depth); -for (depth =0 ; parent->parent; depth++) - parent = parent->parent; - -for ( ; depth >=0 ; depth--) { - buf =string_nocheck (buf, end,"/" , default_str_spec); - buf =string (buf, end,device_node_name_for_depth (np, depth), + buf =string (buf, end,fwnode_get_name_prefix (__fwnode), + default_str_spec); + buf =string (buf, end,fwnode_get_name (__fwnode), default_str_spec); + +fwnode_handle_put (__fwnode); } +return buf; }
@@ -1933,10 +1926,11 @@ char *device_node_string(char *buf, char *end, struct device_node *dn,switch (*fmt) {case 'f' :/* full_name */ - buf =device_node_gen_full_name (dn, buf, end); + buf =fwnode_full_name_string (of_fwnode_handle (dn), buf, + end);break ;case 'n' :/* name */ - p =kbasename (of_node_full_name (dn)); + p =fwnode_get_name (of_fwnode_handle (dn)); precision = str_spec.precision; str_spec.precision =strchrnul (p,'@' ) - p; buf =string (buf, end, p, str_spec);
@@ -1946,7 +1940,7 @@ char *device_node_string(char *buf, char *end, struct device_node *dn, buf =number (buf, end, (unsigned int )dn->phandle, num_spec);break ;case 'P' :/* path-spec */ - p =kbasename (of_node_full_name (dn)); + p =fwnode_get_name (of_fwnode_handle (dn));if (!p[1 ]) p ="/" ; buf =string (buf, end, p, str_spec);
Signature · 1 line
2.20.1
Sakari Ailus
reviewerPATCH v5 9/11 lib/vsprintf: OF nodes are first and foremost, struct device_nodes
In reply to Sakari AilusFactor out static kobject_string() function that simply calls device_node_string(), and thus remove references to kobjects (as these are struct device_node).
--- lib/vsprintf.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)
lib/vsprintf.c +4 -12
@@ -1905,6 +1905,9 @@ char *device_node_string(char *buf, char *end, struct device_node *dn,struct printf_spec str_spec = spec; str_spec.field_width =-1 ; +if (fmt[0 ] !='F' ) +return error_string (buf, end,"(%pO?)" , spec); +if (!IS_ENABLED (CONFIG_OF ))return error_string (buf, end,"(%pOF?)" , spec);
@@ -1978,17 +1981,6 @@ char *device_node_string(char *buf, char *end, struct device_node *dn,return widen_string (buf, buf - buf_start, end, spec); } -static char *kobject_string (char *buf,char *end,void *ptr, -struct printf_spec spec,const char *fmt) -{ -switch (fmt[1 ]) { -case 'F' : -return device_node_string (buf, end, ptr, spec, fmt +1 ); - } - -return error_string (buf, end,"(%pO?)" , spec); -} -/* * Show a '%p' thing. A kernel extension is that the '%p' is followed * by an extra set of alphanumeric characters that are extended format
@@ -2167,7 +2159,7 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,case 'G' :return flags_string (buf, end, ptr, spec, fmt);case 'O' : -return kobject_string (buf, end, ptr, spec, fmt); +return device_node_string (buf, end, ptr, spec, fmt +1 );case 'x' :return pointer_string (buf, end, ptr, spec); }
Signature · 1 line
2.20.1
Re: [PATCH v5 09/11] lib/vsprintf: OF nodes are first and foremost, struct device_nodes
Quoted 43 lines · Sakari Ailus
Factor out static
kobject_string()function that simply callsdevice_node_string(), and thus remove references to kobjects (as these are structdevice_node).Signed-off-by Sakari Ailus <[email protected]>Reviewed-by Andy Shevchenko <[email protected]>--- lib/vsprintf.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)lib/vsprintf.c +3
-11@@ -1905,6 +1905,9 @@ char *device_node_string(char *buf, char *end, struct device_node *dn,struct printf_spec str_spec = spec; str_spec.field_width =-1 ; +if (fmt[0 ] !='F' ) +return error_string (buf, end,"(%pO?)" , spec); +if (!IS_ENABLED (CONFIG_OF ))return error_string (buf, end,"(%pOF?)" , spec);@@ -1978,17 +1981,6 @@ char *device_node_string(char *buf, char *end, struct device_node *dn,return widen_string (buf, buf - buf_start, end, spec); } -static char *kobject_string (char *buf,char *end,void *ptr, -struct printf_spec spec,const char *fmt) -{ -switch (fmt[1 ]) { -case 'F' : -return device_node_string (buf, end, ptr, spec, fmt +1 ); - } - -return error_string (buf, end,"(%pO?)" , spec); -} -/* * Show a '%p' thing. A kernel extension is that the '%p' is followed * by an extra set of alphanumeric characters that are extended format
lib/vsprintf.c char *pointer(const char *fmt, char *buf, char *end, void *ptr, · line 2162
Quoted 5 lines
lib/vsprintf.c +1
-1@@ -2167,7 +2159,7 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,case 'G' :return flags_string (buf, end, ptr, spec, fmt);case 'O' : -return kobject_string (buf, end, ptr, spec, fmt); +return device_node_string (buf, end, ptr, spec, fmt +1 );
I know that this come from from kobject_string(). But please, modify it to follow the style used by other %p modifiers. I mean to pass "fmt" as is and then use:
if (fmt[1] != 'F')
With the above change:
Best Regards,
Petr
Petr Mladek
maintainerRe: [PATCH v5 09/11] lib/vsprintf: OF nodes are first and foremost, struct device_nodes
Quoted 54 lines · Petr Mladek
Quoted 43 lines · Sakari Ailus
Factor out static
kobject_string()function that simply callsdevice_node_string(), and thus remove references to kobjects (as these are structdevice_node).Signed-off-by Sakari Ailus <[email protected]>Reviewed-by Andy Shevchenko <[email protected]>--- lib/vsprintf.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)lib/vsprintf.c +3
-11@@ -1905,6 +1905,9 @@ char *device_node_string(char *buf, char *end, struct device_node *dn,struct printf_spec str_spec = spec; str_spec.field_width =-1 ; +if (fmt[0 ] !='F' ) +return error_string (buf, end,"(%pO?)" , spec); +if (!IS_ENABLED (CONFIG_OF ))return error_string (buf, end,"(%pOF?)" , spec);@@ -1978,17 +1981,6 @@ char *device_node_string(char *buf, char *end, struct device_node *dn,return widen_string (buf, buf - buf_start, end, spec); } -static char *kobject_string (char *buf,char *end,void *ptr, -struct printf_spec spec,const char *fmt) -{ -switch (fmt[1 ]) { -case 'F' : -return device_node_string (buf, end, ptr, spec, fmt +1 ); - } - -return error_string (buf, end,"(%pO?)" , spec); -} -/* * Show a '%p' thing. A kernel extension is that the '%p' is followed * by an extra set of alphanumeric characters that are extended format lib/vsprintf.c char *pointer(const char *fmt, char *buf, char *end, void *ptr, · line 2162
Quoted 5 lines
lib/vsprintf.c +1
-1@@ -2167,7 +2159,7 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,case 'G' :return flags_string (buf, end, ptr, spec, fmt);case 'O' : -return kobject_string (buf, end, ptr, spec, fmt); +return device_node_string (buf, end, ptr, spec, fmt +1 );I know that this come from from
kobject_string(). But please, modify it to follow the style used by other %p modifiers. I mean to pass "fmt" as is and then use:
Quoted 1 line
if (fmt[1] != 'F')
Ah, I see that it would need more changes in device_node_string(). OK, let's leave the patch as is. I am sorry for the noise.
Best Regards,
Petr
Andy Shevchenko
reviewerRe: [PATCH v5 09/11] lib/vsprintf: OF nodes are first and foremost, struct device_nodes
Quoted 13 lines · Petr Mladek
Quoted 12 lines · Petr Mladek
lib/vsprintf.c char *pointer(const char *fmt, char *buf, char *end, void *ptr, · line 2162
Quoted 6 lines · Sakari Ailus
Factor out static
kobject_string()function that simply callsdevice_node_string(), and thus remove references to kobjects (as these are structdevice_node).lib/vsprintf.c +1
-1-return kobject_string (buf, end, ptr, spec, fmt); +return device_node_string (buf, end, ptr, spec, fmt +1 );I know that this come from from
kobject_string(). But please, modify it to follow the style used by other %p modifiers. I mean to pass "fmt" as is and then use:
Quoted 4 lines
Quoted 1 line
if (fmt[1] != 'F')Ah, I see that it would need more changes in
device_node_string(). OK, let's leave the patch as is. I am sorry for the noise.
I came to the same conclusions, though can we consider to drop this patch?
Signature · 2 lines
With Best Regards, Andy Shevchenko
Sakari Ailus
reviewerRe: [PATCH v5 09/11] lib/vsprintf: OF nodes are first and foremost, struct device_nodes
Quoted 14 lines · Andy Shevchenko
Quoted 13 lines · Petr Mladek
Quoted 12 lines · Petr Mladek
lib/vsprintf.c char *pointer(const char *fmt, char *buf, char *end, void *ptr, · line 2162
Quoted 6 lines · Sakari Ailus
Factor out static
kobject_string()function that simply callsdevice_node_string(), and thus remove references to kobjects (as these are structdevice_node).lib/vsprintf.c +1
-1-return kobject_string (buf, end, ptr, spec, fmt); +return device_node_string (buf, end, ptr, spec, fmt +1 );I know that this come from from
kobject_string(). But please, modify it to follow the style used by other %p modifiers. I mean to pass "fmt" as is and then use:
Quoted 6 lines
Quoted 4 lines
Quoted 1 line
if (fmt[1] != 'F')Ah, I see that it would need more changes in
device_node_string(). OK, let's leave the patch as is. I am sorry for the noise.I came to the same conclusions, though can we consider to drop this patch?
It's a cleanup. I'd prefer to keep the patch.
Albeit fmt++; in device_node_string() would do the trick of avoiding fmt + 1 in the caller. That said, I'd prefer to keep the original patch as-is.
Signature · 2 lines
Sakari Ailus [email protected]
Sakari Ailus
reviewerPATCH v5 10/11 lib/vsprintf: Add %pfw conversion specifier for printing fwnode names
In reply to Sakari AilusAdd support for %pfw conversion specifier (with "f" and "P" modifiers) to support printing full path of the node, including its name ("f") and only the node's name ("P") in the printk family of functions. The two flags have equivalent functionality to existing %pOF with the same two modifiers ("f" and "P") on OF based systems. The ability to do the same on ACPI based systems is added by this patch.
On ACPI based systems the resulting strings look like
\[email protected]@0
where the nodes are separated by a dot (".") and the first three are ACPI device nodes and the latter two ACPI data nodes.
--- Documentation/core-api/printk-formats.rst | 24 +++++++++++++++ lib/vsprintf.c | 36 +++++++++++++++++++++++ scripts/checkpatch.pl | 3 +- 3 files changed, 62 insertions(+), 1 deletion(-)
Documentation/core-api/printk-formats.rst +24 -0
@@ -418,6 +418,30 @@ Examples:: Passed by reference. +Fwnode handles +-------------- + +:: + + %pfw[fP] + +For printing information on fwnode handles. The default is to print the full +node name, including the path. The modifiers are functionally equivalent to +%pOF above. + + - f - full name of the node, including the path + - P - the name of the node including an address (if there is one) + +Examples (ACPI): + + %pfwf \[email protected]@0 - Full node name + %pfwP endpoint@0 - Node name + +Examples (OF): + + %pfwf /ocp@68000000/i2c@48072000/camera@10/port/endpoint - Full name + %pfwP endpoint - Node name + Time and date (struct rtc_time) -------------------------------
lib/vsprintf.c +36 -0
@@ -1981,6 +1981,36 @@ char *device_node_string(char *buf, char *end, struct device_node *dn,return widen_string (buf, buf - buf_start, end, spec); } +static noinline_for_stack +char *fwnode_string(char *buf, char *end, struct fwnode_handle *fwnode, +struct printf_spec spec,const char *fmt) +{ +struct printf_spec str_spec = spec; +char *buf_start = buf; + + str_spec.field_width =-1 ; + +if (*fmt !='w' ) +return error_string (buf, end,"(%pfw?)" , spec); + +if (check_pointer (&buf, end, fwnode, spec)) +return buf; + + fmt++; + +switch (*fmt) { +case 'f' :/* full_name */ +default : + buf =fwnode_full_name_string (fwnode, buf, end); +break ; +case 'P' :/* name */ + buf =string (buf, end,fwnode_get_name (fwnode), str_spec); +break ; + } + +return widen_string (buf, buf - buf_start, end, spec); +} +/* * Show a '%p' thing. A kernel extension is that the '%p' is followed * by an extra set of alphanumeric characters that are extended format
@@ -2083,6 +2113,10 @@ char *device_node_string(char *buf, char *end, struct device_node *dn,* F device node flags * c major compatible string * C full compatible string +* - 'fw[fP]' For a firmware node (struct fwnode_handle) pointer +* Without an option prints the full name of the node +* f full name +* P node name, including a possible unit address * - 'x' For printing the address. Equivalent to "%lx". * * ** When making changes please also update:
@@ -2160,6 +2194,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,return flags_string (buf, end, ptr, spec, fmt);case 'O' :return device_node_string (buf, end, ptr, spec, fmt +1 ); +case 'f' : +return fwnode_string (buf, end, ptr, spec, fmt +1 );case 'x' :return pointer_string (buf, end, ptr, spec); }
scripts/checkpatch.pl +2 -1
@@ -5995,7 +5995,8 @@ sub process { while ($fmt =~ /(\%[\*\d\.]*p(\w))/g) { $specifier = $1; $extension = $2; - if ($extension !~ /[SsBKRraEhMmIiUDdgVCbGNOxt]/) { + if ($extension !~ /[SsBKRraEhMmIiUDdgVCbGNOxtf]/ || + $extension =~ /^f[^w]/) { $bad_specifier = $specifier; last; }
Signature · 1 line
2.20.1
Sakari Ailus
reviewerPATCH v5 11/11 lib/test_printf: Add tests for %pfw printk modifier
In reply to Sakari AilusAdd a test for the %pfw printk modifier using software nodes.
--- lib/test_printf.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+)
lib/test_printf.c +37 -0
@@ -22,6 +22,8 @@#include <linux/gfp.h> #include <linux/mm.h> +#include <linux/property.h> +#include "../tools/testing/selftests/kselftest_module.h" #define BUF_SIZE 256
@@ -588,6 +590,40 @@ flags(void)kfree (cmp_buffer); } +static void __init fwnode_pointer (void ) +{ +const struct software_node softnodes[] = { + { .name ="first" , }, + { .name ="second" , .parent = &softnodes[0 ], }, + { .name ="third" , .parent = &softnodes[1 ], }, + {NULL /* Guardian */ }, + }; +const char *const full_name ="/second/third" ; +const char *const full_name_second ="/second" ; +const char *const second_name ="second" ; +const char *const third_name ="third" ; +int rval; + + rval =software_node_register_nodes (softnodes); +if (rval) { +pr_warn ("cannot register softnodes; rval %d\n" , rval); +return ; + } + +test (full_name_second,"%pfw" , +software_node_fwnode (&softnodes[ARRAY_SIZE (softnodes) -3 ])); +test (full_name,"%pfw" , +software_node_fwnode (&softnodes[ARRAY_SIZE (softnodes) -2 ])); +test (full_name,"%pfwf" , +software_node_fwnode (&softnodes[ARRAY_SIZE (softnodes) -2 ])); +test (second_name,"%pfwP" , +software_node_fwnode (&softnodes[ARRAY_SIZE (softnodes) -3 ])); +test (third_name,"%pfwP" , +software_node_fwnode (&softnodes[ARRAY_SIZE (softnodes) -2 ])); + +software_node_unregister_nodes (softnodes); +} +static void __init test_pointer (void ) {
@@ -610,6 +646,7 @@ test_pointer(void)bitmap ();netdev_features ();flags (); +fwnode_pointer (); }static void __init selftest (void )
Signature · 1 line
2.20.1
Andy Shevchenko
reviewerRe: [PATCH v5 11/11] lib/test_printf: Add tests for %pfw printk modifier
lib/test_printf.c flags(void) · line 599
Quoted 9 lines · Sakari Ailus
Add a test for the %pfw printk modifier using software nodes.
lib/test_printf.c +7
-0+static void __init fwnode_pointer (void ) +{ +const struct software_node softnodes[] = { + { .name ="first" , }, + { .name ="second" , .parent = &softnodes[0 ], }, + { .name ="third" , .parent = &softnodes[1 ], }, + {NULL /* Guardian */ },
Comma is still here :-)
lib/test_printf.c flags(void) · line 622
Quoted 12 lines
lib/test_printf.c +11
-0+ }; +test (full_name_second,"%pfw" , +software_node_fwnode (&softnodes[ARRAY_SIZE (softnodes) -3 ])); +test (full_name,"%pfw" , +software_node_fwnode (&softnodes[ARRAY_SIZE (softnodes) -2 ])); +test (full_name,"%pfwf" , +software_node_fwnode (&softnodes[ARRAY_SIZE (softnodes) -2 ])); +test (second_name,"%pfwP" , +software_node_fwnode (&softnodes[ARRAY_SIZE (softnodes) -3 ])); +test (third_name,"%pfwP" , +software_node_fwnode (&softnodes[ARRAY_SIZE (softnodes) -2 ]));
I have another thought about these. The test cases will fail in either of adding, inserting or removing items in softnodes array. So, using the above "protective" scheme doesn't bring any value except making readability worse.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Sakari Ailus
reviewerRe: [PATCH v5 11/11] lib/test_printf: Add tests for %pfw printk modifier
Hi Andy,
Quoted 12 lines · Andy Shevchenko
lib/test_printf.c flags(void) · line 599
Quoted 9 lines · Sakari Ailus
Add a test for the %pfw printk modifier using software nodes.
lib/test_printf.c +7
-0+static void __init fwnode_pointer (void ) +{ +const struct software_node softnodes[] = { + { .name ="first" , }, + { .name ="second" , .parent = &softnodes[0 ], }, + { .name ="third" , .parent = &softnodes[1 ], }, + {NULL /* Guardian */ },Comma is still here :-)
Oops. I ended up removing the comma in a wrong patch which wasn't submitted to the list. Will fix for v6.
Quoted 17 lines
lib/test_printf.c flags(void) · line 622
Quoted 13 lines
lib/test_printf.c +11
-0+ }; +test (full_name_second,"%pfw" , +software_node_fwnode (&softnodes[ARRAY_SIZE (softnodes) -3 ])); +test (full_name,"%pfw" , +software_node_fwnode (&softnodes[ARRAY_SIZE (softnodes) -2 ])); +test (full_name,"%pfwf" , +software_node_fwnode (&softnodes[ARRAY_SIZE (softnodes) -2 ])); +test (second_name,"%pfwP" , +software_node_fwnode (&softnodes[ARRAY_SIZE (softnodes) -3 ])); +test (third_name,"%pfwP" , +software_node_fwnode (&softnodes[ARRAY_SIZE (softnodes) -2 ]));I have another thought about these. The test cases will fail in either of adding, inserting or removing items in softnodes array. So, using the above "protective" scheme doesn't bring any value except making readability worse.
Agreed, to be addressed in v6.
Signature · 4 lines
Regards, Sakari Ailus [email protected]
Andy Shevchenko
reviewerRe: [PATCH v5 11/11] lib/test_printf: Add tests for %pfw printk modifier
Quoted 14 lines · Sakari Ailus
Quoted 12 lines · Andy Shevchenko
lib/test_printf.c flags(void) · line 599
Quoted 9 lines · Sakari Ailus
Add a test for the %pfw printk modifier using software nodes.
lib/test_printf.c +7
-0+static void __init fwnode_pointer (void ) +{ +const struct software_node softnodes[] = { + { .name ="first" , }, + { .name ="second" , .parent = &softnodes[0 ], }, + { .name ="third" , .parent = &softnodes[1 ], }, + {NULL /* Guardian */ },Comma is still here :-)
Quoted 2 lines
Oops. I ended up removing the comma in a wrong patch which wasn't submitted to the list. Will fix for v6.
Also you may remove NULL there since it's default.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Sakari Ailus
reviewerRe: [PATCH v5 11/11] lib/test_printf: Add tests for %pfw printk modifier
Quoted 15 lines · Andy Shevchenko
Quoted 14 lines · Sakari Ailus
Quoted 12 lines · Andy Shevchenko
lib/test_printf.c flags(void) · line 599
Quoted 9 lines · Sakari Ailus
Add a test for the %pfw printk modifier using software nodes.
lib/test_printf.c +7
-0+static void __init fwnode_pointer (void ) +{ +const struct software_node softnodes[] = { + { .name ="first" , }, + { .name ="second" , .parent = &softnodes[0 ], }, + { .name ="third" , .parent = &softnodes[1 ], }, + {NULL /* Guardian */ },Comma is still here :-)
Quoted 4 lines
Quoted 2 lines
Oops. I ended up removing the comma in a wrong patch which wasn't submitted to the list. Will fix for v6.
Also you may remove NULL there since it's default.
Then it'd become GCC specific. Albeit I'm not sure that's any kind of a problem in practice. I guess Clang must cope with that, too? Still, I prefer not to use compiler specific syntax if there's no need to.
Signature · 2 lines
Sakari Ailus [email protected]
Joe Perches
maintainerQuoted 8 lines · Sakari Ailus
Hi all,
This set adds functionality into the device property API (counting a node's parents as well as obtaining its name) in order to support printing fwnode names using a new conversion specifier "%pfw". The names that are produced are equivalent to its OF counterpart "%pOF" on OF systems for the two supported modifiers ("f" and "P").
Quoted 5 lines
Printing a node's name is something that's been available on OF for a long time and if something is converted to device property API (such as the V4L2 fwnode framework) it always got removed of a nice feature that was sometimes essential in debugging. With this set, that no longer is the case.
Doesn't this still have dependencies on removing all existing %p[fF] uses?
In Linus' tree:
tools/lib/traceevent/Documentation/libtraceevent-func_apis.txt:or events have "%pF" or "%pS" parameter in its format string. It is common totools/lib/traceevent/event-parse.c: if (asprintf(&format, "%%pf: (NO FORMAT FOUND at %llx)\n", addr) < 0)tools/lib/traceevent/event-parse.c: if (asprintf(&format, "%s: %s", "%pf", printk->printk) < 0)
And these in -next:
drivers/scsi/lpfc/lpfc_hbadisc.c: "3185 FIND node filter %pf DID " drivers/scsi/lpfc/lpfc_hbadisc.c: "3186 FIND node filter %pf NOT FOUND.\n", filter); drivers/scsi/lpfc/lpfc_sli.c: "(%d):0307 Mailbox cmd x%x (x%x/x%x) Cmpl %pf "
Sakari Ailus
reviewerHi Joe,
Quoted 24 lines · Joe Perches
Quoted 8 lines · Sakari Ailus
Hi all,
This set adds functionality into the device property API (counting a node's parents as well as obtaining its name) in order to support printing fwnode names using a new conversion specifier "%pfw". The names that are produced are equivalent to its OF counterpart "%pOF" on OF systems for the two supported modifiers ("f" and "P").
Quoted 5 lines
Printing a node's name is something that's been available on OF for a long time and if something is converted to device property API (such as the V4L2 fwnode framework) it always got removed of a nice feature that was sometimes essential in debugging. With this set, that no longer is the case.
Doesn't this still have dependencies on removing all existing %p[fF] uses?
In Linus' tree:
tools/lib/traceevent/Documentation/libtraceevent-func_apis.txt:or events have "%pF" or "%pS" parameter in its format string. It is common to
tools/lib/traceevent/event-parse.c: if (asprintf(&format, "%%pf: (NO FORMAT FOUND at %llx)\n", addr)< 0)tools/lib/traceevent/event-parse.c: if (asprintf(&format, "%s: %s", "%pf", printk->printk)< 0)
Quoted 5 lines
And these in -next:
drivers/scsi/lpfc/lpfc_hbadisc.c: "3185 FIND node filter %pf DID " drivers/scsi/lpfc/lpfc_hbadisc.c: "3186 FIND node filter %pf NOT FOUND.\n", filter); drivers/scsi/lpfc/lpfc_sli.c: "(%d):0307 Mailbox cmd x%x (x%x/x%x) Cmpl %pf "
Thanks for bringing these up.
I'll submit patches to address both.
Signature · 4 lines
Kind regards, Sakari Ailus [email protected]