Date: Mon, 2 May 2011 15:23:20 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 192463 for review Message-ID: <201105021523.p42FNKUs056703@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@192463?ac=10 Change 192463 by jhb@jhb_jhbbsd on 2011/05/02 15:22:47 Tidy, always enable SUBTRACTIVE_GROW_WINDOWS. Affected files ... .. //depot/projects/pci/sys/dev/pci/pci_pci.c#19 edit Differences ... ==== //depot/projects/pci/sys/dev/pci/pci_pci.c#19 (text+ko) ==== @@ -110,14 +110,11 @@ #ifdef NEW_PCIB /* * NEW_PCIB todo: - * - test SUBTRACTIVE_GROW_WINDOWS and see if that should be the default - * behavior * - properly handle the ISA enable bit. If it is set, we should change * the behavior of the I/O window resource and rman to not allocate the * blocked ranges (upper 768 bytes of each 1K in the first 64k of the * I/O port address space). */ -#define SUBTRACTIVE_GROW_WINDOWS /* * Is a resource from a child device sub-allocated from one of our @@ -1074,11 +1071,6 @@ end, count, flags); if (r != NULL) break; -#ifndef SUBTRACTIVE_GROW_WINDOWS - if (sc->flags & PCIB_SUBTRACTIVE) - return (bus_generic_alloc_resource(dev, child, type, - rid, start, end, count, flags)); -#endif if (pcib_grow_window(sc, &sc->io, type, start, end, count, flags) == 0) r = pcib_suballoc_resource(sc, &sc->io, child, type, @@ -1103,11 +1095,6 @@ start, end, count, flags); if (r != NULL) break; -#ifndef SUBTRACTIVE_GROW_WINDOWS - if (sc->flags & PCIB_SUBTRACTIVE) - return (bus_generic_alloc_resource(dev, child, type, - rid, start, end, count, flags)); -#endif if (flags & RF_PREFETCHABLE) { if (pcib_grow_window(sc, &sc->pmem, type, start, end, count, flags) == 0) { @@ -1127,7 +1114,6 @@ start, end, count, flags)); } -#ifdef SUBTRACTIVE_GROW_WINDOWS /* * If attempts to suballocate from the window fail but this is a * subtractive bridge, pass the request up the tree. @@ -1135,7 +1121,6 @@ if (sc->flags & PCIB_SUBTRACTIVE && r == NULL) return (bus_generic_alloc_resource(dev, child, type, rid, start, end, count, flags)); -#endif return (r); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201105021523.p42FNKUs056703>