Date: Thu, 1 Mar 2012 19:31:31 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 207177 for review Message-ID: <201203011931.q21JVVnD044454@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@207177?ac=10 Change 207177 by jhb@jhb_jhbbsd on 2012/03/01 19:31:28 Remove some now-unneeded hacks. Affected files ... .. //depot/projects/pci/sys/dev/aac/aac_pci.c#3 edit .. //depot/projects/pci/sys/dev/bge/if_bgereg.h#5 edit .. //depot/projects/pci/sys/dev/twa/tw_osl.h#3 edit .. //depot/projects/pci/sys/dev/twa/tw_osl_freebsd.c#3 edit Differences ... ==== //depot/projects/pci/sys/dev/aac/aac_pci.c#3 (text+ko) ==== @@ -402,9 +402,9 @@ * * Note that some of these controllers are 64-bit capable. */ - if (bus_dma_tag_create(NULL, /* parent */ + if (bus_dma_tag_create(bus_get_dma_tag(sc->aac_dev), /* parent */ PAGE_SIZE, /* alignment */ - ((bus_size_t)((uint64_t)1 << 32)), /* boundary*/ + 0, /* boundary*/ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ ==== //depot/projects/pci/sys/dev/bge/if_bgereg.h#5 (text+ko) ==== @@ -2691,15 +2691,11 @@ #define BGE_DMA_MAXADDR 0xFFFFFFFFFF #endif -#ifdef PAE -#define BGE_DMA_BNDRY 0x80000000 -#else #if (BUS_SPACE_MAXADDR > 0xFFFFFFFF) #define BGE_DMA_BNDRY 0x100000000 #else #define BGE_DMA_BNDRY 0 #endif -#endif /* * Ring structures. Most of these reside in host memory and we tell ==== //depot/projects/pci/sys/dev/twa/tw_osl.h#3 (text+ko) ==== @@ -55,12 +55,6 @@ #define TW_OSLI_MAX_NUM_IOS (TW_OSLI_MAX_NUM_REQUESTS - 2) #define TW_OSLI_MAX_NUM_AENS 0x100 -#ifdef PAE -#define TW_OSLI_DMA_BOUNDARY (1u << 31) -#else -#define TW_OSLI_DMA_BOUNDARY ((bus_size_t)((uint64_t)1 << 32)) -#endif - /* Possible values of req->state. */ #define TW_OSLI_REQ_STATE_INIT 0x0 /* being initialized */ #define TW_OSLI_REQ_STATE_BUSY 0x1 /* submitted to CL */ ==== //depot/projects/pci/sys/dev/twa/tw_osl_freebsd.c#3 (text+ko) ==== @@ -562,9 +562,9 @@ } /* Create the parent dma tag. */ - if (bus_dma_tag_create(NULL, /* parent */ + if (bus_dma_tag_create(bus_get_dma_tag(sc->bus_dev), /* parent */ sc->alignment, /* alignment */ - TW_OSLI_DMA_BOUNDARY, /* boundary */ + 0, /* boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203011931.q21JVVnD044454>