git: 2b410bace4a0 - stable/14 - cxgbe tom: Limit TOE connections to 2 reassembly islands always

From: John Baldwin <jhb_at_FreeBSD.org>
Date: Mon, 08 Apr 2024 19:04:21 UTC
The branch stable/14 has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=2b410bace4a04941b52887539ac0eed8c97b0a7e

commit 2b410bace4a04941b52887539ac0eed8c97b0a7e
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2024-01-31 00:41:23 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2024-04-08 17:39:31 +0000

    cxgbe tom: Limit TOE connections to 2 reassembly islands always
    
    Previously this was only limited on T6 cards to support switching from
    ULP_MODE_NONE to ULP_MODE_TLS.  To support switching to
    ULP_MODE_TCPDDP, enable this for all adapters.
    
    Reviewed by:    np
    Sponsored by:   Chelsio Communications
    Differential Revision:  https://reviews.freebsd.org/D43669
    
    (cherry picked from commit afaefb7737994293f9264953e361de095c666c18)
---
 sys/dev/cxgbe/t4_main.c | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c
index 4fbc45e16464..e20c697d2865 100644
--- a/sys/dev/cxgbe/t4_main.c
+++ b/sys/dev/cxgbe/t4_main.c
@@ -5726,18 +5726,15 @@ set_params__post_init(struct adapter *sc)
 	}
 #endif
 
-#ifdef KERN_TLS
-	if (sc->cryptocaps & FW_CAPS_CONFIG_TLSKEYS &&
-	    sc->toecaps & FW_CAPS_CONFIG_TOE) {
-		/*
-		 * Limit TOE connections to 2 reassembly "islands".
-		 * This is required to permit migrating TOE
-		 * connections to UPL_MODE_TLS.
-		 */
-		t4_tp_wr_bits_indirect(sc, A_TP_FRAG_CONFIG,
-		    V_PASSMODE(M_PASSMODE), V_PASSMODE(2));
-	}
+	/*
+	 * Limit TOE connections to 2 reassembly "islands".  This is
+	 * required to permit migrating TOE connections to either
+	 * ULP_MODE_TCPDDP or UPL_MODE_TLS.
+	 */
+	t4_tp_wr_bits_indirect(sc, A_TP_FRAG_CONFIG, V_PASSMODE(M_PASSMODE),
+	    V_PASSMODE(2));
 
+#ifdef KERN_TLS
 	if (is_ktls(sc)) {
 		sc->tlst.inline_keys = t4_tls_inline_keys;
 		sc->tlst.combo_wrs = t4_tls_combo_wrs;