From: Sepherosa Ziehau Date: Fri, 17 Aug 2012 15:13:33 +0000 (+0800) Subject: pci: Enable PCIe memory mapped configuration again X-Git-Tag: v3.2.0~372 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/aaa576552b475dd91f4433c99d494f3008753e98?ds=sidebyside pci: Enable PCIe memory mapped configuration again bd7ad9e91e71693907a00c74ab8dfc457cd655c9 should have fixed the system hanging seen by y0netan1@ --- diff --git a/sys/bus/pci/x86_64/pci_cfgreg.c b/sys/bus/pci/x86_64/pci_cfgreg.c index 01d9a2eacf..0d12a73b61 100644 --- a/sys/bus/pci/x86_64/pci_cfgreg.c +++ b/sys/bus/pci/x86_64/pci_cfgreg.c @@ -63,7 +63,7 @@ static uint32_t pcie_badslots; static int cfgmech; static struct spinlock pcicfg_spin; -static int mcfg_enable = 0; +static int mcfg_enable = 1; TUNABLE_INT("hw.pci.mcfg", &mcfg_enable); static uint32_t pci_docfgregread(int bus, int slot, int func, int reg, int bytes); @@ -273,6 +273,9 @@ pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus) if (minbus != 0) return 0; + if (bootverbose) + kprintf("PCIe: Using Memory Mapped configuration\n"); + pcie_base = (vm_offset_t)pmap_mapdev_uncacheable(base, ((unsigned)maxbus + 1) << 20); pcie_minbus = minbus;