Module Name: src
Committed By: thorpej
Date: Wed May 12 04:07:34 UTC 2021
Modified Files:
src/sys/arch/arm/broadcom: bcm2838_pcie.c
src/sys/arch/arm/fdt: pcihost_fdt.c
src/sys/arch/arm/nvidia: tegra_pcie.c
src/sys/arch/arm/nxp: imxpcie.c
src/sys/arch/ofppc/pci: ofwpci.c
Log Message:
Pass along our device handle to the PCI bus instance we attach.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/broadcom/bcm2838_pcie.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/fdt/pcihost_fdt.c
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/arm/nvidia/tegra_pcie.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/nxp/imxpcie.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/ofppc/pci/ofwpci.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/arm/broadcom/bcm2838_pcie.c
diff -u src/sys/arch/arm/broadcom/bcm2838_pcie.c:1.3 src/sys/arch/arm/broadcom/bcm2838_pcie.c:1.4
--- src/sys/arch/arm/broadcom/bcm2838_pcie.c:1.3 Mon May 3 18:56:38 2021
+++ src/sys/arch/arm/broadcom/bcm2838_pcie.c Wed May 12 04:07:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2838_pcie.c,v 1.3 2021/05/03 18:56:38 tnn Exp $ */
+/* $NetBSD: bcm2838_pcie.c,v 1.4 2021/05/12 04:07:34 thorpej Exp $ */
/*-
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2838_pcie.c,v 1.3 2021/05/03 18:56:38 tnn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2838_pcie.c,v 1.4 2021/05/12 04:07:34 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -281,7 +281,9 @@ bcmstb_attach(device_t self, struct bcms
pba.pba_pc = pc;
pba.pba_bus = sc->sc_bus_min;
- config_found(self, &pba, pcibusprint, CFARG_EOL);
+ config_found(self, &pba, pcibusprint,
+ CFARG_DEVHANDLE, device_handle(self),
+ CFARG_EOL);
}
static void
Index: src/sys/arch/arm/fdt/pcihost_fdt.c
diff -u src/sys/arch/arm/fdt/pcihost_fdt.c:1.24 src/sys/arch/arm/fdt/pcihost_fdt.c:1.25
--- src/sys/arch/arm/fdt/pcihost_fdt.c:1.24 Sat Apr 24 23:36:26 2021
+++ src/sys/arch/arm/fdt/pcihost_fdt.c Wed May 12 04:07:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pcihost_fdt.c,v 1.24 2021/04/24 23:36:26 thorpej Exp $ */
+/* $NetBSD: pcihost_fdt.c,v 1.25 2021/05/12 04:07:34 thorpej Exp $ */
/*-
* Copyright (c) 2018 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcihost_fdt.c,v 1.24 2021/04/24 23:36:26 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcihost_fdt.c,v 1.25 2021/05/12 04:07:34 thorpej Exp $");
#include <sys/param.h>
@@ -194,7 +194,9 @@ pcihost_init2(struct pcihost_softc *sc)
pba.pba_pc = &sc->sc_pc;
pba.pba_bus = sc->sc_bus_min;
- config_found(sc->sc_dev, &pba, pcibusprint, CFARG_EOL);
+ config_found(sc->sc_dev, &pba, pcibusprint,
+ CFARG_DEVHANDLE, device_handle(sc->sc_dev),
+ CFARG_EOL);
}
void
Index: src/sys/arch/arm/nvidia/tegra_pcie.c
diff -u src/sys/arch/arm/nvidia/tegra_pcie.c:1.37 src/sys/arch/arm/nvidia/tegra_pcie.c:1.38
--- src/sys/arch/arm/nvidia/tegra_pcie.c:1.37 Sat Apr 24 23:36:27 2021
+++ src/sys/arch/arm/nvidia/tegra_pcie.c Wed May 12 04:07:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_pcie.c,v 1.37 2021/04/24 23:36:27 thorpej Exp $ */
+/* $NetBSD: tegra_pcie.c,v 1.38 2021/05/12 04:07:34 thorpej Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_pcie.c,v 1.37 2021/04/24 23:36:27 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_pcie.c,v 1.38 2021/05/12 04:07:34 thorpej Exp $");
#include <sys/param.h>
@@ -275,7 +275,9 @@ tegra_pcie_attach(device_t parent, devic
pba.pba_pc = &sc->sc_pc;
pba.pba_bus = 0;
- config_found(self, &pba, pcibusprint, CFARG_EOL);
+ config_found(self, &pba, pcibusprint,
+ CFARG_DEVHANDLE, device_handle(self),
+ CFARG_EOL);
}
static int
Index: src/sys/arch/arm/nxp/imxpcie.c
diff -u src/sys/arch/arm/nxp/imxpcie.c:1.2 src/sys/arch/arm/nxp/imxpcie.c:1.3
--- src/sys/arch/arm/nxp/imxpcie.c:1.2 Sat Apr 24 23:36:28 2021
+++ src/sys/arch/arm/nxp/imxpcie.c Wed May 12 04:07:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: imxpcie.c,v 1.2 2021/04/24 23:36:28 thorpej Exp $ */
+/* $NetBSD: imxpcie.c,v 1.3 2021/05/12 04:07:34 thorpej Exp $ */
/*
* Copyright (c) 2019 Genetec Corporation. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imxpcie.c,v 1.2 2021/04/24 23:36:28 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imxpcie.c,v 1.3 2021/05/12 04:07:34 thorpej Exp $");
#include "opt_pci.h"
#include "opt_fdt.h"
@@ -509,7 +509,9 @@ imxpcie_attach_common(struct imxpcie_sof
pba.pba_pc = &sc->sc_pc;
pba.pba_bus = 0;
- config_found(sc->sc_dev, &pba, pcibusprint, CFARG_EOL);
+ config_found(sc->sc_dev, &pba, pcibusprint,
+ CFARG_DEVHANDLE, device_handle(sc->sc_dev),
+ CFARG_EOL);
}
int
Index: src/sys/arch/ofppc/pci/ofwpci.c
diff -u src/sys/arch/ofppc/pci/ofwpci.c:1.19 src/sys/arch/ofppc/pci/ofwpci.c:1.20
--- src/sys/arch/ofppc/pci/ofwpci.c:1.19 Sat Apr 24 23:36:45 2021
+++ src/sys/arch/ofppc/pci/ofwpci.c Wed May 12 04:07:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ofwpci.c,v 1.19 2021/04/24 23:36:45 thorpej Exp $ */
+/* $NetBSD: ofwpci.c,v 1.20 2021/05/12 04:07:34 thorpej Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofwpci.c,v 1.19 2021/04/24 23:36:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofwpci.c,v 1.20 2021/05/12 04:07:34 thorpej Exp $");
#include "opt_pci.h"
@@ -228,5 +228,7 @@ ofwpci_attach(device_t parent, device_t
pba.pba_bridgetag = NULL;
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, device_handle(self),
+ CFARG_EOL);
}
