From owner-p4-projects@FreeBSD.ORG  Tue Oct 27 14:33:06 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1FA421065694; Tue, 27 Oct 2009 14:33:06 +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 CB0161065692
	for <perforce@freebsd.org>; Tue, 27 Oct 2009 14:33:05 +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 B88218FC2D
	for <perforce@freebsd.org>; Tue, 27 Oct 2009 14:33:05 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9REX5qA008344
	for <perforce@freebsd.org>; Tue, 27 Oct 2009 14:33:05 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9REX5kN008342
	for perforce@freebsd.org; Tue, 27 Oct 2009 14:33:05 GMT
	(envelope-from mav@freebsd.org)
Date: Tue, 27 Oct 2009 14:33:05 GMT
Message-Id: <200910271433.n9REX5kN008342@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>
Precedence: bulk
Cc: 
Subject: PERFORCE change 169855 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Tue, 27 Oct 2009 14:33:06 -0000

http://p4web.freebsd.org/chv.cgi?CH=169855

Change 169855 by mav@mav_mavtest on 2009/10/27 14:32:41

	Tune PMP reset/rescan timings.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#15 edit

Differences ...

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

@@ -93,6 +93,7 @@
 	int			pm_step;
 	int			pm_try;
 	int			found;
+	int			reset;
 	int			frozen;
 	int			restart;
 	union			ccb saved_ccb;
@@ -482,6 +483,7 @@
 		ata_pm_read_cmd(ataio, 0, softc->pm_step);
 		break;
 	case PMP_STATE_CLEAR:
+		softc->reset = 0;
 		cam_fill_ataio(ataio,
 		      pmp_retry_count,
 		      pmpdone,
@@ -571,6 +573,7 @@
 	case PMP_STATE_CONFIG:
 		softc->pm_step = 0;
 		softc->state = PMP_STATE_RESET;
+		softc->reset |= ~softc->found;
 		xpt_release_ccb(done_ccb);
 		xpt_schedule(periph, priority);
 		return;
@@ -595,6 +598,12 @@
 		if (softc->pm_step >= softc->pm_ports) {
 			softc->pm_step = 0;
 			softc->pm_try = 0;
+			cam_freeze_devq(periph->path);
+			cam_release_devq(periph->path,
+			    RELSIM_RELEASE_AFTER_TIMEOUT,
+			    /*reduction*/0,
+			    /*timeout*/10,
+			    /*getcount_only*/0);
 			printf("PM connect done\n");
 			softc->state = PMP_STATE_CHECK;
 		}
@@ -611,7 +620,7 @@
 			softc->found |= (1 << softc->pm_step);
 			softc->pm_step++;
 		} else {
-			if (softc->pm_try < 100) {
+			if (softc->pm_try < 10) {
 				cam_freeze_devq(periph->path);
 				cam_release_devq(periph->path,
 				    RELSIM_RELEASE_AFTER_TIMEOUT,
@@ -632,6 +641,14 @@
 			}
 		}
 		if (softc->pm_step >= softc->pm_ports) {
+			if (softc->reset & softc->found) {
+				cam_freeze_devq(periph->path);
+				cam_release_devq(periph->path,
+				    RELSIM_RELEASE_AFTER_TIMEOUT,
+				    /*reduction*/0,
+				    /*timeout*/1000,
+				    /*getcount_only*/0);
+			}
 			softc->state = PMP_STATE_CLEAR;
 			softc->pm_step = 0;
 		}