[src/trunk]: src/sys/dev/fdt Move fdt_update_stdout_path from evbarm code to ...

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f08755fa73f3
branches:  trunk
changeset: 374403:f08755fa73f3
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sat Apr 22 09:53:45 2023 +0000

description:
Move fdt_update_stdout_path from evbarm code to MI code

diffstat:

 sys/arch/evbarm/fdt/fdt_machdep.c |  34 +------------
 sys/dev/fdt/fdt_boot.c            |  92 +++++++++++++++++++++++++++++++++++++++
 sys/dev/fdt/fdt_boot.h            |  37 +++++++++++++++
 sys/dev/fdt/files.fdt             |   3 +-
 4 files changed, 135 insertions(+), 31 deletions(-)

diffs (230 lines):

diff -r a61dc6e2804d -r f08755fa73f3 sys/arch/evbarm/fdt/fdt_machdep.c
--- a/sys/arch/evbarm/fdt/fdt_machdep.c Sat Apr 22 09:39:14 2023 +0000
+++ b/sys/arch/evbarm/fdt/fdt_machdep.c Sat Apr 22 09:53:45 2023 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_machdep.c,v 1.102 2023/04/07 08:55:31 skrll Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.103 2023/04/22 09:53:45 skrll Exp $ */
 
 /*-
  * Copyright (c) 2015-2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.102 2023/04/07 08:55:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.103 2023/04/22 09:53:45 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_bootconfig.h"
@@ -94,6 +94,7 @@
 #include <arm/fdt/arm_fdtvar.h>
 
 #include <dev/fdt/fdtvar.h>
+#include <dev/fdt/fdt_boot.h>
 #include <dev/fdt/fdt_private.h>
 #include <dev/fdt/fdt_memory.h>
 
@@ -140,7 +141,6 @@ static uint8_t fdt_data[FDT_BUF_SIZE];
 extern char KERNEL_BASE_phys[];
 #define KERNEL_BASE_PHYS ((paddr_t)KERNEL_BASE_phys)
 
-static void fdt_update_stdout_path(void);
 static void fdt_device_register(device_t, void *);
 static void fdt_device_register_post_config(device_t, void *);
 static void fdt_cpu_rootconf(void);
@@ -547,7 +547,7 @@ initarm(void *arg)
         * value in /chosen/stdout-path before initializing console.
         */
        VPRINTF("stdout\n");
-       fdt_update_stdout_path();
+       fdt_update_stdout_path(fdt_data, boot_args);
 
 #if BYTE_ORDER == BIG_ENDIAN
        /*
@@ -668,32 +668,6 @@ initarm(void *arg)
        return sp;
 }
 
-static void
-fdt_update_stdout_path(void)
-{
-       char *stdout_path, *ep;
-       int stdout_path_len;
-       char buf[256];
-
-       const int chosen_off = fdt_path_offset(fdt_data, "/chosen");
-       if (chosen_off == -1)
-               return;
-
-       if (get_bootconf_option(boot_args, "stdout-path",
-           BOOTOPT_TYPE_STRING, &stdout_path) == 0)
-               return;
-
-       ep = strchr(stdout_path, ' ');
-       stdout_path_len = ep ? (ep - stdout_path) : strlen(stdout_path);
-       if (stdout_path_len >= sizeof(buf))
-               return;
-
-       strncpy(buf, stdout_path, stdout_path_len);
-       buf[stdout_path_len] = '\0';
-       fdt_setprop(fdt_data, chosen_off, "stdout-path",
-           buf, stdout_path_len + 1);
-}
-
 void
 consinit(void)
 {
diff -r a61dc6e2804d -r f08755fa73f3 sys/dev/fdt/fdt_boot.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/fdt/fdt_boot.c    Sat Apr 22 09:53:45 2023 +0000
@@ -0,0 +1,92 @@
+/*     $NetBSD: fdt_boot.c,v 1.1 2023/04/22 09:53:45 skrll Exp $       */
+
+/*-
+ * Copyright (c) 2015-2017 Jared McNeill <jmcneill%invisible.ca@localhost>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*-
+ * Copyright (c) 2022 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Nick Hudson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: fdt_boot.c,v 1.1 2023/04/22 09:53:45 skrll Exp $");
+
+#include <sys/param.h>
+
+#include <sys/optstr.h>
+
+#include <libfdt.h>
+
+#include <dev/fdt/fdtvar.h>
+#include <dev/fdt/fdt_boot.h>
+
+void
+fdt_update_stdout_path(void *fdt, const char *boot_args)
+{
+       const char *stdout_path;
+       char buf[256];
+
+       const int chosen_off = fdt_path_offset(fdt, "/chosen");
+       if (chosen_off == -1)
+               return;
+
+       if (optstr_get_string(boot_args, "stdout-path", &stdout_path) == false)
+               return;
+
+       const char *ep = strchr(stdout_path, ' ');
+       size_t stdout_path_len = ep ? (ep - stdout_path) : strlen(stdout_path);
+       if (stdout_path_len >= sizeof(buf))
+               return;
+
+       strncpy(buf, stdout_path, stdout_path_len);
+       buf[stdout_path_len] = '\0';
+       fdt_setprop(fdt, chosen_off, "stdout-path",
+           buf, stdout_path_len + 1);
+}
diff -r a61dc6e2804d -r f08755fa73f3 sys/dev/fdt/fdt_boot.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/fdt/fdt_boot.h    Sat Apr 22 09:53:45 2023 +0000
@@ -0,0 +1,37 @@
+/* $NetBSD: fdt_boot.h,v 1.1 2023/04/22 09:53:45 skrll Exp $ */
+
+/*-
+ * Copyright (c) 2018 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jared McNeill <jmcneill%invisible.ca@localhost>.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _DEV_FDT_FDT_BOOT_H_
+#define _DEV_FDT_FDT_BOOT_H_
+
+void fdt_update_stdout_path(void *, const char *);
+
+#endif /* _DEV_FDT_FDT_BOOT_H_ */
diff -r a61dc6e2804d -r f08755fa73f3 sys/dev/fdt/files.fdt
--- a/sys/dev/fdt/files.fdt     Sat Apr 22 09:39:14 2023 +0000
+++ b/sys/dev/fdt/files.fdt     Sat Apr 22 09:53:45 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.fdt,v 1.68 2023/04/16 16:51:38 jmcneill Exp $
+# $NetBSD: files.fdt,v 1.69 2023/04/22 09:53:45 skrll Exp $
 
 include        "external/bsd/libfdt/conf/files.libfdt"
 
@@ -66,6 +66,7 @@ device        iicmux: i2cbus, i2cmux
 attach iicmux at fdt with iicmux_fdt
 file   dev/fdt/i2cmux_fdt.c                    iicmux_fdt
 
+file   dev/fdt/fdt_boot.c                      fdtbase
 file   dev/fdt/fdt_memory.c                    fdtbase
 file   dev/fdt/fdt_openfirm.c                  fdtbase
 file   dev/fdt/fdt_platform.c                  fdtbase