From owner-svn-src-projects@FreeBSD.ORG Thu Dec 27 01:43:36 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 993F0181;
Thu, 27 Dec 2012 01:43:36 +0000 (UTC)
(envelope-from jeff@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 7F37A8FC13;
Thu, 27 Dec 2012 01:43:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBR1haPM082063;
Thu, 27 Dec 2012 01:43:36 GMT (envelope-from jeff@svn.freebsd.org)
Received: (from jeff@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBR1hZVZ082059;
Thu, 27 Dec 2012 01:43:35 GMT (envelope-from jeff@svn.freebsd.org)
Message-Id: <201212270143.qBR1hZVZ082059@svn.freebsd.org>
From: Jeff Roberson <jeff@FreeBSD.org>
Date: Thu, 27 Dec 2012 01:43:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244724 - in projects/physbio/sys: arm/arm mips/mips
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Dec 2012 01:43:36 -0000
Author: jeff
Date: Thu Dec 27 01:43:35 2012
New Revision: 244724
URL: http://svnweb.freebsd.org/changeset/base/244724
Log:
- Coalesce virtual addresses in the sync list so we are less likely to
overrun our segment limit.
- Unload tags on failure to load. This releases reserved bounce pages.
Sponsored by: EMC / Isilon Storage Division
Modified:
projects/physbio/sys/arm/arm/busdma_machdep-v6.c
projects/physbio/sys/arm/arm/busdma_machdep.c
projects/physbio/sys/mips/mips/busdma_machdep.c
Modified: projects/physbio/sys/arm/arm/busdma_machdep-v6.c
==============================================================================
--- projects/physbio/sys/arm/arm/busdma_machdep-v6.c Thu Dec 27 00:17:54 2012 (r244723)
+++ projects/physbio/sys/arm/arm/busdma_machdep-v6.c Thu Dec 27 01:43:35 2012 (r244724)
@@ -773,12 +773,17 @@ _bus_dmamap_load_buffer(bus_dma_tag_t dm
map->pagesneeded != 0 && run_filter(dmat, curaddr)) {
curaddr = add_bounce_page(dmat, map, vaddr, sgsize);
} else {
- sl = &map->slist[map->sync_count];
- if (++map->sync_count > dmat->nsegments)
- goto cleanup;
- sl->vaddr = vaddr;
- sl->datacount = sgsize;
- sl->busaddr = curaddr;
+ sl = &map->slist[map->sync_count - 1];
+ if (map->sync_count == 0 ||
+ vaddr != sl->vaddr + sl->datacount) {
+ if (++map->sync_count > dmat->nsegments)
+ goto cleanup;
+ sl++;
+ sl->vaddr = vaddr;
+ sl->datacount = sgsize;
+ sl->busaddr = curaddr;
+ } else
+ sl->datacount += sgsize;
}
if (dmat->ranges) {
Modified: projects/physbio/sys/arm/arm/busdma_machdep.c
==============================================================================
--- projects/physbio/sys/arm/arm/busdma_machdep.c Thu Dec 27 00:17:54 2012 (r244723)
+++ projects/physbio/sys/arm/arm/busdma_machdep.c Thu Dec 27 01:43:35 2012 (r244724)
@@ -857,12 +857,17 @@ _bus_dmamap_load_buffer(bus_dma_tag_t dm
map->pagesneeded != 0 && run_filter(dmat, curaddr)) {
curaddr = add_bounce_page(dmat, map, vaddr, sgsize);
} else {
- sl = &map->slist[map->sync_count];
- if (++map->sync_count > dmat->nsegments)
- goto cleanup;
- sl->vaddr = vaddr;
- sl->datacount = sgsize;
- sl->busaddr = curaddr;
+ sl = &map->slist[map->sync_count - 1];
+ if (map->sync_count == 0 ||
+ vaddr != sl->vaddr + sl->datacount) {
+ if (++map->sync_count > dmat->nsegments)
+ goto cleanup;
+ sl++;
+ sl->vaddr = vaddr;
+ sl->datacount = sgsize;
+ sl->busaddr = curaddr;
+ } else
+ sl->datacount += sgsize;
}
if (dmat->ranges) {
@@ -910,8 +915,10 @@ cleanup:
/*
* Did we fit?
*/
- if (buflen != 0)
+ if (buflen != 0) {
+ _bus_dmamap_unload(dmat, map);
error = EFBIG; /* XXX better return value here? */
+ }
return (error);
}
Modified: projects/physbio/sys/mips/mips/busdma_machdep.c
==============================================================================
--- projects/physbio/sys/mips/mips/busdma_machdep.c Thu Dec 27 00:17:54 2012 (r244723)
+++ projects/physbio/sys/mips/mips/busdma_machdep.c Thu Dec 27 01:43:35 2012 (r244724)
@@ -814,12 +814,17 @@ _bus_dmamap_load_buffer(bus_dma_tag_t dm
map->pagesneeded != 0 && run_filter(dmat, curaddr)) {
curaddr = add_bounce_page(dmat, map, vaddr, sgsize);
} else {
- sl = &map->slist[map->sync_count];
- if (++map->sync_count > dmat->nsegments)
- goto cleanup;
- sl->vaddr = vaddr;
- sl->datacount = sgsize;
- sl->busaddr = curaddr;
+ sl = &map->slist[map->sync_count - 1];
+ if (map->sync_count == 0 ||
+ vaddr != sl->vaddr + sl->datacount) {
+ if (++map->sync_count > dmat->nsegments)
+ goto cleanup;
+ sl++;
+ sl->vaddr = vaddr;
+ sl->datacount = sgsize;
+ sl->busaddr = curaddr;
+ } else
+ sl->datacount += sgsize;
}
/*
@@ -852,8 +857,10 @@ cleanup:
/*
* Did we fit?
*/
- if (buflen != 0)
+ if (buflen != 0) {
+ _bus_dmamap_unload(dmat, map);
error = EFBIG; /* XXX better return value here? */
+ }
return (error);
}
@@ -869,7 +876,7 @@ __bus_dmamap_mayblock(bus_dma_tag_t dmat
}
bus_dma_segment_t *
-_bus_dmamap_directseg(bus_dma_tag_t dmat, bus_dmamap_t map,
+_bus_dmamap_complete(bus_dma_tag_t dmat, bus_dmamap_t map,
bus_dma_segment_t *segs, int nsegs, int error)
{