From owner-svn-src-all@FreeBSD.ORG Wed Mar 23 21:06:19 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BCECC106567D; Wed, 23 Mar 2011 21:06:19 +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 949688FC2B; Wed, 23 Mar 2011 21:06:19 +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 p2NL6Jqx007339; Wed, 23 Mar 2011 21:06:19 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2NL6J6f007337; Wed, 23 Mar 2011 21:06:19 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201103232106.p2NL6J6f007337@svn.freebsd.org> From: Marius Strobl Date: Wed, 23 Mar 2011 21:06:19 +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: r219936 - stable/8/sys/dev/fxp X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Mar 2011 21:06:19 -0000 Author: marius Date: Wed Mar 23 21:06:19 2011 New Revision: 219936 URL: http://svn.freebsd.org/changeset/base/219936 Log: MFC: r219060 - Allocate the DMA memory shared between the host and the controller as coherent. - Update a comment to no longer reference Alpha. Modified: stable/8/sys/dev/fxp/if_fxp.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/fxp/if_fxp.c ============================================================================== --- stable/8/sys/dev/fxp/if_fxp.c Wed Mar 23 21:04:56 2011 (r219935) +++ stable/8/sys/dev/fxp/if_fxp.c Wed Mar 23 21:06:19 2011 (r219936) @@ -87,7 +87,7 @@ MODULE_DEPEND(fxp, miibus, 1, 1, 1); #include "miibus_if.h" /* - * NOTE! On the Alpha, we have an alignment constraint. The + * NOTE! On !x86 we typically have an alignment constraint. The * card DMAs the packet immediately following the RFA. However, * the first thing in the packet is a 14-byte Ethernet header. * This means that the packet is misaligned. To compensate, @@ -675,7 +675,7 @@ fxp_attach(device_t dev) } error = bus_dmamem_alloc(sc->fxp_stag, (void **)&sc->fxp_stats, - BUS_DMA_NOWAIT | BUS_DMA_ZERO, &sc->fxp_smap); + BUS_DMA_NOWAIT | BUS_DMA_COHERENT | BUS_DMA_ZERO, &sc->fxp_smap); if (error) { device_printf(dev, "could not allocate stats DMA memory\n"); goto fail; @@ -697,7 +697,7 @@ fxp_attach(device_t dev) } error = bus_dmamem_alloc(sc->cbl_tag, (void **)&sc->fxp_desc.cbl_list, - BUS_DMA_NOWAIT | BUS_DMA_ZERO, &sc->cbl_map); + BUS_DMA_NOWAIT | BUS_DMA_COHERENT | BUS_DMA_ZERO, &sc->cbl_map); if (error) { device_printf(dev, "could not allocate TxCB DMA memory\n"); goto fail; @@ -722,7 +722,7 @@ fxp_attach(device_t dev) } error = bus_dmamem_alloc(sc->mcs_tag, (void **)&sc->mcsp, - BUS_DMA_NOWAIT | BUS_DMA_ZERO, &sc->mcs_map); + BUS_DMA_NOWAIT | BUS_DMA_COHERENT | BUS_DMA_ZERO, &sc->mcs_map); if (error) { device_printf(dev, "could not allocate multicast setup DMA memory\n");