aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorJames Smart <james.smart@broadcom.com>2016-07-06 15:36:03 -0400
committerMartin K. Petersen <martin.petersen@oracle.com>2016-07-15 15:25:06 -0400
commit12f4445733c516648ab0b013314a83467876ac2f (patch)
tree69f9331047fd883a9dc4e6dc2d177db66cc0511e /drivers/scsi
parenta1cadfeffac70a1ed77b45a8f93b92b9cb501d94 (diff)
lpfc: Re-organize source for easier device-id management
Re-organize source for easier device-id management Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com> Signed-off-by: James Smart <james.smart@broadcom.com> Reviewed-by: Hannes Reinecke <hare@suse.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/lpfc/lpfc_ids.h122
-rw-r--r--drivers/scsi/lpfc/lpfc_init.c101
2 files changed, 123 insertions, 100 deletions
diff --git a/drivers/scsi/lpfc/lpfc_ids.h b/drivers/scsi/lpfc/lpfc_ids.h
new file mode 100644
index 000000000000..5733feafe25f
--- /dev/null
+++ b/drivers/scsi/lpfc/lpfc_ids.h
@@ -0,0 +1,122 @@
1/*******************************************************************
2 * This file is part of the Emulex Linux Device Driver for *
3 * Fibre Channel Host Bus Adapters. *
4 * Copyright (C) 2004-2016 Emulex. All rights reserved. *
5 * EMULEX and SLI are trademarks of Emulex. *
6 * www.emulex.com *
7 * Portions Copyright (C) 2004-2005 Christoph Hellwig *
8 * *
9 * This program is free software; you can redistribute it and/or *
10 * modify it under the terms of version 2 of the GNU General *
11 * Public License as published by the Free Software Foundation. *
12 * This program is distributed in the hope that it will be useful. *
13 * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND *
14 * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, *
15 * FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE *
16 * DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD *
17 * TO BE LEGALLY INVALID. See the GNU General Public License for *
18 * more details, a copy of which can be found in the file COPYING *
19 * included with this package. *
20 *******************************************************************/
21
22#include <linux/pci.h>
23
24const struct pci_device_id lpfc_id_table[] = {
25 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_VIPER,
26 PCI_ANY_ID, PCI_ANY_ID, },
27 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_FIREFLY,
28 PCI_ANY_ID, PCI_ANY_ID, },
29 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_THOR,
30 PCI_ANY_ID, PCI_ANY_ID, },
31 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PEGASUS,
32 PCI_ANY_ID, PCI_ANY_ID, },
33 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_CENTAUR,
34 PCI_ANY_ID, PCI_ANY_ID, },
35 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_DRAGONFLY,
36 PCI_ANY_ID, PCI_ANY_ID, },
37 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SUPERFLY,
38 PCI_ANY_ID, PCI_ANY_ID, },
39 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_RFLY,
40 PCI_ANY_ID, PCI_ANY_ID, },
41 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PFLY,
42 PCI_ANY_ID, PCI_ANY_ID, },
43 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_NEPTUNE,
44 PCI_ANY_ID, PCI_ANY_ID, },
45 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_NEPTUNE_SCSP,
46 PCI_ANY_ID, PCI_ANY_ID, },
47 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_NEPTUNE_DCSP,
48 PCI_ANY_ID, PCI_ANY_ID, },
49 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HELIOS,
50 PCI_ANY_ID, PCI_ANY_ID, },
51 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HELIOS_SCSP,
52 PCI_ANY_ID, PCI_ANY_ID, },
53 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HELIOS_DCSP,
54 PCI_ANY_ID, PCI_ANY_ID, },
55 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BMID,
56 PCI_ANY_ID, PCI_ANY_ID, },
57 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BSMB,
58 PCI_ANY_ID, PCI_ANY_ID, },
59 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR,
60 PCI_ANY_ID, PCI_ANY_ID, },
61 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HORNET,
62 PCI_ANY_ID, PCI_ANY_ID, },
63 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR_SCSP,
64 PCI_ANY_ID, PCI_ANY_ID, },
65 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR_DCSP,
66 PCI_ANY_ID, PCI_ANY_ID, },
67 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZMID,
68 PCI_ANY_ID, PCI_ANY_ID, },
69 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZSMB,
70 PCI_ANY_ID, PCI_ANY_ID, },
71 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_TFLY,
72 PCI_ANY_ID, PCI_ANY_ID, },
73 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LP101,
74 PCI_ANY_ID, PCI_ANY_ID, },
75 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LP10000S,
76 PCI_ANY_ID, PCI_ANY_ID, },
77 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LP11000S,
78 PCI_ANY_ID, PCI_ANY_ID, },
79 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LPE11000S,
80 PCI_ANY_ID, PCI_ANY_ID, },
81 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT,
82 PCI_ANY_ID, PCI_ANY_ID, },
83 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_MID,
84 PCI_ANY_ID, PCI_ANY_ID, },
85 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_SMB,
86 PCI_ANY_ID, PCI_ANY_ID, },
87 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_DCSP,
88 PCI_ANY_ID, PCI_ANY_ID, },
89 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_SCSP,
90 PCI_ANY_ID, PCI_ANY_ID, },
91 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_S,
92 PCI_ANY_ID, PCI_ANY_ID, },
93 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_VF,
94 PCI_ANY_ID, PCI_ANY_ID, },
95 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_PF,
96 PCI_ANY_ID, PCI_ANY_ID, },
97 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_S,
98 PCI_ANY_ID, PCI_ANY_ID, },
99 {PCI_VENDOR_ID_SERVERENGINE, PCI_DEVICE_ID_TIGERSHARK,
100 PCI_ANY_ID, PCI_ANY_ID, },
101 {PCI_VENDOR_ID_SERVERENGINE, PCI_DEVICE_ID_TOMCAT,
102 PCI_ANY_ID, PCI_ANY_ID, },
103 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_FALCON,
104 PCI_ANY_ID, PCI_ANY_ID, },
105 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BALIUS,
106 PCI_ANY_ID, PCI_ANY_ID, },
107 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FC,
108 PCI_ANY_ID, PCI_ANY_ID, },
109 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FCOE,
110 PCI_ANY_ID, PCI_ANY_ID, },
111 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FC_VF,
112 PCI_ANY_ID, PCI_ANY_ID, },
113 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FCOE_VF,
114 PCI_ANY_ID, PCI_ANY_ID, },
115 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_G6_FC,
116 PCI_ANY_ID, PCI_ANY_ID, },
117 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SKYHAWK,
118 PCI_ANY_ID, PCI_ANY_ID, },
119 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SKYHAWK_VF,
120 PCI_ANY_ID, PCI_ANY_ID, },
121 { 0 }
122};
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 8d940ed2b504..6e11574ac6f2 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -52,6 +52,7 @@
52#include "lpfc_crtn.h" 52#include "lpfc_crtn.h"
53#include "lpfc_vport.h" 53#include "lpfc_vport.h"
54#include "lpfc_version.h" 54#include "lpfc_version.h"
55#include "lpfc_ids.h"
55 56
56char *_dump_buf_data; 57char *_dump_buf_data;
57unsigned long _dump_buf_data_order; 58unsigned long _dump_buf_data_order;
@@ -11385,106 +11386,6 @@ lpfc_fof_queue_destroy(struct lpfc_hba *phba)
11385 return 0; 11386 return 0;
11386} 11387}
11387 11388
11388static struct pci_device_id lpfc_id_table[] = {
11389 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_VIPER,
11390 PCI_ANY_ID, PCI_ANY_ID, },
11391 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_FIREFLY,
11392 PCI_ANY_ID, PCI_ANY_ID, },
11393 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_THOR,
11394 PCI_ANY_ID, PCI_ANY_ID, },
11395 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PEGASUS,
11396 PCI_ANY_ID, PCI_ANY_ID, },
11397 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_CENTAUR,
11398 PCI_ANY_ID, PCI_ANY_ID, },
11399 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_DRAGONFLY,
11400 PCI_ANY_ID, PCI_ANY_ID, },
11401 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SUPERFLY,
11402 PCI_ANY_ID, PCI_ANY_ID, },
11403 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_RFLY,
11404 PCI_ANY_ID, PCI_ANY_ID, },
11405 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PFLY,
11406 PCI_ANY_ID, PCI_ANY_ID, },
11407 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_NEPTUNE,
11408 PCI_ANY_ID, PCI_ANY_ID, },
11409 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_NEPTUNE_SCSP,
11410 PCI_ANY_ID, PCI_ANY_ID, },
11411 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_NEPTUNE_DCSP,
11412 PCI_ANY_ID, PCI_ANY_ID, },
11413 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HELIOS,
11414 PCI_ANY_ID, PCI_ANY_ID, },
11415 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HELIOS_SCSP,
11416 PCI_ANY_ID, PCI_ANY_ID, },
11417 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HELIOS_DCSP,
11418 PCI_ANY_ID, PCI_ANY_ID, },
11419 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BMID,
11420 PCI_ANY_ID, PCI_ANY_ID, },
11421 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BSMB,
11422 PCI_ANY_ID, PCI_ANY_ID, },
11423 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR,
11424 PCI_ANY_ID, PCI_ANY_ID, },
11425 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HORNET,
11426 PCI_ANY_ID, PCI_ANY_ID, },
11427 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR_SCSP,
11428 PCI_ANY_ID, PCI_ANY_ID, },
11429 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR_DCSP,
11430 PCI_ANY_ID, PCI_ANY_ID, },
11431 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZMID,
11432 PCI_ANY_ID, PCI_ANY_ID, },
11433 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZSMB,
11434 PCI_ANY_ID, PCI_ANY_ID, },
11435 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_TFLY,
11436 PCI_ANY_ID, PCI_ANY_ID, },
11437 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LP101,
11438 PCI_ANY_ID, PCI_ANY_ID, },
11439 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LP10000S,
11440 PCI_ANY_ID, PCI_ANY_ID, },
11441 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LP11000S,
11442 PCI_ANY_ID, PCI_ANY_ID, },
11443 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LPE11000S,
11444 PCI_ANY_ID, PCI_ANY_ID, },
11445 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT,
11446 PCI_ANY_ID, PCI_ANY_ID, },
11447 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_MID,
11448 PCI_ANY_ID, PCI_ANY_ID, },
11449 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_SMB,
11450 PCI_ANY_ID, PCI_ANY_ID, },
11451 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_DCSP,
11452 PCI_ANY_ID, PCI_ANY_ID, },
11453 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_SCSP,
11454 PCI_ANY_ID, PCI_ANY_ID, },
11455 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_S,
11456 PCI_ANY_ID, PCI_ANY_ID, },
11457 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_VF,
11458 PCI_ANY_ID, PCI_ANY_ID, },
11459 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_PF,
11460 PCI_ANY_ID, PCI_ANY_ID, },
11461 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_S,
11462 PCI_ANY_ID, PCI_ANY_ID, },
11463 {PCI_VENDOR_ID_SERVERENGINE, PCI_DEVICE_ID_TIGERSHARK,
11464 PCI_ANY_ID, PCI_ANY_ID, },
11465 {PCI_VENDOR_ID_SERVERENGINE, PCI_DEVICE_ID_TOMCAT,
11466 PCI_ANY_ID, PCI_ANY_ID, },
11467 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_FALCON,
11468 PCI_ANY_ID, PCI_ANY_ID, },
11469 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BALIUS,
11470 PCI_ANY_ID, PCI_ANY_ID, },
11471 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FC,
11472 PCI_ANY_ID, PCI_ANY_ID, },
11473 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FCOE,
11474 PCI_ANY_ID, PCI_ANY_ID, },
11475 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FC_VF,
11476 PCI_ANY_ID, PCI_ANY_ID, },
11477 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FCOE_VF,
11478 PCI_ANY_ID, PCI_ANY_ID, },
11479 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_G6_FC,
11480 PCI_ANY_ID, PCI_ANY_ID, },
11481 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SKYHAWK,
11482 PCI_ANY_ID, PCI_ANY_ID, },
11483 {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SKYHAWK_VF,
11484 PCI_ANY_ID, PCI_ANY_ID, },
11485 { 0 }
11486};
11487
11488MODULE_DEVICE_TABLE(pci, lpfc_id_table); 11389MODULE_DEVICE_TABLE(pci, lpfc_id_table);
11489 11390
11490static const struct pci_error_handlers lpfc_err_handler = { 11391static const struct pci_error_handlers lpfc_err_handler = {