diff options
| author | Visa Hankala <visa@cvs.openbsd.org> | 2016-06-18 15:59:35 +0000 |
|---|---|---|
| committer | Visa Hankala <visa@cvs.openbsd.org> | 2016-06-18 15:59:35 +0000 |
| commit | b9753ae1da754556287aea9592069fd7566a7991 (patch) | |
| tree | 623b021e76d9e62264f08056ea0532136859220d | |
| parent | 84c0e93bdc33342a7fbeb293d361230e553884b3 (diff) | |
Make the 1 Gbps SGMII settings the default to define a consistent set of
parameters even if a link is down.
| -rw-r--r-- | sys/arch/octeon/dev/cn30xxgmx.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/arch/octeon/dev/cn30xxgmx.c b/sys/arch/octeon/dev/cn30xxgmx.c index b10f383b41c..48a9c688f47 100644 --- a/sys/arch/octeon/dev/cn30xxgmx.c +++ b/sys/arch/octeon/dev/cn30xxgmx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cn30xxgmx.c,v 1.23 2016/06/09 15:29:22 visa Exp $ */ +/* $OpenBSD: cn30xxgmx.c,v 1.24 2016/06/18 15:59:34 visa Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -1259,6 +1259,7 @@ cn30xxgmx_sgmii_speed(struct cn30xxgmx_port_softc *sc) misc_ctl |= 5 & PCS_MISC_CTL_SAMP_PT; break; case IF_Gbps(1): + default: tx_slot = 0x200; tx_burst = 0x2000; SET(prt_cfg, PRTN_CFG_SPEED); @@ -1266,8 +1267,6 @@ cn30xxgmx_sgmii_speed(struct cn30xxgmx_port_softc *sc) SET(prt_cfg, PRTN_CFG_SLOTTIME); misc_ctl |= 1 & PCS_MISC_CTL_SAMP_PT; break; - default: - break; } PCS_WRITE_8(sc, PCS_MISC_CTL, misc_ctl); |