From owner-p4-projects@FreeBSD.ORG  Sat Jun 13 21:34:23 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4294E106566B; Sat, 13 Jun 2009 21:34:23 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0035C106566C
	for <perforce@freebsd.org>; Sat, 13 Jun 2009 21:34:22 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E29B98FC0C
	for <perforce@freebsd.org>; Sat, 13 Jun 2009 21:34:22 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n5DLYMHC079925
	for <perforce@freebsd.org>; Sat, 13 Jun 2009 21:34:22 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5DLYISk079922
	for perforce@freebsd.org; Sat, 13 Jun 2009 21:34:18 GMT
	(envelope-from mav@freebsd.org)
Date: Sat, 13 Jun 2009 21:34:18 GMT
Message-Id: <200906132134.n5DLYISk079922@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 164296 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, 13 Jun 2009 21:34:24 -0000

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

Change 164296 by mav@mav_mavbook on 2009/06/13 21:33:25

	Fix probing when PM supported, but absent.
	Reduce PM reset timeout and retries.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#17 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#17 (text+ko) ====

@@ -349,13 +349,13 @@
 	switch (softc->action) {
 	case PROBE_RESET:
 		cam_fill_ataio(ataio,
-		      1,
+		      0,
 		      probedone,
 		      /*flags*/CAM_DIR_NONE,
 		      MSG_SIMPLE_Q_TAG,
 		      /*data_ptr*/NULL,
 		      /*dxfer_len*/0,
-		      10 * 1000);
+		      (done_ccb->ccb_h.target_id == 15 ? 3 : 15) * 1000);
 		ata_reset_cmd(ataio);
 		break;
 	case PROBE_IDENTIFY:
@@ -1202,7 +1202,8 @@
 		 * Free the current request path- we're done with it.
 		 */
 		xpt_free_path(work_ccb->ccb_h.path);
-		if (scan_info->counter == 15)
+		if (scan_info->counter == 15 &&
+		    work_ccb->ccb_h.ppriv_field1 != 0)
 			scan_info->found = work_ccb->ccb_h.ppriv_field1;
 take_next:
 		/* Take next device. Wrap from 15 (PM) to 0. */