[src/trunk]: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm defer vchiq ...

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

details:   https://anonhg.NetBSD.org/src/rev/c2680cfe4dae
branches:  trunk
changeset: 785707:c2680cfe4dae
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Mon Mar 25 22:59:25 2013 +0000

description:
defer vchiq initialization with config_mountroot, works around a timing issue that caused problems during sdhc init on some boards

diffstat:

 sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_kmod_netbsd.c |  25 +++++----
 1 files changed, 13 insertions(+), 12 deletions(-)

diffs (54 lines):

diff -r 0fcb4b8c1c6b -r c2680cfe4dae sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_kmod_netbsd.c
--- a/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_kmod_netbsd.c       Mon Mar 25 22:58:42 2013 +0000
+++ b/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_kmod_netbsd.c       Mon Mar 25 22:59:25 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vchiq_kmod_netbsd.c,v 1.1 2013/03/08 12:32:31 jmcneill Exp $ */
+/* $NetBSD: vchiq_kmod_netbsd.c,v 1.2 2013/03/25 22:59:25 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vchiq_kmod_netbsd.c,v 1.1 2013/03/08 12:32:31 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vchiq_kmod_netbsd.c,v 1.2 2013/03/25 22:59:25 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -104,9 +104,18 @@
                return;
        }
 
-       vchiq_core_initialize();
+       vchiq_softc = sc;
+
+       config_mountroot(self, vchiq_defer);
+}
 
-       vchiq_softc = sc;
+static void
+vchiq_defer(device_t self)
+{
+       struct vchiq_attach_args vaa;
+       struct vchiq_softc *sc = device_private(self);
+
+       vchiq_core_initialize();
 
        sc->sc_ih = bcm2835_intr_establish(sc->sc_intr, IPL_VM,
            vchiq_intr, sc);
@@ -118,14 +127,6 @@
 
        vchiq_init();
 
-       config_mountroot(self, vchiq_defer);
-}
-
-static void
-vchiq_defer(device_t self)
-{
-       struct vchiq_attach_args vaa;
-
        vaa.vaa_name = "AUDS";
        config_found_ia(self, "vchiqbus", &vaa, vchiq_print);
 }