From owner-svn-src-stable-8@FreeBSD.ORG Fri Mar 25 12:48:56 2011 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D2BD11065673; Fri, 25 Mar 2011 12:48:56 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C0E418FC0A; Fri, 25 Mar 2011 12:48:56 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2PCmuBu081630; Fri, 25 Mar 2011 12:48:56 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2PCmutx081628; Fri, 25 Mar 2011 12:48:56 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201103251248.p2PCmutx081628@svn.freebsd.org> From: Marius Strobl Date: Fri, 25 Mar 2011 12:48:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219993 - stable/8/sys/dev/xl X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Mar 2011 12:48:56 -0000 Author: marius Date: Fri Mar 25 12:48:56 2011 New Revision: 219993 URL: http://svn.freebsd.org/changeset/base/219993 Log: MFC: r219545 Allocate the DMA memory shared between the host and the controller as coherent. Modified: stable/8/sys/dev/xl/if_xl.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/xl/if_xl.c ============================================================================== --- stable/8/sys/dev/xl/if_xl.c Fri Mar 25 12:48:06 2011 (r219992) +++ stable/8/sys/dev/xl/if_xl.c Fri Mar 25 12:48:56 2011 (r219993) @@ -1317,8 +1317,8 @@ xl_attach(device_t dev) } error = bus_dmamem_alloc(sc->xl_ldata.xl_rx_tag, - (void **)&sc->xl_ldata.xl_rx_list, BUS_DMA_NOWAIT | BUS_DMA_ZERO, - &sc->xl_ldata.xl_rx_dmamap); + (void **)&sc->xl_ldata.xl_rx_list, BUS_DMA_NOWAIT | + BUS_DMA_COHERENT | BUS_DMA_ZERO, &sc->xl_ldata.xl_rx_dmamap); if (error) { device_printf(dev, "no memory for rx list buffers!\n"); bus_dma_tag_destroy(sc->xl_ldata.xl_rx_tag); @@ -1349,8 +1349,8 @@ xl_attach(device_t dev) } error = bus_dmamem_alloc(sc->xl_ldata.xl_tx_tag, - (void **)&sc->xl_ldata.xl_tx_list, BUS_DMA_NOWAIT | BUS_DMA_ZERO, - &sc->xl_ldata.xl_tx_dmamap); + (void **)&sc->xl_ldata.xl_tx_list, BUS_DMA_NOWAIT | + BUS_DMA_COHERENT | BUS_DMA_ZERO, &sc->xl_ldata.xl_tx_dmamap); if (error) { device_printf(dev, "no memory for list buffers!\n"); bus_dma_tag_destroy(sc->xl_ldata.xl_tx_tag);