Module Name: src
Committed By: msaitoh
Date: Thu Feb 25 15:07:06 UTC 2010
Modified Files:
src/sys/dev/pci: if_wm.c if_wmvar.h
Log Message:
Merge if_wm.c rev. 1.162.4.13 and if_wmvar.h rev. 1.2.46.3 into maintrunk.
Increase the timeout value to prevent timeout on 80003. The values are taken
from Intel's e1000 driver. Tested by spz and me.
To generate a diff of this commit:
cvs rdiff -u -r1.199 -r1.200 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/if_wmvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.199 src/sys/dev/pci/if_wm.c:1.200
--- src/sys/dev/pci/if_wm.c:1.199 Tue Feb 16 15:17:17 2010
+++ src/sys/dev/pci/if_wm.c Thu Feb 25 15:07:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.199 2010/02/16 15:17:17 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.200 2010/02/25 15:07:06 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.199 2010/02/16 15:17:17 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.200 2010/02/25 15:07:06 msaitoh Exp $");
#include "rnd.h"
@@ -5546,11 +5546,11 @@
CSR_WRITE(sc, WMREG_MDIC, MDIC_OP_READ | MDIC_PHYADD(phy) |
MDIC_REGADD(reg));
- for (i = 0; i < 320; i++) {
+ for (i = 0; i < WM_GEN_POLL_TIMEOUT * 3; i++) {
mdic = CSR_READ(sc, WMREG_MDIC);
if (mdic & MDIC_READY)
break;
- delay(10);
+ delay(50);
}
if ((mdic & MDIC_READY) == 0) {
@@ -5587,11 +5587,11 @@
CSR_WRITE(sc, WMREG_MDIC, MDIC_OP_WRITE | MDIC_PHYADD(phy) |
MDIC_REGADD(reg) | MDIC_DATA(val));
- for (i = 0; i < 320; i++) {
+ for (i = 0; i < WM_GEN_POLL_TIMEOUT * 3; i++) {
mdic = CSR_READ(sc, WMREG_MDIC);
if (mdic & MDIC_READY)
break;
- delay(10);
+ delay(50);
}
if ((mdic & MDIC_READY) == 0)
Index: src/sys/dev/pci/if_wmvar.h
diff -u src/sys/dev/pci/if_wmvar.h:1.9 src/sys/dev/pci/if_wmvar.h:1.10
--- src/sys/dev/pci/if_wmvar.h:1.9 Tue Feb 16 15:17:17 2010
+++ src/sys/dev/pci/if_wmvar.h Thu Feb 25 15:07:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wmvar.h,v 1.9 2010/02/16 15:17:17 msaitoh Exp $ */
+/* $NetBSD: if_wmvar.h,v 1.10 2010/02/25 15:07:06 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -135,6 +135,7 @@
} wm_phy_type;
+#define WM_GEN_POLL_TIMEOUT 640
#define WM_PHY_CFG_TIMEOUT 100
#define WM_ICH8_LAN_INIT_TIMEOUT 1500
#define WM_MDIO_OWNERSHIP_TIMEOUT 10
