diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2005-05-21 17:24:51 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2005-05-21 17:24:51 +0000 |
| commit | 9f5d24966546a867b426976e472cbff641ba74f4 (patch) | |
| tree | a8c028f5418b42eec30ba67be4d0b64d2410cb7e /sys | |
| parent | 6d9f87b4ddb0dbc8c24a5eff70af559c63405789 (diff) | |
backout part of rev 1.35, which breaks some 5704-based fibre interfaces on
some IBM/Intel blade servers.
From FreeBSD
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/if_bge.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c index 9f6395d64e8..976c774c545 100644 --- a/sys/dev/pci/if_bge.c +++ b/sys/dev/pci/if_bge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bge.c,v 1.58 2005/04/25 17:55:51 brad Exp $ */ +/* $OpenBSD: if_bge.c,v 1.59 2005/05/21 17:24:50 brad Exp $ */ /* * Copyright (c) 2001 Wind River Systems * Copyright (c) 1997, 1998, 1999, 2001 @@ -2893,23 +2893,6 @@ bge_ifmedia_upd(ifp) return(EINVAL); switch(IFM_SUBTYPE(ifm->ifm_media)) { case IFM_AUTO: - /* - * The BCM5704 ASIC appears to have a special - * mechanism for programming the autoneg - * advertisement registers in TBI mode. - */ - if (BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5704) { - uint32_t sgdig; - CSR_WRITE_4(sc, BGE_TX_TBI_AUTONEG, 0); - sgdig = CSR_READ_4(sc, BGE_SGDIG_CFG); - sgdig |= BGE_SGDIGCFG_AUTO| - BGE_SGDIGCFG_PAUSE_CAP| - BGE_SGDIGCFG_ASYM_PAUSE; - CSR_WRITE_4(sc, BGE_SGDIG_CFG, - sgdig|BGE_SGDIGCFG_SEND); - DELAY(5); - CSR_WRITE_4(sc, BGE_SGDIG_CFG, sgdig); - } break; case IFM_1000_SX: if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) { |