From owner-p4-projects@FreeBSD.ORG  Fri Dec  4 22:10:13 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 296FA1065679; Fri,  4 Dec 2009 22:10:13 +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 E40DB106566B
	for <perforce@freebsd.org>; Fri,  4 Dec 2009 22:10:12 +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 D1E3D8FC1D
	for <perforce@freebsd.org>; Fri,  4 Dec 2009 22:10:12 +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 nB4MACEf097864
	for <perforce@freebsd.org>; Fri, 4 Dec 2009 22:10:12 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB4MACdB097862
	for perforce@freebsd.org; Fri, 4 Dec 2009 22:10:12 GMT
	(envelope-from mav@freebsd.org)
Date: Fri, 4 Dec 2009 22:10:12 GMT
Message-Id: <200912042210.nB4MACdB097862@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 171393 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: Fri, 04 Dec 2009 22:10:13 -0000

http://p4web.freebsd.org/chv.cgi?CH=171393

Change 171393 by mav@mav_mavtest on 2009/12/04 22:09:22

	Add comments that JMicron and Marvell PATA don't require explicit
	mode setting. They snoop mode setting command sent to drive.
	Add 40-wire cable detection to Marvell PATA.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-jmicron.c#8 edit
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-marvell.c#18 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-jmicron.c#8 (text+ko) ====

@@ -153,6 +153,7 @@
 		ata_print_cable(dev, "controller");
 		mode = ATA_UDMA2;
 	}
+	/* Nothing to do to setup mode, the controller snoop SET_FEATURE cmd. */
 	return (mode);
 }
 

==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-marvell.c#18 (text+ko) ====

@@ -170,6 +170,7 @@
 	error = ata_pci_ch_attach(dev);
     	/* dont use 32 bit PIO transfers */
 	ch->flags |= ATA_USE_16BIT;
+	ch->flags |= ATA_CHECKS_CABLE;
 	return (error);
 }
 
@@ -177,8 +178,15 @@
 ata_marvell_setmode(device_t dev, int target, int mode)
 {
 	struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev));
+	struct ata_channel *ch = device_get_softc(dev);
 
 	mode = min(mode, ctlr->chip->max_dma);
+	/* Check for 80pin cable present. */
+	if (mode > ATA_UDMA2 && ATA_IDX_INB(ch, ATA_BMDEVSPEC_0) & 0x01) {
+		ata_print_cable(dev, "controller");
+		mode = ATA_UDMA2;
+	}
+	/* Nothing to do to setup mode, the controller snoop SET_FEATURE cmd. */
 	return (mode);
 }