svn commit: r355253 - stable/11/sys/dev/cxgbe

[Navdeep Parhar]

Author: np
Date: Sat Nov 30 21:11:17 2019
New Revision: 355253
URL: https://svnweb.freebsd.org/changeset/base/355253

Log:
  MFC r354742:
  
  cxgbev(4): Catch up with the pciids in the PF driver.
  
  Sponsored by:	Chelsio Communications

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

Modified: stable/11/sys/dev/cxgbe/t4_iov.c
==============================================================================
--- stable/11/sys/dev/cxgbe/t4_iov.c	Sat Nov 30 20:51:47 2019	(r355252)
+++ stable/11/sys/dev/cxgbe/t4_iov.c	Sat Nov 30 21:11:17 2019	(r355253)
@@ -81,16 +81,10 @@ struct {
 	{0x5012,  "Chelsio T560-CR"},		/* 1 x 40G, 2 x 10G */
 	{0x5014,  "Chelsio T580-LP-SO-CR"},	/* 2 x 40G, nomem */
 	{0x5015,  "Chelsio T502-BT"},		/* 2 x 1G */
-#ifdef notyet
-	{0x5004,  "Chelsio T520-BCH"},
-	{0x5005,  "Chelsio T540-BCH"},
-	{0x5006,  "Chelsio T540-CH"},
-	{0x5008,  "Chelsio T520-CX"},
-	{0x500b,  "Chelsio B520-SR"},
-	{0x500c,  "Chelsio B504-BT"},
-	{0x500f,  "Chelsio Amsterdam"},
-	{0x5013,  "Chelsio T580-CHR"},
-#endif
+	{0x5018,  "Chelsio T540-BT"},		/* 4 x 10GBaseT */
+	{0x5019,  "Chelsio T540-LP-BT"},	/* 4 x 10GBaseT */
+	{0x501a,  "Chelsio T540-SO-BT"},	/* 4 x 10GBaseT, nomem */
+	{0x501b,  "Chelsio T540-SO-CR"},	/* 4 x 10G, nomem */
 }, t6iov_pciids[] = {
 	{0x6000, "Chelsio T6-DBG-25"},		/* 2 x 10/25G, debug */
 	{0x6001, "Chelsio T6225-CR"},		/* 2 x 10/25G */
@@ -111,6 +105,12 @@ struct {
 	/* Custom */
 	{0x6080, "Chelsio T6225 80"},
 	{0x6081, "Chelsio T62100 81"},
+	{0x6082, "Chelsio T6225-CR 82"},
+	{0x6083, "Chelsio T62100-CR 83"},
+	{0x6084, "Chelsio T64100-CR 84"},
+	{0x6085, "Chelsio T6240-SO 85"},
+	{0x6086, "Chelsio T6225-SO-CR 86"},
+	{0x6087, "Chelsio T6225-CR 87"},
 };
 
 static int	t4iov_attach_child(device_t dev);

Modified: stable/11/sys/dev/cxgbe/t4_vf.c
==============================================================================
--- stable/11/sys/dev/cxgbe/t4_vf.c	Sat Nov 30 20:51:47 2019	(r355252)
+++ stable/11/sys/dev/cxgbe/t4_vf.c	Sat Nov 30 21:11:17 2019	(r355253)
@@ -97,16 +97,10 @@ struct {
 	{0x5812,  "Chelsio T560-CR VF"},	/* 1 x 40G, 2 x 10G */
 	{0x5814,  "Chelsio T580-LP-SO-CR VF"},	/* 2 x 40G, nomem */
 	{0x5815,  "Chelsio T502-BT VF"},	/* 2 x 1G */
-#ifdef notyet
-	{0x5804,  "Chelsio T520-BCH VF"},
-	{0x5805,  "Chelsio T540-BCH VF"},
-	{0x5806,  "Chelsio T540-CH VF"},
-	{0x5808,  "Chelsio T520-CX VF"},
-	{0x580b,  "Chelsio B520-SR VF"},
-	{0x580c,  "Chelsio B504-BT VF"},
-	{0x580f,  "Chelsio Amsterdam VF"},
-	{0x5813,  "Chelsio T580-CHR VF"},
-#endif
+	{0x5818,  "Chelsio T540-BT VF"},	/* 4 x 10GBaseT */
+	{0x5819,  "Chelsio T540-LP-BT VF"},	/* 4 x 10GBaseT */
+	{0x581a,  "Chelsio T540-SO-BT VF"},	/* 4 x 10GBaseT, nomem */
+	{0x581b,  "Chelsio T540-SO-CR VF"},	/* 4 x 10G, nomem */
 }, t6vf_pciids[] = {
 	{0x6800, "Chelsio T6-DBG-25 VF"},	/* 2 x 10/25G, debug */
 	{0x6801, "Chelsio T6225-CR VF"},	/* 2 x 10/25G */
@@ -127,6 +121,12 @@ struct {
 	/* Custom */
 	{0x6880, "Chelsio T6225 80 VF"},
 	{0x6881, "Chelsio T62100 81 VF"},
+	{0x6882, "Chelsio T6225-CR 82 VF"},
+	{0x6883, "Chelsio T62100-CR 83 VF"},
+	{0x6884, "Chelsio T64100-CR 84 VF"},
+	{0x6885, "Chelsio T6240-SO 85 VF"},
+	{0x6886, "Chelsio T6225-SO-CR 86 VF"},
+	{0x6887, "Chelsio T6225-CR 87 VF"},
 };
 
 static d_ioctl_t t4vf_ioctl;