5 files changed, 150 insertions, 170 deletions

diff --git a/sys/dev/cxgbe/firmware/t4fw_cfg.txt b/sys/dev/cxgbe/firmware/t4fw_cfg.txt
index 11721a1ed648..17fd9a8f5f1c 100644
--- a/sys/dev/cxgbe/firmware/t4fw_cfg.txt
+++ b/sys/dev/cxgbe/firmware/t4fw_cfg.txt
@@ -46,54 +46,50 @@
 # PFs 0-3.  These get 8 MSI/8 MSI-X vectors each.  VFs are supported by
 # these 4 PFs only.
 [function "0"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x1
 
 [function "1"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x2
 
 [function "2"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x4
 
 [function "3"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x8
 
@@ -103,7 +99,7 @@
 	wx_caps = all
 	r_caps = all
 	nvi = 32
-	rssnvi = 8
+	rssnvi = 16
 	niqflint = 512
 	nethctrl = 1024
 	neq = 2048
@@ -166,7 +162,7 @@
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
@@ -178,7 +174,7 @@
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
@@ -190,7 +186,7 @@
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
@@ -202,7 +198,7 @@
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
@@ -246,7 +242,7 @@
 
 [fini]
 	version = 0x1
-	checksum = 0x159b9295
+	checksum = 0x3ecbe8a0
 #
 # $FreeBSD$
 #
diff --git a/sys/dev/cxgbe/firmware/t5fw_cfg.txt b/sys/dev/cxgbe/firmware/t5fw_cfg.txt
index f42966c62e49..8d93b2e16a93 100644
--- a/sys/dev/cxgbe/firmware/t5fw_cfg.txt
+++ b/sys/dev/cxgbe/firmware/t5fw_cfg.txt
@@ -90,54 +90,50 @@
 # PFs 0-3.  These get 8 MSI/8 MSI-X vectors each.  VFs are supported by
 # these 4 PFs only.
 [function "0"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x1
 
 [function "1"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x2
 
 [function "2"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x4
 
 [function "3"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x8
 
@@ -147,7 +143,7 @@
 	wx_caps = all
 	r_caps = all
 	nvi = 32
-	rssnvi = 8
+	rssnvi = 16
 	niqflint = 512
 	nethctrl = 1024
 	neq = 2048
@@ -211,7 +207,7 @@
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
@@ -223,7 +219,7 @@
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
@@ -235,7 +231,7 @@
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
@@ -247,7 +243,7 @@
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
@@ -291,7 +287,7 @@
 
 [fini]
 	version = 0x1
-	checksum = 0x30b6a157
+	checksum = 0x34da8705
 #
 # $FreeBSD$
 #
diff --git a/sys/dev/cxgbe/firmware/t5fw_cfg_hashfilter.txt b/sys/dev/cxgbe/firmware/t5fw_cfg_hashfilter.txt
index 7a39f3bc6983..05d13d80d1c4 100644
--- a/sys/dev/cxgbe/firmware/t5fw_cfg_hashfilter.txt
+++ b/sys/dev/cxgbe/firmware/t5fw_cfg_hashfilter.txt
@@ -99,54 +99,50 @@
 # PFs 0-3.  These get 8 MSI/8 MSI-X vectors each.  VFs are supported by
 # these 4 PFs only.
 [function "0"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x1
 
 [function "1"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x2
 
 [function "2"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x4
 
 [function "3"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x8
 
@@ -156,7 +152,7 @@
 	wx_caps = all
 	r_caps = all
 	nvi = 32
-	rssnvi = 8
+	rssnvi = 16
 	niqflint = 512
 	nethctrl = 1024
 	neq = 2048
@@ -214,7 +210,7 @@
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
@@ -226,7 +222,7 @@
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
@@ -238,7 +234,7 @@
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
@@ -250,7 +246,7 @@
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
@@ -294,7 +290,7 @@
 
 [fini]
 	version = 0x1
-	checksum = 0x380a0a4
+	checksum = 0x7a962d44
 #
 # $FreeBSD$
 #
diff --git a/sys/dev/cxgbe/firmware/t6fw_cfg.txt b/sys/dev/cxgbe/firmware/t6fw_cfg.txt
index c542cfcadf5e..a53bd673fa7a 100644
--- a/sys/dev/cxgbe/firmware/t6fw_cfg.txt
+++ b/sys/dev/cxgbe/firmware/t6fw_cfg.txt
@@ -88,54 +88,50 @@
 # PFs 0-3.  These get 8 MSI/8 MSI-X vectors each.  VFs are supported by
 # these 4 PFs only.
 [function "0"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x1
 
 [function "1"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x2
 
 [function "2"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x4
 
 [function "3"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x8
 
@@ -145,7 +141,7 @@
 	wx_caps = all
 	r_caps = all
 	nvi = 32
-	rssnvi = 8
+	rssnvi = 32
 	niqflint = 512
 	nethctrl = 1024
 	neq = 2048
@@ -212,7 +208,7 @@
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
@@ -224,7 +220,7 @@
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
@@ -236,7 +232,7 @@
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
@@ -248,7 +244,7 @@
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
@@ -276,7 +272,7 @@
 
 [fini]
 	version = 0x1
-	checksum = 0xf3e93001
+	checksum = 0x4528a6ac
 #
 # $FreeBSD$
 #
diff --git a/sys/dev/cxgbe/firmware/t6fw_cfg_hashfilter.txt b/sys/dev/cxgbe/firmware/t6fw_cfg_hashfilter.txt
index 3c05e356c677..14c3065feef4 100644
--- a/sys/dev/cxgbe/firmware/t6fw_cfg_hashfilter.txt
+++ b/sys/dev/cxgbe/firmware/t6fw_cfg_hashfilter.txt
@@ -81,54 +81,50 @@
 # PFs 0-3.  These get 8 MSI/8 MSI-X vectors each.  VFs are supported by
 # these 4 PFs only.
 [function "0"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x1
 
 [function "1"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x2
 
 [function "2"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x4
 
 [function "3"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x8
 
@@ -138,7 +134,7 @@
 	wx_caps = all
 	r_caps = all
 	nvi = 32
-	rssnvi = 8
+	rssnvi = 32
 	niqflint = 512
 	nethctrl = 1024
 	neq = 2048
@@ -195,7 +191,7 @@
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
@@ -207,7 +203,7 @@
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
@@ -219,7 +215,7 @@
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
@@ -231,7 +227,7 @@
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
@@ -259,7 +255,7 @@
 
 [fini]
 	version = 0x1
-	checksum = 0xb577311e
+	checksum = 0x5e0e0eb7
 #
 # $FreeBSD$
 #