summaryrefslogtreecommitdiff
path: root/sys/arch/amd64
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2006-03-13 20:10:50 +0000
committerBrad Smith <brad@cvs.openbsd.org>2006-03-13 20:10:50 +0000
commit2bbf5c811672d5b0c39d5784c61dd91913e8e045 (patch)
treea1809fa7aebf56fa87ef985c841627841bad37d0 /sys/arch/amd64
parent9afec5752905399d9d215d7e3ed13f7c74e690fb (diff)
* Add "pcitag_t *pba_bridgetag" to pci_attach_args. This is set to
NULL for root PCI busses. For busses behind a bridge, it points to a persistent copy of the bridge's pcitag_t. This can be very useful for machine-dependent PCI bus enumeration code. From NetBSD ok grange@ kettenis@
Diffstat (limited to 'sys/arch/amd64')
-rw-r--r--sys/arch/amd64/amd64/mainbus.c3
-rw-r--r--sys/arch/amd64/pci/pchb.c3
2 files changed, 4 insertions, 2 deletions
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);
}