From owner-cvs-all@FreeBSD.ORG Mon Jul 17 19:45:48 2006 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4C50716A4DA; Mon, 17 Jul 2006 19:45:48 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7CEED43D5A; Mon, 17 Jul 2006 19:45:47 +0000 (GMT) (envelope-from jhb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6HJjlgd031768; Mon, 17 Jul 2006 19:45:47 GMT (envelope-from jhb@repoman.freebsd.org) Received: (from jhb@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6HJjlo0031767; Mon, 17 Jul 2006 19:45:47 GMT (envelope-from jhb) Message-Id: <200607171945.k6HJjlo0031767@repoman.freebsd.org> From: John Baldwin Date: Mon, 17 Jul 2006 19:45:47 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/sys/dev/amr amr.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Jul 2006 19:45:48 -0000 jhb 2006-07-17 19:45:47 UTC FreeBSD src repository Modified files: sys/dev/amr amr.c Log: Chain the bus_dmamap_load() calls when mapping a command with a data CCB instead of doing the first load with the BUS_DMA_NOWAIT flag. On 4.x with PAE and > 4gb of RAM this proved disastrous if there weren't enough bounce pages as amr_mapcmd() would return failure but the callback would later fire once enough bounce pages were available and would then overwrite another command's S/G list. MFC after: 3 days Submitted by: scottl (4.x version) Reviewed by: scottl (port from 4.x to HEAD) Revision Changes Path 1.79 +42 -24 src/sys/dev/amr/amr.c