From 70be3980706df980c696bf0fe0f82c44bd0183fd Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Sat, 17 Jan 2004 21:54:04 +0000 Subject: [PATCH] It appears that the changes in the resources allocated is causing much pain and suffering. Attempt to back it out by removing the 'if the requested range is larger than the window, clip to the window' code. This is a band-aide until the issues are better understood and the issues with the lazy allocation patches are resolved. --- sys/dev/pci/pci_pci.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/dev/pci/pci_pci.c b/sys/dev/pci/pci_pci.c index eeba0006c74..293c372464b 100644 --- a/sys/dev/pci/pci_pci.c +++ b/sys/dev/pci/pci_pci.c @@ -321,11 +321,12 @@ pcib_alloc_resource(device_t dev, device_t child, int type, int *rid, } } else { ok = 1; +#if 0 if (start < sc->iobase && end > sc->iolimit) { start = sc->iobase; end = sc->iolimit; } - +#endif } if (end < start) { device_printf(dev, "ioport: end (%lx) < start (%lx)\n", end, start); @@ -376,6 +377,7 @@ pcib_alloc_resource(device_t dev, device_t child, int type, int *rid, } } else if (!ok) { ok = 1; /* subtractive bridge: always ok */ +#if 0 if (pcib_is_nonprefetch_open(sc)) { if (start < sc->membase && end > sc->memlimit) { start = sc->membase; @@ -388,6 +390,7 @@ pcib_alloc_resource(device_t dev, device_t child, int type, int *rid, end = sc->pmemlimit; } } +#endif } if (end < start) { device_printf(dev, "memory: end (%lx) < start (%lx)\n", end, start);