Module Name: src
Committed By: thorpej
Date: Sun Apr 4 17:43:53 UTC 2021
Modified Files:
src/sys/arch/shark/ofw [thorpej-cfargs]: ofisapc.c ofisascr.c vlpci.c
src/sys/dev/ofisa [thorpej-cfargs]: ofisa.c
src/sys/dev/ofw [thorpej-cfargs]: ofbus.c
Log Message:
Associate the OpenFirmware phandle associated with a found device (including
PCI bus instances) by using CFARG_DEVHANDLE.
To generate a diff of this commit:
cvs rdiff -u -r1.11.68.1 -r1.11.68.2 src/sys/arch/shark/ofw/ofisapc.c
cvs rdiff -u -r1.10.68.1 -r1.10.68.2 src/sys/arch/shark/ofw/ofisascr.c
cvs rdiff -u -r1.10.2.1 -r1.10.2.2 src/sys/arch/shark/ofw/vlpci.c
cvs rdiff -u -r1.30.2.1 -r1.30.2.2 src/sys/dev/ofisa/ofisa.c
cvs rdiff -u -r1.26.30.1 -r1.26.30.2 src/sys/dev/ofw/ofbus.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/shark/ofw/ofisapc.c
diff -u src/sys/arch/shark/ofw/ofisapc.c:1.11.68.1 src/sys/arch/shark/ofw/ofisapc.c:1.11.68.2
--- src/sys/arch/shark/ofw/ofisapc.c:1.11.68.1 Sun Mar 21 21:09:07 2021
+++ src/sys/arch/shark/ofw/ofisapc.c Sun Apr 4 17:43:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ofisapc.c,v 1.11.68.1 2021/03/21 21:09:07 thorpej Exp $ */
+/* $NetBSD: ofisapc.c,v 1.11.68.2 2021/04/04 17:43:52 thorpej Exp $ */
/*
* Copyright 1997
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofisapc.c,v 1.11.68.1 2021/03/21 21:09:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofisapc.c,v 1.11.68.2 2021/04/04 17:43:52 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -120,5 +120,7 @@ ofisapcattach(device_t parent, device_t
ia.ia_aux = (void *)oba->oba_phandle;
- config_found(dev, &ia, NULL, CFARG_EOL);
+ config_found(dev, &ia, NULL,
+ CFARG_DEVHANDLE, devhandle_from_of(oba->oba_phandle),
+ CFARG_EOL);
}
Index: src/sys/arch/shark/ofw/ofisascr.c
diff -u src/sys/arch/shark/ofw/ofisascr.c:1.10.68.1 src/sys/arch/shark/ofw/ofisascr.c:1.10.68.2
--- src/sys/arch/shark/ofw/ofisascr.c:1.10.68.1 Sun Mar 21 21:09:07 2021
+++ src/sys/arch/shark/ofw/ofisascr.c Sun Apr 4 17:43:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ofisascr.c,v 1.10.68.1 2021/03/21 21:09:07 thorpej Exp $ */
+/* $NetBSD: ofisascr.c,v 1.10.68.2 2021/04/04 17:43:52 thorpej Exp $ */
/*
* Copyright 1997
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofisascr.c,v 1.10.68.1 2021/03/21 21:09:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofisascr.c,v 1.10.68.2 2021/04/04 17:43:52 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -104,5 +104,7 @@ ofisascrattach(device_t parent, device_t
ia.ia_aux = (void *)oba->oba_phandle;
- config_found(dev, &ia, NULL, CFARG_EOL);
+ config_found(dev, &ia, NULL,
+ CFARG_DEVHANDLE, devhandle_from_of(oba->oba_phandle),
+ CFARG_EOL);
}
Index: src/sys/arch/shark/ofw/vlpci.c
diff -u src/sys/arch/shark/ofw/vlpci.c:1.10.2.1 src/sys/arch/shark/ofw/vlpci.c:1.10.2.2
--- src/sys/arch/shark/ofw/vlpci.c:1.10.2.1 Tue Mar 23 07:14:51 2021
+++ src/sys/arch/shark/ofw/vlpci.c Sun Apr 4 17:43:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vlpci.c,v 1.10.2.1 2021/03/23 07:14:51 thorpej Exp $ */
+/* $NetBSD: vlpci.c,v 1.10.2.2 2021/04/04 17:43:53 thorpej Exp $ */
/*
* Copyright (c) 2017 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vlpci.c,v 1.10.2.1 2021/03/23 07:14:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vlpci.c,v 1.10.2.2 2021/04/04 17:43:53 thorpej Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -202,6 +202,7 @@ vlpci_match(device_t parent, struct cfda
static void
vlpci_attach(device_t parent, device_t self, void *aux)
{
+ struct ofbus_attach_args * const oba = aux;
struct vlpci_softc * const sc = device_private(self);
pci_chipset_tag_t const pc = &sc->sc_pc;
struct pcibus_attach_args pba;
@@ -327,7 +328,9 @@ vlpci_attach(device_t parent, device_t s
vlpci_dump_window(sc, VLPCI_PCI_WND_NO_2);
vlpci_dump_window(sc, VLPCI_PCI_WND_NO_3);
- config_found(self, &pba, pcibusprint, CFARG_EOL);
+ config_found(self, &pba, pcibusprint,
+ CFARG_DEVHANDLE, devhandle_from_of(oba->oba_phandle),
+ CFARG_EOL);
}
static void
Index: src/sys/dev/ofisa/ofisa.c
diff -u src/sys/dev/ofisa/ofisa.c:1.30.2.1 src/sys/dev/ofisa/ofisa.c:1.30.2.2
--- src/sys/dev/ofisa/ofisa.c:1.30.2.1 Sun Mar 21 21:09:13 2021
+++ src/sys/dev/ofisa/ofisa.c Sun Apr 4 17:43:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ofisa.c,v 1.30.2.1 2021/03/21 21:09:13 thorpej Exp $ */
+/* $NetBSD: ofisa.c,v 1.30.2.2 2021/04/04 17:43:52 thorpej Exp $ */
/*
* Copyright 1997, 1998
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofisa.c,v 1.30.2.1 2021/03/21 21:09:13 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofisa.c,v 1.30.2.2 2021/04/04 17:43:52 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -131,7 +131,9 @@ ofisaattach(device_t parent, device_t se
aa.dmat = iba.iba_dmat;
aa.ic = iba.iba_ic;
- config_found(self, &aa, ofisaprint, CFARG_EOL);
+ config_found(self, &aa, ofisaprint,
+ CFARG_DEVHANDLE, devhandle_from_of(child),
+ CFARG_EOL);
}
}
Index: src/sys/dev/ofw/ofbus.c
diff -u src/sys/dev/ofw/ofbus.c:1.26.30.1 src/sys/dev/ofw/ofbus.c:1.26.30.2
--- src/sys/dev/ofw/ofbus.c:1.26.30.1 Sun Mar 21 21:09:13 2021
+++ src/sys/dev/ofw/ofbus.c Sun Apr 4 17:43:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ofbus.c,v 1.26.30.1 2021/03/21 21:09:13 thorpej Exp $ */
+/* $NetBSD: ofbus.c,v 1.26.30.2 2021/04/04 17:43:52 thorpej Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofbus.c,v 1.26.30.1 2021/03/21 21:09:13 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofbus.c,v 1.26.30.2 2021/04/04 17:43:52 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -116,7 +116,9 @@ ofbus_attach(device_t parent, device_t d
strlcpy(oba2.oba_ofname, name,
sizeof(oba2.oba_ofname));
}
- config_found(dev, &oba2, ofbus_print, CFARG_EOL);
+ config_found(dev, &oba2, ofbus_print,
+ CFARG_DEVHANDLE, devhandle_from_of(child),
+ CFARG_EOL);
}
}
@@ -141,7 +143,9 @@ ofbus_attach(device_t parent, device_t d
strlcpy(oba2.oba_ofname, name,
sizeof(oba2.oba_ofname));
}
- config_found(dev, &oba2, ofbus_print, CFARG_EOL);
+ config_found(dev, &oba2, ofbus_print,
+ CFARG_DEVHANDLE, devhandle_from_of(child),
+ CFARG_EOL);
}
}
