From owner-svn-src-head@FreeBSD.ORG  Thu Dec 11 00:30:26 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 D73771065677;
	Thu, 11 Dec 2008 00:30:26 +0000 (UTC)
	(envelope-from yongari@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C2E628FC17;
	Thu, 11 Dec 2008 00:30:26 +0000 (UTC)
	(envelope-from yongari@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 mBB0UQ6c047516;
	Thu, 11 Dec 2008 00:30:26 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBB0UQiK047515;
	Thu, 11 Dec 2008 00:30:26 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <200812110030.mBB0UQiK047515@svn.freebsd.org>
From: Pyun YongHyeon <yongari@FreeBSD.org>
Date: Thu, 11 Dec 2008 00:30:26 +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: r185896 - head/sys/dev/re
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: Thu, 11 Dec 2008 00:30:27 -0000

Author: yongari
Date: Thu Dec 11 00:30:26 2008
New Revision: 185896
URL: http://svn.freebsd.org/changeset/base/185896

Log:
  Partly revert r185756. RTL8169SC doesn't like reduced delays in
  GMII access while Tx/Rx is in progress.
  
  Reported by:	Jaakko Heinonen <jh <> saunalahti DOT fi>,
  		Anton Yuzhaninov <citrin <> citrin DOT ru>
  Tested by:	Jaakko Heinonen <jh <> saunalahti DOT fi>

Modified:
  head/sys/dev/re/if_re.c

Modified: head/sys/dev/re/if_re.c
==============================================================================
--- head/sys/dev/re/if_re.c	Wed Dec 10 23:12:39 2008	(r185895)
+++ head/sys/dev/re/if_re.c	Thu Dec 11 00:30:26 2008	(r185896)
@@ -419,10 +419,10 @@ re_gmii_readreg(device_t dev, int phy, i
 	CSR_WRITE_4(sc, RL_PHYAR, reg << 16);
 
 	for (i = 0; i < RL_TIMEOUT; i++) {
-		DELAY(30);
 		rval = CSR_READ_4(sc, RL_PHYAR);
 		if (rval & RL_PHYAR_BUSY)
 			break;
+		DELAY(100);
 	}
 
 	if (i == RL_TIMEOUT) {
@@ -446,10 +446,10 @@ re_gmii_writereg(device_t dev, int phy, 
 	    (data & RL_PHYAR_PHYDATA) | RL_PHYAR_BUSY);
 
 	for (i = 0; i < RL_TIMEOUT; i++) {
-		DELAY(30);
 		rval = CSR_READ_4(sc, RL_PHYAR);
 		if (!(rval & RL_PHYAR_BUSY))
 			break;
+		DELAY(100);
 	}
 
 	if (i == RL_TIMEOUT) {