From owner-p4-projects@FreeBSD.ORG Thu Mar 1 19:31:33 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D88810656E7; Thu, 1 Mar 2012 19:31:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 926B110657B8 for ; Thu, 1 Mar 2012 19:31:32 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 4C79B8FC1A for ; Thu, 1 Mar 2012 19:31:32 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q21JVWHl044460 for ; Thu, 1 Mar 2012 19:31:32 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q21JVVnD044454 for perforce@freebsd.org; Thu, 1 Mar 2012 19:31:31 GMT (envelope-from jhb@freebsd.org) Date: Thu, 1 Mar 2012 19:31:31 GMT Message-Id: <201203011931.q21JVVnD044454@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 207177 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Mar 2012 19:31:33 -0000 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 */