summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authormsaitoh <msaitoh@NetBSD.org>2010-02-25 15:07:06 +0000
committermsaitoh <msaitoh@NetBSD.org>2010-02-25 15:07:06 +0000
commitb32bc8f5ec243339c818fe6e252e458b744525f7 (patch)
treec9e897329915c015aa22a07ace5fd36693fa5c06 /sys/dev
parentbc3c98c2fc372012bf92bb96baec1e438d3c91c7 (diff)
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.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/if_wm.c12
-rw-r--r--sys/dev/pci/if_wmvar.h3
2 files changed, 8 insertions, 7 deletions
diff --git a/sys/dev/pci/if_wm.c b/sys/dev/pci/if_wm.c
index 22306ed926b..1674d13e326 100644
--- a/sys/dev/pci/if_wm.c
+++ b/sys/dev/pci/if_wm.c
@@ -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 @@ wm_gmii_i82544_readreg(device_t self, int phy, int reg)
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 @@ wm_gmii_i82544_writereg(device_t self, int phy, int reg, int val)
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)
diff --git a/sys/dev/pci/if_wmvar.h b/sys/dev/pci/if_wmvar.h
index 192263f2eab..d500468a9b5 100644
--- a/sys/dev/pci/if_wmvar.h
+++ b/sys/dev/pci/if_wmvar.h
@@ -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 @@ typedef enum {
} 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