svn commit: r185900 - in head/sys: dev/re pci
Pyun YongHyeon
yongari at FreeBSD.org
Wed Dec 10 17:26:18 PST 2008
Author: yongari
Date: Thu Dec 11 01:26:18 2008
New Revision: 185900
URL: http://svn.freebsd.org/changeset/base/185900
Log:
Newer RealTek controllers requires setting stop request bit to
terminate active Tx/Rx operation.
Modified:
head/sys/dev/re/if_re.c
head/sys/pci/if_rlreg.h
Modified: head/sys/dev/re/if_re.c
==============================================================================
--- head/sys/dev/re/if_re.c Thu Dec 11 01:04:25 2008 (r185899)
+++ head/sys/dev/re/if_re.c Thu Dec 11 01:26:18 2008 (r185900)
@@ -1244,7 +1244,7 @@ re_attach(device_t dev)
case RL_HWREV_8102EL:
sc->rl_flags |= RL_FLAG_NOJUMBO | RL_FLAG_INVMAR |
RL_FLAG_PHYWAKE | RL_FLAG_PAR | RL_FLAG_DESCV2 |
- RL_FLAG_MACSTAT | RL_FLAG_FASTETHER;
+ RL_FLAG_MACSTAT | RL_FLAG_FASTETHER | RL_FLAG_CMDSTOP;
break;
case RL_HWREV_8168_SPIN1:
case RL_HWREV_8168_SPIN2:
@@ -1257,7 +1257,8 @@ re_attach(device_t dev)
case RL_HWREV_8168CP:
case RL_HWREV_8168D:
sc->rl_flags |= RL_FLAG_INVMAR | RL_FLAG_PHYWAKE |
- RL_FLAG_PAR | RL_FLAG_DESCV2 | RL_FLAG_MACSTAT;
+ RL_FLAG_PAR | RL_FLAG_DESCV2 | RL_FLAG_MACSTAT |
+ RL_FLAG_CMDSTOP;
/*
* These controllers support jumbo frame but it seems
* that enabling it requires touching additional magic
@@ -2868,7 +2869,12 @@ re_stop(struct rl_softc *sc)
callout_stop(&sc->rl_stat_callout);
ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE);
- CSR_WRITE_1(sc, RL_COMMAND, 0x00);
+ if ((sc->rl_flags & RL_FLAG_CMDSTOP) != 0)
+ CSR_WRITE_1(sc, RL_COMMAND, RL_CMD_STOPREQ | RL_CMD_TX_ENB |
+ RL_CMD_RX_ENB);
+ else
+ CSR_WRITE_1(sc, RL_COMMAND, 0x00);
+ DELAY(1000);
CSR_WRITE_2(sc, RL_IMR, 0x0000);
CSR_WRITE_2(sc, RL_ISR, 0xFFFF);
Modified: head/sys/pci/if_rlreg.h
==============================================================================
--- head/sys/pci/if_rlreg.h Thu Dec 11 01:04:25 2008 (r185899)
+++ head/sys/pci/if_rlreg.h Thu Dec 11 01:26:18 2008 (r185900)
@@ -308,6 +308,7 @@
#define RL_CMD_TX_ENB 0x0004
#define RL_CMD_RX_ENB 0x0008
#define RL_CMD_RESET 0x0010
+#define RL_CMD_STOPREQ 0x0080
/*
* Twister register values. These are completely undocumented and derived
@@ -883,6 +884,7 @@ struct rl_softc {
#define RL_FLAG_DESCV2 0x0040
#define RL_FLAG_MACSTAT 0x0080
#define RL_FLAG_FASTETHER 0x0100
+#define RL_FLAG_CMDSTOP 0x0200
#define RL_FLAG_LINK 0x8000
};
More information about the svn-src-all
mailing list