From owner-p4-projects@FreeBSD.ORG  Sun Oct 25 11:45:05 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DC5D21065679; Sun, 25 Oct 2009 11:45:04 +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 A10A81065670
	for <perforce@freebsd.org>; Sun, 25 Oct 2009 11:45:04 +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 8E7AC8FC20
	for <perforce@freebsd.org>; Sun, 25 Oct 2009 11:45:04 +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 n9PBj4u6097470
	for <perforce@freebsd.org>; Sun, 25 Oct 2009 11:45:04 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9PBj44O097468
	for perforce@freebsd.org; Sun, 25 Oct 2009 11:45:04 GMT
	(envelope-from mav@freebsd.org)
Date: Sun, 25 Oct 2009 11:45:04 GMT
Message-Id: <200910251145.n9PBj44O097468@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 169793 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: Sun, 25 Oct 2009 11:45:05 -0000

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

Change 169793 by mav@mav_mavtest on 2009/10/25 11:44:40

	Replace DELAY() with device freezing to not spent 1s in a loop.

Affected files ...

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

Differences ...

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

@@ -578,7 +578,12 @@
 		softc->pm_step++;
 		if (softc->pm_step >= softc->pm_ports) {
 			softc->pm_step = 0;
-			DELAY(5000);
+			cam_freeze_devq(periph->path);
+			cam_release_devq(periph->path,
+			    RELSIM_RELEASE_AFTER_TIMEOUT,
+			    /*reduction*/0,
+			    /*timeout*/5,
+			    /*getcount_only*/0);
 			printf("PM reset done\n");
 			softc->state = PMP_STATE_CONNECT;
 		}
@@ -607,7 +612,12 @@
 			softc->pm_step++;
 		} else {
 			if (softc->pm_try < 100) {
-				DELAY(10000);
+				cam_freeze_devq(periph->path);
+				cam_release_devq(periph->path,
+				    RELSIM_RELEASE_AFTER_TIMEOUT,
+				    /*reduction*/0,
+				    /*timeout*/10,
+				    /*getcount_only*/0);
 				softc->pm_try++;
 			} else {
 				printf("PM status: %d - %08x\n", softc->pm_step, res);
@@ -621,18 +631,13 @@
 				softc->pm_step++;
 			}
 		}
-		if (softc->pm_step < softc->pm_ports) {
-			xpt_release_ccb(done_ccb);
-			xpt_schedule(periph, priority);
-			return;
-		} else {
+		if (softc->pm_step >= softc->pm_ports) {
+			softc->state = PMP_STATE_CLEAR;
 			softc->pm_step = 0;
-			softc->state = PMP_STATE_CLEAR;
-			xpt_release_ccb(done_ccb);
-			xpt_schedule(periph, priority);
-			return;
 		}
-		break;
+		xpt_release_ccb(done_ccb);
+		xpt_schedule(periph, priority);
+		return;
 	case PMP_STATE_CLEAR:
 		softc->pm_step++;
 		if (softc->pm_step < softc->pm_ports) {