From owner-svn-src-head@FreeBSD.ORG  Fri Nov 13 00:34:28 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 654C01065670;
	Fri, 13 Nov 2009 00:34:28 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 53F158FC19;
	Fri, 13 Nov 2009 00:34:28 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAD0YS1K048288;
	Fri, 13 Nov 2009 00:34:28 GMT (envelope-from np@svn.freebsd.org)
Received: (from np@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAD0YSJJ048285;
	Fri, 13 Nov 2009 00:34:28 GMT (envelope-from np@svn.freebsd.org)
Message-Id: <200911130034.nAD0YSJJ048285@svn.freebsd.org>
From: Navdeep Parhar <np@FreeBSD.org>
Date: Fri, 13 Nov 2009 00:34:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r199239 - head/sys/dev/cxgb/common
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Nov 2009 00:34:28 -0000

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));