qlcnic: Add identifying string for 83xx adapter

o Added identifying strings for 8300 Series of adapters. o updated PCI_VENDOR_ID_QLOGIC and PCI_DEVICE_ID_824X for 8200 Series adapter. Signed-off-by: Himanshu Madhani <himanshu.madhani@qlogic.com> Signed-off-by: Shahed Shaikh <shahed.shaikh@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
author: Himanshu Madhani <himanshu.madhani@qlogic.com> 2013-04-24 08:42:44 -0400
committer: David S. Miller <davem@davemloft.net> 2013-04-24 19:34:06 -0400
commit: e386cd4a7fd3a366607badf5b5cae0ced113cba6 (patch)
tree: fdf40d6d0289980163de1f8b5d70a43581022892 /drivers/net/ethernet/qlogic/qlcnic
parent: ddb2e1745daeef3bf2646213cbccca2830b8b211 (diff)
1 files changed, 106 insertions, 19 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 1310b7b6bc5c..264d5a4f8153 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -156,25 +156,112 @@ static const u32 qlcnic_reg_tbl[] = {
 };
 static const struct qlcnic_board_info qlcnic_boards[] = {
-        {0x1077, 0x8020, 0x1077, 0x203,
+        { PCI_VENDOR_ID_QLOGIC,
-         "8200 Series Single Port 10GbE Converged Network Adapter"
+          PCI_DEVICE_ID_QLOGIC_QLE834X,
-         "(TCP/IP Networking)"},
+          PCI_VENDOR_ID_QLOGIC,
-        {0x1077, 0x8020, 0x1077, 0x207,
+          0x24e,
-         "8200 Series Dual Port 10GbE Converged Network Adapter"
+          "8300 Series Dual Port 10GbE Converged Network Adapter "
-         "(TCP/IP Networking)"},
+          "(TCP/IP Networking)" },
-        {0x1077, 0x8020, 0x1077, 0x20b,
+        { PCI_VENDOR_ID_QLOGIC,
-         "3200 Series Dual Port 10Gb Intelligent Ethernet Adapter"},
+          PCI_DEVICE_ID_QLOGIC_QLE834X,
-        {0x1077, 0x8020, 0x1077, 0x20c,
+          PCI_VENDOR_ID_QLOGIC,
-         "3200 Series Quad Port 1Gb Intelligent Ethernet Adapter"},
+          0x243,
-        {0x1077, 0x8020, 0x1077, 0x20f,
+          "8300 Series Single Port 10GbE Converged Network Adapter "
-         "3200 Series Single Port 10Gb Intelligent Ethernet Adapter"},
+          "(TCP/IP Networking)" },
-        {0x1077, 0x8020, 0x103c, 0x3733,
+        { PCI_VENDOR_ID_QLOGIC,
-         "NC523SFP 10Gb 2-port Server Adapter"},
+          PCI_DEVICE_ID_QLOGIC_QLE834X,
-        {0x1077, 0x8020, 0x103c, 0x3346,
+          PCI_VENDOR_ID_QLOGIC,
-         "CN1000Q Dual Port Converged Network Adapter"},
+          0x24a,
-        {0x1077, 0x8020, 0x1077, 0x210,
+          "8300 Series Dual Port 10GbE Converged Network Adapter "
-         "QME8242-k 10GbE Dual Port Mezzanine Card"},
+          "(TCP/IP Networking)" },
-        {0x1077, 0x8020, 0x0, 0x0, "cLOM8214 1/10GbE Controller"},
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE834X,
+          PCI_VENDOR_ID_QLOGIC,
+          0x246,
+          "8300 Series Dual Port 10GbE Converged Network Adapter "
+          "(TCP/IP Networking)" },
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE834X,
+          PCI_VENDOR_ID_QLOGIC,
+          0x252,
+          "8300 Series Dual Port 10GbE Converged Network Adapter "
+          "(TCP/IP Networking)" },
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE834X,
+          PCI_VENDOR_ID_QLOGIC,
+          0x26e,
+          "8300 Series Dual Port 10GbE Converged Network Adapter "
+          "(TCP/IP Networking)" },
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE834X,
+          PCI_VENDOR_ID_QLOGIC,
+          0x260,
+          "8300 Series Dual Port 10GbE Converged Network Adapter "
+          "(TCP/IP Networking)" },
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE834X,
+          PCI_VENDOR_ID_QLOGIC,
+          0x266,
+          "8300 Series Single Port 10GbE Converged Network Adapter "
+          "(TCP/IP Networking)" },
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE834X,
+          PCI_VENDOR_ID_QLOGIC,
+          0x269,
+          "8300 Series Dual Port 10GbE Converged Network Adapter "
+          "(TCP/IP Networking)" },
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE834X,
+          PCI_VENDOR_ID_QLOGIC,
+          0x271,
+          "8300 Series Dual Port 10GbE Converged Network Adapter "
+          "(TCP/IP Networking)" },
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE834X,
+          0x0, 0x0, "8300 Series 1/10GbE Controller" },
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE824X,
+          PCI_VENDOR_ID_QLOGIC,
+          0x203,
+          "8200 Series Single Port 10GbE Converged Network Adapter"
+          "(TCP/IP Networking)" },
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE824X,
+          PCI_VENDOR_ID_QLOGIC,
+          0x207,
+          "8200 Series Dual Port 10GbE Converged Network Adapter"
+          "(TCP/IP Networking)" },
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE824X,
+          PCI_VENDOR_ID_QLOGIC,
+          0x20b,
+          "3200 Series Dual Port 10Gb Intelligent Ethernet Adapter" },
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE824X,
+          PCI_VENDOR_ID_QLOGIC,
+          0x20c,
+          "3200 Series Quad Port 1Gb Intelligent Ethernet Adapter" },
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE824X,
+          PCI_VENDOR_ID_QLOGIC,
+          0x20f,
+          "3200 Series Single Port 10Gb Intelligent Ethernet Adapter" },
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE824X,
+          0x103c, 0x3733,
+          "NC523SFP 10Gb 2-port Server Adapter" },
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE824X,
+          0x103c, 0x3346,
+          "CN1000Q Dual Port Converged Network Adapter" },
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE824X,
+          PCI_VENDOR_ID_QLOGIC,
+          0x210,
+          "QME8242-k 10GbE Dual Port Mezzanine Card" },
+        { PCI_VENDOR_ID_QLOGIC,
+          PCI_DEVICE_ID_QLOGIC_QLE824X,
+          0x0, 0x0, "cLOM8214 1/10GbE Controller" },
 };
 #define NUM_SUPPORTED_BOARDS ARRAY_SIZE(qlcnic_boards)
