From owner-svn-src-all@FreeBSD.ORG Thu Jun 11 15:50:25 2009 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 73D1F106567C; Thu, 11 Jun 2009 15:50:25 +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 470F18FC2B; Thu, 11 Jun 2009 15:50:25 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5BFoPZK052081; Thu, 11 Jun 2009 15:50:25 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5BFoPCG052080; Thu, 11 Jun 2009 15:50:25 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <200906111550.n5BFoPCG052080@svn.freebsd.org> From: Marius Strobl Date: Thu, 11 Jun 2009 15:50:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r194009 - stable/6/share/man/man9 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: Thu, 11 Jun 2009 15:50:26 -0000 Author: marius Date: Thu Jun 11 15:50:25 2009 New Revision: 194009 URL: http://svn.freebsd.org/changeset/base/194009 Log: MFC: r190283, r192026 Correct the documentation of BUS_DMA_NOCACHE for amd64 and i386, it's a flag to bus_dmamem_alloc(9) rather than bus_dmamap_load(9) there. Modified: stable/6/share/man/man9/ (props changed) stable/6/share/man/man9/bus_dma.9 Modified: stable/6/share/man/man9/bus_dma.9 ============================================================================== --- stable/6/share/man/man9/bus_dma.9 Thu Jun 11 15:49:45 2009 (r194008) +++ stable/6/share/man/man9/bus_dma.9 Thu Jun 11 15:50:25 2009 (r194009) @@ -60,7 +60,7 @@ .\" $FreeBSD$ .\" $NetBSD: bus_dma.9,v 1.25 2002/10/14 13:43:16 wiz Exp $ .\" -.Dd November 16, 2008 +.Dd May 12, 2009 .Dt BUS_DMA 9 .Os .Sh NAME @@ -561,14 +561,12 @@ Are as follows: The load should not be deferred in case of insufficient mapping resources, and instead should return immediately with an appropriate error. .It Dv BUS_DMA_NOCACHE -The allocated memory will not be cached in the processor caches. -All memory accesses appear on the bus and are executed -without reordering. -On the amd64 and i386 architectures this flag results in the -Strong Uncacheable PAT to be set for the allocated virtual address range. -The +The generated transactions to and from the virtual page are non-cacheable. +For +.Fn bus_dmamap_load , +the .Dv BUS_DMA_NOCACHE -flag is currently implemented on amd64, i386 and sparc64. +flag is currently implemented on sparc64. .El .El .Pp @@ -784,6 +782,16 @@ the flag is currently implemented on arm and sparc64. .It Dv BUS_DMA_ZERO Causes the allocated memory to be set to all zeros. +.It Dv BUS_DMA_NOCACHE +The allocated memory will not be cached in the processor caches. +All memory accesses appear on the bus and are executed +without reordering. +For +.Fn bus_dmamem_alloc , +the +.Dv BUS_DMA_NOCACHE +flag is currently implemented on amd64 and i386 where it results in the +Strong Uncacheable PAT to be set for the allocated virtual address range. .El .It Fa mapp Pointer to a