aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drivers/scsi/qla2xxx/qla_devtbl.h219
-rw-r--r--drivers/scsi/qla2xxx/qla_init.c6
2 files changed, 80 insertions, 145 deletions
diff --git a/drivers/scsi/qla2xxx/qla_devtbl.h b/drivers/scsi/qla2xxx/qla_devtbl.h
index 5109735dd891..a8fc0ffc7fc5 100644
--- a/drivers/scsi/qla2xxx/qla_devtbl.h
+++ b/drivers/scsi/qla2xxx/qla_devtbl.h
@@ -1,146 +1,81 @@
1#define QLA_MODEL_NAMES 0x44 1#define QLA_MODEL_NAMES 0x4A
2 2
3/* 3/*
4 * Adapter model names. 4 * Adapter model names and descriptions.
5 */ 5 */
6static char *qla2x00_model_name[QLA_MODEL_NAMES] = { 6static char *qla2x00_model_name[QLA_MODEL_NAMES*2] = {
7 "QLA2340", /* 0x100 */ 7 "QLA2340", "133MHz PCI-X to 2Gb FC, Single Channel", /* 0x100 */
8 "QLA2342", /* 0x101 */ 8 "QLA2342", "133MHz PCI-X to 2Gb FC, Dual Channel", /* 0x101 */
9 "QLA2344", /* 0x102 */ 9 "QLA2344", "133MHz PCI-X to 2Gb FC, Quad Channel", /* 0x102 */
10 "QCP2342", /* 0x103 */ 10 "QCP2342", "cPCI to 2Gb FC, Dual Channel", /* 0x103 */
11 "QSB2340", /* 0x104 */ 11 "QSB2340", "SBUS to 2Gb FC, Single Channel", /* 0x104 */
12 "QSB2342", /* 0x105 */ 12 "QSB2342", "SBUS to 2Gb FC, Dual Channel", /* 0x105 */
13 "QLA2310", /* 0x106 */ 13 "QLA2310", "Sun 66MHz PCI-X to 2Gb FC, Single Channel", /* 0x106 */
14 "QLA2332", /* 0x107 */ 14 "QLA2332", "Sun 66MHz PCI-X to 2Gb FC, Single Channel", /* 0x107 */
15 "QCP2332", /* 0x108 */ 15 "QCP2332", "Sun cPCI to 2Gb FC, Dual Channel", /* 0x108 */
16 "QCP2340", /* 0x109 */ 16 "QCP2340", "cPCI to 2Gb FC, Single Channel", /* 0x109 */
17 "QLA2342", /* 0x10a */ 17 "QLA2342", "Sun 133MHz PCI-X to 2Gb FC, Dual Channel", /* 0x10a */
18 "QCP2342", /* 0x10b */ 18 "QCP2342", "Sun - cPCI to 2Gb FC, Dual Channel", /* 0x10b */
19 "QLA2350", /* 0x10c */ 19 "QLA2350", "133MHz PCI-X to 2Gb FC, Single Channel", /* 0x10c */
20 "QLA2352", /* 0x10d */ 20 "QLA2352", "133MHz PCI-X to 2Gb FC, Dual Channel", /* 0x10d */
21 "QLA2352", /* 0x10e */ 21 "QLA2352", "Sun 133MHz PCI-X to 2Gb FC, Dual Channel", /* 0x10e */
22 "HPQ SVS", /* 0x10f */ 22 " ", " ", /* 0x10f */
23 "HPQ SVS", /* 0x110 */ 23 " ", " ", /* 0x110 */
24 " ", /* 0x111 */ 24 " ", " ", /* 0x111 */
25 " ", /* 0x112 */ 25 " ", " ", /* 0x112 */
26 " ", /* 0x113 */ 26 " ", " ", /* 0x113 */
27 " ", /* 0x114 */ 27 " ", " ", /* 0x114 */
28 "QLA2360", /* 0x115 */ 28 "QLA2360", "133MHz PCI-X to 2Gb FC, Single Channel", /* 0x115 */
29 "QLA2362", /* 0x116 */ 29 "QLA2362", "133MHz PCI-X to 2Gb FC, Dual Channel", /* 0x116 */
30 "QLE2360", /* 0x117 */ 30 "QLE2360", "PCI-Express to 2Gb FC, Single Channel", /* 0x117 */
31 "QLE2362", /* 0x118 */ 31 "QLE2362", "PCI-Express to 2Gb FC, Dual Channel", /* 0x118 */
32 "QLA200", /* 0x119 */ 32 "QLA200", "133MHz PCI-X to 2Gb FC Optical", /* 0x119 */
33 "QLA200C", /* 0x11a */ 33 " ", " ", /* 0x11a */
34 "QLA200P", /* 0x11b */ 34 " ", " ", /* 0x11b */
35 "QLA200P", /* 0x11c */ 35 "QLA200P", "133MHz PCI-X to 2Gb FC SFP", /* 0x11c */
36 " ", /* 0x11d */ 36 " ", " ", /* 0x11d */
37 " ", /* 0x11e */ 37 " ", " ", /* 0x11e */
38 " ", /* 0x11f */ 38 " ", " ", /* 0x11f */
39 " ", /* 0x120 */ 39 " ", " ", /* 0x120 */
40 " ", /* 0x121 */ 40 " ", " ", /* 0x121 */
41 " ", /* 0x122 */ 41 " ", " ", /* 0x122 */
42 " ", /* 0x123 */ 42 " ", " ", /* 0x123 */
43 " ", /* 0x124 */ 43 " ", " ", /* 0x124 */
44 " ", /* 0x125 */ 44 " ", " ", /* 0x125 */
45 " ", /* 0x126 */ 45 " ", " ", /* 0x126 */
46 " ", /* 0x127 */ 46 " ", " ", /* 0x127 */
47 " ", /* 0x128 */ 47 " ", " ", /* 0x128 */
48 " ", /* 0x129 */ 48 " ", " ", /* 0x129 */
49 " ", /* 0x12a */ 49 " ", " ", /* 0x12a */
50 " ", /* 0x12b */ 50 " ", " ", /* 0x12b */
51 " ", /* 0x12c */ 51 " ", " ", /* 0x12c */
52 " ", /* 0x12d */ 52 " ", " ", /* 0x12d */
53 " ", /* 0x12e */ 53 " ", " ", /* 0x12e */
54 "QLA210", /* 0x12f */ 54 "QLA210", "133MHz PCI-X to 2Gb FC, Single Channel", /* 0x12f */
55 "EMC 250", /* 0x130 */ 55 "EMC 250", "133MHz PCI-X to 2Gb FC, Single Channel", /* 0x130 */
56 "HP A7538A", /* 0x131 */ 56 "HP A7538A", "HP 1p2g PCI-X to 2Gb FC, Single Channel", /* 0x131 */
57 "QLA210", /* 0x132 */ 57 "QLA210", "Sun 133MHz PCI-X to 2Gb FC, Single Channel", /* 0x132 */
58 "QLA2460", /* 0x133 */ 58 "QLA2460", "PCI-X 2.0 to 4Gb FC, Single Channel", /* 0x133 */
59 "QLA2462", /* 0x134 */ 59 "QLA2462", "PCI-X 2.0 to 4Gb FC, Dual Channel", /* 0x134 */
60 "QMC2462", /* 0x135 */ 60 "QMC2462", "IBM eServer BC 4Gb FC Expansion Card", /* 0x135 */
61 "QMC2462S", /* 0x136 */ 61 "QMC2462S", "IBM eServer BC 4Gb FC Expansion Card SFF", /* 0x136 */
62 "QLE2460", /* 0x137 */ 62 "QLE2460", "PCI-Express to 4Gb FC, Single Channel", /* 0x137 */
63 "QLE2462", /* 0x138 */ 63 "QLE2462", "PCI-Express to 4Gb FC, Dual Channel", /* 0x138 */
64 "QME2462", /* 0x139 */ 64 "QME2462", "Dell BS PCI-Express to 4Gb FC, Dual Channel", /* 0x139 */
65 "QLA2440", /* 0x13a */ 65 " ", " ", /* 0x13a */
66 "QLA2442", /* 0x13b */ 66 " ", " ", /* 0x13b */
67 "QSM2442", /* 0x13c */ 67 " ", " ", /* 0x13c */
68 "QSM2462", /* 0x13d */ 68 "QEM2462", "Sun Server I/O Module 4Gb FC, Dual Channel", /* 0x13d */
69 "QLE210", /* 0x13e */ 69 "QLE210", "PCI-Express to 2Gb FC, Single Channel", /* 0x13e */
70 "QLE220", /* 0x13f */ 70 "QLE220", "PCI-Express to 4Gb FC, Single Channel", /* 0x13f */
71 "QLA2460", /* 0x140 */ 71 "QLA2460", "Sun PCI-X 2.0 to 4Gb FC, Single Channel", /* 0x140 */
72 "QLA2462", /* 0x141 */ 72 "QLA2462", "Sun PCI-X 2.0 to 4Gb FC, Dual Channel", /* 0x141 */
73 "QLE2460", /* 0x142 */ 73 "QLE2460", "Sun PCI-Express to 2Gb FC, Single Channel", /* 0x142 */
74 "QLE2462" /* 0x143 */ 74 "QLE2462", "Sun PCI-Express to 4Gb FC, Single Channel", /* 0x143 */
75}; 75 "QEM2462" "Server I/O Module 4Gb FC, Dual Channel", /* 0x144 */
76 76 "QLE2440", "PCI-Express to 4Gb FC, Single Channel", /* 0x145 */
77static char *qla2x00_model_desc[QLA_MODEL_NAMES] = { 77 "QLE2464", "PCI-Express to 4Gb FC, Quad Channel", /* 0x146 */
78 "133MHz PCI-X to 2Gb FC, Single Channel", /* 0x100 */ 78 "QLA2440", "PCI-X 2.0 to 4Gb FC, Single Channel", /* 0x147 */
79 "133MHz PCI-X to 2Gb FC, Dual Channel", /* 0x101 */ 79 " ", " ", /* 0x148 */
80 "133MHz PCI-X to 2Gb FC, Quad Channel", /* 0x102 */ 80 "QLA2340", "Sun 133MHz PCI-X to 2Gb FC, Single Channel", /* 0x149 */
81 " ", /* 0x103 */
82 " ", /* 0x104 */
83 " ", /* 0x105 */
84 " ", /* 0x106 */
85 " ", /* 0x107 */
86 " ", /* 0x108 */
87 " ", /* 0x109 */
88 " ", /* 0x10a */
89 " ", /* 0x10b */
90 "133MHz PCI-X to 2Gb FC, Single Channel", /* 0x10c */
91 "133MHz PCI-X to 2Gb FC, Dual Channel", /* 0x10d */
92 " ", /* 0x10e */
93 "HPQ SVS HBA- Initiator device", /* 0x10f */
94 "HPQ SVS HBA- Target device", /* 0x110 */
95 " ", /* 0x111 */
96 " ", /* 0x112 */
97 " ", /* 0x113 */
98 " ", /* 0x114 */
99 "133MHz PCI-X to 2Gb FC, Single Channel", /* 0x115 */
100 "133MHz PCI-X to 2Gb FC, Dual Channel", /* 0x116 */
101 "PCI-Express to 2Gb FC, Single Channel", /* 0x117 */
102 "PCI-Express to 2Gb FC, Dual Channel", /* 0x118 */
103 "133MHz PCI-X to 2Gb FC Optical", /* 0x119 */
104 "133MHz PCI-X to 2Gb FC Copper", /* 0x11a */
105 "133MHz PCI-X to 2Gb FC SFP", /* 0x11b */
106 "133MHz PCI-X to 2Gb FC SFP", /* 0x11c */
107 " ", /* 0x11d */
108 " ", /* 0x11e */
109 " ", /* 0x11f */
110 " ", /* 0x120 */
111 " ", /* 0x121 */
112 " ", /* 0x122 */
113 " ", /* 0x123 */
114 " ", /* 0x124 */
115 " ", /* 0x125 */
116 " ", /* 0x126 */
117 " ", /* 0x127 */
118 " ", /* 0x128 */
119 " ", /* 0x129 */
120 " ", /* 0x12a */
121 " ", /* 0x12b */
122 " ", /* 0x12c */
123 " ", /* 0x12d */
124 " ", /* 0x12e */
125 "133MHz PCI-X to 2Gb FC SFF", /* 0x12f */
126 "133MHz PCI-X to 2Gb FC SFF", /* 0x130 */
127 "HP 1p2g QLA2340", /* 0x131 */
128 "133MHz PCI-X to 2Gb FC, Single Channel", /* 0x132 */
129 "PCI-X 2.0 to 4Gb FC, Single Channel", /* 0x133 */
130 "PCI-X 2.0 to 4Gb FC, Dual Channel", /* 0x134 */
131 "IBM eServer BC 4Gb FC Expansion Card", /* 0x135 */
132 "IBM eServer BC 4Gb FC Expansion Card SFF", /* 0x136 */
133 "PCI-Express to 4Gb FC, Single Channel", /* 0x137 */
134 "PCI-Express to 4Gb FC, Dual Channel", /* 0x138 */
135 "Dell PCI-Express to 4Gb FC, Dual Channel", /* 0x139 */
136 "PCI-X 1.0 to 4Gb FC, Single Channel", /* 0x13a */
137 "PCI-X 1.0 to 4Gb FC, Dual Channel", /* 0x13b */
138 "Server I/O Module 4Gb FC, Single Channel", /* 0x13c */
139 "Server I/O Module 4Gb FC, Single Channel", /* 0x13d */
140 "PCI-Express to 2Gb FC, Single Channel", /* 0x13e */
141 "PCI-Express to 4Gb FC, Single Channel", /* 0x13f */
142 "Sun PCI-X 2.0 to 4Gb FC, Single Channel", /* 0x140 */
143 "Sun PCI-X 2.0 to 4Gb FC, Dual Channel", /* 0x141 */
144 "Sun PCI-Express to 2Gb FC, Single Channel", /* 0x142 */
145 "Sun PCI-Express to 4Gb FC, Single Channel" /* 0x143 */
146}; 81};
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index d4389095b4bc..3bc3e1749f32 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1505,9 +1505,9 @@ qla2x00_nvram_config(scsi_qla_host_t *ha)
1505 index = (ha->pdev->subsystem_device & 0xff); 1505 index = (ha->pdev->subsystem_device & 0xff);
1506 if (index < QLA_MODEL_NAMES) { 1506 if (index < QLA_MODEL_NAMES) {
1507 strcpy(ha->model_number, 1507 strcpy(ha->model_number,
1508 qla2x00_model_name[index]); 1508 qla2x00_model_name[index * 2]);
1509 ha->model_desc = 1509 ha->model_desc =
1510 qla2x00_model_desc[index]; 1510 qla2x00_model_name[index * 2 + 1];
1511 } else { 1511 } else {
1512 strcpy(ha->model_number, "QLA23xx"); 1512 strcpy(ha->model_number, "QLA23xx");
1513 } 1513 }
@@ -3373,7 +3373,7 @@ qla24xx_nvram_config(scsi_qla_host_t *ha)
3373 3373
3374 index = (ha->pdev->subsystem_device & 0xff); 3374 index = (ha->pdev->subsystem_device & 0xff);
3375 if (index < QLA_MODEL_NAMES) 3375 if (index < QLA_MODEL_NAMES)
3376 ha->model_desc = qla2x00_model_desc[index]; 3376 ha->model_desc = qla2x00_model_name[index * 2 + 1];
3377 } else 3377 } else
3378 strcpy(ha->model_number, "QLA2462"); 3378 strcpy(ha->model_number, "QLA2462");
3379 3379
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-23 20:40:48 -0500