Index: head/sys/dev/cxgbe/firmware/t4fw_cfg.txt
===================================================================
--- head/sys/dev/cxgbe/firmware/t4fw_cfg.txt	(revision 296949)
+++ head/sys/dev/cxgbe/firmware/t4fw_cfg.txt	(revision 296950)
@@ -1,172 +1,173 @@
 # Firmware configuration file.
 #
 # Global limits (some are hardware limits, others are due to the firmware).
 # nvi = 128		virtual interfaces
 # niqflint = 1023	ingress queues with freelists and/or interrupts
 # nethctrl = 64K	Ethernet or ctrl egress queues
 # neq = 64K		egress queues of all kinds, including freelists
 # nexactf = 336		MPS TCAM entries, can oversubscribe.
 #
 
 [global]
 	rss_glb_config_mode = basicvirtual
-	rss_glb_config_options = tnlmapen, hashtoeplitz, tnlalllkp
+	rss_glb_config_options = tnlmapen,hashtoeplitz,tnlalllkp
 
 	sge_timer_value = 1, 5, 10, 50, 100, 200	# usecs
 
 	# enable TP_OUT_CONFIG.IPIDSPLITMODE
 	reg[0x7d04] = 0x00010000/0x00010000
 
 	# disable TP_PARA_REG3.RxFragEn
 	reg[0x7d6c] = 0x00000000/0x00007000
 
-	# TP_SHIFT_CNT
-	reg[0x7dc0] = 0x62f8849
+	reg[0x7dc0] = 0x0e2f8849		# TP_SHIFT_CNT
 
 	filterMode = fragmentation, mpshittype, protocol, vlan, port, fcoe
 	filterMask = protocol, fcoe
 
-	# TP rx and tx channels (0 = auto).
+	tp_pmrx = 38, 512
+	tp_pmrx_pagesize = 64K
+
+	# TP number of RX channels (0 = auto)
 	tp_nrxch = 0
-	tp_ntxch = 0
 
-	# TP rx and tx payload memory (% of the total EDRAM + DDR3).
-	tp_pmrx = 38, 512
 	tp_pmtx = 60, 512
-	tp_pmrx_pagesize = 64K
 	tp_pmtx_pagesize = 64K
 
-	# cluster, lan, or wan.
-	tp_tcptuning = lan
+	# TP number of TX channels (0 = auto)
+	tp_ntxch = 0
 
 	# TP OFLD MTUs
 	tp_mtus = 88, 256, 512, 576, 808, 1024, 1280, 1488, 1500, 2002, 2048, 4096, 4352, 8192, 9000, 9600
 
+	# cluster, lan, or wan.
+	tp_tcptuning = lan
+
 # PFs 0-3.  These get 8 MSI/8 MSI-X vectors each.  VFs are supported by
 # these 4 PFs only.  Not used here at all.
 [function "0"]
 	nvf = 16
 	nvi = 1
 	rssnvi = 0
 [function "0/*"]
 	nvi = 1
 	rssnvi = 0
 
 [function "1"]
 	nvf = 16
 	nvi = 1
 	rssnvi = 0
 [function "1/*"]
 	nvi = 1
 	rssnvi = 0
 
 [function "2"]
 	nvf = 16
 	nvi = 1
 	rssnvi = 0
 [function "2/*"]
 	nvi = 1
 	rssnvi = 0
 
 [function "3"]
 	nvf = 16
 	nvi = 1
 	rssnvi = 0
 [function "3/*"]
 	nvi = 1
 	rssnvi = 0
 
 # PF4 is the resource-rich PF that the bus/nexus driver attaches to.
 # It gets 32 MSI/128 MSI-X vectors.
 [function "4"]
 	wx_caps = all
 	r_caps = all
 	nvi = 32
 	rssnvi = 8
 	niqflint = 512
 	nethctrl = 1024
 	neq = 2048
 	nexactf = 328
 	cmask = all
 	pmask = all
 
 	# driver will mask off features it won't use
 	protocol = ofld
 
 	tp_l2t = 4096
 	tp_ddp = 2
 
 	# 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
 	# TCAM iff there is room left (that is, the rest don't add up to 2048).
 	nroute = 32
 	nclip = 32
 	nfilter = 1456
 	nserver = 512
 	nhash = 16384
 
 # PF5 is the SCSI Controller PF. It gets 32 MSI/40 MSI-X vectors.
 # Not used right now.
 [function "5"]
 	nvi = 1
 	rssnvi = 0
 
 # PF6 is the FCoE Controller PF. It gets 32 MSI/40 MSI-X vectors.
 # Not used right now.
 [function "6"]
 	nvi = 1
 	rssnvi = 0
 
 # The following function, 1023, is not an actual PCIE function but is used to
 # configure and reserve firmware internal resources that come from the global
 # resource pool.
 [function "1023"]
 	wx_caps = all
 	r_caps = all
 	nvi = 4
 	rssnvi = 0
 	cmask = all
 	pmask = all
 	nexactf = 8
 	nfilter = 16
 
 # MPS has 192K buffer space for ingress packets from the wire as well as
 # loopback path of the L2 switch.
 [port "0"]
 	dcb = none
 	bg_mem = 25
 	lpbk_mem = 25
 	hwm = 30
 	lwm = 15
 	dwm = 30
 
 [port "1"]
 	dcb = none
 	bg_mem = 25
 	lpbk_mem = 25
 	hwm = 30
 	lwm = 15
 	dwm = 30
 
 [port "2"]
 	dcb = none
 	bg_mem = 25
 	lpbk_mem = 25
 	hwm = 30
 	lwm = 15
 	dwm = 30
 
 [port "3"]
 	dcb = none
 	bg_mem = 25
 	lpbk_mem = 25
 	hwm = 30
 	lwm = 15
 	dwm = 30
 
 [fini]
 	version = 0x1
