Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 28 Apr 2019 18:44:29 +0000 (UTC)
From:      Navdeep Parhar <np@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r346850 - in stable/11/sys/dev/cxgbe: . tom
Message-ID:  <201904281844.x3SIiTig091895@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: np
Date: Sun Apr 28 18:44:29 2019
New Revision: 346850
URL: https://svnweb.freebsd.org/changeset/base/346850

Log:
  MFC r333043:
  
  cxgbe(4): Move release_tid to the base NIC driver for future consumers.
  
  Sponsored by:	Chelsio Communications.

Modified:
  stable/11/sys/dev/cxgbe/adapter.h
  stable/11/sys/dev/cxgbe/t4_main.c
  stable/11/sys/dev/cxgbe/tom/t4_tom.c
  stable/11/sys/dev/cxgbe/tom/t4_tom.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/cxgbe/adapter.h
==============================================================================
--- stable/11/sys/dev/cxgbe/adapter.h	Sun Apr 28 18:36:54 2019	(r346849)
+++ stable/11/sys/dev/cxgbe/adapter.h	Sun Apr 28 18:44:29 2019	(r346850)
@@ -1124,6 +1124,7 @@ void free_atid_tab(struct tid_info *);
 int alloc_atid(struct adapter *, void *);
 void *lookup_atid(struct adapter *, int);
 void free_atid(struct adapter *, int);
+void release_tid(struct adapter *, int, struct sge_wrq *);
 
 #ifdef DEV_NETMAP
 /* t4_netmap.c */

Modified: stable/11/sys/dev/cxgbe/t4_main.c
==============================================================================
--- stable/11/sys/dev/cxgbe/t4_main.c	Sun Apr 28 18:36:54 2019	(r346849)
+++ stable/11/sys/dev/cxgbe/t4_main.c	Sun Apr 28 18:44:29 2019	(r346850)
@@ -2830,6 +2830,31 @@ free_atid(struct adapter *sc, int atid)
 	mtx_unlock(&t->atid_lock);
 }
 
+static void
+queue_tid_release(struct adapter *sc, int tid)
+{
+
+	CXGBE_UNIMPLEMENTED("deferred tid release");
+}
+
+void
+release_tid(struct adapter *sc, int tid, struct sge_wrq *ctrlq)
+{
+	struct wrqe *wr;
+	struct cpl_tid_release *req;
+
+	wr = alloc_wrqe(sizeof(*req), ctrlq);
+	if (wr == NULL) {
+		queue_tid_release(sc, tid);	/* defer */
+		return;
+	}
+	req = wrtod(wr);
+
+	INIT_TP_WR_MIT_CPL(req, CPL_TID_RELEASE, tid);
+
+	t4_wrq_tx(sc, wr);
+}
+
 static int
 t4_range_cmp(const void *a, const void *b)
 {

Modified: stable/11/sys/dev/cxgbe/tom/t4_tom.c
==============================================================================
--- stable/11/sys/dev/cxgbe/tom/t4_tom.c	Sun Apr 28 18:36:54 2019	(r346849)
+++ stable/11/sys/dev/cxgbe/tom/t4_tom.c	Sun Apr 28 18:44:29 2019	(r346850)
@@ -93,7 +93,6 @@ static struct uld_info tom_uld_info = {
 	.deactivate = t4_tom_deactivate,
 };
 
-static void queue_tid_release(struct adapter *, int);
 static void release_offload_resources(struct toepcb *);
 static int alloc_tid_tabs(struct tid_info *);
 static void free_tid_tabs(struct tid_info *);
@@ -536,31 +535,6 @@ remove_tid(struct adapter *sc, int tid, int ntids)
 
 	t->tid_tab[tid] = NULL;
 	atomic_subtract_int(&t->tids_in_use, ntids);
-}
-
-void
-release_tid(struct adapter *sc, int tid, struct sge_wrq *ctrlq)
-{
-	struct wrqe *wr;
-	struct cpl_tid_release *req;
-
-	wr = alloc_wrqe(sizeof(*req), ctrlq);
-	if (wr == NULL) {
-		queue_tid_release(sc, tid);	/* defer */
-		return;
-	}
-	req = wrtod(wr);
-
-	INIT_TP_WR_MIT_CPL(req, CPL_TID_RELEASE, tid);
-
-	t4_wrq_tx(sc, wr);
-}
-
-static void
-queue_tid_release(struct adapter *sc, int tid)
-{
-
-	CXGBE_UNIMPLEMENTED("deferred tid release");
 }
 
 /*

Modified: stable/11/sys/dev/cxgbe/tom/t4_tom.h
==============================================================================
--- stable/11/sys/dev/cxgbe/tom/t4_tom.h	Sun Apr 28 18:36:54 2019	(r346849)
+++ stable/11/sys/dev/cxgbe/tom/t4_tom.h	Sun Apr 28 18:44:29 2019	(r346850)
@@ -329,7 +329,6 @@ void insert_tid(struct adapter *, int, void *, int);
 void *lookup_tid(struct adapter *, int);
 void update_tid(struct adapter *, int, void *);
 void remove_tid(struct adapter *, int, int);
-void release_tid(struct adapter *, int, struct sge_wrq *);
 int find_best_mtu_idx(struct adapter *, struct in_conninfo *,
     struct offload_settings *);
 u_long select_rcv_wnd(struct socket *);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904281844.x3SIiTig091895>