From owner-p4-projects@FreeBSD.ORG  Wed Oct 15 00:21:57 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C76AA1065689; Wed, 15 Oct 2008 00:21:56 +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 8AE8C1065688
	for <perforce@freebsd.org>; Wed, 15 Oct 2008 00:21:56 +0000 (UTC)
	(envelope-from nwhitehorn@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 78D2A8FC24
	for <perforce@freebsd.org>; Wed, 15 Oct 2008 00:21:56 +0000 (UTC)
	(envelope-from nwhitehorn@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9F0LuxX011339
	for <perforce@freebsd.org>; Wed, 15 Oct 2008 00:21:56 GMT
	(envelope-from nwhitehorn@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9F0LunD011337
	for perforce@freebsd.org; Wed, 15 Oct 2008 00:21:56 GMT
	(envelope-from nwhitehorn@freebsd.org)
Date: Wed, 15 Oct 2008 00:21:56 GMT
Message-Id: <200810150021.m9F0LunD011337@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	nwhitehorn@freebsd.org using -f
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 151401 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Wed, 15 Oct 2008 00:21:57 -0000

http://perforce.freebsd.org/chv.cgi?CH=151401

Change 151401 by nwhitehorn@nwhitehorn_trantor on 2008/10/15 00:20:55

	Move K2 SATA patch to correspond to ATA modularization.

Affected files ...

.. //depot/projects/ppc-g5/sys/dev/ata/ata-chipset.c#6 delete
.. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-serverworks.c#2 edit

Differences ...

==== //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-serverworks.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-serverworks.c,v 1.1 2008/10/09 12:56:57 sos Exp $");
+__FBSDID("$FreeBSD: head/sys/dev/ata/chipsets/ata-serverworks.c 183724 2008-10-09 12:56:57Z sos $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
@@ -57,6 +57,7 @@
 static void ata_serverworks_tf_read(struct ata_request *request);
 static void ata_serverworks_tf_write(struct ata_request *request);
 static void ata_serverworks_setmode(device_t dev, int mode);
+static int ata_serverworks_k2status(device_t dev);
 
 /* misc defines */
 #define SWKS_33		0
@@ -98,6 +99,16 @@
 }
 
 static int
+ata_serverworks_k2status(device_t dev)
+{
+    struct ata_channel *ch = device_get_softc(dev);
+
+    ATA_IDX_INL(ch,ATA_STATUS);
+
+    return ata_pci_status(dev);
+}
+
+static int
 ata_serverworks_chipinit(device_t dev)
 {
     struct ata_pci_controller *ctlr = device_get_softc(dev);
@@ -186,6 +197,10 @@
     /* chip does not reliably do 64K DMA transfers */
     ch->dma.max_iosize = 126 * DEV_BSIZE;
 
+    /* For K2, we need to do a 4-byte read on the status reg */
+    if (ctlr->chip->chipid == ATA_K2)
+	ch->hw.status = ata_serverworks_k2status;
+
     return 0;
 }