Module Name: src
Committed By: thorpej
Date: Sun Apr 4 17:28:03 UTC 2021
Modified Files:
src/sys/arch/macppc/dev [thorpej-cfargs]: gpio.c mediabay.c obio.c
smu.c uni-n.c
src/sys/arch/macppc/macppc [thorpej-cfargs]: mainbus.c
src/sys/arch/macppc/pci [thorpej-cfargs]: bandit.c grackle.c u3.c
uninorth.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.13.2.1 -r1.13.2.2 src/sys/arch/macppc/dev/gpio.c
cvs rdiff -u -r1.24.2.1 -r1.24.2.2 src/sys/arch/macppc/dev/mediabay.c
cvs rdiff -u -r1.48.2.1 -r1.48.2.2 src/sys/arch/macppc/dev/obio.c
cvs rdiff -u -r1.12.2.1 -r1.12.2.2 src/sys/arch/macppc/dev/smu.c
cvs rdiff -u -r1.9.16.1 -r1.9.16.2 src/sys/arch/macppc/dev/uni-n.c
cvs rdiff -u -r1.22.10.1 -r1.22.10.2 src/sys/arch/macppc/macppc/mainbus.c
cvs rdiff -u -r1.32.32.1 -r1.32.32.2 src/sys/arch/macppc/pci/bandit.c
cvs rdiff -u -r1.16.32.1 -r1.16.32.2 src/sys/arch/macppc/pci/grackle.c
cvs rdiff -u -r1.9.16.1 -r1.9.16.2 src/sys/arch/macppc/pci/u3.c
cvs rdiff -u -r1.20.16.1 -r1.20.16.2 src/sys/arch/macppc/pci/uninorth.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/macppc/dev/gpio.c
diff -u src/sys/arch/macppc/dev/gpio.c:1.13.2.1 src/sys/arch/macppc/dev/gpio.c:1.13.2.2
--- src/sys/arch/macppc/dev/gpio.c:1.13.2.1 Sun Mar 21 21:09:02 2021
+++ src/sys/arch/macppc/dev/gpio.c Sun Apr 4 17:28:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gpio.c,v 1.13.2.1 2021/03/21 21:09:02 thorpej Exp $ */
+/* $NetBSD: gpio.c,v 1.13.2.2 2021/04/04 17:28:02 thorpej Exp $ */
/*-
* Copyright (C) 1998 Internet Research Institute, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.13.2.1 2021/03/21 21:09:02 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.13.2.2 2021/04/04 17:28:02 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -119,7 +119,9 @@ gpio_obio_attach(device_t parent, device
ca2.ca_reg = reg;
ca2.ca_intr = intr;
- config_found(self, &ca2, gpio_obio_print, CFARG_EOL);
+ config_found(self, &ca2, gpio_obio_print,
+ CFARG_DEVHANDLE, devhandle_from_of(child),
+ CFARG_EOL);
}
}
Index: src/sys/arch/macppc/dev/mediabay.c
diff -u src/sys/arch/macppc/dev/mediabay.c:1.24.2.1 src/sys/arch/macppc/dev/mediabay.c:1.24.2.2
--- src/sys/arch/macppc/dev/mediabay.c:1.24.2.1 Sun Mar 21 21:09:02 2021
+++ src/sys/arch/macppc/dev/mediabay.c Sun Apr 4 17:28:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mediabay.c,v 1.24.2.1 2021/03/21 21:09:02 thorpej Exp $ */
+/* $NetBSD: mediabay.c,v 1.24.2.2 2021/04/04 17:28:02 thorpej Exp $ */
/*-
* Copyright (C) 1999 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mediabay.c,v 1.24.2.1 2021/03/21 21:09:02 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mediabay.c,v 1.24.2.2 2021/04/04 17:28:02 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -244,6 +244,7 @@ mediabay_attach_content(struct mediabay_
ca.ca_intr = intr;
content = config_found(sc->sc_dev, &ca, mediabay_print,
+ CFARG_DEVHANDLE, devhandle_from_of(child),
CFARG_EOL);
if (content) {
sc->sc_content = content;
Index: src/sys/arch/macppc/dev/obio.c
diff -u src/sys/arch/macppc/dev/obio.c:1.48.2.1 src/sys/arch/macppc/dev/obio.c:1.48.2.2
--- src/sys/arch/macppc/dev/obio.c:1.48.2.1 Sun Mar 21 21:09:02 2021
+++ src/sys/arch/macppc/dev/obio.c Sun Apr 4 17:28:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.48.2.1 2021/03/21 21:09:02 thorpej Exp $ */
+/* $NetBSD: obio.c,v 1.48.2.2 2021/04/04 17:28:02 thorpej Exp $ */
/*-
* Copyright (C) 1998 Internet Research Institute, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.48.2.1 2021/03/21 21:09:02 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.48.2.2 2021/04/04 17:28:02 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -271,7 +271,9 @@ obio_attach(device_t parent, device_t se
ca.ca_reg = reg;
ca.ca_intr = intr;
- config_found(self, &ca, obio_print, CFARG_EOL);
+ config_found(self, &ca, obio_print,
+ CFARG_DEVHANDLE, devhandle_from_of(child),
+ CFARG_EOL);
}
}
Index: src/sys/arch/macppc/dev/smu.c
diff -u src/sys/arch/macppc/dev/smu.c:1.12.2.1 src/sys/arch/macppc/dev/smu.c:1.12.2.2
--- src/sys/arch/macppc/dev/smu.c:1.12.2.1 Tue Mar 23 07:14:48 2021
+++ src/sys/arch/macppc/dev/smu.c Sun Apr 4 17:28:02 2021
@@ -477,7 +477,9 @@ smu_setup_iicbus(struct smu_softc *sc)
ca.ca_name = name;
ca.ca_node = node;
ca.ca_tag = i2c;
- config_found(sc->sc_dev, &ca, smu_iicbus_print, CFARG_EOL);
+ config_found(sc->sc_dev, &ca, smu_iicbus_print,
+ CFARG_DEVHANDLE, devhandle_from_of(node),
+ CFARG_EOL);
sc->sc_num_iicbus++;
}
Index: src/sys/arch/macppc/dev/uni-n.c
diff -u src/sys/arch/macppc/dev/uni-n.c:1.9.16.1 src/sys/arch/macppc/dev/uni-n.c:1.9.16.2
--- src/sys/arch/macppc/dev/uni-n.c:1.9.16.1 Sun Mar 21 21:09:02 2021
+++ src/sys/arch/macppc/dev/uni-n.c Sun Apr 4 17:28:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: uni-n.c,v 1.9.16.1 2021/03/21 21:09:02 thorpej Exp $ */
+/* $NetBSD: uni-n.c,v 1.9.16.2 2021/04/04 17:28:02 thorpej Exp $ */
/*-
* Copyright (C) 2005 Michael Lorenz.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uni-n.c,v 1.9.16.1 2021/03/21 21:09:02 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uni-n.c,v 1.9.16.2 2021/04/04 17:28:02 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -149,7 +149,9 @@ uni_n_attach(device_t parent, device_t s
ca.ca_reg = reg;
ca.ca_intr = intr;
- config_found(self, &ca, uni_n_print, CFARG_EOL);
+ config_found(self, &ca, uni_n_print,
+ CFARG_DEVHANDLE, devhandle_from_of(child),
+ CFARG_EOL);
}
}
Index: src/sys/arch/macppc/macppc/mainbus.c
diff -u src/sys/arch/macppc/macppc/mainbus.c:1.22.10.1 src/sys/arch/macppc/macppc/mainbus.c:1.22.10.2
--- src/sys/arch/macppc/macppc/mainbus.c:1.22.10.1 Sun Mar 21 21:09:02 2021
+++ src/sys/arch/macppc/macppc/mainbus.c Sun Apr 4 17:28:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.22.10.1 2021/03/21 21:09:02 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.22.10.2 2021/04/04 17:28:03 thorpej Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.22.10.1 2021/03/21 21:09:02 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.22.10.2 2021/04/04 17:28:03 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -80,7 +80,9 @@ mainbus_attach(device_t parent, device_t
ca.ca_name = "cpu";
ca.ca_reg = reg;
ca.ca_nreg = OF_getprop(node, "reg", reg, sizeof(reg));
- config_found(self, &ca, NULL, CFARG_EOL);
+ config_found(self, &ca, NULL,
+ CFARG_DEVHANDLE, devhandle_from_of(node),
+ CFARG_EOL);
node = OF_peer(node);
}
} else {
@@ -98,7 +100,9 @@ mainbus_attach(device_t parent, device_t
if (node) {
oba.oba_busname = "ofw";
oba.oba_phandle = node;
- config_found(self, &oba, NULL, CFARG_EOL);
+ config_found(self, &oba, NULL,
+ CFARG_DEVHANDLE, devhandle_from_of(node),
+ CFARG_EOL);
}
for (node = OF_child(OF_finddevice("/")); node; node = OF_peer(node)) {
@@ -110,7 +114,9 @@ mainbus_attach(device_t parent, device_t
ca.ca_node = node;
ca.ca_nreg = OF_getprop(node, "reg", reg, sizeof(reg));
ca.ca_reg = reg;
- config_found(self, &ca, NULL, CFARG_EOL);
+ config_found(self, &ca, NULL,
+ CFARG_DEVHANDLE, devhandle_from_of(node),
+ CFARG_EOL);
}
#ifdef MAMBO
Index: src/sys/arch/macppc/pci/bandit.c
diff -u src/sys/arch/macppc/pci/bandit.c:1.32.32.1 src/sys/arch/macppc/pci/bandit.c:1.32.32.2
--- src/sys/arch/macppc/pci/bandit.c:1.32.32.1 Tue Mar 23 07:14:48 2021
+++ src/sys/arch/macppc/pci/bandit.c Sun Apr 4 17:28:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bandit.c,v 1.32.32.1 2021/03/23 07:14:48 thorpej Exp $ */
+/* $NetBSD: bandit.c,v 1.32.32.2 2021/04/04 17:28:03 thorpej Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bandit.c,v 1.32.32.1 2021/03/23 07:14:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bandit.c,v 1.32.32.2 2021/04/04 17:28:03 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -152,7 +152,9 @@ bandit_attach(device_t parent, device_t
pba.pba_pc = pc;
pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY;
- config_found(self, &pba, pcibusprint, CFARG_EOL);
+ config_found(self, &pba, pcibusprint,
+ CFARG_DEVHANDLE, devhandle_from_of(node),
+ CFARG_EOL);
}
static pcireg_t
Index: src/sys/arch/macppc/pci/grackle.c
diff -u src/sys/arch/macppc/pci/grackle.c:1.16.32.1 src/sys/arch/macppc/pci/grackle.c:1.16.32.2
--- src/sys/arch/macppc/pci/grackle.c:1.16.32.1 Tue Mar 23 07:14:48 2021
+++ src/sys/arch/macppc/pci/grackle.c Sun Apr 4 17:28:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: grackle.c,v 1.16.32.1 2021/03/23 07:14:48 thorpej Exp $ */
+/* $NetBSD: grackle.c,v 1.16.32.2 2021/04/04 17:28:03 thorpej Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grackle.c,v 1.16.32.1 2021/03/23 07:14:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grackle.c,v 1.16.32.2 2021/04/04 17:28:03 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -145,7 +145,9 @@ grackle_attach(device_t parent, device_t
pba.pba_pc = pc;
pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY;
- config_found(self, &pba, pcibusprint, CFARG_EOL);
+ config_found(self, &pba, pcibusprint,
+ CFARG_DEVHANDLE, devhandle_from_of(node),
+ CFARG_EOL);
}
static pcireg_t
Index: src/sys/arch/macppc/pci/u3.c
diff -u src/sys/arch/macppc/pci/u3.c:1.9.16.1 src/sys/arch/macppc/pci/u3.c:1.9.16.2
--- src/sys/arch/macppc/pci/u3.c:1.9.16.1 Tue Mar 23 07:14:48 2021
+++ src/sys/arch/macppc/pci/u3.c Sun Apr 4 17:28:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: u3.c,v 1.9.16.1 2021/03/23 07:14:48 thorpej Exp $ */
+/* $NetBSD: u3.c,v 1.9.16.2 2021/04/04 17:28:03 thorpej Exp $ */
/*
* Copyright 2006 Kyma Systems LLC.
@@ -164,7 +164,10 @@ ibmcpc_attach(device_t parent, device_t
pba.pba_pc = pc;
pba.pba_bus = pc->pc_bus;
pba.pba_flags = PCI_FLAGS_MEM_OKAY | PCI_FLAGS_IO_OKAY;
- config_found(self, &pba, pcibusprint, CFARG_EOL);
+
+ config_found(self, &pba, pcibusprint,
+ CFARG_DEVHANDLE, devhandle_from_of(child),
+ CFARG_EOL);
pc++;
}
Index: src/sys/arch/macppc/pci/uninorth.c
diff -u src/sys/arch/macppc/pci/uninorth.c:1.20.16.1 src/sys/arch/macppc/pci/uninorth.c:1.20.16.2
--- src/sys/arch/macppc/pci/uninorth.c:1.20.16.1 Tue Mar 23 07:14:48 2021
+++ src/sys/arch/macppc/pci/uninorth.c Sun Apr 4 17:28:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: uninorth.c,v 1.20.16.1 2021/03/23 07:14:48 thorpej Exp $ */
+/* $NetBSD: uninorth.c,v 1.20.16.2 2021/04/04 17:28:03 thorpej Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uninorth.c,v 1.20.16.1 2021/03/23 07:14:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uninorth.c,v 1.20.16.2 2021/04/04 17:28:03 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -183,7 +183,9 @@ uninorth_attach(device_t parent, device_
pba.pba_pc = pc;
pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY;
- config_found(self, &pba, pcibusprint, CFARG_EOL);
+ config_found(self, &pba, pcibusprint,
+ CFARG_DEVHANDLE, devhandle_from_of(node),
+ CFARG_EOL);
}
static pcireg_t
