Module Name: src
Committed By: thorpej
Date: Mon May 10 23:53:44 UTC 2021
Modified Files:
src/sys/arch/sparc/dev: bootbus.c ebus.c sbus.c vme_machdep.c
src/sys/arch/sparc/sparc: autoconf.c iommu.c msiiep.c
src/sys/arch/sparc64/dev: cbus.c central.c ebus.c ebus_mainbus.c fhc.c
psycho.c pyro.c sbus.c schizo.c upa.c vbus.c vpci.c
src/sys/arch/sparc64/sparc64: autoconf.c
src/sys/dev/sbus: dma_sbus.c lebuffer.c qec.c xbox.c
Log Message:
Associate the OpenBoot / OpenFirmware node with attached devices
at config_found() time.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sparc/dev/bootbus.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/sparc/dev/ebus.c
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/sparc/dev/sbus.c
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/sparc/dev/vme_machdep.c
cvs rdiff -u -r1.265 -r1.266 src/sys/arch/sparc/sparc/autoconf.c
cvs rdiff -u -r1.97 -r1.98 src/sys/arch/sparc/sparc/iommu.c
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/sparc/sparc/msiiep.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sparc64/dev/cbus.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sparc64/dev/central.c \
src/sys/arch/sparc64/dev/vbus.c
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/sparc64/dev/ebus.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sparc64/dev/ebus_mainbus.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sparc64/dev/fhc.c
cvs rdiff -u -r1.133 -r1.134 src/sys/arch/sparc64/dev/psycho.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/sparc64/dev/pyro.c
cvs rdiff -u -r1.101 -r1.102 src/sys/arch/sparc64/dev/sbus.c
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/sparc64/dev/schizo.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sparc64/dev/upa.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sparc64/dev/vpci.c
cvs rdiff -u -r1.228 -r1.229 src/sys/arch/sparc64/sparc64/autoconf.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/sbus/dma_sbus.c
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/sbus/lebuffer.c
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/sbus/qec.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/sbus/xbox.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/dev/bootbus.c
diff -u src/sys/arch/sparc/dev/bootbus.c:1.21 src/sys/arch/sparc/dev/bootbus.c:1.22
--- src/sys/arch/sparc/dev/bootbus.c:1.21 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sparc/dev/bootbus.c Mon May 10 23:53:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bootbus.c,v 1.21 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: bootbus.c,v 1.22 2021/05/10 23:53:44 thorpej Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bootbus.c,v 1.21 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bootbus.c,v 1.22 2021/05/10 23:53:44 thorpej Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -123,6 +123,7 @@ bootbus_attach(device_t parent, device_t
panic("bootbus_attach: failed to set up attach args");
config_found(self, &baa, bootbus_print,
+ CFARG_DEVHANDLE, prom_node_to_devhandle(node),
CFARG_SUBMATCH, bootbus_submatch,
CFARG_EOL);
Index: src/sys/arch/sparc/dev/ebus.c
diff -u src/sys/arch/sparc/dev/ebus.c:1.39 src/sys/arch/sparc/dev/ebus.c:1.40
--- src/sys/arch/sparc/dev/ebus.c:1.39 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sparc/dev/ebus.c Mon May 10 23:53:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ebus.c,v 1.39 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: ebus.c,v 1.40 2021/05/10 23:53:44 thorpej Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.39 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.40 2021/05/10 23:53:44 thorpej Exp $");
#if defined(DEBUG) && !defined(EBUS_DEBUG)
#define EBUS_DEBUG
@@ -316,7 +316,9 @@ ebus_attach(device_t parent, device_t se
}
DPRINTF(EDB_CHILD,
("- found child `%s', attaching\n", ea.ea_name));
- (void)config_found(self, &ea, ebus_print, CFARG_EOL);
+ (void)config_found(self, &ea, ebus_print,
+ CFARG_DEVHANDLE, prom_node_to_devhandle(node),
+ CFARG_EOL);
ebus_destroy_attach_args(&ea);
}
}
Index: src/sys/arch/sparc/dev/sbus.c
diff -u src/sys/arch/sparc/dev/sbus.c:1.81 src/sys/arch/sparc/dev/sbus.c:1.82
--- src/sys/arch/sparc/dev/sbus.c:1.81 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sparc/dev/sbus.c Mon May 10 23:53:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sbus.c,v 1.81 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: sbus.c,v 1.82 2021/05/10 23:53:44 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.81 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.82 2021/05/10 23:53:44 thorpej Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -413,6 +413,7 @@ sbus_attach_common(struct sbus_softc *sc
panic("sbus_attach: %s: incomplete", sp);
}
(void) config_found(sc->sc_dev, (void *)&sa, sbus_print,
+ CFARG_DEVHANDLE, prom_node_to_devhandle(node),
CFARG_EOL);
sbus_destroy_attach_args(&sa);
}
@@ -435,6 +436,7 @@ sbus_attach_common(struct sbus_softc *sc
continue;
}
(void) config_found(sc->sc_dev, (void *)&sa, sbus_print,
+ CFARG_DEVHANDLE, prom_node_to_devhandle(node),
CFARG_EOL);
sbus_destroy_attach_args(&sa);
}
Index: src/sys/arch/sparc/dev/vme_machdep.c
diff -u src/sys/arch/sparc/dev/vme_machdep.c:1.72 src/sys/arch/sparc/dev/vme_machdep.c:1.73
--- src/sys/arch/sparc/dev/vme_machdep.c:1.72 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sparc/dev/vme_machdep.c Mon May 10 23:53:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vme_machdep.c,v 1.72 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: vme_machdep.c,v 1.73 2021/05/10 23:53:44 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.72 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.73 2021/05/10 23:53:44 thorpej Exp $");
#include <sys/param.h>
#include <sys/extent.h>
@@ -431,7 +431,9 @@ vmeattach_iommu(device_t parent, device_
printf(": version 0x%x\n",
sc->sc_reg->vmebus_cr & VMEBUS_CR_IMPL);
- (void)config_found(self, &vba, 0, CFARG_EOL);
+ (void)config_found(self, &vba, 0,
+ CFARG_DEVHANDLE, prom_node_to_devhandle(node),
+ CFARG_EOL);
#endif /* SUN4M */
}
Index: src/sys/arch/sparc/sparc/autoconf.c
diff -u src/sys/arch/sparc/sparc/autoconf.c:1.265 src/sys/arch/sparc/sparc/autoconf.c:1.266
--- src/sys/arch/sparc/sparc/autoconf.c:1.265 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sparc/sparc/autoconf.c Mon May 10 23:53:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.265 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: autoconf.c,v 1.266 2021/05/10 23:53:44 thorpej Exp $ */
/*
* Copyright (c) 1996
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.265 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.266 2021/05/10 23:53:44 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -1285,7 +1285,9 @@ mainbus_attach(device_t parent, device_t
ma.ma_dmatag = &mainbus_dma_tag;
ma.ma_node = node;
ma.ma_name = "cpu";
- config_found(dev, (void *)&ma, mbprint, CFARG_EOL);
+ config_found(dev, (void *)&ma, mbprint,
+ CFARG_DEVHANDLE, prom_node_to_devhandle(node),
+ CFARG_EOL);
if (node == bootnode && bootmid != 0) {
/* Re-enter loop to find all remaining CPUs */
goto rescan;
@@ -1297,7 +1299,9 @@ mainbus_attach(device_t parent, device_t
ma.ma_dmatag = &mainbus_dma_tag;
ma.ma_node = findroot();
ma.ma_name = "cpu";
- config_found(dev, (void *)&ma, mbprint, CFARG_EOL);
+ config_found(dev, (void *)&ma, mbprint,
+ CFARG_DEVHANDLE, prom_node_to_devhandle(ma.ma_node),
+ CFARG_EOL);
}
for (ssp = openboot_special; (sp = ssp->dev) != NULL; ssp++) {
@@ -1328,6 +1332,7 @@ mainbus_attach(device_t parent, device_t
continue;
if (config_found(dev, (void *)&ma, mbprint,
+ CFARG_DEVHANDLE, prom_node_to_devhandle(node),
CFARG_EOL) == NULL) {
if (ssp->flags & BS_OPTIONAL) continue;
panic("%s", sp);
@@ -1387,8 +1392,9 @@ mainbus_attach(device_t parent, device_t
ma.ma_pri = 0;
ma.ma_promvaddr = 0;
- (void) config_found(dev, (void *)&ma, mbprint,
- CFARG_EOL);
+ config_found(dev, (void *)&ma, mbprint,
+ CFARG_DEVHANDLE, prom_node_to_devhandle(node),
+ CFARG_EOL);
continue;
}
#endif /* SUN4M */
@@ -1405,7 +1411,9 @@ mainbus_attach(device_t parent, device_t
if (prom_getprop_address1(node, &ma.ma_promvaddr) != 0)
continue;
- (void) config_found(dev, (void *)&ma, mbprint, CFARG_EOL);
+ config_found(dev, (void *)&ma, mbprint,
+ CFARG_DEVHANDLE, prom_node_to_devhandle(node),
+ CFARG_EOL);
}
#endif /* SUN4C || SUN4M || SUN4D */
}
Index: src/sys/arch/sparc/sparc/iommu.c
diff -u src/sys/arch/sparc/sparc/iommu.c:1.97 src/sys/arch/sparc/sparc/iommu.c:1.98
--- src/sys/arch/sparc/sparc/iommu.c:1.97 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sparc/sparc/iommu.c Mon May 10 23:53:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: iommu.c,v 1.97 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: iommu.c,v 1.98 2021/05/10 23:53:44 thorpej Exp $ */
/*
* Copyright (c) 1996
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.97 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.98 2021/05/10 23:53:44 thorpej Exp $");
#include "opt_sparc_arch.h"
@@ -298,7 +298,9 @@ iommu_attach(device_t parent, device_t s
ia.iom_reg = &sbus_iommu_reg;
ia.iom_nreg = 1;
- (void) config_found(self, (void *)&ia, iommu_print, CFARG_EOL);
+ config_found(self, (void *)&ia, iommu_print,
+ CFARG_DEVHANDLE, prom_node_to_devhandle(node),
+ CFARG_EOL);
return;
}
@@ -321,7 +323,9 @@ iommu_attach(device_t parent, device_t s
prom_getprop(node, "reg", sizeof(struct openprom_addr),
&ia.iom_nreg, &ia.iom_reg);
- (void) config_found(self, (void *)&ia, iommu_print, CFARG_EOL);
+ config_found(self, (void *)&ia, iommu_print,
+ CFARG_DEVHANDLE, prom_node_to_devhandle(node),
+ CFARG_EOL);
if (ia.iom_reg != NULL)
free(ia.iom_reg, M_DEVBUF);
}
Index: src/sys/arch/sparc/sparc/msiiep.c
diff -u src/sys/arch/sparc/sparc/msiiep.c:1.50 src/sys/arch/sparc/sparc/msiiep.c:1.51
--- src/sys/arch/sparc/sparc/msiiep.c:1.50 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sparc/sparc/msiiep.c Mon May 10 23:53:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: msiiep.c,v 1.50 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: msiiep.c,v 1.51 2021/05/10 23:53:44 thorpej Exp $ */
/*
* Copyright (c) 2001 Valeriy E. Ushakov
@@ -27,7 +27,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msiiep.c,v 1.50 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msiiep.c,v 1.51 2021/05/10 23:53:44 thorpej Exp $");
#include <sys/param.h>
#include <sys/kmem.h>
@@ -362,7 +362,9 @@ mspcic_attach(device_t parent, device_t
mspcic_pci_scan(sc->sc_node);
- config_found(self, &pba, mspcic_print, CFARG_EOL);
+ config_found(self, &pba, mspcic_print,
+ CFARG_DEVHANDLE, prom_node_to_devhandle(sc->sc_node),
+ CFARG_EOL);
}
Index: src/sys/arch/sparc64/dev/cbus.c
diff -u src/sys/arch/sparc64/dev/cbus.c:1.5 src/sys/arch/sparc64/dev/cbus.c:1.6
--- src/sys/arch/sparc64/dev/cbus.c:1.5 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sparc64/dev/cbus.c Mon May 10 23:53:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cbus.c,v 1.5 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: cbus.c,v 1.6 2021/05/10 23:53:44 thorpej Exp $ */
/* $OpenBSD: cbus.c,v 1.15 2015/09/27 11:29:20 kettenis Exp $ */
/*
* Copyright (c) 2008 Mark Kettenis
@@ -118,11 +118,12 @@ cbus_attach(device_t parent, device_t se
int rc = cbus_get_channel_endpoint(sc, &ca);
DPRINTF(CBUSDB_AC, ("cbus_attach() - cbus_get_channel_endpoint() %d\n", rc));
if ( rc != 0) {
- continue;
+ continue;
}
- config_found(self, &ca, cbus_print, CFARG_EOL);
-
+ config_found(self, &ca, cbus_print,
+ CFARG_DEVHANDLE, devhandle_from_of(ca.ca_node),
+ CFARG_EOL);
}
}
Index: src/sys/arch/sparc64/dev/central.c
diff -u src/sys/arch/sparc64/dev/central.c:1.6 src/sys/arch/sparc64/dev/central.c:1.7
--- src/sys/arch/sparc64/dev/central.c:1.6 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sparc64/dev/central.c Mon May 10 23:53:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: central.c,v 1.6 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: central.c,v 1.7 2021/05/10 23:53:44 thorpej Exp $ */
/* $OpenBSD: central.c,v 1.7 2010/11/11 17:58:23 miod Exp $ */
/*
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: central.c,v 1.6 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: central.c,v 1.7 2021/05/10 23:53:44 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -112,7 +112,9 @@ central_attach(device_t parent, device_t
prom_getprop(node, "reg", sizeof(struct central_reg),
&ca.ca_nreg, (void **)&ca.ca_reg);
- (void)config_found(self, (void *)&ca, central_print, CFARG_EOL);
+ (void)config_found(self, (void *)&ca, central_print,
+ CFARG_DEVHANDLE, prom_node_to_devhandle(ca.ca_node),
+ CFARG_EOL);
if (ca.ca_name != NULL)
free(ca.ca_name, M_DEVBUF);
Index: src/sys/arch/sparc64/dev/vbus.c
diff -u src/sys/arch/sparc64/dev/vbus.c:1.6 src/sys/arch/sparc64/dev/vbus.c:1.7
--- src/sys/arch/sparc64/dev/vbus.c:1.6 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sparc64/dev/vbus.c Mon May 10 23:53:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vbus.c,v 1.6 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: vbus.c,v 1.7 2021/05/10 23:53:44 thorpej Exp $ */
/* $OpenBSD: vbus.c,v 1.8 2015/09/27 11:29:20 kettenis Exp $ */
/*
* Copyright (c) 2008 Mark Kettenis
@@ -96,7 +96,9 @@ vbus_attach(device_t parent, device_t se
&va.va_nreg, (void **)&va.va_reg);
prom_getprop(node, "interrupts", sizeof(*va.va_intr),
&va.va_nintr, (void **)&va.va_intr);
- config_found(self, &va, vbus_print, CFARG_EOL);
+ config_found(self, &va, vbus_print,
+ CFARG_DEVHANDLE, prom_node_to_devhandle(va.va_node),
+ CFARG_EOL);
}
struct vbus_attach_args va;
Index: src/sys/arch/sparc64/dev/ebus.c
diff -u src/sys/arch/sparc64/dev/ebus.c:1.66 src/sys/arch/sparc64/dev/ebus.c:1.67
--- src/sys/arch/sparc64/dev/ebus.c:1.66 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sparc64/dev/ebus.c Mon May 10 23:53:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ebus.c,v 1.66 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: ebus.c,v 1.67 2021/05/10 23:53:44 thorpej Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.66 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.67 2021/05/10 23:53:44 thorpej Exp $");
#include "opt_ddb.h"
@@ -213,7 +213,9 @@ ebus_attach(device_t parent, device_t se
} else {
DPRINTF(EDB_CHILD, ("- found child `%s', attaching\n",
eba.ea_name));
- (void)config_found(self, &eba, ebus_print, CFARG_EOL);
+ (void)config_found(self, &eba, ebus_print,
+ CFARG_DEVHANDLE, prom_node_to_devhandle(node),
+ CFARG_EOL);
}
ebus_destroy_attach_args(&eba);
}
Index: src/sys/arch/sparc64/dev/ebus_mainbus.c
diff -u src/sys/arch/sparc64/dev/ebus_mainbus.c:1.19 src/sys/arch/sparc64/dev/ebus_mainbus.c:1.20
--- src/sys/arch/sparc64/dev/ebus_mainbus.c:1.19 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sparc64/dev/ebus_mainbus.c Mon May 10 23:53:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ebus_mainbus.c,v 1.19 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: ebus_mainbus.c,v 1.20 2021/05/10 23:53:44 thorpej Exp $ */
/* $OpenBSD: ebus_mainbus.c,v 1.7 2010/11/11 17:58:23 miod Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ebus_mainbus.c,v 1.19 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ebus_mainbus.c,v 1.20 2021/05/10 23:53:44 thorpej Exp $");
#ifdef DEBUG
#define EDB_PROM 0x01
@@ -173,7 +173,9 @@ ebus_mainbus_attach(device_t parent, dev
} else {
DPRINTF(EDB_CHILD, ("- found child `%s', attaching\n",
eba.ea_name));
- (void)config_found(self, &eba, ebus_print, CFARG_EOL);
+ (void)config_found(self, &eba, ebus_print,
+ CFARG_DEVHANDLE, prom_node_to_devhandle(node),
+ CFARG_EOL);
}
ebus_destroy_attach_args(&eba);
}
Index: src/sys/arch/sparc64/dev/fhc.c
diff -u src/sys/arch/sparc64/dev/fhc.c:1.8 src/sys/arch/sparc64/dev/fhc.c:1.9
--- src/sys/arch/sparc64/dev/fhc.c:1.8 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sparc64/dev/fhc.c Mon May 10 23:53:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fhc.c,v 1.8 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: fhc.c,v 1.9 2021/05/10 23:53:44 thorpej Exp $ */
/* $OpenBSD: fhc.c,v 1.17 2010/11/11 17:58:23 miod Exp $ */
/*
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fhc.c,v 1.8 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fhc.c,v 1.9 2021/05/10 23:53:44 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -117,6 +117,7 @@ fhc_attach(struct fhc_softc *sc)
&fa.fa_npromvaddrs, (void **)&fa.fa_promvaddrs);
(void)config_found(sc->sc_dev, (void *)&fa, fhc_print,
+ CFARG_DEVHANDLE, prom_node_to_devhandle(node),
CFARG_EOL);
if (fa.fa_name != NULL)
Index: src/sys/arch/sparc64/dev/psycho.c
diff -u src/sys/arch/sparc64/dev/psycho.c:1.133 src/sys/arch/sparc64/dev/psycho.c:1.134
--- src/sys/arch/sparc64/dev/psycho.c:1.133 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sparc64/dev/psycho.c Mon May 10 23:53:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: psycho.c,v 1.133 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: psycho.c,v 1.134 2021/05/10 23:53:44 thorpej Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: psycho.c,v 1.133 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: psycho.c,v 1.134 2021/05/10 23:53:44 thorpej Exp $");
#include "opt_ddb.h"
@@ -684,7 +684,9 @@ found:
pba.pba_memt = sc->sc_psycho_this->pp_memt;
pba.pba_pc = pp->pp_pc;
- config_found(self, &pba, psycho_print, CFARG_EOL);
+ config_found(self, &pba, psycho_print,
+ CFARG_DEVHANDLE, prom_node_to_devhandle(sc->sc_node),
+ CFARG_EOL);
}
static int
Index: src/sys/arch/sparc64/dev/pyro.c
diff -u src/sys/arch/sparc64/dev/pyro.c:1.23 src/sys/arch/sparc64/dev/pyro.c:1.24
--- src/sys/arch/sparc64/dev/pyro.c:1.23 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sparc64/dev/pyro.c Mon May 10 23:53:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pyro.c,v 1.23 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: pyro.c,v 1.24 2021/05/10 23:53:44 thorpej Exp $ */
/* from: $OpenBSD: pyro.c,v 1.20 2010/12/05 15:15:14 kettenis Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pyro.c,v 1.23 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pyro.c,v 1.24 2021/05/10 23:53:44 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -237,7 +237,9 @@ pyro_init(struct pyro_softc *sc, int bus
free(busranges, M_DEVBUF);
- config_found(sc->sc_dev, &pba, pyro_print, CFARG_EOL);
+ config_found(sc->sc_dev, &pba, pyro_print,
+ CFARG_DEVHANDLE, prom_node_to_devhandle(sc->sc_node),
+ CFARG_EOL);
}
void
Index: src/sys/arch/sparc64/dev/sbus.c
diff -u src/sys/arch/sparc64/dev/sbus.c:1.101 src/sys/arch/sparc64/dev/sbus.c:1.102
--- src/sys/arch/sparc64/dev/sbus.c:1.101 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sparc64/dev/sbus.c Mon May 10 23:53:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sbus.c,v 1.101 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: sbus.c,v 1.102 2021/05/10 23:53:44 thorpej Exp $ */
/*
* Copyright (c) 1999-2002 Eduardo Horvath
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.101 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.102 2021/05/10 23:53:44 thorpej Exp $");
#include "opt_ddb.h"
@@ -293,7 +293,9 @@ sbus_attach(device_t parent, device_t se
printf("sbus_attach: %s: incomplete\n", name1);
continue;
}
- (void) config_found(self, &sa, sbus_print, CFARG_EOL);
+ (void) config_found(self, &sa, sbus_print,
+ CFARG_DEVHANDLE, prom_node_to_devhandle(node),
+ CFARG_EOL);
sbus_destroy_attach_args(&sa);
}
}
Index: src/sys/arch/sparc64/dev/schizo.c
diff -u src/sys/arch/sparc64/dev/schizo.c:1.44 src/sys/arch/sparc64/dev/schizo.c:1.45
--- src/sys/arch/sparc64/dev/schizo.c:1.44 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sparc64/dev/schizo.c Mon May 10 23:53:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: schizo.c,v 1.44 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: schizo.c,v 1.45 2021/05/10 23:53:44 thorpej Exp $ */
/* $OpenBSD: schizo.c,v 1.55 2008/08/18 20:29:37 brad Exp $ */
/*
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: schizo.c,v 1.44 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: schizo.c,v 1.45 2021/05/10 23:53:44 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -365,7 +365,9 @@ schizo_attach(device_t parent, device_t
schizo_pbm_write(pbm, SCZ_PCI_IOCACHE_CSR, iocache_csr);
}
- config_found(sc->sc_dev, &pba, schizo_print, CFARG_EOL);
+ config_found(sc->sc_dev, &pba, schizo_print,
+ CFARG_DEVHANDLE, prom_node_to_devhandle(sc->sc_node),
+ CFARG_EOL);
}
int
Index: src/sys/arch/sparc64/dev/upa.c
diff -u src/sys/arch/sparc64/dev/upa.c:1.21 src/sys/arch/sparc64/dev/upa.c:1.22
--- src/sys/arch/sparc64/dev/upa.c:1.21 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sparc64/dev/upa.c Mon May 10 23:53:44 2021
@@ -1,3 +1,4 @@
+/* $NetBSD: upa.c,v 1.22 2021/05/10 23:53:44 thorpej Exp $ */
/* $OpenBSD: upa.c,v 1.8 2008/01/17 22:53:18 kettenis Exp $ */
/*
@@ -28,11 +29,10 @@
* Effort sponsored in part by the Defense Advanced Research Projects
* Agency (DARPA) and Air Force Research Laboratory, Air Force
* Materiel Command, USAF, under agreement number F30602-01-2-0537.
- *
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: upa.c,v 1.21 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: upa.c,v 1.22 2021/05/10 23:53:44 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -132,7 +132,9 @@ upa_attach(device_t parent, device_t sel
map.ma_name = buf;
map.ma_bustag = sc->sc_cbt;
map.ma_dmatag = ma->ma_dmatag;
- config_found(sc->sc_dev, &map, upa_print, CFARG_EOL);
+ config_found(sc->sc_dev, &map, upa_print,
+ CFARG_DEVHANDLE, prom_node_to_devhandle(node),
+ CFARG_EOL);
}
}
Index: src/sys/arch/sparc64/dev/vpci.c
diff -u src/sys/arch/sparc64/dev/vpci.c:1.10 src/sys/arch/sparc64/dev/vpci.c:1.11
--- src/sys/arch/sparc64/dev/vpci.c:1.10 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sparc64/dev/vpci.c Mon May 10 23:53:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vpci.c,v 1.10 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: vpci.c,v 1.11 2021/05/10 23:53:44 thorpej Exp $ */
/*
* Copyright (c) 2015 Palle Lyckegaard
* All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vpci.c,v 1.10 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vpci.c,v 1.11 2021/05/10 23:53:44 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -267,7 +267,9 @@ FIXME
free(busranges, M_DEVBUF);
- config_found(sc->sc_dev, &pba, vpci_print, CFARG_EOL);
+ config_found(sc->sc_dev, &pba, vpci_print,
+ CFARG_DEVHANDLE, prom_node_to_devhandle(sc->sc_node),
+ CFARG_EOL);
}
void
Index: src/sys/arch/sparc64/sparc64/autoconf.c
diff -u src/sys/arch/sparc64/sparc64/autoconf.c:1.228 src/sys/arch/sparc64/sparc64/autoconf.c:1.229
--- src/sys/arch/sparc64/sparc64/autoconf.c:1.228 Sat Apr 24 23:36:49 2021
+++ src/sys/arch/sparc64/sparc64/autoconf.c Mon May 10 23:53:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.228 2021/04/24 23:36:49 thorpej Exp $ */
+/* $NetBSD: autoconf.c,v 1.229 2021/05/10 23:53:44 thorpej Exp $ */
/*
* Copyright (c) 1996
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.228 2021/04/24 23:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.229 2021/05/10 23:53:44 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -634,7 +634,9 @@ extern struct sparc_bus_space_tag mainbu
ma.ma_dmatag = &mainbus_dma_tag;
ma.ma_node = node;
ma.ma_name = "cpu";
- config_found(dev, &ma, mbprint, CFARG_EOL);
+ config_found(dev, &ma, mbprint,
+ CFARG_DEVHANDLE, devhandle_from_of(ma.ma_node),
+ CFARG_EOL);
}
node = findroot(); /* re-init root node */
@@ -717,7 +719,9 @@ extern struct sparc_bus_space_tag mainbu
printf(" no address\n");
}
#endif
- (void) config_found(dev, (void *)&ma, mbprint, CFARG_EOL);
+ (void) config_found(dev, (void *)&ma, mbprint,
+ CFARG_DEVHANDLE, prom_node_to_devhandle(ma.ma_node),
+ CFARG_EOL);
free(ma.ma_reg, M_DEVBUF);
if (ma.ma_ninterrupts)
free(ma.ma_interrupts, M_DEVBUF);
Index: src/sys/dev/sbus/dma_sbus.c
diff -u src/sys/dev/sbus/dma_sbus.c:1.36 src/sys/dev/sbus/dma_sbus.c:1.37
--- src/sys/dev/sbus/dma_sbus.c:1.36 Sat Apr 24 23:36:58 2021
+++ src/sys/dev/sbus/dma_sbus.c Mon May 10 23:53:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dma_sbus.c,v 1.36 2021/04/24 23:36:58 thorpej Exp $ */
+/* $NetBSD: dma_sbus.c,v 1.37 2021/05/10 23:53:44 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dma_sbus.c,v 1.36 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dma_sbus.c,v 1.37 2021/05/10 23:53:44 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -211,6 +211,7 @@ dmaattach_sbus(device_t parent, device_t
struct sbus_attach_args sax;
sbus_setup_attach_args(sbsc, sbt, sc->sc_dmatag, node, &sax);
(void)config_found(self, (void *)&sax, dmaprint_sbus,
+ CFARG_DEVHANDLE, prom_node_to_devhandle(node),
CFARG_EOL);
sbus_destroy_attach_args(&sax);
}
Index: src/sys/dev/sbus/lebuffer.c
diff -u src/sys/dev/sbus/lebuffer.c:1.37 src/sys/dev/sbus/lebuffer.c:1.38
--- src/sys/dev/sbus/lebuffer.c:1.37 Sat Apr 24 23:36:58 2021
+++ src/sys/dev/sbus/lebuffer.c Mon May 10 23:53:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lebuffer.c,v 1.37 2021/04/24 23:36:58 thorpej Exp $ */
+/* $NetBSD: lebuffer.c,v 1.38 2021/05/10 23:53:44 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lebuffer.c,v 1.37 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lebuffer.c,v 1.38 2021/05/10 23:53:44 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -124,7 +124,9 @@ lebufattach(device_t parent, device_t se
struct sbus_attach_args sax;
sbus_setup_attach_args(sbsc,
bt, dt, node, &sax);
- (void)config_found(self, (void *)&sax, lebufprint, CFARG_EOL);
+ (void)config_found(self, (void *)&sax, lebufprint,
+ CFARG_DEVHANDLE, prom_node_to_devhandle(node),
+ CFARG_EOL);
sbus_destroy_attach_args(&sax);
}
}
Index: src/sys/dev/sbus/qec.c
diff -u src/sys/dev/sbus/qec.c:1.51 src/sys/dev/sbus/qec.c:1.52
--- src/sys/dev/sbus/qec.c:1.51 Sat Apr 24 23:36:58 2021
+++ src/sys/dev/sbus/qec.c Mon May 10 23:53:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: qec.c,v 1.51 2021/04/24 23:36:58 thorpej Exp $ */
+/* $NetBSD: qec.c,v 1.52 2021/05/10 23:53:44 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qec.c,v 1.51 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qec.c,v 1.52 2021/05/10 23:53:44 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -207,7 +207,9 @@ qecattach(device_t parent, device_t self
struct sbus_attach_args sax;
sbus_setup_attach_args(sbsc,
sbt, sc->sc_dmatag, node, &sax);
- (void)config_found(self, (void *)&sax, qecprint, CFARG_EOL);
+ (void)config_found(self, (void *)&sax, qecprint,
+ CFARG_DEVHANDLE, prom_node_to_devhandle(node),
+ CFARG_EOL);
sbus_destroy_attach_args(&sax);
}
}
Index: src/sys/dev/sbus/xbox.c
diff -u src/sys/dev/sbus/xbox.c:1.22 src/sys/dev/sbus/xbox.c:1.23
--- src/sys/dev/sbus/xbox.c:1.22 Sat Apr 24 23:36:58 2021
+++ src/sys/dev/sbus/xbox.c Mon May 10 23:53:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: xbox.c,v 1.22 2021/04/24 23:36:58 thorpej Exp $ */
+/* $NetBSD: xbox.c,v 1.23 2021/05/10 23:53:44 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xbox.c,v 1.22 2021/04/24 23:36:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbox.c,v 1.23 2021/05/10 23:53:44 thorpej Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -149,5 +149,7 @@ xbox_attach(device_t parent, device_t se
xa.xa_bustag = sa->sa_bustag;
xa.xa_dmatag = sa->sa_dmatag;
- (void) config_found(self, (void *)&xa, xbox_print, CFARG_EOL);
+ (void) config_found(self, (void *)&xa, xbox_print,
+ CFARG_DEVHANDLE, prom_node_to_devhandle(node),
+ CFARG_EOL);
}
