Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/fdt Fix LOCKDEBUG by calling fdtbus_intr_init as par...



details:   https://anonhg.NetBSD.org/src/rev/db1df07a2871
branches:  trunk
changeset: 1008021:db1df07a2871
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sun Mar 08 08:26:54 2020 +0000

description:
Fix LOCKDEBUG by calling fdtbus_intr_init as part of cpu_startup_hook, i.e.
later.

diffstat:

 sys/arch/evbarm/fdt/fdt_machdep.c |  7 +++++--
 sys/dev/fdt/fdt_subr.c            |  7 ++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (63 lines):

diff -r dd661fd38807 -r db1df07a2871 sys/arch/evbarm/fdt/fdt_machdep.c
--- a/sys/arch/evbarm/fdt/fdt_machdep.c Sun Mar 08 08:25:36 2020 +0000
+++ b/sys/arch/evbarm/fdt/fdt_machdep.c Sun Mar 08 08:26:54 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_machdep.c,v 1.67 2020/02/16 14:56:52 thorpej Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.68 2020/03/08 08:26:54 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.67 2020/02/16 14:56:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.68 2020/03/08 08:26:54 skrll Exp $");
 
 #include "opt_machdep.h"
 #include "opt_bootconfig.h"
@@ -89,6 +89,7 @@
 #include <evbarm/fdt/fdt_memory.h>
 
 #include <arm/fdt/arm_fdtvar.h>
+#include <dev/fdt/fdt_private.h>
 
 #ifdef EFI_RUNTIME
 #include <arm/arm/efi_runtime.h>
@@ -695,6 +696,8 @@
 cpu_startup_hook(void)
 {
 
+       fdtbus_intr_init();
+
        fdt_setup_rndseed();
 }
 
diff -r dd661fd38807 -r db1df07a2871 sys/dev/fdt/fdt_subr.c
--- a/sys/dev/fdt/fdt_subr.c    Sun Mar 08 08:25:36 2020 +0000
+++ b/sys/dev/fdt/fdt_subr.c    Sun Mar 08 08:26:54 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_subr.c,v 1.35 2020/02/24 12:38:57 rin Exp $ */
+/* $NetBSD: fdt_subr.c,v 1.36 2020/03/08 08:26:54 skrll Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_subr.c,v 1.35 2020/02/24 12:38:57 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_subr.c,v 1.36 2020/03/08 08:26:54 skrll Exp $");
 
 #include "opt_fdt.h"
 
@@ -52,9 +52,6 @@
        }
        fdt_data = data;
 
-       /* Now that we have a FDT blob, initialize other bits that need it. */
-       fdtbus_intr_init();
-
        return true;
 }
 



Home | Main Index | Thread Index | Old Index