diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2015-11-27 15:28:23 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2015-11-27 15:28:23 +0000 |
| commit | 01eb60d711eba5f572af5ea205617c9033889052 (patch) | |
| tree | 5079e35b9d423cce1d2900636873b069d9b9bd06 /sys/dev | |
| parent | a7e0c36eec2fa97a5a2fc68c2940b9964e475069 (diff) | |
Don't report a bus conflict for bridges that are left (partly) unconfigured by
the system firmware.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 17f330a9169..e7ebc08d9bd 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci.c,v 1.110 2015/09/10 10:36:48 deraadt Exp $ */ +/* $OpenBSD: pci.c,v 1.111 2015/11/27 15:28:22 kettenis Exp $ */ /* $NetBSD: pci.c,v 1.31 1997/06/06 23:48:04 thorpej Exp $ */ /* @@ -981,7 +981,7 @@ pci_reserve_resources(struct pci_attach_args *pa) bir = pci_conf_read(pc, tag, PPB_REG_BUSINFO); sec = PPB_BUSINFO_SECONDARY(bir); sub = PPB_BUSINFO_SUBORDINATE(bir); - if (pa->pa_busex && sub >= sec) { + if (pa->pa_busex && sub >= sec && sub > 0) { if (extent_alloc_region(pa->pa_busex, sec, sub - sec + 1, EX_NOWAIT)) { printf("%d:%d:%d: bridge bus conflict %d-%d\n", |