diff options
author | imp <imp@FreeBSD.org> | 2004-01-17 21:54:04 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2004-01-17 21:54:04 +0000 |
commit | 141bacab7d3dd776fc4c28886630714b93ccc61b (patch) | |
tree | 2455bb16b398e65b8ca51d279f665278bb6a7bf2 /sys/dev/pci/pci_pci.c | |
parent | ffaedccd58d520477e2c30fd54a710cc663c1f6a (diff) | |
download | FreeBSD-src-141bacab7d3dd776fc4c28886630714b93ccc61b.zip FreeBSD-src-141bacab7d3dd776fc4c28886630714b93ccc61b.tar.gz |
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.
Diffstat (limited to 'sys/dev/pci/pci_pci.c')
-rw-r--r-- | sys/dev/pci/pci_pci.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/dev/pci/pci_pci.c b/sys/dev/pci/pci_pci.c index eeba000..293c372 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); |