From 691b4852d0fe4e6dd384fe4b1da789de561c10ab Mon Sep 17 00:00:00 2001
From: np <np@FreeBSD.org>
Date: Wed, 16 Mar 2016 19:43:44 +0000
Subject: [PATCH] cxgbe(4): Enable additional capabilities in the default
 configuration files.  All features with FreeBSD drivers of some kind are now
 in the default configuration.

---
 sys/dev/cxgbe/firmware/t4fw_cfg.txt | 12 ++++++++----
 sys/dev/cxgbe/firmware/t5fw_cfg.txt | 12 ++++++++----
 sys/dev/cxgbe/t4_main.c             | 24 +++++++++++++++++++++---
 3 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/sys/dev/cxgbe/firmware/t4fw_cfg.txt b/sys/dev/cxgbe/firmware/t4fw_cfg.txt
index 01dc34564e2a..17c24e691de2 100644
--- a/sys/dev/cxgbe/firmware/t4fw_cfg.txt
+++ b/sys/dev/cxgbe/firmware/t4fw_cfg.txt
@@ -25,13 +25,13 @@
 	filterMode = fragmentation, mpshittype, protocol, vlan, port, fcoe
 	filterMask = protocol, fcoe
 
-	tp_pmrx = 38, 512
+	tp_pmrx = 36, 512
 	tp_pmrx_pagesize = 64K
 
 	# TP number of RX channels (0 = auto)
 	tp_nrxch = 0
 
-	tp_pmtx = 60, 512
+	tp_pmtx = 46, 512
 	tp_pmtx_pagesize = 64K
 
 	# TP number of TX channels (0 = auto)
@@ -92,10 +92,14 @@
 	pmask = all
 
 	# driver will mask off features it won't use
-	protocol = ofld
+	protocol = ofld, rddp, rdmac, iscsi_initiator_pdu, iscsi_target_pdu
 
 	tp_l2t = 4096
 	tp_ddp = 2
+	tp_ddp_iscsi = 2
+	tp_stag = 2
+	tp_pbl = 5
+	tp_rq = 7
 
 	# TCAM has 8K cells; each region must start at a multiple of 128 cell.
 	# Each entry in these categories takes 4 cells each.  nhash will use the
@@ -167,7 +171,7 @@
 
 [fini]
 	version = 0x1
-	checksum = 0x5a34a3ce
+	checksum = 0x76b034e0
 #
 # $FreeBSD$
 #
diff --git a/sys/dev/cxgbe/firmware/t5fw_cfg.txt b/sys/dev/cxgbe/firmware/t5fw_cfg.txt
index d4f8f8820892..9cb7c838e476 100644
--- a/sys/dev/cxgbe/firmware/t5fw_cfg.txt
+++ b/sys/dev/cxgbe/firmware/t5fw_cfg.txt
@@ -52,13 +52,13 @@
 	filterMode = fragmentation, mpshittype, protocol, vlan, port, fcoe
 	filterMask = protocol, fcoe
 
-	tp_pmrx = 38, 512
+	tp_pmrx = 36, 512
 	tp_pmrx_pagesize = 64K
 
 	# TP number of RX channels (0 = auto)
 	tp_nrxch = 0
 
-	tp_pmtx = 60, 512
+	tp_pmtx = 46, 512
 	tp_pmtx_pagesize = 64K
 
 	# TP number of TX channels (0 = auto)
@@ -136,10 +136,14 @@
 	pmask = all
 
 	# driver will mask off features it won't use
-	protocol = ofld
+	protocol = ofld, rddp, rdmac, iscsi_initiator_pdu, iscsi_target_pdu, iscsi_t10dif
 
 	tp_l2t = 4096
 	tp_ddp = 2
+	tp_ddp_iscsi = 2
+	tp_stag = 2
+	tp_pbl = 5
+	tp_rq = 7
 
 	# TCAM has 8K cells; each region must start at a multiple of 128 cell.
 	# Each entry in these categories takes 4 cells each.  nhash will use the
@@ -211,7 +215,7 @@
 
 [fini]
 	version = 0x1
-	checksum = 0xdd685b
+	checksum = 0xebb87494
 #
 # $FreeBSD$
 #
diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c
index ef65a187d92b..0caa4194a96b 100644
--- a/sys/dev/cxgbe/t4_main.c
+++ b/sys/dev/cxgbe/t4_main.c
@@ -334,7 +334,8 @@ TUNABLE_INT("hw.cxgbe.nbmcaps_allowed", &t4_nbmcaps_allowed);
 static int t4_linkcaps_allowed = 0;	/* No DCBX, PPP, etc. by default */
 TUNABLE_INT("hw.cxgbe.linkcaps_allowed", &t4_linkcaps_allowed);
 
-static int t4_switchcaps_allowed = 0;
+static int t4_switchcaps_allowed = FW_CAPS_CONFIG_SWITCH_INGRESS |
+    FW_CAPS_CONFIG_SWITCH_EGRESS;
 TUNABLE_INT("hw.cxgbe.switchcaps_allowed", &t4_switchcaps_allowed);
 
 static int t4_niccaps_allowed = FW_CAPS_CONFIG_NIC;
@@ -343,13 +344,13 @@ TUNABLE_INT("hw.cxgbe.niccaps_allowed", &t4_niccaps_allowed);
 static int t4_toecaps_allowed = -1;
 TUNABLE_INT("hw.cxgbe.toecaps_allowed", &t4_toecaps_allowed);
 
-static int t4_rdmacaps_allowed = 0;
+static int t4_rdmacaps_allowed = -1;
 TUNABLE_INT("hw.cxgbe.rdmacaps_allowed", &t4_rdmacaps_allowed);
 
 static int t4_tlscaps_allowed = 0;
 TUNABLE_INT("hw.cxgbe.tlscaps_allowed", &t4_tlscaps_allowed);
 
-static int t4_iscsicaps_allowed = 0;
+static int t4_iscsicaps_allowed = -1;
 TUNABLE_INT("hw.cxgbe.iscsicaps_allowed", &t4_iscsicaps_allowed);
 
 static int t4_fcoecaps_allowed = 0;
@@ -9103,9 +9104,26 @@ tweak_tunables(void)
 
 	if (t4_toecaps_allowed == -1)
 		t4_toecaps_allowed = FW_CAPS_CONFIG_TOE;
+
+	if (t4_rdmacaps_allowed == -1) {
+		t4_rdmacaps_allowed = FW_CAPS_CONFIG_RDMA_RDDP |
+		    FW_CAPS_CONFIG_RDMA_RDMAC;
+	}
+
+	if (t4_iscsicaps_allowed == -1) {
+		t4_iscsicaps_allowed = FW_CAPS_CONFIG_ISCSI_INITIATOR_PDU |
+		    FW_CAPS_CONFIG_ISCSI_TARGET_PDU |
+		    FW_CAPS_CONFIG_ISCSI_T10DIF;
+	}
 #else
 	if (t4_toecaps_allowed == -1)
 		t4_toecaps_allowed = 0;
+
+	if (t4_rdmacaps_allowed == -1)
+		t4_rdmacaps_allowed = 0;
+
+	if (t4_iscsicaps_allowed == -1)
+		t4_iscsicaps_allowed = 0;
 #endif
 
 #ifdef DEV_NETMAP