svn commit: r245145 - stable/9/sys/dev/cxgbe

[Navdeep Parhar]

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