author	Himanshu Madhani <himanshu.madhani@qlogic.com>	2013-04-24 08:42:44 -0400
committer	David S. Miller <davem@davemloft.net>	2013-04-24 19:34:06 -0400
commit	e386cd4a7fd3a366607badf5b5cae0ced113cba6 (patch)
tree	fdf40d6d0289980163de1f8b5d70a43581022892 /drivers/net/ethernet/qlogic/qlcnic
parent	ddb2e1745daeef3bf2646213cbccca2830b8b211 (diff)

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c index 1310b7b6bc5c..264d5a4f8153 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -156,25 +156,112 @@ static const u32 qlcnic_reg_tbl[] = {
156	};	156	};
157		157
158	static const struct qlcnic_board_info qlcnic_boards[] = {	158	static const struct qlcnic_board_info qlcnic_boards[] = {
159	{0x1077, 0x8020, 0x1077, 0x203,	159	{ PCI_VENDOR_ID_QLOGIC,
160	"8200 Series Single Port 10GbE Converged Network Adapter"	160	PCI_DEVICE_ID_QLOGIC_QLE834X,
161	"(TCP/IP Networking)"},	161	PCI_VENDOR_ID_QLOGIC,
162	{0x1077, 0x8020, 0x1077, 0x207,	162	0x24e,
163	"8200 Series Dual Port 10GbE Converged Network Adapter"	163	"8300 Series Dual Port 10GbE Converged Network Adapter "
164	"(TCP/IP Networking)"},	164	"(TCP/IP Networking)" },
165	{0x1077, 0x8020, 0x1077, 0x20b,	165	{ PCI_VENDOR_ID_QLOGIC,
166	"3200 Series Dual Port 10Gb Intelligent Ethernet Adapter"},	166	PCI_DEVICE_ID_QLOGIC_QLE834X,
167	{0x1077, 0x8020, 0x1077, 0x20c,	167	PCI_VENDOR_ID_QLOGIC,
168	"3200 Series Quad Port 1Gb Intelligent Ethernet Adapter"},	168	0x243,
169	{0x1077, 0x8020, 0x1077, 0x20f,	169	"8300 Series Single Port 10GbE Converged Network Adapter "
170	"3200 Series Single Port 10Gb Intelligent Ethernet Adapter"},	170	"(TCP/IP Networking)" },
171	{0x1077, 0x8020, 0x103c, 0x3733,	171	{ PCI_VENDOR_ID_QLOGIC,
172	"NC523SFP 10Gb 2-port Server Adapter"},	172	PCI_DEVICE_ID_QLOGIC_QLE834X,
173	{0x1077, 0x8020, 0x103c, 0x3346,	173	PCI_VENDOR_ID_QLOGIC,
174	"CN1000Q Dual Port Converged Network Adapter"},	174	0x24a,
175	{0x1077, 0x8020, 0x1077, 0x210,	175	"8300 Series Dual Port 10GbE Converged Network Adapter "
176	"QME8242-k 10GbE Dual Port Mezzanine Card"},	176	"(TCP/IP Networking)" },
177	{0x1077, 0x8020, 0x0, 0x0, "cLOM8214 1/10GbE Controller"},	177	{ PCI_VENDOR_ID_QLOGIC,
		178	PCI_DEVICE_ID_QLOGIC_QLE834X,
		179	PCI_VENDOR_ID_QLOGIC,
		180	0x246,
		181	"8300 Series Dual Port 10GbE Converged Network Adapter "
		182	"(TCP/IP Networking)" },
		183	{ PCI_VENDOR_ID_QLOGIC,
		184	PCI_DEVICE_ID_QLOGIC_QLE834X,
		185	PCI_VENDOR_ID_QLOGIC,
		186	0x252,
		187	"8300 Series Dual Port 10GbE Converged Network Adapter "
		188	"(TCP/IP Networking)" },
		189	{ PCI_VENDOR_ID_QLOGIC,
		190	PCI_DEVICE_ID_QLOGIC_QLE834X,
		191	PCI_VENDOR_ID_QLOGIC,
		192	0x26e,
		193	"8300 Series Dual Port 10GbE Converged Network Adapter "
		194	"(TCP/IP Networking)" },
		195	{ PCI_VENDOR_ID_QLOGIC,
		196	PCI_DEVICE_ID_QLOGIC_QLE834X,
		197	PCI_VENDOR_ID_QLOGIC,
		198	0x260,
		199	"8300 Series Dual Port 10GbE Converged Network Adapter "
		200	"(TCP/IP Networking)" },
		201	{ PCI_VENDOR_ID_QLOGIC,
		202	PCI_DEVICE_ID_QLOGIC_QLE834X,
		203	PCI_VENDOR_ID_QLOGIC,
		204	0x266,
		205	"8300 Series Single Port 10GbE Converged Network Adapter "
		206	"(TCP/IP Networking)" },
		207	{ PCI_VENDOR_ID_QLOGIC,
		208	PCI_DEVICE_ID_QLOGIC_QLE834X,
		209	PCI_VENDOR_ID_QLOGIC,
		210	0x269,
		211	"8300 Series Dual Port 10GbE Converged Network Adapter "
		212	"(TCP/IP Networking)" },
		213	{ PCI_VENDOR_ID_QLOGIC,
		214	PCI_DEVICE_ID_QLOGIC_QLE834X,
		215	PCI_VENDOR_ID_QLOGIC,
		216	0x271,
		217	"8300 Series Dual Port 10GbE Converged Network Adapter "
		218	"(TCP/IP Networking)" },
		219	{ PCI_VENDOR_ID_QLOGIC,
		220	PCI_DEVICE_ID_QLOGIC_QLE834X,
		221	0x0, 0x0, "8300 Series 1/10GbE Controller" },
		222	{ PCI_VENDOR_ID_QLOGIC,
		223	PCI_DEVICE_ID_QLOGIC_QLE824X,
		224	PCI_VENDOR_ID_QLOGIC,
		225	0x203,
		226	"8200 Series Single Port 10GbE Converged Network Adapter"
		227	"(TCP/IP Networking)" },
		228	{ PCI_VENDOR_ID_QLOGIC,
		229	PCI_DEVICE_ID_QLOGIC_QLE824X,
		230	PCI_VENDOR_ID_QLOGIC,
		231	0x207,
		232	"8200 Series Dual Port 10GbE Converged Network Adapter"
		233	"(TCP/IP Networking)" },
		234	{ PCI_VENDOR_ID_QLOGIC,
		235	PCI_DEVICE_ID_QLOGIC_QLE824X,
		236	PCI_VENDOR_ID_QLOGIC,
		237	0x20b,
		238	"3200 Series Dual Port 10Gb Intelligent Ethernet Adapter" },
		239	{ PCI_VENDOR_ID_QLOGIC,
		240	PCI_DEVICE_ID_QLOGIC_QLE824X,
		241	PCI_VENDOR_ID_QLOGIC,
		242	0x20c,
		243	"3200 Series Quad Port 1Gb Intelligent Ethernet Adapter" },
		244	{ PCI_VENDOR_ID_QLOGIC,
		245	PCI_DEVICE_ID_QLOGIC_QLE824X,
		246	PCI_VENDOR_ID_QLOGIC,
		247	0x20f,
		248	"3200 Series Single Port 10Gb Intelligent Ethernet Adapter" },
		249	{ PCI_VENDOR_ID_QLOGIC,
		250	PCI_DEVICE_ID_QLOGIC_QLE824X,
		251	0x103c, 0x3733,
		252	"NC523SFP 10Gb 2-port Server Adapter" },
		253	{ PCI_VENDOR_ID_QLOGIC,
		254	PCI_DEVICE_ID_QLOGIC_QLE824X,
		255	0x103c, 0x3346,
		256	"CN1000Q Dual Port Converged Network Adapter" },
		257	{ PCI_VENDOR_ID_QLOGIC,
		258	PCI_DEVICE_ID_QLOGIC_QLE824X,
		259	PCI_VENDOR_ID_QLOGIC,
		260	0x210,
		261	"QME8242-k 10GbE Dual Port Mezzanine Card" },
		262	{ PCI_VENDOR_ID_QLOGIC,
		263	PCI_DEVICE_ID_QLOGIC_QLE824X,
		264	0x0, 0x0, "cLOM8214 1/10GbE Controller" },
178	};	265	};
179		266
180	#define NUM_SUPPORTED_BOARDS ARRAY_SIZE(qlcnic_boards)	267	#define NUM_SUPPORTED_BOARDS ARRAY_SIZE(qlcnic_boards)