svn commit: r318844 - stable/10/sys/dev/cxgbe

[Navdeep Parhar]

Author: np
Date: Thu May 25 01:01:35 2017
New Revision: 318844
URL: https://svnweb.freebsd.org/changeset/base/318844

Log:
  MFC r317820 and r317837.
  
  r317820:
  cxgbe(4): Update the list of PCIe devices claimed by the driver.  At
  this point any board with a T6 should just work.
  
  r317837:
  cxgbe(4):  Update the VF device ids too.  This should have been part
  of r317820.
  
  Sponsored by:	Chelsio Communications

Modified:
  stable/10/sys/dev/cxgbe/t4_main.c
  stable/10/sys/dev/cxgbe/t4_vf.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/cxgbe/t4_main.c
==============================================================================
--- stable/10/sys/dev/cxgbe/t4_main.c	Thu May 25 01:00:57 2017	(r318843)
+++ stable/10/sys/dev/cxgbe/t4_main.c	Thu May 25 01:01:35 2017	(r318844)
@@ -611,13 +611,25 @@ struct {
 #endif
 }, t6_pciids[] = {
 	{0xc006, "Chelsio Terminator 6 FPGA"},	/* T6 PE10K6 FPGA (PF0) */
-	{0x6400, "Chelsio T6225-DBG"},		/* 2 x 10/25G, debug */
+	{0x6400, "Chelsio T6-DBG-25"},		/* 2 x 10/25G, debug */
 	{0x6401, "Chelsio T6225-CR"},		/* 2 x 10/25G */
 	{0x6402, "Chelsio T6225-SO-CR"},	/* 2 x 10/25G, nomem */
+	{0x6403, "Chelsio T6425-CR"},		/* 4 x 10/25G */
+	{0x6404, "Chelsio T6425-SO-CR"},	/* 4 x 10/25G, nomem */
+	{0x6405, "Chelsio T6225-OCP-SO"},	/* 2 x 10/25G, nomem */
+	{0x6406, "Chelsio T62100-OCP-SO"},	/* 2 x 40/50/100G, nomem */
 	{0x6407, "Chelsio T62100-LP-CR"},	/* 2 x 40/50/100G */
 	{0x6408, "Chelsio T62100-SO-CR"},	/* 2 x 40/50/100G, nomem */
+	{0x6409, "Chelsio T6210-BT"},		/* 2 x 10GBASE-T */
 	{0x640d, "Chelsio T62100-CR"},		/* 2 x 40/50/100G */
-	{0x6410, "Chelsio T62100-DBG"},		/* 2 x 40/50/100G, debug */
+	{0x6410, "Chelsio T6-DBG-100"},		/* 2 x 40/50/100G, debug */
+	{0x6411, "Chelsio T6225-LL-CR"},	/* 2 x 10/25G */
+	{0x6414, "Chelsio T61100-OCP-SO"},	/* 1 x 40/50/100G, nomem */
+	{0x6415, "Chelsio T6201-BT"},		/* 2 x 1000BASE-T */
+
+	/* Custom */
+	{0x6480, "Chelsio T6225 80"},
+	{0x6481, "Chelsio T62100 81"},
 };
 
 #ifdef TCP_OFFLOAD

Modified: stable/10/sys/dev/cxgbe/t4_vf.c
==============================================================================
--- stable/10/sys/dev/cxgbe/t4_vf.c	Thu May 25 01:00:57 2017	(r318843)
+++ stable/10/sys/dev/cxgbe/t4_vf.c	Thu May 25 01:01:35 2017	(r318844)
@@ -114,11 +114,25 @@ struct {
 	{0x5813,  "Chelsio T580-CHR VF"},
 #endif
 }, t6vf_pciids[] = {
+	{0x6800, "Chelsio T6-DBG-25 VF"},	/* 2 x 10/25G, debug */
 	{0x6801, "Chelsio T6225-CR VF"},	/* 2 x 10/25G */
 	{0x6802, "Chelsio T6225-SO-CR VF"},	/* 2 x 10/25G, nomem */
+	{0x6803, "Chelsio T6425-CR VF"},	/* 4 x 10/25G */
+	{0x6804, "Chelsio T6425-SO-CR VF"},	/* 4 x 10/25G, nomem */
+	{0x6805, "Chelsio T6225-OCP-SO VF"},	/* 2 x 10/25G, nomem */
+	{0x6806, "Chelsio T62100-OCP-SO VF"},	/* 2 x 40/50/100G, nomem */
 	{0x6807, "Chelsio T62100-LP-CR VF"},	/* 2 x 40/50/100G */
 	{0x6808, "Chelsio T62100-SO-CR VF"},	/* 2 x 40/50/100G, nomem */
+	{0x6809, "Chelsio T6210-BT VF"},	/* 2 x 10GBASE-T */
 	{0x680d, "Chelsio T62100-CR VF"},	/* 2 x 40/50/100G */
+	{0x6810, "Chelsio T6-DBG-100 VF"},	/* 2 x 40/50/100G, debug */
+	{0x6811, "Chelsio T6225-LL-CR VF"},	/* 2 x 10/25G */
+	{0x6814, "Chelsio T61100-OCP-SO VF"},	/* 1 x 40/50/100G, nomem */
+	{0x6815, "Chelsio T6201-BT VF"},	/* 2 x 1000BASE-T */
+
+	/* Custom */
+	{0x6880, "Chelsio T6225 80 VF"},
+	{0x6881, "Chelsio T62100 81 VF"},
 };
 
 static d_ioctl_t t4vf_ioctl;