diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2011-01-10 16:26:28 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2011-01-10 16:26:28 +0000 |
| commit | d5752f9442ad624ff1a77a80568f89b94a24b927 (patch) | |
| tree | e1b0b3370393af97c29b9418cc18f6e77014d016 /sys/arch/i386/pci | |
| parent | 0a4a9df88e4339b22efeef2192b29449d870ee36 (diff) | |
Only use MMCFG extended PCIe config space. Gets us back the on-CPU PCI devices on AMD Family 0Fh processors.
Diffstat (limited to 'sys/arch/i386/pci')
| -rw-r--r-- | sys/arch/i386/pci/pci_machdep.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/i386/pci/pci_machdep.c b/sys/arch/i386/pci/pci_machdep.c index 8d684f8f306..e928858e394 100644 --- a/sys/arch/i386/pci/pci_machdep.c +++ b/sys/arch/i386/pci/pci_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_machdep.c,v 1.57 2011/01/09 11:38:10 kettenis Exp $ */ +/* $OpenBSD: pci_machdep.c,v 1.58 2011/01/10 16:26:27 kettenis Exp $ */ /* $NetBSD: pci_machdep.c,v 1.28 1997/06/06 23:29:17 thorpej Exp $ */ /*- @@ -304,7 +304,7 @@ pci_conf_read(pci_chipset_tag_t pc, pcitag_t tag, int reg) pcireg_t data; int bus; - if (pci_mcfg_addr) { + if (pci_mcfg_addr && reg >= PCI_CONFIG_SPACE_SIZE) { pci_decompose_tag(pc, tag, &bus, NULL, NULL); if (bus >= pci_mcfg_min_bus && bus <= pci_mcfg_max_bus) { pci_mcfg_map_bus(bus); @@ -340,7 +340,7 @@ pci_conf_write(pci_chipset_tag_t pc, pcitag_t tag, int reg, pcireg_t data) { int bus; - if (pci_mcfg_addr) { + if (pci_mcfg_addr && reg >= PCI_CONFIG_SPACE_SIZE) { pci_decompose_tag(pc, tag, &bus, NULL, NULL); if (bus >= pci_mcfg_min_bus && bus <= pci_mcfg_max_bus) { pci_mcfg_map_bus(bus); |