Re: [PATCH v2 4/4] of: improve reporting invalid overlay target path

From: Geert Uytterhoeven
Date: Mon Feb 12 2018 - 04:00:47 EST


Hi Frank,

On Mon, Feb 12, 2018 at 9:51 AM, <frowand.list@xxxxxxxxx> wrote:
> From: Frank Rowand <frank.rowand@xxxxxxxx>
>
> Errors while developing the patch to create of_overlay_fdt_apply()
> exposed inadequate error messages to debug problems when overlay
> devicetree fragment nodes contain an invalid target path. Improve
> the messages in find_target_node() to remedy this.
>
> Signed-off-by: Frank Rowand <frank.rowand@xxxxxxxx>

Thanks for your patch!

> --- a/drivers/of/overlay.c
> +++ b/drivers/of/overlay.c
> @@ -488,17 +488,26 @@ static int build_changeset(struct overlay_changeset *ovcs)
> */
> static struct device_node *find_target_node(struct device_node *info_node)
> {
> + struct device_node *node;
> const char *path;
> u32 val;
> int ret;
>
> ret = of_property_read_u32(info_node, "target", &val);
> - if (!ret)
> - return of_find_node_by_phandle(val);
> + if (!ret) {
> + node = of_find_node_by_phandle(val);
> + if (!node)
> + pr_err("target node find by phandle failed\n");

Do you want to print the actual node, cfr. below?

> + return node;
> + }
>
> ret = of_property_read_string(info_node, "target-path", &path);
> - if (!ret)
> - return of_find_node_by_path(path);
> + if (!ret) {
> + node = of_find_node_by_path(path);
> + if (!node)
> + pr_err("target node find by path failed\n");

Likewise.

> + return node;
> + }
>
> pr_err("Failed to find target for node %p (%s)\n",
> info_node, info_node->name);

This one prints more info.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds