diff options
author | np <np@FreeBSD.org> | 2009-11-13 00:34:28 +0000 |
---|---|---|
committer | np <np@FreeBSD.org> | 2009-11-13 00:34:28 +0000 |
commit | 822ab741920a4207ff5b238af50005cba409fded (patch) | |
tree | 60727ad718bb2317db933ede6139ccaaa6bc5144 /sys/dev | |
parent | 05368b9503a243bd9458a696971f1b1f6eeb945f (diff) | |
download | FreeBSD-src-822ab741920a4207ff5b238af50005cba409fded.zip FreeBSD-src-822ab741920a4207ff5b238af50005cba409fded.tar.gz |
The 10GBASE-T card should use an IPG of 1. Also enable the check
for low power startup on this card.
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/cxgb/common/cxgb_aq100x.c | 2 | ||||
-rw-r--r-- | sys/dev/cxgb/common/cxgb_xgmac.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/sys/dev/cxgb/common/cxgb_aq100x.c b/sys/dev/cxgb/common/cxgb_aq100x.c index abb93c4..46f07ca 100644 --- a/sys/dev/cxgb/common/cxgb_aq100x.c +++ b/sys/dev/cxgb/common/cxgb_aq100x.c @@ -515,13 +515,11 @@ t3_aq100x_phy_prep(pinfo_t *pinfo, int phy_addr, CH_WARN(adapter, "PHY%d: unknown firmware %d.%d\n", phy_addr, v >> 8, v & 0xff); -#if 0 /* The PHY should start in really-low-power mode. */ (void) mdio_read(phy, MDIO_DEV_PMA_PMD, MII_BMCR, &v); if ((v & BMCR_PDOWN) == 0) CH_WARN(adapter, "PHY%d does not start in low power mode.\n", phy_addr); -#endif /* * Verify XAUI and 1000-X settings, but let prep succeed no matter what. diff --git a/sys/dev/cxgb/common/cxgb_xgmac.c b/sys/dev/cxgb/common/cxgb_xgmac.c index e323c9b..853da35 100644 --- a/sys/dev/cxgb/common/cxgb_xgmac.c +++ b/sys/dev/cxgb/common/cxgb_xgmac.c @@ -508,7 +508,7 @@ int t3_mac_set_mtu(struct cmac *mac, unsigned int mtu) thres /= 10; thres = mtu > thres ? (mtu - thres + 7) / 8 : 0; thres = max(thres, 8U); /* need at least 8 */ - ipg = (adap->params.rev == T3_REV_C) ? 0 : 1; + ipg = (port_type == 9 || adap->params.rev != T3_REV_C) ? 1 : 0; t3_set_reg_field(adap, A_XGM_TXFIFO_CFG + mac->offset, V_TXFIFOTHRESH(M_TXFIFOTHRESH) | V_TXIPG(M_TXIPG), V_TXFIFOTHRESH(thres) | V_TXIPG(ipg)); |