-	checksum = 0x98210e18
+	checksum = 0x5a34a3ce
 #
 # $FreeBSD$
 #
Index: head/sys/dev/cxgbe/firmware/t5fw_cfg.txt
===================================================================
--- head/sys/dev/cxgbe/firmware/t5fw_cfg.txt	(revision 296949)
+++ head/sys/dev/cxgbe/firmware/t5fw_cfg.txt	(revision 296950)
@@ -1,192 +1,217 @@
 # Firmware configuration file.
 #
 # Global limits (some are hardware limits, others are due to the firmware).
 # nvi = 128		virtual interfaces
 # niqflint = 1023	ingress queues with freelists and/or interrupts
 # nethctrl = 64K	Ethernet or ctrl egress queues
 # neq = 64K		egress queues of all kinds, including freelists
 # nexactf = 512		MPS TCAM entries, can oversubscribe.
 #
 
 [global]
 	rss_glb_config_mode = basicvirtual
-	rss_glb_config_options = tnlmapen, hashtoeplitz, tnlalllkp
+	rss_glb_config_options = tnlmapen,hashtoeplitz,tnlalllkp
 
 	# PL_TIMEOUT register
-	pl_timeout_value = 200		# the timeout value in units of us
+	pl_timeout_value = 10000	# the timeout value in units of us
 
-	sge_timer_value = 1, 5, 10, 50, 100, 200	# usecs
+	# SGE_THROTTLE_CONTROL
+	bar2throttlecount = 500		# bar2throttlecount in us
 
+	sge_timer_value = 1, 5, 10, 50, 100, 200	# SGE_TIMER_VALUE* in usecs
+
+	reg[0x1124] = 0x00000400/0x00000400 # SGE_CONTROL2, enable VFIFO; if
+					# SGE_VFIFO_SIZE is not set, then
+					# firmware will set it up in function
+					# of number of egress queues used
+
+	reg[0x1130] = 0x00d5ffeb	# SGE_DBP_FETCH_THRESHOLD, fetch
+					# threshold set to queue depth
+					# minus 128-entries for FL and HP
+					# queues, and 0xfff for LP which
+					# prompts the firmware to set it up
+					# in function of egress queues
+					# used
+
+	reg[0x113c] = 0x0002ffc0	# SGE_VFIFO_SIZE, set to 0x2ffc0 which
+					# prompts the firmware to set it up in
+					# function of number of egress queues
+					# used 
+
 	# enable TP_OUT_CONFIG.IPIDSPLITMODE
 	reg[0x7d04] = 0x00010000/0x00010000
 
 	# disable TP_PARA_REG3.RxFragEn
 	reg[0x7d6c] = 0x00000000/0x00007000
 
 	# enable TP_PARA_REG6.EnableCSnd
 	reg[0x7d78] = 0x00000400/0x00000000
 
-	# TP_SHIFT_CNT
-	reg[0x7dc0] = 0x62f8849
+	reg[0x7dc0] = 0x0e2f8849	# TP_SHIFT_CNT
 
-	# TP_GLOBAL_CONFIG
-	reg[0x7d08] = 0x00000800/0x00000800 # set IssFromCplEnable
-
-	# TP_PARA_REG0
-	reg[0x7d60] = 0x06000000/0x07000000 # set InitCWND to 6
-
 	filterMode = fragmentation, mpshittype, protocol, vlan, port, fcoe
 	filterMask = protocol, fcoe
 
-	# TP rx and tx channels (0 = auto).
+	tp_pmrx = 38, 512
+	tp_pmrx_pagesize = 64K
+
+	# TP number of RX channels (0 = auto)
 	tp_nrxch = 0
-	tp_ntxch = 0
 
