[src/trunk]: src/sys/dev/fdt Reduce the number of times we need to call drive...

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

details:   https://anonhg.NetBSD.org/src/rev/a00e9f8cb405
branches:  trunk
changeset: 999121:a00e9f8cb405
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Mon May 20 11:12:10 2019 +0000

description:
Reduce the number of times we need to call driver match functions. Makes
a noticeable difference in boot time on an ODROID-XU4.

diffstat:

 sys/dev/fdt/fdtbus.c |  23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)

diffs (87 lines):

diff -r e07518f569c6 -r a00e9f8cb405 sys/dev/fdt/fdtbus.c
--- a/sys/dev/fdt/fdtbus.c      Mon May 20 08:55:31 2019 +0000
+++ b/sys/dev/fdt/fdtbus.c      Mon May 20 11:12:10 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fdtbus.c,v 1.27 2019/02/25 19:28:36 jmcneill Exp $ */
+/* $NetBSD: fdtbus.c,v 1.28 2019/05/20 11:12:10 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdtbus.c,v 1.27 2019/02/25 19:28:36 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdtbus.c,v 1.28 2019/05/20 11:12:10 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -52,6 +52,7 @@
        int             n_phandle;
        const char      *n_name;
        struct fdt_attach_args n_faa;
+       cfdata_t        n_cf;
 
        u_int           n_order;
 
@@ -74,6 +75,7 @@
 static void    fdt_childdet(device_t, device_t);
 
 static int     fdt_scan_submatch(device_t, cfdata_t, const int *, void *);
+static cfdata_t        fdt_scan_best(struct fdt_softc *, struct fdt_node *);
 static void    fdt_scan(struct fdt_softc *, int);
 static void    fdt_add_node(struct fdt_node *);
 static u_int   fdt_get_order(int);
@@ -143,14 +145,22 @@
 fdt_rescan(device_t self, const char *ifattr, const int *locs)
 {
        struct fdt_softc *sc = device_private(self);
+       struct fdt_node *node;
        int pass;
 
+       TAILQ_FOREACH(node, &fdt_nodes, n_nodes)
+               node->n_cf = fdt_scan_best(sc, node);
+
        pass = 0;
        fdt_need_rescan = false;
        do {
                fdt_scan(sc, pass);
                if (fdt_need_rescan == true) {
                        pass = 0;
+                       TAILQ_FOREACH(node, &fdt_nodes, n_nodes) {
+                               if (node->n_dev == NULL)
+                                       node->n_cf = fdt_scan_best(sc, node);
+                       }
                        fdt_need_rescan = false;
                } else {
                        pass++;
@@ -280,7 +290,7 @@
        char buf[FDT_MAX_PATH];
 
        TAILQ_FOREACH(node, &fdt_nodes, n_nodes) {
-               if (node->n_dev != NULL)
+               if (node->n_dev != NULL || node->n_cf == NULL)
                        continue;
 
                fdt_init_attach_args(&sc->sc_faa, node, quiet, &faa);
@@ -288,17 +298,16 @@
                /*
                 * Make sure we don't attach before a better match in a later pass.
                 */
-               cfdata_t cf_best = fdt_scan_best(sc, node);
                cfdata_t cf_pass =
                    config_search_loc(fdt_scan_submatch, node->n_bus, "fdt", locs, &faa);
-               if (cf_best != cf_pass)
+               if (node->n_cf != cf_pass)
                        continue;
 
                /*
                 * Attach the device.
                 */
-               node->n_dev = config_found_sm_loc(node->n_bus, "fdt", locs,
-                   &faa, fdtbus_print, fdt_scan_submatch);
+               node->n_dev = config_attach_loc(node->n_bus, cf_pass, locs,
+                   &faa, fdtbus_print);
                if (node->n_dev) {
                        dict = device_properties(node->n_dev);
                        if (fdtbus_get_path(node->n_phandle, buf, sizeof(buf)))