From owner-svn-src-head@FreeBSD.ORG  Mon Oct 27 00:09:14 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B0E07106567F;
	Mon, 27 Oct 2008 00:09:14 +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 9E50F8FC14;
	Mon, 27 Oct 2008 00:09:14 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9R09EPS008077;
	Mon, 27 Oct 2008 00:09:14 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9R09ExS008076;
	Mon, 27 Oct 2008 00:09:14 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <200810270009.m9R09ExS008076@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Mon, 27 Oct 2008 00:09:14 +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: r184314 - head/sys/powerpc/powermac
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Oct 2008 00:09:14 -0000

Author: nwhitehorn
Date: Mon Oct 27 00:09:14 2008
New Revision: 184314
URL: http://svn.freebsd.org/changeset/base/184314

Log:
  Bring Kauai ATA driver in line with Macio ATA by reading the PIO config reg
  to set the initial PIO mode instead of assuming PIO4. There are still a few
  nagging issues:
  
  - There are some problems with 64 K DMA transfers waiting on lower level
  changes.
  
  - ATAPI DMA is broken on Marcel's Mac Mini because we need an ATA SELECT hook
  propagated up to individual drivers for hardware without timing registers for
  each ATA channel.

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

Modified: head/sys/powerpc/powermac/ata_kauai.c
==============================================================================
--- head/sys/powerpc/powermac/ata_kauai.c	Sun Oct 26 23:11:25 2008	(r184313)
+++ head/sys/powerpc/powermac/ata_kauai.c	Mon Oct 27 00:09:14 2008	(r184314)
@@ -292,16 +292,12 @@ ata_kauai_attach(device_t dev)
 #endif
 
 	/* Set up initial mode */
-	if (sc->shasta)
-		sc->pioconf[0] = sc->pioconf[1] = pio_timing_shasta[4];
-	else 
-		sc->pioconf[0] = sc->pioconf[1] = pio_timing_kauai[4];
+	sc->pioconf[0] = sc->pioconf[1] = 
+	    bus_read_4(sc->sc_memr, PIO_CONFIG_REG) & 0x0f000fff;
 
 	sc->udmaconf[0] = sc->udmaconf[1] = 0;
 	sc->wdmaconf[0] = sc->wdmaconf[1] = 0;
 
-	bus_write_4(sc->sc_memr, PIO_CONFIG_REG, sc->pioconf[0]);
-
 	/* Magic FCR value from Apple */
 	bus_write_4(sc->sc_memr, 0, 0x00000007);