From bc57263342f754e8470e2857c942dc2dec541b30 Mon Sep 17 00:00:00 2001 From: Kevin Eyssartier Date: Thu, 22 Jun 2023 15:23:51 +0200 Subject: [PATCH 2/3] bsps/riscv: Handle ":" in chosen stdout-path The riscv_get_console_node function is searching the devices for the string specified in chosen in the fdt. Unfortunately, this chosen string can contain parameters after the ":" character. As specified in https://www.kernel.org/doc/Documentation/devicetree/bindings/chosen.txt : If the character ":" is present in the value, this terminates the path. This was not handled in the function. --- bsps/riscv/riscv/console/console-config.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bsps/riscv/riscv/console/console-config.c b/bsps/riscv/riscv/console/console-config.c index 4916191e0b..a49aa82b46 100644 --- a/bsps/riscv/riscv/console/console-config.c +++ b/bsps/riscv/riscv/console/console-config.c @@ -91,6 +91,9 @@ static int riscv_get_console_node(const void *fdt) stdout_path = ""; } + const char *q = memchr(stdout_path, ':', strlen(stdout_path)); + const int stdout_path_len = q == NULL ? strlen(stdout_path) : q-stdout_path; + #if RISCV_ENABLE_FRDME310ARTY_SUPPORT != 0 int root; int soc; @@ -101,7 +104,7 @@ static int riscv_get_console_node(const void *fdt) return offset; #else - return fdt_path_offset(fdt, stdout_path); + return fdt_path_offset_namelen(fdt, stdout_path, stdout_path_len); #endif } -- 2.25.1