From owner-svn-src-all@FreeBSD.ORG Tue Jul 29 02:37:32 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7178DA8D; Tue, 29 Jul 2014 02:37:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 593C12637; Tue, 29 Jul 2014 02:37:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s6T2bWJJ074581; Tue, 29 Jul 2014 02:37:32 GMT (envelope-from ian@svn.freebsd.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s6T2bWs5074580; Tue, 29 Jul 2014 02:37:32 GMT (envelope-from ian@svn.freebsd.org) Message-Id: <201407290237.s6T2bWs5074580@svn.freebsd.org> From: Ian Lepore Date: Tue, 29 Jul 2014 02:37:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r269215 - head/sys/arm/arm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 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: Tue, 29 Jul 2014 02:37:32 -0000 Author: ian Date: Tue Jul 29 02:37:31 2014 New Revision: 269215 URL: http://svnweb.freebsd.org/changeset/base/269215 Log: We never need bounce pages for memory we allocate. We cleverly allocate memory the matches all the constraints of the dma tag so that bouncing will never be required. Reviewed by: cognet Modified: head/sys/arm/arm/busdma_machdep-v6.c Modified: head/sys/arm/arm/busdma_machdep-v6.c ============================================================================== --- head/sys/arm/arm/busdma_machdep-v6.c Tue Jul 29 02:37:24 2014 (r269214) +++ head/sys/arm/arm/busdma_machdep-v6.c Tue Jul 29 02:37:31 2014 (r269215) @@ -743,14 +743,6 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, voi map->flags = DMAMAP_DMAMEM_ALLOC; map->sync_count = 0; - /* We may need bounce pages, even for allocated memory */ - error = allocate_bz_and_pages(dmat, map); - if (error != 0) { - free(map, M_DEVBUF); - *mapp = NULL; - return (error); - } - if (dmat->segments == NULL) { dmat->segments = (bus_dma_segment_t *)malloc( sizeof(bus_dma_segment_t) * dmat->nsegments, M_DEVBUF,