[PATCH v2 1/1] lib/utils: consider ':' in stdout-path

[Atish Patra]

On Fri, May 28, 2021 at 4:08 AM Heinrich Schuchardt <xypron.glpk at gmx.de> wrote:
>
> The value of the /chosen/stdout-path devicetree property is used to
> determine the UART used by openSBI. According to the devicetree
> specification the value may contain a hyphen, e.g.
>
>         chosen {
>                 stdout-path = "/serial at f00:115200";
>         };
>
> If the character ':' is present, it terminates the path of the device.
>
> Signed-off-by: Heinrich Schuchardt <xypron.glpk at gmx.de>
> ---
> v2:
>         add a comment describing why the DT is changed in place
> ---
>  lib/utils/serial/fdt_serial.c | 22 +++++++++++++++++++++-
>  1 file changed, 21 insertions(+), 1 deletion(-)
>
> diff --git a/lib/utils/serial/fdt_serial.c b/lib/utils/serial/fdt_serial.c
> index 25982ec..83a1f95 100644
> --- a/lib/utils/serial/fdt_serial.c
> +++ b/lib/utils/serial/fdt_serial.c
> @@ -46,8 +46,28 @@ int fdt_serial_init(void)
>         coff = fdt_path_offset(fdt, "/chosen");
>         if (-1 < coff) {
>                 prop = fdt_getprop(fdt, coff, "stdout-path", &len);
> -               if (prop && len)
> +               if (prop && len) {
> +                       char *s;
> +
> +                       /*
> +                        * The device path may be followed by ':' and
> +                        * parameters. Truncate the path accordingly.
> +                        *
> +                        * Scratch memory is very limited. As long as we cannot
> +                        * free scratch memory it is preferable to avoid its
> +                        * usage. Hence the devicetree is modified in place.
> +                        *

I think we can use fdt_path_offset_namelen instead ?

> +                        * TODO:
> +                        * Use a copy in scratch memory once
> +                        * sbi_scratch_free_offset() is properly implemented.
> +                        */
> +                       s = strchr(prop, ':');
> +                       if (s)
> +                               *s = 0;
>                         noff = fdt_path_offset(fdt, prop);
> +                       if (s)
> +                               *s = ':';
> +               }
>         }
>
>         /* First check DT node pointed by stdout-path */
> --
> 2.32.0.rc0
>
>
> --
> opensbi mailing list
> opensbi at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/opensbi



-- 
Regards,
Atish