From owner-svn-src-all@FreeBSD.ORG Wed Jun 11 20:44:03 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D1A5E7E7; Wed, 11 Jun 2014 20:44:03 +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 BE9D52423; Wed, 11 Jun 2014 20:44:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5BKi3vU088817; Wed, 11 Jun 2014 20:44:03 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5BKi3U6088813; Wed, 11 Jun 2014 20:44:03 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201406112044.s5BKi3U6088813@svn.freebsd.org> From: John Baldwin Date: Wed, 11 Jun 2014 20:44:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r267375 - in head/sys/dev: qlxgb qlxgbe qlxge 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: Wed, 11 Jun 2014 20:44:03 -0000 Author: jhb Date: Wed Jun 11 20:44:02 2014 New Revision: 267375 URL: http://svnweb.freebsd.org/changeset/base/267375 Log: Unload maps for DMA buffers allocated via bus_dmamem_alloc() before freeing the buffers. Reviewed by: davidcs Modified: head/sys/dev/qlxgb/qla_os.c head/sys/dev/qlxgbe/ql_os.c head/sys/dev/qlxge/qls_os.c Modified: head/sys/dev/qlxgb/qla_os.c ============================================================================== --- head/sys/dev/qlxgb/qla_os.c Wed Jun 11 20:38:14 2014 (r267374) +++ head/sys/dev/qlxgb/qla_os.c Wed Jun 11 20:44:02 2014 (r267375) @@ -602,6 +602,7 @@ qla_alloc_dmabuf_exit: void qla_free_dmabuf(qla_host_t *ha, qla_dma_t *dma_buf) { + bus_dmamap_unload(dma_buf->dma_tag, dma_buf->dma_map); bus_dmamem_free(dma_buf->dma_tag, dma_buf->dma_b, dma_buf->dma_map); bus_dma_tag_destroy(dma_buf->dma_tag); } Modified: head/sys/dev/qlxgbe/ql_os.c ============================================================================== --- head/sys/dev/qlxgbe/ql_os.c Wed Jun 11 20:38:14 2014 (r267374) +++ head/sys/dev/qlxgbe/ql_os.c Wed Jun 11 20:44:02 2014 (r267375) @@ -681,6 +681,7 @@ ql_alloc_dmabuf_exit: void ql_free_dmabuf(qla_host_t *ha, qla_dma_t *dma_buf) { + bus_dmamap_unload(dma_buf->dma_tag, dma_buf->dma_map); bus_dmamem_free(dma_buf->dma_tag, dma_buf->dma_b, dma_buf->dma_map); bus_dma_tag_destroy(dma_buf->dma_tag); } Modified: head/sys/dev/qlxge/qls_os.c ============================================================================== --- head/sys/dev/qlxge/qls_os.c Wed Jun 11 20:38:14 2014 (r267374) +++ head/sys/dev/qlxge/qls_os.c Wed Jun 11 20:44:02 2014 (r267375) @@ -670,6 +670,7 @@ qls_alloc_dmabuf_exit: void qls_free_dmabuf(qla_host_t *ha, qla_dma_t *dma_buf) { + bus_dmamap_unload(dma_buf->dma_tag, dma_buf->dma_map); bus_dmamem_free(dma_buf->dma_tag, dma_buf->dma_b, dma_buf->dma_map); bus_dma_tag_destroy(dma_buf->dma_tag); }