From owner-p4-projects@FreeBSD.ORG  Sat May 19 18:26:19 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6B74716A421; Sat, 19 May 2007 18:26:19 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 048A716A46C
	for <perforce@freebsd.org>; Sat, 19 May 2007 18:26:19 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id E804313C4AD
	for <perforce@freebsd.org>; Sat, 19 May 2007 18:26:18 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4JIQITw021691
	for <perforce@freebsd.org>; Sat, 19 May 2007 18:26:18 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4JIQINs021650
	for perforce@freebsd.org; Sat, 19 May 2007 18:26:18 GMT
	(envelope-from mjacob@freebsd.org)
Date: Sat, 19 May 2007 18:26:18 GMT
Message-Id: <200705191826.l4JIQINs021650@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mjacob@freebsd.org using -f
From: Matt Jacob <mjacob@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 120066 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 May 2007 18:26:19 -0000

http://perforce.freebsd.org/chv.cgi?CH=120066

Change 120066 by mjacob@mjexp on 2007/05/19 18:25:21

	Note integrated raid completion and do some LOR fixes.

Affected files ...

.. //depot/projects/mjexp/sys/dev/mpt/mpt_raid.c#8 edit

Differences ...

==== //depot/projects/mjexp/sys/dev/mpt/mpt_raid.c#8 (text+ko) ====

@@ -368,6 +368,11 @@
 	int i;
 	int print_event;
 
+	if (msg->Event == MPI_EVENT_IR_RESYNC_UPDATE) {
+		mpt_prt(mpt, "IR resync update %d completed.",
+		    (le32toh(msg->Data[0]) > 16) & 0xff);
+		return (1);
+	}
 	if (msg->Event != MPI_EVENT_INTEGRATED_RAID) {
 		return (0);
 	}
@@ -701,19 +706,20 @@
 
 			mpt->raid_rescan = 0;
 
+			MPTLOCK_2_CAMLOCK(mpt);
 			ccb = malloc(sizeof(*ccb), M_DEVBUF, M_WAITOK);
 			error = xpt_create_path(&path, xpt_periph,
 			    cam_sim_path(mpt->phydisk_sim),
 			    CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD);
 			if (error != CAM_REQ_CMP) {
 				free(ccb, M_DEVBUF);
+				CAMLOCK_2_MPTLOCK(mpt);
 				mpt_prt(mpt, "Unable to rescan RAID Bus!\n");
 			} else {
 				xpt_setup_ccb(&ccb->ccb_h, path, 5);
 				ccb->ccb_h.func_code = XPT_SCAN_BUS;
 				ccb->ccb_h.cbfcnp = mpt_cam_rescan_callback;
 				ccb->crcn.flags = CAM_FLAG_NONE;
-				MPTLOCK_2_CAMLOCK(mpt);
 				xpt_action(ccb);
 				CAMLOCK_2_MPTLOCK(mpt);
 			}