From owner-cvs-src@FreeBSD.ORG Tue Feb 28 07:44:51 2006 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2F8F516A420; Tue, 28 Feb 2006 07:44:51 +0000 (GMT) (envelope-from mjacob@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E205A43D4C; Tue, 28 Feb 2006 07:44:50 +0000 (GMT) (envelope-from mjacob@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1S7io3K001167; Tue, 28 Feb 2006 07:44:50 GMT (envelope-from mjacob@repoman.freebsd.org) Received: (from mjacob@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1S7io0A001166; Tue, 28 Feb 2006 07:44:50 GMT (envelope-from mjacob) Message-Id: <200602280744.k1S7io0A001166@repoman.freebsd.org> From: Matt Jacob Date: Tue, 28 Feb 2006 07:44:50 +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/mpt mpt.c mpt_cam.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2006 07:44:51 -0000 mjacob 2006-02-28 07:44:50 UTC FreeBSD src repository Modified files: sys/dev/mpt mpt.c mpt_cam.c Log: Fix mpt_reset to try mpt_hard_reset more than once, and to try mpt_soft_reset more than once. And to wait for MPT_DB_STATE_READY twice. I mean, this is crucial- give the IOC a chance to get ready. If mpt_reset is called to reinit things, and we succeed, make sure to re-enable interrupts. This is what has mostly led to system lockup after having to hard reset the chip. Also, if we think that interrupts aren't function in mpt_cam_timeout, for goodness sake, turn them on again. In read_cfg_header, return distinguishing errnos so the caller can decide what's an error. It's *not* an error to fail to read a RAID page from a non-RAID capable device like the FC929X. Some whitespace fixes (removing spaces from ends of lines). Revision Changes Path 1.18 +85 -43 src/sys/dev/mpt/mpt.c 1.9 +1 -0 src/sys/dev/mpt/mpt_cam.c