From owner-p4-projects@FreeBSD.ORG  Tue Apr 27 11:43:41 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 02F5B1065674; Tue, 27 Apr 2010 11:43:41 +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 BBE281065672
	for <perforce@freebsd.org>; Tue, 27 Apr 2010 11:43:40 +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 AAAB48FC0C
	for <perforce@freebsd.org>; Tue, 27 Apr 2010 11:43:40 +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 o3RBhekL002774
	for <perforce@freebsd.org>; Tue, 27 Apr 2010 11:43:40 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3RBhewf002772
	for perforce@freebsd.org; Tue, 27 Apr 2010 11:43:40 GMT
	(envelope-from mav@freebsd.org)
Date: Tue, 27 Apr 2010 11:43:40 GMT
Message-Id: <201004271143.o3RBhewf002772@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 177396 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 Apr 2010 11:43:41 -0000

http://p4web.freebsd.org/@@177396?ac=10

Change 177396 by mav@mav_mavtest on 2010/04/27 11:43:30

	Add power management support.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.c#14 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.c#14 (text+ko) ====

@@ -592,20 +592,34 @@
 static void
 mvs_ch_pm(void *arg)
 {
-#if 0
 	device_t dev = (device_t)arg;
 	struct mvs_channel *ch = device_get_softc(dev);
 	uint32_t work;
 
 	if (ch->numrslots != 0)
 		return;
-	work = ATA_INL(ch->r_mem, MVS_P_CMD);
+	work = ATA_INL(ch->r_mem, SATA_SC);
+	work &= ~ATA_SC_SPM_MASK;
 	if (ch->pm_level == 4)
-		work |= MVS_P_CMD_PARTIAL;
+		work |= ATA_SC_SPM_PARTIAL;
 	else
-		work |= MVS_P_CMD_SLUMBER;
-	ATA_OUTL(ch->r_mem, MVS_P_CMD, work);
-#endif
+		work |= ATA_SC_SPM_SLUMBER;
+	ATA_OUTL(ch->r_mem, SATA_SC, work);
+}
+
+static void
+mvs_ch_pm_wake(device_t dev)
+{
+	struct mvs_channel *ch = device_get_softc(dev);
+	uint32_t work;
+
+	work = ATA_INL(ch->r_mem, SATA_SS);
+	if (work & ATA_SS_IPM_ACTIVE)
+		return;
+	work = ATA_INL(ch->r_mem, SATA_SC);
+	work &= ~ATA_SC_SPM_MASK;
+	work |= ATA_SC_SPM_ACTIVE;
+	ATA_OUTL(ch->r_mem, SATA_SC, work);
 }
 
 static void
@@ -1056,6 +1070,8 @@
 	struct mvs_slot *slot;
 	int slotn, tag;
 
+	if (ch->pm_level > 0)
+		mvs_ch_pm_wake(dev);
 	/* Softreset is a special case. */
 	if (ccb->ccb_h.func_code == XPT_ATA_IO &&
 	    (ccb->ataio.cmd.flags & CAM_ATAIO_CONTROL)) {