diff options
| author |   brad <brad@openbsd.org> | 2006-07-23 05:59:18 +0000 |
|---|---|---|
| committer | brad <brad@openbsd.org> | 2006-07-23 05:59:18 +0000 |
| commit | 4c4b3b8fd200d344daab2a8b6fe53c7acb31e9eb (patch) | |
| tree | 6df07f6649e53b44a9694aafa09a784fea5cef00 | |
| parent | update nviic(4) entry. (diff) | |
| download | wireguard-openbsd-4c4b3b8fd200d344daab2a8b6fe53c7acb31e9eb.tar.xz wireguard-openbsd-4c4b3b8fd200d344daab2a8b6fe53c7acb31e9eb.zip | |
improved Yukon init routine with proper workaround for the PHY COMA mode.
From yongari@FreeBSD
| -rw-r--r-- | sys/dev/pci/if_sk.c | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c index a478ec3ff30..b84c9d925d7 100644 --- a/sys/dev/pci/if_sk.c +++ b/sys/dev/pci/if_sk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sk.c,v 1.116 2006/06/22 23:06:03 brad Exp $ */ +/* $OpenBSD: if_sk.c,v 1.117 2006/07/23 05:59:18 brad Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -2496,24 +2496,36 @@ void sk_init_yukon(struct sk_if_softc *sc_if) if (sc->sk_type == SK_YUKON_LITE && sc->sk_rev >= SK_YUKON_LITE_REV_A3) { - /* Take PHY out of reset. */ - sk_win_write_4(sc, SK_GPIO, - (sk_win_read_4(sc, SK_GPIO) | SK_GPIO_DIR9) & ~SK_GPIO_DAT9); + /* + * Workaround code for COMA mode, set PHY reset. + * Otherwise it will not correctly take chip out of + * powerdown (coma) + */ + v = sk_win_read_4(sc, SK_GPIO); + v |= SK_GPIO_DIR9 | SK_GPIO_DAT9; + sk_win_write_4(sc, SK_GPIO, v); } - /* GMAC and GPHY Reset */ - SK_IF_WRITE_4(sc_if, 0, SK_GPHY_CTRL, SK_GPHY_RESET_SET); - DPRINTFN(6, ("sk_init_yukon: 1\n")); - SK_IF_WRITE_4(sc_if, 0, SK_GMAC_CTRL, SK_GMAC_RESET_SET); - DELAY(1000); - SK_IF_WRITE_4(sc_if, 0, SK_GMAC_CTRL, SK_GMAC_RESET_CLEAR); + /* GMAC and GPHY Reset */ + SK_IF_WRITE_4(sc_if, 0, SK_GPHY_CTRL, SK_GPHY_RESET_SET); SK_IF_WRITE_4(sc_if, 0, SK_GMAC_CTRL, SK_GMAC_RESET_SET); DELAY(1000); DPRINTFN(6, ("sk_init_yukon: 2\n")); + if (sc->sk_type == SK_YUKON_LITE && + sc->sk_rev >= SK_YUKON_LITE_REV_A3) { + /* + * Workaround code for COMA mode, clear PHY reset + */ + v = sk_win_read_4(sc, SK_GPIO); + v |= SK_GPIO_DIR9; + v &= ~SK_GPIO_DAT9; + sk_win_write_4(sc, SK_GPIO, v); + } + phy = SK_GPHY_INT_POL_HI | SK_GPHY_DIS_FC | SK_GPHY_DIS_SLEEP | SK_GPHY_ENA_XC | SK_GPHY_ANEG_ALL | SK_GPHY_ENA_PAUSE; |