From owner-svn-src-stable-9@FreeBSD.ORG  Tue Jan  8 02:02:20 2013
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id C2327CF;
 Tue,  8 Jan 2013 02:02:20 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9AF7725A;
 Tue,  8 Jan 2013 02:02:20 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0822KnA070518;
 Tue, 8 Jan 2013 02:02:20 GMT (envelope-from np@svn.freebsd.org)
Received: (from np@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0822KKK070516;
 Tue, 8 Jan 2013 02:02:20 GMT (envelope-from np@svn.freebsd.org)
Message-Id: <201301080202.r0822KKK070516@svn.freebsd.org>
From: Navdeep Parhar <np@FreeBSD.org>
Date: Tue, 8 Jan 2013 02:02:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r245145 - stable/9/sys/dev/cxgbe
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Jan 2013 02:02:20 -0000

Author: np
Date: Tue Jan  8 02:02:19 2013
New Revision: 245145
URL: http://svnweb.freebsd.org/changeset/base/245145

Log:
  MFC r244551, r244580.
  
  r244551:
  cxgbe(4): must hold a write-lock on the table while allocating an L2
  entry for switching.
  
  r244580:
  cxgbe(4): Add support for the T440-LP-CR card.  This is the 4x10G low
  profile card with a QSFP+ transceiver.

Modified:
  stable/9/sys/dev/cxgbe/t4_l2t.c
  stable/9/sys/dev/cxgbe/t4_main.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/cxgbe/t4_l2t.c
==============================================================================
--- stable/9/sys/dev/cxgbe/t4_l2t.c	Tue Jan  8 01:56:05 2013	(r245144)
+++ stable/9/sys/dev/cxgbe/t4_l2t.c	Tue Jan  8 02:02:19 2013	(r245145)
@@ -149,7 +149,7 @@ t4_l2t_alloc_switching(struct l2t_data *
 {
 	struct l2t_entry *e;
 
-	rw_rlock(&d->lock);
+	rw_wlock(&d->lock);
 	e = t4_alloc_l2e(d);
 	if (e) {
 		mtx_lock(&e->lock);          /* avoid race with t4_l2t_free */
@@ -157,7 +157,7 @@ t4_l2t_alloc_switching(struct l2t_data *
 		atomic_store_rel_int(&e->refcnt, 1);
 		mtx_unlock(&e->lock);
 	}
-	rw_runlock(&d->lock);
+	rw_wunlock(&d->lock);
 	return e;
 }
 

Modified: stable/9/sys/dev/cxgbe/t4_main.c
==============================================================================
--- stable/9/sys/dev/cxgbe/t4_main.c	Tue Jan  8 01:56:05 2013	(r245144)
+++ stable/9/sys/dev/cxgbe/t4_main.c	Tue Jan  8 02:02:19 2013	(r245145)
@@ -371,6 +371,7 @@ struct t4_pciids {
 	{0x4408, "Chelsio T420-CX"},
 	{0x4409, "Chelsio T420-BT"},
 	{0x440a, "Chelsio T404-BT"},
+	{0x440e, "Chelsio T440-LP-CR"},
 };
 
 #ifdef TCP_OFFLOAD