From owner-svn-src-stable@FreeBSD.ORG  Tue Nov  2 09:15:28 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 28FDC106564A;
	Tue,  2 Nov 2010 09:15:28 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 165E28FC17;
	Tue,  2 Nov 2010 09:15:28 +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 oA29FRYL032384;
	Tue, 2 Nov 2010 09:15:27 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oA29FR4g032382;
	Tue, 2 Nov 2010 09:15:27 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201011020915.oA29FR4g032382@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Tue, 2 Nov 2010 09:15:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r214669 - stable/8/sys/dev/ata/chipsets
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Nov 2010 09:15:28 -0000

Author: mav
Date: Tue Nov  2 09:15:27 2010
New Revision: 214669
URL: http://svn.freebsd.org/changeset/base/214669

Log:
  MFC r213301:
  Revert r132291.
  Restore setting PIO/WDMA timings for VIA UDMA133 controllers.
  Linux disables only AST register writing there, but no all timings.

Modified:
  stable/8/sys/dev/ata/chipsets/ata-via.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/dev/ata/chipsets/ata-via.c
==============================================================================
--- stable/8/sys/dev/ata/chipsets/ata-via.c	Tue Nov  2 09:14:04 2010	(r214668)
+++ stable/8/sys/dev/ata/chipsets/ata-via.c	Tue Nov  2 09:15:27 2010	(r214669)
@@ -352,8 +352,7 @@ ata_via_old_setmode(device_t dev, int ta
 	    piomode = mode;
 	}
 	/* Set WDMA/PIO timings */
-	if (ctlr->chip->cfg1 != VIA133)
-	    pci_write_config(parent, reg - 0x08,timings[ata_mode2idx(piomode)], 1);
+	pci_write_config(parent, reg - 0x08,timings[ata_mode2idx(piomode)], 1);
 	return (mode);
 }