svn commit: r189844 - head/sys/dev/pci

[Warner Losh]

Author: imp
Date: Sun Mar 15 06:40:57 2009
New Revision: 189844
URL: http://svn.freebsd.org/changeset/base/189844

Log:
  Don't adjust ranges at all for subtractive bridges.  The simple-minded
  stuff we're doing is too simple-minded, so back it out for now.

Modified:
  head/sys/dev/pci/pci_pci.c

Modified: head/sys/dev/pci/pci_pci.c
==============================================================================
--- head/sys/dev/pci/pci_pci.c	Sun Mar 15 02:31:34 2009	(r189843)
+++ head/sys/dev/pci/pci_pci.c	Sun Mar 15 06:40:57 2009	(r189844)
@@ -413,12 +413,14 @@ pcib_alloc_resource(device_t dev, device
 			}
 		} else {
 			ok = 1;
+#if 0
 			/*
 			 * If we overlap with the subtractive range, then
 			 * pick the upper range to use.
 			 */
 			if (start < sc->iolimit && end > sc->iobase)
 				start = sc->iolimit + 1;
+#endif
 		}
 		if (end < start) {
 			device_printf(dev, "ioport: end (%lx) < start (%lx)\n",
@@ -478,6 +480,7 @@ pcib_alloc_resource(device_t dev, device
 			}
 		} else if (!ok) {
 			ok = 1;	/* subtractive bridge: always ok */
+#if 0
 			if (pcib_is_nonprefetch_open(sc)) {
 				if (start < sc->memlimit && end > sc->membase)
 					start = sc->memlimit + 1;
@@ -486,6 +489,7 @@ pcib_alloc_resource(device_t dev, device
 				if (start < sc->pmemlimit && end > sc->pmembase)
 					start = sc->pmemlimit + 1;
 			}
+#endif
 		}
 		if (end < start) {
 			device_printf(dev, "memory: end (%lx) < start (%lx)\n",