From owner-svn-src-all@FreeBSD.ORG  Sun Jan 23 17:20:12 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 02032106564A;
	Sun, 23 Jan 2011 17:20:12 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E53168FC08;
	Sun, 23 Jan 2011 17:20:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0NHKBbf062240;
	Sun, 23 Jan 2011 17:20:11 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0NHKBDO062238;
	Sun, 23 Jan 2011 17:20:11 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201101231720.p0NHKBDO062238@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sun, 23 Jan 2011 17:20:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217756 - head/sys/powerpc/powermac
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Jan 2011 17:20:12 -0000

Author: nwhitehorn
Date: Sun Jan 23 17:20:11 2011
New Revision: 217756
URL: http://svn.freebsd.org/changeset/base/217756

Log:
  Disable ATAPI DMA unconditionally on Apple Kauai ATA controllers, like it
  is on the MacIO ones. It appears to be unreliable on all DBDMA-based
  controllers for unknown reasons, which should be figured out eventually.
  
  Tested by:	Torfinn Ingolfsen
  MFC after:	1 week

Modified:
  head/sys/powerpc/powermac/ata_kauai.c

Modified: head/sys/powerpc/powermac/ata_kauai.c
==============================================================================
--- head/sys/powerpc/powermac/ata_kauai.c	Sun Jan 23 17:13:29 2011	(r217755)
+++ head/sys/powerpc/powermac/ata_kauai.c	Sun Jan 23 17:20:11 2011	(r217756)
@@ -217,10 +217,8 @@ ata_kauai_probe(device_t dev)
 	ch = &sc->sc_ch.sc_ch;
 
 	compatstring = ofw_bus_get_compat(dev);
-	if (compatstring != NULL && strcmp(compatstring,"shasta-ata") == 0) {
-		ch->flags |= ATA_NO_ATAPI_DMA;
+	if (compatstring != NULL && strcmp(compatstring,"shasta-ata") == 0)
 		sc->shasta = 1;
-	}
 
 	/* Pre-K2 controllers apparently need this hack */
 	if (!sc->shasta &&
@@ -246,8 +244,11 @@ ata_kauai_probe(device_t dev)
         ch->r_io[ATA_CONTROL].offset = ATA_KAUAI_ALTOFFSET;
 	ata_default_registers(dev);
 
-        ch->unit = 0;
-        ch->flags |= ATA_USE_16BIT;
+	ch->unit = 0;
+	ch->flags |= ATA_USE_16BIT;
+	
+	/* XXX: ATAPI DMA is unreliable. We should find out why. */
+	ch->flags |= ATA_NO_ATAPI_DMA;
 	ata_generic_hw(dev);
 
         return (ata_probe(dev));