svn commit: r185896 - head/sys/dev/re

[Pyun YongHyeon]

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) {