From owner-svn-src-all@FreeBSD.ORG Fri Mar 25 12:46:09 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 11CB7106564A; Fri, 25 Mar 2011 12:46:09 +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 D95078FC12; Fri, 25 Mar 2011 12:46:08 +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 p2PCk8pg081431; Fri, 25 Mar 2011 12:46:08 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2PCk89T081428; Fri, 25 Mar 2011 12:46:08 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201103251246.p2PCk89T081428@svn.freebsd.org> From: Marius Strobl Date: Fri, 25 Mar 2011 12:46:08 +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: r219990 - stable/8/sys/dev/firewire 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: Fri, 25 Mar 2011 12:46:09 -0000 Author: marius Date: Fri Mar 25 12:46:08 2011 New Revision: 219990 URL: http://svn.freebsd.org/changeset/base/219990 Log: MFC: r219543 Allocate the DMA memory shared between the host and the controller as coherent. Modified: stable/8/sys/dev/firewire/fwohci.c stable/8/sys/dev/firewire/sbp.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/firewire/fwohci.c ============================================================================== --- stable/8/sys/dev/firewire/fwohci.c Fri Mar 25 11:52:31 2011 (r219989) +++ stable/8/sys/dev/firewire/fwohci.c Fri Mar 25 12:46:08 2011 (r219990) @@ -686,7 +686,7 @@ fwohci_init(struct fwohci_softc *sc, dev sc->fc.dev = dev; sc->fc.config_rom = fwdma_malloc(&sc->fc, CROMSIZE, CROMSIZE, - &sc->crom_dma, BUS_DMA_WAITOK); + &sc->crom_dma, BUS_DMA_WAITOK | BUS_DMA_COHERENT); if(sc->fc.config_rom == NULL){ device_printf(dev, "config_rom alloc failed."); return ENOMEM; @@ -708,7 +708,7 @@ fwohci_init(struct fwohci_softc *sc, dev /* SID recieve buffer must align 2^11 */ #define OHCI_SIDSIZE (1 << 11) sc->sid_buf = fwdma_malloc(&sc->fc, OHCI_SIDSIZE, OHCI_SIDSIZE, - &sc->sid_dma, BUS_DMA_WAITOK); + &sc->sid_dma, BUS_DMA_WAITOK | BUS_DMA_COHERENT); if (sc->sid_buf == NULL) { device_printf(dev, "sid_buf alloc failed."); return ENOMEM; Modified: stable/8/sys/dev/firewire/sbp.c ============================================================================== --- stable/8/sys/dev/firewire/sbp.c Fri Mar 25 11:52:31 2011 (r219989) +++ stable/8/sys/dev/firewire/sbp.c Fri Mar 25 12:46:08 2011 (r219990) @@ -562,7 +562,8 @@ END_DEBUG fwdma_malloc(sbp->fd.fc, /* alignment */ sizeof(uint32_t), - SBP_DMA_SIZE, &sdev->dma, BUS_DMA_NOWAIT); + SBP_DMA_SIZE, &sdev->dma, BUS_DMA_NOWAIT | + BUS_DMA_COHERENT); if (sdev->dma.v_addr == NULL) { printf("%s: dma space allocation failed\n", __func__);