-	# TP rx and tx payload memory (% of the total EDRAM + DDR3).
-	tp_pmrx = 38, 512
 	tp_pmtx = 60, 512
-	tp_pmrx_pagesize = 64K
 	tp_pmtx_pagesize = 64K
 
-	# cluster, lan, or wan.
-	tp_tcptuning = lan
+	# TP number of TX channels (0 = auto)
+	tp_ntxch = 0
 
 	# TP OFLD MTUs
 	tp_mtus = 88, 256, 512, 576, 808, 1024, 1280, 1488, 1500, 2002, 2048, 4096, 4352, 8192, 9000, 9600
 
+	# TP_GLOBAL_CONFIG
+	reg[0x7d08] = 0x00000800/0x00000800 # set IssFromCplEnable
+
+	# TP_PC_CONFIG
+	reg[0x7d48] = 0x00000000/0x00000400 # clear EnableFLMError
+
+	# TP_PARA_REG0
+	reg[0x7d60] = 0x06000000/0x07000000 # set InitCWND to 6
+
+	# cluster, lan, or wan.
+	tp_tcptuning = lan
+
 	# MC configuration
 	mc_mode_brc[0] = 1		# mc0 - 1: enable BRC, 0: enable RBC
 	mc_mode_brc[1] = 1		# mc1 - 1: enable BRC, 0: enable RBC
 
 	# ULP_TX_CONFIG
 	reg[0x8dc0] = 0x00000004/0x00000004 # Enable more error msg for ...
 					    # TPT error.
 
 # PFs 0-3.  These get 8 MSI/8 MSI-X vectors each.  VFs are supported by
 # these 4 PFs only.  Not used here at all.
 [function "0"]
 	nvf = 16
 	nvi = 1
 	rssnvi = 0
 [function "0/*"]
 	nvi = 1
 	rssnvi = 0
 
 [function "1"]
 	nvf = 16
 	nvi = 1
 	rssnvi = 0
 [function "1/*"]
 	nvi = 1
 	rssnvi = 0
 
 [function "2"]
 	nvf = 16
 	nvi = 1
 	rssnvi = 0
 [function "2/*"]
 	nvi = 1
 	rssnvi = 0
 
 [function "3"]
 	nvf = 16
 	nvi = 1
 	rssnvi = 0
 [function "3/*"]
 	nvi = 1
 	rssnvi = 0
 
 # PF4 is the resource-rich PF that the bus/nexus driver attaches to.
 # It gets 32 MSI/128 MSI-X vectors.
 [function "4"]
 	wx_caps = all
 	r_caps = all
 	nvi = 32
 	rssnvi = 8
 	niqflint = 512
 	nethctrl = 1024
 	neq = 2048
 	nexactf = 328
 	cmask = all
 	pmask = all
 
 	# driver will mask off features it won't use
 	protocol = ofld
 
 	tp_l2t = 4096
 	tp_ddp = 2
 
 	# 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
 	# TCAM iff there is room left (that is, the rest don't add up to 2048).
 	nroute = 32
 	nclip = 32
 	nfilter = 1008
 	nserver = 512
 	nhash = 16384
 
 # PF5 is the SCSI Controller PF. It gets 32 MSI/40 MSI-X vectors.
 # Not used right now.
 [function "5"]
 	nvi = 1
 	rssnvi = 0
 
 # PF6 is the FCoE Controller PF. It gets 32 MSI/40 MSI-X vectors.
 # Not used right now.
 [function "6"]
 	nvi = 1
 	rssnvi = 0
 
 # The following function, 1023, is not an actual PCIE function but is used to
 # configure and reserve firmware internal resources that come from the global
 # resource pool.
 [function "1023"]
 	wx_caps = all
 	r_caps = all
 	nvi = 4
 	rssnvi = 0
 	cmask = all
 	pmask = all
 	nexactf = 8
 	nfilter = 16
 
 # MPS has 192K buffer space for ingress packets from the wire as well as
 # loopback path of the L2 switch.
 [port "0"]
 	dcb = none
 	bg_mem = 25
 	lpbk_mem = 25
 	hwm = 30
 	lwm = 15
 	dwm = 30
 
 [port "1"]
 	dcb = none
 	bg_mem = 25
 	lpbk_mem = 25
 	hwm = 30
 	lwm = 15
 	dwm = 30
 
 [port "2"]
 	dcb = none
 	bg_mem = 25
 	lpbk_mem = 25
 	hwm = 30
 	lwm = 15
 	dwm = 30
 
 [port "3"]
 	dcb = none
 	bg_mem = 25
 	lpbk_mem = 25
 	hwm = 30
 	lwm = 15
 	dwm = 30
 
 [fini]
 	version = 0x1
-	checksum = 0x7044b7fd
+	checksum = 0xdd685b
 #
 # $FreeBSD$
 #