summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/arch/alpha/pci/apecs.c3
-rw-r--r--sys/arch/alpha/pci/cia.c3
-rw-r--r--sys/arch/alpha/pci/irongate.c3
-rw-r--r--sys/arch/alpha/pci/lca.c3
-rw-r--r--sys/arch/alpha/pci/tsc.c3
-rw-r--r--sys/arch/amd64/amd64/mainbus.c3
-rw-r--r--sys/arch/amd64/pci/pchb.c3
-rw-r--r--sys/arch/arm/footbridge/footbridge.c3
-rw-r--r--sys/arch/hppa/dev/dino.c3
-rw-r--r--sys/arch/hppa64/dev/elroy.c3
-rw-r--r--sys/arch/i386/i386/mainbus.c3
-rw-r--r--sys/arch/i386/pci/pchb.c3
-rw-r--r--sys/arch/macppc/pci/ht.c3
-rw-r--r--sys/arch/macppc/pci/mpcpcibus.c3
-rw-r--r--sys/arch/sgi/pci/macepcibridge.c3
-rw-r--r--sys/arch/sparc64/dev/psycho.c3
-rw-r--r--sys/arch/sparc64/dev/schizo.c3
-rw-r--r--sys/dev/pci/pcivar.h9
-rw-r--r--sys/dev/pci/ppb.c15
19 files changed, 55 insertions, 20 deletions
diff --git a/sys/arch/alpha/pci/apecs.c b/sys/arch/alpha/pci/apecs.c
index f3d2966a7af..dba64eae71e 100644
--- a/sys/arch/alpha/pci/apecs.c
+++ b/sys/arch/alpha/pci/apecs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apecs.c,v 1.17 2002/03/14 01:26:27 millert Exp $ */
+/* $OpenBSD: apecs.c,v 1.18 2006/03/13 20:10:49 brad Exp $ */
/* $NetBSD: apecs.c,v 1.16 1996/12/05 01:39:34 cgd Exp $ */
/*-
@@ -245,6 +245,7 @@ apecsattach(parent, self, aux)
alphabus_dma_get_tag(&acp->ac_dmat_direct, ALPHA_BUS_PCI);
pba.pba_pc = &acp->ac_pc;
pba.pba_bus = 0;
+ pba.pba_bridgetag = NULL;
#ifdef notyet
pba.pba_flags = PCI_FLAGS_IO_ENABLED | PCI_FLAGS_MEM_ENABLED |
PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY | PCI_FLAGS_MWI_OKAY;
diff --git a/sys/arch/alpha/pci/cia.c b/sys/arch/alpha/pci/cia.c
index 6648a0b2d93..87623a2e941 100644
--- a/sys/arch/alpha/pci/cia.c
+++ b/sys/arch/alpha/pci/cia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cia.c,v 1.20 2003/10/18 20:14:42 jmc Exp $ */
+/* $OpenBSD: cia.c,v 1.21 2006/03/13 20:10:49 brad Exp $ */
/* $NetBSD: cia.c,v 1.56 2000/06/29 08:58:45 mrg Exp $ */
/*-
@@ -402,6 +402,7 @@ ciaattach(parent, self, aux)
alphabus_dma_get_tag(&ccp->cc_dmat_direct, ALPHA_BUS_PCI);
pba.pba_pc = &ccp->cc_pc;
pba.pba_bus = 0;
+ pba.pba_bridgetag = NULL;
#ifdef notyet
pba.pba_flags = PCI_FLAGS_IO_ENABLED | PCI_FLAGS_MEM_ENABLED;
diff --git a/sys/arch/alpha/pci/irongate.c b/sys/arch/alpha/pci/irongate.c
index ca970b8c1a7..bca9c006616 100644
--- a/sys/arch/alpha/pci/irongate.c
+++ b/sys/arch/alpha/pci/irongate.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: irongate.c,v 1.6 2004/07/18 02:18:26 deraadt Exp $ */
+/* $OpenBSD: irongate.c,v 1.7 2006/03/13 20:10:49 brad Exp $ */
/* $NetBSD: irongate.c,v 1.3 2000/11/29 06:29:10 thorpej Exp $ */
/*-
@@ -185,6 +185,7 @@ irongate_attach(struct device *parent, struct device *self, void *aux)
alphabus_dma_get_tag(&icp->ic_dmat_pci, ALPHA_BUS_PCI);
pba.pba_pc = &icp->ic_pc;
pba.pba_bus = 0;
+ pba.pba_bridgetag = NULL;
#ifdef notyet
pba.pba_flags = PCI_FLAGS_IO_ENABLED | PCI_FLAGS_MEM_ENABLED |
PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY | PCI_FLAGS_MWI_OKAY;
diff --git a/sys/arch/alpha/pci/lca.c b/sys/arch/alpha/pci/lca.c
index 859e1f9e9d7..a90c5f92007 100644
--- a/sys/arch/alpha/pci/lca.c
+++ b/sys/arch/alpha/pci/lca.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lca.c,v 1.16 2002/03/14 01:26:27 millert Exp $ */
+/* $OpenBSD: lca.c,v 1.17 2006/03/13 20:10:49 brad Exp $ */
/* $NetBSD: lca.c,v 1.14 1996/12/05 01:39:35 cgd Exp $ */
/*-
@@ -256,6 +256,7 @@ lcaattach(parent, self, aux)
alphabus_dma_get_tag(&lcp->lc_dmat_direct, ALPHA_BUS_PCI);
pba.pba_pc = &lcp->lc_pc;
pba.pba_bus = 0;
+ pba.pba_bridgetag = NULL;
#ifdef notyet
pba.pba_flags = PCI_FLAGS_IO_ENABLED | PCI_FLAGS_MEM_ENABLED |
PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY | PCI_FLAGS_MWI_OKAY;
diff --git a/sys/arch/alpha/pci/tsc.c b/sys/arch/alpha/pci/tsc.c
index 52a03a5b41c..29807f4af7b 100644
--- a/sys/arch/alpha/pci/tsc.c
+++ b/sys/arch/alpha/pci/tsc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tsc.c,v 1.10 2005/12/13 01:16:11 martin Exp $ */
+/* $OpenBSD: tsc.c,v 1.11 2006/03/13 20:10:49 brad Exp $ */
/* $NetBSD: tsc.c,v 1.3 2000/06/25 19:17:40 thorpej Exp $ */
/*-
@@ -200,6 +200,7 @@ tspattach(parent, self, aux)
alphabus_dma_get_tag(&pcp->pc_dmat_direct, ALPHA_BUS_PCI);
pba.pba_pc = &pcp->pc_pc;
pba.pba_bus = 0;
+ pba.pba_bridgetag = NULL;
#ifdef notyet
pba.pba_flags = PCI_FLAGS_IO_ENABLED | PCI_FLAGS_MEM_ENABLED |
PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY | PCI_FLAGS_MWI_OKAY;
diff --git a/sys/arch/amd64/amd64/mainbus.c b/sys/arch/amd64/amd64/mainbus.c
index d8ddd224ec2..a07542b4be9 100644
--- a/sys/arch/amd64/amd64/mainbus.c
+++ b/sys/arch/amd64/amd64/mainbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mainbus.c,v 1.5 2006/03/13 15:57:18 marco Exp $ */
+/* $OpenBSD: mainbus.c,v 1.6 2006/03/13 20:10:49 brad Exp $ */
/* $NetBSD: mainbus.c,v 1.1 2003/04/26 18:39:29 fvdl Exp $ */
/*
@@ -205,6 +205,7 @@ mainbus_attach(parent, self, aux)
mba.mba_pba.pba_memt = X86_BUS_SPACE_MEM;
mba.mba_pba.pba_dmat = &pci_bus_dma_tag;
mba.mba_pba.pba_bus = 0;
+ mba.mba_pba.pba_bridgetag = NULL;
mba.mba_pba.pba_pc = NULL;
config_found(self, &mba.mba_pba, mainbus_print);
}
diff --git a/sys/arch/amd64/pci/pchb.c b/sys/arch/amd64/pci/pchb.c
index 478121194bf..ac63b13aff5 100644
--- a/sys/arch/amd64/pci/pchb.c
+++ b/sys/arch/amd64/pci/pchb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pchb.c,v 1.3 2006/02/12 23:46:27 kettenis Exp $ */
+/* $OpenBSD: pchb.c,v 1.4 2006/03/13 20:10:49 brad Exp $ */
/* $NetBSD: pchb.c,v 1.1 2003/04/26 18:39:50 fvdl Exp $ */
/*-
@@ -171,6 +171,7 @@ pchb_amd64ht_attach (struct device *self, struct pci_attach_args *pa, int i)
pba.pba_memt = pa->pa_memt;
pba.pba_dmat = pa->pa_dmat;
pba.pba_bus = AMD64HT_LDT_SEC_BUS_NUM(bus);
+ pba.pba_bridgetag = NULL;
pba.pba_pc = pa->pa_pc;
config_found(self, &pba, pchb_print);
}
diff --git a/sys/arch/arm/footbridge/footbridge.c b/sys/arch/arm/footbridge/footbridge.c
index 6fa0cfed203..cba0426c0c7 100644
--- a/sys/arch/arm/footbridge/footbridge.c
+++ b/sys/arch/arm/footbridge/footbridge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: footbridge.c,v 1.4 2004/08/17 19:40:45 drahn Exp $ */
+/* $OpenBSD: footbridge.c,v 1.5 2006/03/13 20:10:49 brad Exp $ */
/* $NetBSD: footbridge.c,v 1.7 2002/05/16 01:01:33 thorpej Exp $ */
/*
@@ -222,6 +222,7 @@ footbridge_attach(parent, self, aux)
fba.fba_pba.pba_flags = PCI_FLAGS_IO_ENABLED | PCI_FLAGS_MEM_ENABLED;
*/
fba.fba_pba.pba_bus = 0;
+ fba.fba_pba.pba_bridgetag = NULL;
config_found(self, &fba.fba_pba, footbridge_print);
/* Attach uart device */
diff --git a/sys/arch/hppa/dev/dino.c b/sys/arch/hppa/dev/dino.c
index ec279bdb32d..f25598e11fe 100644
--- a/sys/arch/hppa/dev/dino.c
+++ b/sys/arch/hppa/dev/dino.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dino.c,v 1.16 2005/09/06 23:53:38 mickey Exp $ */
+/* $OpenBSD: dino.c,v 1.17 2006/03/13 20:10:49 brad Exp $ */
/*
* Copyright (c) 2003-2005 Michael Shalayeff
@@ -1623,6 +1623,7 @@ dinoattach(parent, self, aux)
pba.pba_dmat = &sc->sc_dmatag;
pba.pba_pc = &sc->sc_pc;
pba.pba_bus = 0;
+ pba.pba_bridgetag = NULL;
config_found(self, &pba, dinoprint);
/* enable interrupts now that all the devices are there */
diff --git a/sys/arch/hppa64/dev/elroy.c b/sys/arch/hppa64/dev/elroy.c
index 36538cdfd00..e271b97fbcc 100644
--- a/sys/arch/hppa64/dev/elroy.c
+++ b/sys/arch/hppa64/dev/elroy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: elroy.c,v 1.2 2005/05/22 01:38:09 mickey Exp $ */
+/* $OpenBSD: elroy.c,v 1.3 2006/03/13 20:10:49 brad Exp $ */
/*
* Copyright (c) 2005 Michael Shalayeff
@@ -1179,6 +1179,7 @@ letoh64(r->eio_base), letoh64(r->eio_mask));
pba.pba_memt = &sc->sc_memt;
pba.pba_dmat = &sc->sc_dmatag;
pba.pba_pc = &sc->sc_pc;
+ pba.pba_bridgetag = NULL;
pba.pba_bus = 0; /* (letoh32(elroy_read32(&r->busnum)) & 0xff) >> 4; */
config_found(self, &pba, elroyprint);
diff --git a/sys/arch/i386/i386/mainbus.c b/sys/arch/i386/i386/mainbus.c
index 6397fb6d2f9..8bae218b5a5 100644
--- a/sys/arch/i386/i386/mainbus.c
+++ b/sys/arch/i386/i386/mainbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mainbus.c,v 1.24 2006/03/13 15:40:37 marco Exp $ */
+/* $OpenBSD: mainbus.c,v 1.25 2006/03/13 20:10:49 brad Exp $ */
/* $NetBSD: mainbus.c,v 1.21 1997/06/06 23:14:20 thorpej Exp $ */
/*
@@ -237,6 +237,7 @@ mainbus_attach(parent, self, aux)
mba.mba_pba.pba_memt = I386_BUS_SPACE_MEM;
mba.mba_pba.pba_dmat = &pci_bus_dma_tag;
mba.mba_pba.pba_bus = 0;
+ mba.mba_pba.pba_bridgetag = NULL;
config_found(self, &mba.mba_pba, mainbus_print);
}
#endif
diff --git a/sys/arch/i386/pci/pchb.c b/sys/arch/i386/pci/pchb.c
index 8da305e6d7d..7a664b416c5 100644
--- a/sys/arch/i386/pci/pchb.c
+++ b/sys/arch/i386/pci/pchb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pchb.c,v 1.51 2006/02/14 13:42:54 kettenis Exp $ */
+/* $OpenBSD: pchb.c,v 1.52 2006/03/13 20:10:49 brad Exp $ */
/* $NetBSD: pchb.c,v 1.6 1997/06/06 23:29:16 thorpej Exp $ */
/*
@@ -238,6 +238,7 @@ pchbattach(parent, self, aux)
pba.pba_memt = pa->pa_memt;
pba.pba_dmat = pa->pa_dmat;
pba.pba_bus = bdnum;
+ pba.pba_bridgetag = NULL;
pba.pba_pc = pa->pa_pc;
printf("\n");
config_found(self, &pba, pchb_print);
diff --git a/sys/arch/macppc/pci/ht.c b/sys/arch/macppc/pci/ht.c
index 657c41cac8b..ba439b2056e 100644
--- a/sys/arch/macppc/pci/ht.c
+++ b/sys/arch/macppc/pci/ht.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ht.c,v 1.8 2005/12/14 20:06:57 kettenis Exp $ */
+/* $OpenBSD: ht.c,v 1.9 2006/03/13 20:10:49 brad Exp $ */
/*
* Copyright (c) 2005 Mark Kettenis
@@ -190,6 +190,7 @@ ht_attach(struct device *parent, struct device *self, void *aux)
pba.pba_dmat = &pci_bus_dma_tag;
pba.pba_pc = &sc->sc_pc;
pba.pba_bus = 0;
+ pba.pba_bridgetag = NULL;
printf(": %d devices\n", sc->sc_maxdevs);
diff --git a/sys/arch/macppc/pci/mpcpcibus.c b/sys/arch/macppc/pci/mpcpcibus.c
index 786ab8c5dbc..cd624c24a0b 100644
--- a/sys/arch/macppc/pci/mpcpcibus.c
+++ b/sys/arch/macppc/pci/mpcpcibus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpcpcibus.c,v 1.30 2006/02/11 05:21:40 brad Exp $ */
+/* $OpenBSD: mpcpcibus.c,v 1.31 2006/03/13 20:10:49 brad Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom
@@ -444,6 +444,7 @@ mpcpcibrattach(struct device *parent, struct device *self, void *aux)
pba.pba_memt = &sc->sc_membus_space;
pba.pba_pc = &lcp->lc_pc;
pba.pba_bus = 0;
+ pba.pba_bridgetag = NULL;
/* we want to check pci irq settings */
if (of_node != 0) {
diff --git a/sys/arch/sgi/pci/macepcibridge.c b/sys/arch/sgi/pci/macepcibridge.c
index 90b6646b683..fb6efacb836 100644
--- a/sys/arch/sgi/pci/macepcibridge.c
+++ b/sys/arch/sgi/pci/macepcibridge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: macepcibridge.c,v 1.9 2006/01/04 20:23:09 miod Exp $ */
+/* $OpenBSD: macepcibridge.c,v 1.10 2006/03/13 20:10:49 brad Exp $ */
/*
* Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se)
@@ -243,6 +243,7 @@ mace_pcibrattach(struct device *parent, struct device *self, void *aux)
*pba.pba_dmat = pci_bus_dma_tag;
pba.pba_pc = &sc->sc_pc;
pba.pba_bus = sc->sc_dev.dv_unit;
+ pba.pba_bridgetag = NULL;
config_found(self, &pba, mace_pcibrprint);
/* Clear PCI errors and set up error interrupt */
diff --git a/sys/arch/sparc64/dev/psycho.c b/sys/arch/sparc64/dev/psycho.c
index 7ef8a64e5d9..b187a7e81c7 100644
--- a/sys/arch/sparc64/dev/psycho.c
+++ b/sys/arch/sparc64/dev/psycho.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: psycho.c,v 1.41 2005/06/06 20:31:12 jason Exp $ */
+/* $OpenBSD: psycho.c,v 1.42 2006/03/13 20:10:49 brad Exp $ */
/* $NetBSD: psycho.c,v 1.39 2001/10/07 20:30:41 eeh Exp $ */
/*
@@ -358,6 +358,7 @@ psycho_attach(struct device *parent, struct device *self, void *aux)
psycho_get_bus_range(sc->sc_node, psycho_br);
pba.pba_bus = psycho_br[0];
+ pba.pba_bridgetag = NULL;
printf("bus range %u to %u", psycho_br[0], psycho_br[1]);
printf("; PCI bus %d", psycho_br[0]);
diff --git a/sys/arch/sparc64/dev/schizo.c b/sys/arch/sparc64/dev/schizo.c
index fdffac2237b..252275b7eba 100644
--- a/sys/arch/sparc64/dev/schizo.c
+++ b/sys/arch/sparc64/dev/schizo.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: schizo.c,v 1.16 2003/06/24 21:54:39 henric Exp $ */
+/* $OpenBSD: schizo.c,v 1.17 2006/03/13 20:10:49 brad Exp $ */
/*
* Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -191,6 +191,7 @@ schizo_init(struct schizo_softc *sc, int busa)
pba.pba_busname = "pci";
pba.pba_bus = busranges[0];
+ pba.pba_bridgetag = NULL;
pba.pba_pc = pbm->sp_pc;
#if 0
pba.pba_flags = pbm->sp_flags;
diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h
index 9aa4858e92d..a3546de0868 100644
--- a/sys/dev/pci/pcivar.h
+++ b/sys/dev/pci/pcivar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcivar.h,v 1.43 2006/03/11 22:08:07 brad Exp $ */
+/* $OpenBSD: pcivar.h,v 1.44 2006/03/13 20:10:49 brad Exp $ */
/* $NetBSD: pcivar.h,v 1.23 1997/06/06 23:48:05 thorpej Exp $ */
/*
@@ -83,6 +83,12 @@ struct pcibus_attach_args {
int pba_bus; /* PCI bus number */
/*
+ * Pointer to the pcitag of our parent bridge. If there is no
+ * parent bridge, then we assume we are a root bus.
+ */
+ pcitag_t *pba_bridgetag;
+
+ /*
* Interrupt swizzling information. These fields
* are only used by secondary busses.
*/
@@ -149,6 +155,7 @@ struct pci_softc {
void *sc_powerhook;
LIST_HEAD(, pci_dev) sc_devs;
int sc_bus;
+ pcitag_t *sc_bridgetag;
};
/*
diff --git a/sys/dev/pci/ppb.c b/sys/dev/pci/ppb.c
index 888f55a4fd6..b40c1a10604 100644
--- a/sys/dev/pci/ppb.c
+++ b/sys/dev/pci/ppb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ppb.c,v 1.13 2006/02/27 02:05:19 drahn Exp $ */
+/* $OpenBSD: ppb.c,v 1.14 2006/03/13 20:10:49 brad Exp $ */
/* $NetBSD: ppb.c,v 1.16 1997/06/06 23:48:05 thorpej Exp $ */
/*
@@ -50,11 +50,17 @@
#include <dev/pci/pcidevs.h>
#include <dev/pci/ppbreg.h>
+struct ppb_softc {
+ struct device sc_dev; /* generic device glue */
+ pci_chipset_tag_t sc_pc; /* our PCI chipset... */
+ pcitag_t sc_tag; /* ...and tag. */
+};
+
int ppbmatch(struct device *, void *, void *);
void ppbattach(struct device *, struct device *, void *);
struct cfattach ppb_ca = {
- sizeof(struct device), ppbmatch, ppbattach
+ sizeof(struct ppb_softc), ppbmatch, ppbattach
};
struct cfdriver ppb_cd = {
@@ -96,6 +102,7 @@ ppbattach(parent, self, aux)
struct device *parent, *self;
void *aux;
{
+ struct ppb_softc *sc = (void *) self;
struct pci_attach_args *pa = aux;
pci_chipset_tag_t pc = pa->pa_pc;
struct pcibus_attach_args pba;
@@ -103,6 +110,9 @@ ppbattach(parent, self, aux)
printf("\n");
+ sc->sc_pc = pc;
+ sc->sc_tag = pa->pa_tag;
+
busdata = pci_conf_read(pc, pa->pa_tag, PPB_REG_BUSINFO);
if (PPB_BUSINFO_SECONDARY(busdata) == 0) {
@@ -132,6 +142,7 @@ ppbattach(parent, self, aux)
pba.pba_dmat = pa->pa_dmat;
pba.pba_pc = pc;
pba.pba_bus = PPB_BUSINFO_SECONDARY(busdata);
+ pba.pba_bridgetag = &sc->sc_tag;
pba.pba_intrswiz = pa->pa_intrswiz;
pba.pba_intrtag = pa->pa_intrtag;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-31 23:15:27 +0000