From owner-svn-src-all@FreeBSD.ORG  Sun Mar  1 06:46:40 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 317281065672;
	Sun,  1 Mar 2009 06:46:40 +0000 (UTC)
	(envelope-from scottl@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1F59C8FC14;
	Sun,  1 Mar 2009 06:46:40 +0000 (UTC)
	(envelope-from scottl@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 n216kdZo033448;
	Sun, 1 Mar 2009 06:46:39 GMT (envelope-from scottl@svn.freebsd.org)
Received: (from scottl@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n216kdfW033447;
	Sun, 1 Mar 2009 06:46:39 GMT (envelope-from scottl@svn.freebsd.org)
Message-Id: <200903010646.n216kdfW033447@svn.freebsd.org>
From: Scott Long <scottl@FreeBSD.org>
Date: Sun, 1 Mar 2009 06:46:39 +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: r189210 - stable/7/sys/cam
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Mar 2009 06:46:40 -0000

Author: scottl
Date: Sun Mar  1 06:46:39 2009
New Revision: 189210
URL: http://svn.freebsd.org/changeset/base/189210

Log:
  Merge r186891: Retry TEST UNIT READY if needed.

Modified:
  stable/7/sys/cam/cam_xpt.c   (contents, props changed)

Modified: stable/7/sys/cam/cam_xpt.c
==============================================================================
--- stable/7/sys/cam/cam_xpt.c	Sun Mar  1 06:27:03 2009	(r189209)
+++ stable/7/sys/cam/cam_xpt.c	Sun Mar  1 06:46:39 2009	(r189210)
@@ -5652,7 +5652,7 @@ probestart(struct cam_periph *periph, un
 	case PROBE_DV_EXIT:
 	{
 		scsi_test_unit_ready(csio,
-				     /*retries*/4,
+				     /*retries*/10,
 				     probedone,
 				     MSG_SIMPLE_Q_TAG,
 				     SSD_FULL_SIZE,
@@ -6259,6 +6259,13 @@ probedone(struct cam_periph *periph, uni
 		break;
 	}
 	case PROBE_TUR_FOR_NEGOTIATION:
+		if ((done_ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
+			DELAY(500000);
+			if (cam_periph_error(done_ccb, 0, SF_RETRY_UA,
+			    NULL) == ERESTART)
+				return;
+		}
+	/* FALLTHROUGH */
 	case PROBE_DV_EXIT:
 		if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) {
 			/* Don't wedge the queue */