Date: Mon, 25 Jul 2011 16:45:12 +0000 (UTC) From: Marius Strobl <marius@FreeBSD.org> To: cvs-src-old@freebsd.org Subject: cvs commit: src/sys/dev/mpt mpt.c mpt.h mpt_cam.c mpt_pci.c mpt_raid.c Message-ID: <201107251645.p6PGjWhN072530@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
marius 2011-07-25 16:45:12 UTC FreeBSD src repository Modified files: (Branch: RELENG_7) sys/dev/mpt mpt.c mpt.h mpt_cam.c mpt_pci.c mpt_raid.c Log: SVN rev 224332 on 2011-07-25 16:45:12Z by marius MFC: r209599 (partial), r209960: r209960 | marius - Make the maxsize parameter of the data buffer DMA tag match maxio, which was missed in r209599. Reported and tested by: Michael Moll - Declare mpt_dma_buf_alloc() static just like mpt_dma_buf_free(), both are used in mpt.c only. Reviewed by: ken MFC after: r209599 r209599 | ken Change the mpt driver to allow larger I/O sizes. The mpt driver previously didn't report a 'maxio' size to CAM, and so the da(4) driver limited I/O sizes to DFLTPHYS (64K) by default. The number of scatter gather segments allowed, as reported to busdma, was (128K / PAGE_SIZE) + 1, or 33 on architectures with 4K pages. Change things around so that we wait until we've determined how many segments the adapter can support before creating the busdma tag used for buffers, so we can potentially support more S/G segments and therefore larger I/O sizes. Also, fix some things that were broken about the module unload path. It still gets hung up inside CAM, though. mpt.c: Move some busdma initialization calls in here, and call them just after we've gotten the IOCFacts, and know how many S/G segments this adapter can support. mpt.h: Add max_cam_seg_cnt. mpt_cam.c: Fix the locking in mpt_cam_detach(). mpt_pci.c: Pull some busdma initialization and teardown out and put it in mpt.c. We now delay it until we know many scatter gather segments the adapter can support, and therefore how to setup our busdma tags. mpt_raid.c: Make sure we wake up the right wait channel to get the raid thread to wake up when we're trying to shut it down. Reviewed by: gibbs, mjacob MFC after: 2 weeks Revision Changes Path 1.44.2.9 +131 -16 src/sys/dev/mpt/mpt.c 1.42.2.8 +1 -0 src/sys/dev/mpt/mpt.h 1.61.2.12 +6 -6 src/sys/dev/mpt/mpt_cam.c 1.51.2.7 +0 -87 src/sys/dev/mpt/mpt_pci.c 1.15.2.7 +1 -1 src/sys/dev/mpt/mpt_raid.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201107251645.p6PGjWhN072530>