svn commit: r199239 - head/sys/dev/cxgb/common

[Navdeep Parhar]

Author: np
Date: Fri Nov 13 00:34:28 2009
New Revision: 199239
URL: http://svn.freebsd.org/changeset/base/199239

Log:
  The 10GBASE-T card should use an IPG of 1.  Also enable the check
  for low power startup on this card.

Modified:
  head/sys/dev/cxgb/common/cxgb_aq100x.c
  head/sys/dev/cxgb/common/cxgb_xgmac.c

Modified: head/sys/dev/cxgb/common/cxgb_aq100x.c
==============================================================================
--- head/sys/dev/cxgb/common/cxgb_aq100x.c	Fri Nov 13 00:31:51 2009	(r199238)
+++ head/sys/dev/cxgb/common/cxgb_aq100x.c	Fri Nov 13 00:34:28 2009	(r199239)
@@ -515,13 +515,11 @@ t3_aq100x_phy_prep(pinfo_t *pinfo, int p
 		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.

Modified: head/sys/dev/cxgb/common/cxgb_xgmac.c
==============================================================================
--- head/sys/dev/cxgb/common/cxgb_xgmac.c	Fri Nov 13 00:31:51 2009	(r199238)
+++ head/sys/dev/cxgb/common/cxgb_xgmac.c	Fri Nov 13 00:34:28 2009	(r199239)
@@ -508,7 +508,7 @@ int t3_mac_set_mtu(struct cmac *mac, uns
 		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));