Date: Wed, 21 Jan 2009 17:13:31 +0000 (UTC) From: John Baldwin <jhb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r187540 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb dev/mfi Message-ID: <200901211713.n0LHDVQg084279@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200901211713.n0LHDVQg084279>