From owner-svn-src-stable-7@FreeBSD.ORG  Wed Jan 21 17:13:31 2009
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 834CC1065672;
	Wed, 21 Jan 2009 17:13:31 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 707678FC1C;
	Wed, 21 Jan 2009 17:13:31 +0000 (UTC) (envelope-from jhb@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 n0LHDVcE084280;
	Wed, 21 Jan 2009 17:13:31 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0LHDVQg084279;
	Wed, 21 Jan 2009 17:13:31 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200901211713.n0LHDVQg084279@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 21 Jan 2009 17:13:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187540 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb dev/mfi
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jan 2009 17:13:32 -0000

Author: jhb
Date: Wed Jan 21 17:13:31 2009
New Revision: 187540
URL: http://svn.freebsd.org/changeset/base/187540

Log:
  MFC: Fix the maximum transfer size for mfi(4) disk devices to not exceed
  the maximum number of scatter/gather elements supported in the bus dma tag.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/dev/mfi/mfi_disk.c

Modified: stable/7/sys/dev/mfi/mfi_disk.c
==============================================================================
--- stable/7/sys/dev/mfi/mfi_disk.c	Wed Jan 21 17:07:46 2009	(r187539)
+++ stable/7/sys/dev/mfi/mfi_disk.c	Wed Jan 21 17:13:31 2009	(r187540)
@@ -136,7 +136,8 @@ mfi_disk_attach(device_t dev)
 
 	sc->ld_disk = disk_alloc();
 	sc->ld_disk->d_drv1 = sc;
-	sc->ld_disk->d_maxsize = sc->ld_controller->mfi_max_io * secsize;
+	sc->ld_disk->d_maxsize = min(sc->ld_controller->mfi_max_io * secsize,
+	    (sc->ld_controller->mfi_max_sge - 1) * PAGE_SIZE);
 	sc->ld_disk->d_name = "mfid";
 	sc->ld_disk->d_open = mfi_disk_open;
 	sc->ld_disk->d_close = mfi_disk_close;