From owner-svn-src-projects@FreeBSD.ORG  Fri May 24 04:01:33 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 2F565A33;
 Fri, 24 May 2013 04:01:33 +0000 (UTC)
 (envelope-from jhibbits@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2311E790;
 Fri, 24 May 2013 04:01:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4O41XFg028657;
 Fri, 24 May 2013 04:01:33 GMT
 (envelope-from jhibbits@svn.freebsd.org)
Received: (from jhibbits@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4O41XXP028656;
 Fri, 24 May 2013 04:01:33 GMT
 (envelope-from jhibbits@svn.freebsd.org)
Message-Id: <201305240401.r4O41XXP028656@svn.freebsd.org>
From: Justin Hibbits <jhibbits@FreeBSD.org>
Date: Fri, 24 May 2013 04:01:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r250959 - projects/pmac_pmu/sys/powerpc/powermac
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 May 2013 04:01:33 -0000

Author: jhibbits
Date: Fri May 24 04:01:32 2013
New Revision: 250959
URL: http://svnweb.freebsd.org/changeset/base/250959

Log:
  Fix suspend/resume in ATA macio.

Modified:
  projects/pmac_pmu/sys/powerpc/powermac/ata_macio.c

Modified: projects/pmac_pmu/sys/powerpc/powermac/ata_macio.c
==============================================================================
--- projects/pmac_pmu/sys/powerpc/powermac/ata_macio.c	Fri May 24 04:00:47 2013	(r250958)
+++ projects/pmac_pmu/sys/powerpc/powermac/ata_macio.c	Fri May 24 04:01:32 2013	(r250959)
@@ -340,13 +340,14 @@ ata_macio_begin_transaction(struct ata_r
 static int
 ata_macio_suspend(device_t dev)
 {
-	struct ata_channel *ch = device_get_softc(dev);
+	struct ata_dbdma_channel *ch = device_get_softc(dev);
 	int error;
 
-	if (!ch->attached)
+	if (!ch->sc_ch.attached)
 		return (0);
 
 	error = ata_suspend(dev);
+	dbdma_save_state(ch->dbdma);
 
 	return (error);
 }
@@ -354,12 +355,13 @@ ata_macio_suspend(device_t dev)
 static int
 ata_macio_resume(device_t dev)
 {
-	struct ata_channel *ch = device_get_softc(dev);
+	struct ata_dbdma_channel *ch = device_get_softc(dev);
 	int error;
 
-	if (!ch->attached)
+	if (!ch->sc_ch.attached)
 		return (0);
 
+	dbdma_restore_state(ch->dbdma);
 	error = ata_resume(dev);
 
 	return (error);