Re: [PATCH v3 09/10] lib/vsprintf: Add %pfw conversion specifier for printing fwnode names
From: Sakari Ailus
Date: Mon Sep 02 2019 - 03:22:29 EST
Hi Andy,
Thanks for the review.
On Fri, Aug 30, 2019 at 04:03:49PM +0300, Andy Shevchenko wrote:
> On Thu, Aug 29, 2019 at 01:10:42PM +0300, Sakari Ailus wrote:
> > Add 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
> >
> > \_SB.PCI0.CIO2.port@xxxxxxxxxx@0
> >
> > where the nodes are separated by a dot (".") and the first three are
> > ACPI device nodes and the latter two ACPI data nodes.
>
> Couple of comments below, FWIW,
> Reviewed-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
Thanks!
>
> >
> > Signed-off-by: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx>
> > ---
> > Documentation/core-api/printk-formats.rst | 24 +++++++++++++++
> > lib/vsprintf.c | 37 +++++++++++++++++++++++
> > scripts/checkpatch.pl | 3 +-
> > 3 files changed, 63 insertions(+), 1 deletion(-)
> >
> > diff --git a/Documentation/core-api/printk-formats.rst b/Documentation/core-api/printk-formats.rst
> > index 922a29eb70e6c..abba210f67567 100644
> > --- a/Documentation/core-api/printk-formats.rst
> > +++ b/Documentation/core-api/printk-formats.rst
> > @@ -418,6 +418,30 @@ Examples::
> >
> > Passed by reference.
> >
> > +Fwnode handles
> > +--------------
> > +
> > +::
> > +
> > + %pfw[fP]
>
> I'm not familiar with all flavours of the OF case, the question is do we use
> same letters for analogues?
Yes. There are some that may be unworkable to be extended, but in general
this helps folks who are familiar with the OF conversion specifiers.
>
> > +
> > +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 \_SB.PCI0.CIO2.port@xxxxxxxxxx@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)
> > -------------------------------
> >
> > diff --git a/lib/vsprintf.c b/lib/vsprintf.c
> > index 19f9b3f30623e..79dacd0b9e124 100644
> > --- a/lib/vsprintf.c
> > +++ b/lib/vsprintf.c
> > @@ -1978,6 +1978,37 @@ 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);
>
> Perfectly one line.
Fixed.
--
Sakari Ailus
sakari.ailus@xxxxxxxxxxxxxxx