svn commit: r345629 - stable/11/sys/dev/cxgbe/common

[Navdeep Parhar]

Author: np
Date: Thu Mar 28 06:10:41 2019
New Revision: 345629
URL: https://svnweb.freebsd.org/changeset/base/345629

Log:
  MFC r329788 (by jhb@):
  
  Bring in additional constants and message fields for TLS-related messages.
  
  Sponsored by:	Chelsio Communications

Modified:
  stable/11/sys/dev/cxgbe/common/t4_msg.h
  stable/11/sys/dev/cxgbe/common/t4_tcb.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/cxgbe/common/t4_msg.h
==============================================================================
--- stable/11/sys/dev/cxgbe/common/t4_msg.h	Thu Mar 28 03:48:51 2019	(r345628)
+++ stable/11/sys/dev/cxgbe/common/t4_msg.h	Thu Mar 28 06:10:41 2019	(r345629)
@@ -3102,7 +3102,8 @@ struct cpl_rx_mps_pkt {
 struct cpl_tx_tls_sfo {
 	__be32 op_to_seg_len;
 	__be32 pld_len;
-	__be64 rsvd;
+	__be32 type_protover;
+	__be32 r1_lo;
 	__be32 seqno_numivs;
 	__be32 ivgen_hdrlen;
 	__be64 scmd1;
@@ -3126,15 +3127,28 @@ struct cpl_tx_tls_sfo {
 #define V_CPL_TX_TLS_SFO_CPL_LEN(x)     ((x) << S_CPL_TX_TLS_SFO_CPL_LEN)
 #define G_CPL_TX_TLS_SFO_CPL_LEN(x)     \
 	(((x) >> S_CPL_TX_TLS_SFO_CPL_LEN) & M_CPL_TX_TLS_SFO_CPL_LEN)
+
 #define S_CPL_TX_TLS_SFO_SEG_LEN        0
 #define M_CPL_TX_TLS_SFO_SEG_LEN        0xffff
 #define V_CPL_TX_TLS_SFO_SEG_LEN(x)     ((x) << S_CPL_TX_TLS_SFO_SEG_LEN)
 #define G_CPL_TX_TLS_SFO_SEG_LEN(x)     \
 	(((x) >> S_CPL_TX_TLS_SFO_SEG_LEN) & M_CPL_TX_TLS_SFO_SEG_LEN)
 
+#define S_CPL_TX_TLS_SFO_TYPE           24
+#define M_CPL_TX_TLS_SFO_TYPE           0xff
+#define V_CPL_TX_TLS_SFO_TYPE(x)        ((x) << S_CPL_TX_TLS_SFO_TYPE)
+#define G_CPL_TX_TLS_SFO_TYPE(x)        \
+    (((x) >> S_CPL_TX_TLS_SFO_TYPE) & M_CPL_TX_TLS_SFO_TYPE)
+
+#define S_CPL_TX_TLS_SFO_PROTOVER       8
+#define M_CPL_TX_TLS_SFO_PROTOVER       0xffff
+#define V_CPL_TX_TLS_SFO_PROTOVER(x)    ((x) << S_CPL_TX_TLS_SFO_PROTOVER)
+#define G_CPL_TX_TLS_SFO_PROTOVER(x)    \
+    (((x) >> S_CPL_TX_TLS_SFO_PROTOVER) & M_CPL_TX_TLS_SFO_PROTOVER)
+
 struct cpl_tls_data {
 	RSS_HDR
-	__be32 op_tid;
+	union opcode_tid ot;
 	__be32 length_pkd;
 	__be32 seq;
 	__be32 r1;
@@ -3160,7 +3174,7 @@ struct cpl_tls_data {
 
 struct cpl_rx_tls_cmp {
 	RSS_HDR
-	__be32 op_tid;
+	union opcode_tid ot;
 	__be32 pdulength_length;
 	__be32 seq;
 	__be32 ddp_report;

Modified: stable/11/sys/dev/cxgbe/common/t4_tcb.h
==============================================================================
--- stable/11/sys/dev/cxgbe/common/t4_tcb.h	Thu Mar 28 03:48:51 2019	(r345628)
+++ stable/11/sys/dev/cxgbe/common/t4_tcb.h	Thu Mar 28 06:10:41 2019	(r345629)
@@ -495,6 +495,54 @@
 #define M_TCB_RX_DDP_BUF1_TAG    0xffffffffULL
 #define V_TCB_RX_DDP_BUF1_TAG(x) ((x) << S_TCB_RX_DDP_BUF1_TAG)
 
+/* 855:832  */
+#define W_TCB_RX_TLS_BUF_OFFSET    26
+#define S_TCB_RX_TLS_BUF_OFFSET    0
+#define M_TCB_RX_TLS_BUF_OFFSET    0xffffffULL
+#define V_TCB_RX_TLS_BUF_OFFSET(x) ((x) << S_TCB_RX_TLS_BUF_OFFSET)
+
+/* 876:856  */
+#define W_TCB_RX_TLS_BUF_LEN    26
+#define S_TCB_RX_TLS_BUF_LEN    24
+#define M_TCB_RX_TLS_BUF_LEN    0xffffffULL
+#define V_TCB_RX_TLS_BUF_LEN(x) ((__u64)(x) << S_TCB_RX_TLS_BUF_LEN)
+
+/* 895:880  */
+#define W_TCB_RX_TLS_FLAGS    26
+#define S_TCB_RX_TLS_FLAGS    48
+#define M_TCB_RX_TLS_FLAGS    0xffffULL
+#define V_TCB_RX_TLS_FLAGS(x) ((__u64)(x) << S_TCB_RX_TLS_FLAGS)
+
+/* 959:896  */
+#define W_TCB_TLS_SEQ    28
+#define S_TCB_TLS_SEQ    0
+#define M_TCB_TLS_SEQ    0xffffffffffffffffULL
+#define V_TCB_TLS_SEQ(x) ((__u64)(x) << S_TCB_TLS_SEQ)
+
+/* 991:960  */
+#define W_TCB_RX_TLS_BUF_TAG    30
+#define S_TCB_RX_TLS_BUF_TAG    0
+#define M_TCB_RX_TLS_BUF_TAG    0xffffffffULL
+#define V_TCB_RX_TLS_BUF_TAG(x) ((x) << S_TCB_RX_TLS_BUF_TAG)
+
+/* 1023:992 */
+#define W_TCB_RX_TLS_KEY_TAG    31
+#define S_TCB_RX_TLS_KEY_TAG    0
+#define M_TCB_RX_TLS_KEY_TAG    0xffffffffULL
+#define V_TCB_RX_TLS_KEY_TAG(x) ((x) << S_TCB_RX_TLS_KEY_TAG)
+
+#define S_TF_TLS_KEY_SIZE    7
+#define V_TF_TLS_KEY_SIZE(x) ((x) << S_TF_TLS_KEY_SIZE)
+
+#define S_TF_TLS_CONTROL     2
+#define V_TF_TLS_CONTROL(x) ((x) << S_TF_TLS_CONTROL)
+
+#define S_TF_TLS_ACTIVE      1
+#define V_TF_TLS_ACTIVE(x) ((x) << S_TF_TLS_ACTIVE)
+
+#define S_TF_TLS_ENABLE      0
+#define V_TF_TLS_ENABLE(x) ((x) << S_TF_TLS_ENABLE)
+
 #define S_TF_MIGRATING    0
 #define V_TF_MIGRATING(x) ((x) << S_TF_MIGRATING)