diff options
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/megaraid/mega_common.h | 1 | ||||
-rw-r--r-- | drivers/scsi/megaraid/megaraid_mbox.c | 125 | ||||
-rw-r--r-- | drivers/scsi/megaraid/megaraid_mbox.h | 64 | ||||
-rw-r--r-- | drivers/scsi/megaraid/megaraid_mm.c | 9 | ||||
-rw-r--r-- | drivers/scsi/megaraid/megaraid_mm.h | 4 |
5 files changed, 27 insertions, 176 deletions
diff --git a/drivers/scsi/megaraid/mega_common.h b/drivers/scsi/megaraid/mega_common.h index 18969a4946b7..69df1a9b935d 100644 --- a/drivers/scsi/megaraid/mega_common.h +++ b/drivers/scsi/megaraid/mega_common.h | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <linux/list.h> | 27 | #include <linux/list.h> |
28 | #include <linux/version.h> | 28 | #include <linux/version.h> |
29 | #include <linux/moduleparam.h> | 29 | #include <linux/moduleparam.h> |
30 | #include <linux/dma-mapping.h> | ||
30 | #include <asm/semaphore.h> | 31 | #include <asm/semaphore.h> |
31 | #include <scsi/scsi.h> | 32 | #include <scsi/scsi.h> |
32 | #include <scsi/scsi_cmnd.h> | 33 | #include <scsi/scsi_cmnd.h> |
diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c index 138fa4815833..78768736077f 100644 --- a/drivers/scsi/megaraid/megaraid_mbox.c +++ b/drivers/scsi/megaraid/megaraid_mbox.c | |||
@@ -10,7 +10,7 @@ | |||
10 | * 2 of the License, or (at your option) any later version. | 10 | * 2 of the License, or (at your option) any later version. |
11 | * | 11 | * |
12 | * FILE : megaraid_mbox.c | 12 | * FILE : megaraid_mbox.c |
13 | * Version : v2.20.4.5 (Feb 03 2005) | 13 | * Version : v2.20.4.6 (Mar 07 2005) |
14 | * | 14 | * |
15 | * Authors: | 15 | * Authors: |
16 | * Atul Mukker <Atul.Mukker@lsil.com> | 16 | * Atul Mukker <Atul.Mukker@lsil.com> |
@@ -202,7 +202,7 @@ MODULE_PARM_DESC(debug_level, "Debug level for driver (default=0)"); | |||
202 | * ### global data ### | 202 | * ### global data ### |
203 | */ | 203 | */ |
204 | static uint8_t megaraid_mbox_version[8] = | 204 | static uint8_t megaraid_mbox_version[8] = |
205 | { 0x02, 0x20, 0x04, 0x05, 2, 3, 20, 5 }; | 205 | { 0x02, 0x20, 0x04, 0x06, 3, 7, 20, 5 }; |
206 | 206 | ||
207 | 207 | ||
208 | /* | 208 | /* |
@@ -229,9 +229,9 @@ static struct pci_device_id pci_id_table_g[] = { | |||
229 | }, | 229 | }, |
230 | { | 230 | { |
231 | PCI_VENDOR_ID_LSI_LOGIC, | 231 | PCI_VENDOR_ID_LSI_LOGIC, |
232 | PCI_DEVICE_ID_PERC4_QC, | 232 | PCI_DEVICE_ID_VERDE, |
233 | PCI_VENDOR_ID_DELL, | 233 | PCI_ANY_ID, |
234 | PCI_SUBSYS_ID_PERC4_QC, | 234 | PCI_ANY_ID, |
235 | }, | 235 | }, |
236 | { | 236 | { |
237 | PCI_VENDOR_ID_DELL, | 237 | PCI_VENDOR_ID_DELL, |
@@ -271,15 +271,9 @@ static struct pci_device_id pci_id_table_g[] = { | |||
271 | }, | 271 | }, |
272 | { | 272 | { |
273 | PCI_VENDOR_ID_LSI_LOGIC, | 273 | PCI_VENDOR_ID_LSI_LOGIC, |
274 | PCI_DEVICE_ID_PERC4E_DC_320_2E, | 274 | PCI_DEVICE_ID_DOBSON, |
275 | PCI_VENDOR_ID_DELL, | 275 | PCI_ANY_ID, |
276 | PCI_SUBSYS_ID_PERC4E_DC_320_2E, | 276 | PCI_ANY_ID, |
277 | }, | ||
278 | { | ||
279 | PCI_VENDOR_ID_LSI_LOGIC, | ||
280 | PCI_DEVICE_ID_PERC4E_SC_320_1E, | ||
281 | PCI_VENDOR_ID_DELL, | ||
282 | PCI_SUBSYS_ID_PERC4E_SC_320_1E, | ||
283 | }, | 277 | }, |
284 | { | 278 | { |
285 | PCI_VENDOR_ID_AMI, | 279 | PCI_VENDOR_ID_AMI, |
@@ -331,36 +325,6 @@ static struct pci_device_id pci_id_table_g[] = { | |||
331 | }, | 325 | }, |
332 | { | 326 | { |
333 | PCI_VENDOR_ID_LSI_LOGIC, | 327 | PCI_VENDOR_ID_LSI_LOGIC, |
334 | PCI_DEVICE_ID_MEGARAID_SCSI_320_0x, | ||
335 | PCI_VENDOR_ID_LSI_LOGIC, | ||
336 | PCI_SUBSYS_ID_MEGARAID_SCSI_320_0x, | ||
337 | }, | ||
338 | { | ||
339 | PCI_VENDOR_ID_LSI_LOGIC, | ||
340 | PCI_DEVICE_ID_MEGARAID_SCSI_320_2x, | ||
341 | PCI_VENDOR_ID_LSI_LOGIC, | ||
342 | PCI_SUBSYS_ID_MEGARAID_SCSI_320_2x, | ||
343 | }, | ||
344 | { | ||
345 | PCI_VENDOR_ID_LSI_LOGIC, | ||
346 | PCI_DEVICE_ID_MEGARAID_SCSI_320_4x, | ||
347 | PCI_VENDOR_ID_LSI_LOGIC, | ||
348 | PCI_SUBSYS_ID_MEGARAID_SCSI_320_4x, | ||
349 | }, | ||
350 | { | ||
351 | PCI_VENDOR_ID_LSI_LOGIC, | ||
352 | PCI_DEVICE_ID_MEGARAID_SCSI_320_1E, | ||
353 | PCI_VENDOR_ID_LSI_LOGIC, | ||
354 | PCI_SUBSYS_ID_MEGARAID_SCSI_320_1E, | ||
355 | }, | ||
356 | { | ||
357 | PCI_VENDOR_ID_LSI_LOGIC, | ||
358 | PCI_DEVICE_ID_MEGARAID_SCSI_320_2E, | ||
359 | PCI_VENDOR_ID_LSI_LOGIC, | ||
360 | PCI_SUBSYS_ID_MEGARAID_SCSI_320_2E, | ||
361 | }, | ||
362 | { | ||
363 | PCI_VENDOR_ID_LSI_LOGIC, | ||
364 | PCI_DEVICE_ID_MEGARAID_I4_133_RAID, | 328 | PCI_DEVICE_ID_MEGARAID_I4_133_RAID, |
365 | PCI_VENDOR_ID_LSI_LOGIC, | 329 | PCI_VENDOR_ID_LSI_LOGIC, |
366 | PCI_SUBSYS_ID_MEGARAID_I4_133_RAID, | 330 | PCI_SUBSYS_ID_MEGARAID_I4_133_RAID, |
@@ -379,21 +343,9 @@ static struct pci_device_id pci_id_table_g[] = { | |||
379 | }, | 343 | }, |
380 | { | 344 | { |
381 | PCI_VENDOR_ID_LSI_LOGIC, | 345 | PCI_VENDOR_ID_LSI_LOGIC, |
382 | PCI_DEVICE_ID_MEGARAID_SATA_300_4x, | 346 | PCI_DEVICE_ID_LINDSAY, |
383 | PCI_VENDOR_ID_LSI_LOGIC, | 347 | PCI_ANY_ID, |
384 | PCI_SUBSYS_ID_MEGARAID_SATA_300_4x, | 348 | PCI_ANY_ID, |
385 | }, | ||
386 | { | ||
387 | PCI_VENDOR_ID_LSI_LOGIC, | ||
388 | PCI_DEVICE_ID_MEGARAID_SATA_300_8x, | ||
389 | PCI_VENDOR_ID_LSI_LOGIC, | ||
390 | PCI_SUBSYS_ID_MEGARAID_SATA_300_8x, | ||
391 | }, | ||
392 | { | ||
393 | PCI_VENDOR_ID_LSI_LOGIC, | ||
394 | PCI_DEVICE_ID_INTEL_RAID_SRCU42X, | ||
395 | PCI_VENDOR_ID_INTEL, | ||
396 | PCI_SUBSYS_ID_INTEL_RAID_SRCU42X, | ||
397 | }, | 349 | }, |
398 | { | 350 | { |
399 | PCI_VENDOR_ID_LSI_LOGIC, | 351 | PCI_VENDOR_ID_LSI_LOGIC, |
@@ -403,58 +355,10 @@ static struct pci_device_id pci_id_table_g[] = { | |||
403 | }, | 355 | }, |
404 | { | 356 | { |
405 | PCI_VENDOR_ID_LSI_LOGIC, | 357 | PCI_VENDOR_ID_LSI_LOGIC, |
406 | PCI_DEVICE_ID_INTEL_RAID_SRCU42E, | ||
407 | PCI_VENDOR_ID_INTEL, | ||
408 | PCI_SUBSYS_ID_INTEL_RAID_SRCU42E, | ||
409 | }, | ||
410 | { | ||
411 | PCI_VENDOR_ID_LSI_LOGIC, | ||
412 | PCI_DEVICE_ID_INTEL_RAID_SRCZCRX, | ||
413 | PCI_VENDOR_ID_INTEL, | ||
414 | PCI_SUBSYS_ID_INTEL_RAID_SRCZCRX, | ||
415 | }, | ||
416 | { | ||
417 | PCI_VENDOR_ID_LSI_LOGIC, | ||
418 | PCI_DEVICE_ID_INTEL_RAID_SRCS28X, | ||
419 | PCI_VENDOR_ID_INTEL, | ||
420 | PCI_SUBSYS_ID_INTEL_RAID_SRCS28X, | ||
421 | }, | ||
422 | { | ||
423 | PCI_VENDOR_ID_LSI_LOGIC, | ||
424 | PCI_DEVICE_ID_INTEL_RAID_SROMBU42E_ALIEF, | ||
425 | PCI_VENDOR_ID_INTEL, | ||
426 | PCI_SUBSYS_ID_INTEL_RAID_SROMBU42E_ALIEF, | ||
427 | }, | ||
428 | { | ||
429 | PCI_VENDOR_ID_LSI_LOGIC, | ||
430 | PCI_DEVICE_ID_INTEL_RAID_SROMBU42E_HARWICH, | ||
431 | PCI_VENDOR_ID_INTEL, | ||
432 | PCI_SUBSYS_ID_INTEL_RAID_SROMBU42E_HARWICH, | ||
433 | }, | ||
434 | { | ||
435 | PCI_VENDOR_ID_LSI_LOGIC, | ||
436 | PCI_DEVICE_ID_INTEL_RAID_SRCU41L_LAKE_SHETEK, | 358 | PCI_DEVICE_ID_INTEL_RAID_SRCU41L_LAKE_SHETEK, |
437 | PCI_VENDOR_ID_INTEL, | 359 | PCI_VENDOR_ID_INTEL, |
438 | PCI_SUBSYS_ID_INTEL_RAID_SRCU41L_LAKE_SHETEK, | 360 | PCI_SUBSYS_ID_INTEL_RAID_SRCU41L_LAKE_SHETEK, |
439 | }, | 361 | }, |
440 | { | ||
441 | PCI_VENDOR_ID_LSI_LOGIC, | ||
442 | PCI_DEVICE_ID_FSC_MEGARAID_PCI_EXPRESS_ROMB, | ||
443 | PCI_SUBSYS_ID_FSC, | ||
444 | PCI_SUBSYS_ID_FSC_MEGARAID_PCI_EXPRESS_ROMB, | ||
445 | }, | ||
446 | { | ||
447 | PCI_VENDOR_ID_LSI_LOGIC, | ||
448 | PCI_DEVICE_ID_MEGARAID_ACER_ROMB_2E, | ||
449 | PCI_VENDOR_ID_AI, | ||
450 | PCI_SUBSYS_ID_MEGARAID_ACER_ROMB_2E, | ||
451 | }, | ||
452 | { | ||
453 | PCI_VENDOR_ID_LSI_LOGIC, | ||
454 | PCI_DEVICE_ID_MEGARAID_NEC_ROMB_2E, | ||
455 | PCI_VENDOR_ID_NEC, | ||
456 | PCI_SUBSYS_ID_MEGARAID_NEC_ROMB_2E, | ||
457 | }, | ||
458 | {0} /* Terminating entry */ | 362 | {0} /* Terminating entry */ |
459 | }; | 363 | }; |
460 | MODULE_DEVICE_TABLE(pci, pci_id_table_g); | 364 | MODULE_DEVICE_TABLE(pci, pci_id_table_g); |
@@ -539,7 +443,8 @@ megaraid_init(void) | |||
539 | 443 | ||
540 | 444 | ||
541 | // register as a PCI hot-plug driver module | 445 | // register as a PCI hot-plug driver module |
542 | if ((rval = pci_module_init(&megaraid_pci_driver_g))) { | 446 | rval = pci_register_driver(&megaraid_pci_driver_g); |
447 | if (rval < 0) { | ||
543 | con_log(CL_ANN, (KERN_WARNING | 448 | con_log(CL_ANN, (KERN_WARNING |
544 | "megaraid: could not register hotplug support.\n")); | 449 | "megaraid: could not register hotplug support.\n")); |
545 | } | 450 | } |
@@ -619,7 +524,7 @@ megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
619 | 524 | ||
620 | // Setup the default DMA mask. This would be changed later on | 525 | // Setup the default DMA mask. This would be changed later on |
621 | // depending on hardware capabilities | 526 | // depending on hardware capabilities |
622 | if (pci_set_dma_mask(adapter->pdev, 0xFFFFFFFF) != 0) { | 527 | if (pci_set_dma_mask(adapter->pdev, DMA_32BIT_MASK) != 0) { |
623 | 528 | ||
624 | con_log(CL_ANN, (KERN_WARNING | 529 | con_log(CL_ANN, (KERN_WARNING |
625 | "megaraid: pci_set_dma_mask failed:%d\n", __LINE__)); | 530 | "megaraid: pci_set_dma_mask failed:%d\n", __LINE__)); |
@@ -1031,7 +936,7 @@ megaraid_init_mbox(adapter_t *adapter) | |||
1031 | 936 | ||
1032 | // Set the DMA mask to 64-bit. All supported controllers as capable of | 937 | // Set the DMA mask to 64-bit. All supported controllers as capable of |
1033 | // DMA in this range | 938 | // DMA in this range |
1034 | if (pci_set_dma_mask(adapter->pdev, 0xFFFFFFFFFFFFFFFFULL) != 0) { | 939 | if (pci_set_dma_mask(adapter->pdev, DMA_64BIT_MASK) != 0) { |
1035 | 940 | ||
1036 | con_log(CL_ANN, (KERN_WARNING | 941 | con_log(CL_ANN, (KERN_WARNING |
1037 | "megaraid: could not set DMA mask for 64-bit.\n")); | 942 | "megaraid: could not set DMA mask for 64-bit.\n")); |
diff --git a/drivers/scsi/megaraid/megaraid_mbox.h b/drivers/scsi/megaraid/megaraid_mbox.h index 07510009d110..644b91bdb028 100644 --- a/drivers/scsi/megaraid/megaraid_mbox.h +++ b/drivers/scsi/megaraid/megaraid_mbox.h | |||
@@ -21,8 +21,8 @@ | |||
21 | #include "megaraid_ioctl.h" | 21 | #include "megaraid_ioctl.h" |
22 | 22 | ||
23 | 23 | ||
24 | #define MEGARAID_VERSION "2.20.4.5" | 24 | #define MEGARAID_VERSION "2.20.4.6" |
25 | #define MEGARAID_EXT_VERSION "(Release Date: Thu Feb 03 12:27:22 EST 2005)" | 25 | #define MEGARAID_EXT_VERSION "(Release Date: Mon Mar 07 12:27:22 EST 2005)" |
26 | 26 | ||
27 | 27 | ||
28 | /* | 28 | /* |
@@ -37,8 +37,7 @@ | |||
37 | #define PCI_DEVICE_ID_PERC4_DC 0x1960 | 37 | #define PCI_DEVICE_ID_PERC4_DC 0x1960 |
38 | #define PCI_SUBSYS_ID_PERC4_DC 0x0518 | 38 | #define PCI_SUBSYS_ID_PERC4_DC 0x0518 |
39 | 39 | ||
40 | #define PCI_DEVICE_ID_PERC4_QC 0x0407 | 40 | #define PCI_DEVICE_ID_VERDE 0x0407 |
41 | #define PCI_SUBSYS_ID_PERC4_QC 0x0531 | ||
42 | 41 | ||
43 | #define PCI_DEVICE_ID_PERC4_DI_EVERGLADES 0x000F | 42 | #define PCI_DEVICE_ID_PERC4_DI_EVERGLADES 0x000F |
44 | #define PCI_SUBSYS_ID_PERC4_DI_EVERGLADES 0x014A | 43 | #define PCI_SUBSYS_ID_PERC4_DI_EVERGLADES 0x014A |
@@ -58,11 +57,7 @@ | |||
58 | #define PCI_DEVICE_ID_PERC4E_DI_GUADALUPE 0x0013 | 57 | #define PCI_DEVICE_ID_PERC4E_DI_GUADALUPE 0x0013 |
59 | #define PCI_SUBSYS_ID_PERC4E_DI_GUADALUPE 0x0170 | 58 | #define PCI_SUBSYS_ID_PERC4E_DI_GUADALUPE 0x0170 |
60 | 59 | ||
61 | #define PCI_DEVICE_ID_PERC4E_DC_320_2E 0x0408 | 60 | #define PCI_DEVICE_ID_DOBSON 0x0408 |
62 | #define PCI_SUBSYS_ID_PERC4E_DC_320_2E 0x0002 | ||
63 | |||
64 | #define PCI_DEVICE_ID_PERC4E_SC_320_1E 0x0408 | ||
65 | #define PCI_SUBSYS_ID_PERC4E_SC_320_1E 0x0001 | ||
66 | 61 | ||
67 | #define PCI_DEVICE_ID_MEGARAID_SCSI_320_0 0x1960 | 62 | #define PCI_DEVICE_ID_MEGARAID_SCSI_320_0 0x1960 |
68 | #define PCI_SUBSYS_ID_MEGARAID_SCSI_320_0 0xA520 | 63 | #define PCI_SUBSYS_ID_MEGARAID_SCSI_320_0 0xA520 |
@@ -73,21 +68,6 @@ | |||
73 | #define PCI_DEVICE_ID_MEGARAID_SCSI_320_2 0x1960 | 68 | #define PCI_DEVICE_ID_MEGARAID_SCSI_320_2 0x1960 |
74 | #define PCI_SUBSYS_ID_MEGARAID_SCSI_320_2 0x0518 | 69 | #define PCI_SUBSYS_ID_MEGARAID_SCSI_320_2 0x0518 |
75 | 70 | ||
76 | #define PCI_DEVICE_ID_MEGARAID_SCSI_320_0x 0x0407 | ||
77 | #define PCI_SUBSYS_ID_MEGARAID_SCSI_320_0x 0x0530 | ||
78 | |||
79 | #define PCI_DEVICE_ID_MEGARAID_SCSI_320_2x 0x0407 | ||
80 | #define PCI_SUBSYS_ID_MEGARAID_SCSI_320_2x 0x0532 | ||
81 | |||
82 | #define PCI_DEVICE_ID_MEGARAID_SCSI_320_4x 0x0407 | ||
83 | #define PCI_SUBSYS_ID_MEGARAID_SCSI_320_4x 0x0531 | ||
84 | |||
85 | #define PCI_DEVICE_ID_MEGARAID_SCSI_320_1E 0x0408 | ||
86 | #define PCI_SUBSYS_ID_MEGARAID_SCSI_320_1E 0x0001 | ||
87 | |||
88 | #define PCI_DEVICE_ID_MEGARAID_SCSI_320_2E 0x0408 | ||
89 | #define PCI_SUBSYS_ID_MEGARAID_SCSI_320_2E 0x0002 | ||
90 | |||
91 | #define PCI_DEVICE_ID_MEGARAID_I4_133_RAID 0x1960 | 71 | #define PCI_DEVICE_ID_MEGARAID_I4_133_RAID 0x1960 |
92 | #define PCI_SUBSYS_ID_MEGARAID_I4_133_RAID 0x0522 | 72 | #define PCI_SUBSYS_ID_MEGARAID_I4_133_RAID 0x0522 |
93 | 73 | ||
@@ -97,52 +77,18 @@ | |||
97 | #define PCI_DEVICE_ID_MEGARAID_SATA_150_6 0x1960 | 77 | #define PCI_DEVICE_ID_MEGARAID_SATA_150_6 0x1960 |
98 | #define PCI_SUBSYS_ID_MEGARAID_SATA_150_6 0x0523 | 78 | #define PCI_SUBSYS_ID_MEGARAID_SATA_150_6 0x0523 |
99 | 79 | ||
100 | #define PCI_DEVICE_ID_MEGARAID_SATA_300_4x 0x0409 | 80 | #define PCI_DEVICE_ID_LINDSAY 0x0409 |
101 | #define PCI_SUBSYS_ID_MEGARAID_SATA_300_4x 0x3004 | ||
102 | |||
103 | #define PCI_DEVICE_ID_MEGARAID_SATA_300_8x 0x0409 | ||
104 | #define PCI_SUBSYS_ID_MEGARAID_SATA_300_8x 0x3008 | ||
105 | |||
106 | #define PCI_DEVICE_ID_INTEL_RAID_SRCU42X 0x0407 | ||
107 | #define PCI_SUBSYS_ID_INTEL_RAID_SRCU42X 0x0532 | ||
108 | 81 | ||
109 | #define PCI_DEVICE_ID_INTEL_RAID_SRCS16 0x1960 | 82 | #define PCI_DEVICE_ID_INTEL_RAID_SRCS16 0x1960 |
110 | #define PCI_SUBSYS_ID_INTEL_RAID_SRCS16 0x0523 | 83 | #define PCI_SUBSYS_ID_INTEL_RAID_SRCS16 0x0523 |
111 | 84 | ||
112 | #define PCI_DEVICE_ID_INTEL_RAID_SRCU42E 0x0408 | ||
113 | #define PCI_SUBSYS_ID_INTEL_RAID_SRCU42E 0x0002 | ||
114 | |||
115 | #define PCI_DEVICE_ID_INTEL_RAID_SRCZCRX 0x0407 | ||
116 | #define PCI_SUBSYS_ID_INTEL_RAID_SRCZCRX 0x0530 | ||
117 | |||
118 | #define PCI_DEVICE_ID_INTEL_RAID_SRCS28X 0x0409 | ||
119 | #define PCI_SUBSYS_ID_INTEL_RAID_SRCS28X 0x3008 | ||
120 | |||
121 | #define PCI_DEVICE_ID_INTEL_RAID_SROMBU42E_ALIEF 0x0408 | ||
122 | #define PCI_SUBSYS_ID_INTEL_RAID_SROMBU42E_ALIEF 0x3431 | ||
123 | |||
124 | #define PCI_DEVICE_ID_INTEL_RAID_SROMBU42E_HARWICH 0x0408 | ||
125 | #define PCI_SUBSYS_ID_INTEL_RAID_SROMBU42E_HARWICH 0x3499 | ||
126 | |||
127 | #define PCI_DEVICE_ID_INTEL_RAID_SRCU41L_LAKE_SHETEK 0x1960 | 85 | #define PCI_DEVICE_ID_INTEL_RAID_SRCU41L_LAKE_SHETEK 0x1960 |
128 | #define PCI_SUBSYS_ID_INTEL_RAID_SRCU41L_LAKE_SHETEK 0x0520 | 86 | #define PCI_SUBSYS_ID_INTEL_RAID_SRCU41L_LAKE_SHETEK 0x0520 |
129 | 87 | ||
130 | #define PCI_DEVICE_ID_FSC_MEGARAID_PCI_EXPRESS_ROMB 0x0408 | ||
131 | #define PCI_SUBSYS_ID_FSC_MEGARAID_PCI_EXPRESS_ROMB 0x1065 | ||
132 | |||
133 | #define PCI_DEVICE_ID_MEGARAID_ACER_ROMB_2E 0x0408 | ||
134 | #define PCI_SUBSYS_ID_MEGARAID_ACER_ROMB_2E 0x004D | ||
135 | |||
136 | #define PCI_SUBSYS_ID_PERC3_QC 0x0471 | 88 | #define PCI_SUBSYS_ID_PERC3_QC 0x0471 |
137 | #define PCI_SUBSYS_ID_PERC3_DC 0x0493 | 89 | #define PCI_SUBSYS_ID_PERC3_DC 0x0493 |
138 | #define PCI_SUBSYS_ID_PERC3_SC 0x0475 | 90 | #define PCI_SUBSYS_ID_PERC3_SC 0x0475 |
139 | 91 | ||
140 | #define PCI_DEVICE_ID_MEGARAID_NEC_ROMB_2E 0x0408 | ||
141 | #define PCI_SUBSYS_ID_MEGARAID_NEC_ROMB_2E 0x8287 | ||
142 | |||
143 | #ifndef PCI_SUBSYS_ID_FSC | ||
144 | #define PCI_SUBSYS_ID_FSC 0x1734 | ||
145 | #endif | ||
146 | 92 | ||
147 | #define MBOX_MAX_SCSI_CMDS 128 // number of cmds reserved for kernel | 93 | #define MBOX_MAX_SCSI_CMDS 128 // number of cmds reserved for kernel |
148 | #define MBOX_MAX_USER_CMDS 32 // number of cmds for applications | 94 | #define MBOX_MAX_USER_CMDS 32 // number of cmds for applications |
diff --git a/drivers/scsi/megaraid/megaraid_mm.c b/drivers/scsi/megaraid/megaraid_mm.c index 9f1b550713ec..37d110e864c4 100644 --- a/drivers/scsi/megaraid/megaraid_mm.c +++ b/drivers/scsi/megaraid/megaraid_mm.c | |||
@@ -10,13 +10,12 @@ | |||
10 | * 2 of the License, or (at your option) any later version. | 10 | * 2 of the License, or (at your option) any later version. |
11 | * | 11 | * |
12 | * FILE : megaraid_mm.c | 12 | * FILE : megaraid_mm.c |
13 | * Version : v2.20.2.5 (Jan 21 2005) | 13 | * Version : v2.20.2.6 (Mar 7 2005) |
14 | * | 14 | * |
15 | * Common management module | 15 | * Common management module |
16 | */ | 16 | */ |
17 | 17 | ||
18 | #include "megaraid_mm.h" | 18 | #include "megaraid_mm.h" |
19 | #include <linux/smp_lock.h> | ||
20 | 19 | ||
21 | 20 | ||
22 | // Entry points for char node driver | 21 | // Entry points for char node driver |
@@ -61,7 +60,7 @@ EXPORT_SYMBOL(mraid_mm_unregister_adp); | |||
61 | EXPORT_SYMBOL(mraid_mm_adapter_app_handle); | 60 | EXPORT_SYMBOL(mraid_mm_adapter_app_handle); |
62 | 61 | ||
63 | static int majorno; | 62 | static int majorno; |
64 | static uint32_t drvr_ver = 0x02200201; | 63 | static uint32_t drvr_ver = 0x02200206; |
65 | 64 | ||
66 | static int adapters_count_g; | 65 | static int adapters_count_g; |
67 | static struct list_head adapters_list_g; | 66 | static struct list_head adapters_list_g; |
@@ -1231,9 +1230,9 @@ mraid_mm_compat_ioctl(struct file *filep, unsigned int cmd, | |||
1231 | unsigned long arg) | 1230 | unsigned long arg) |
1232 | { | 1231 | { |
1233 | int err; | 1232 | int err; |
1234 | lock_kernel(); | 1233 | |
1235 | err = mraid_mm_ioctl(NULL, filep, cmd, arg); | 1234 | err = mraid_mm_ioctl(NULL, filep, cmd, arg); |
1236 | unlock_kernel(); | 1235 | |
1237 | return err; | 1236 | return err; |
1238 | } | 1237 | } |
1239 | #endif | 1238 | #endif |
diff --git a/drivers/scsi/megaraid/megaraid_mm.h b/drivers/scsi/megaraid/megaraid_mm.h index 948a0012ab8c..7e36c46e7c43 100644 --- a/drivers/scsi/megaraid/megaraid_mm.h +++ b/drivers/scsi/megaraid/megaraid_mm.h | |||
@@ -29,9 +29,9 @@ | |||
29 | #include "megaraid_ioctl.h" | 29 | #include "megaraid_ioctl.h" |
30 | 30 | ||
31 | 31 | ||
32 | #define LSI_COMMON_MOD_VERSION "2.20.2.5" | 32 | #define LSI_COMMON_MOD_VERSION "2.20.2.6" |
33 | #define LSI_COMMON_MOD_EXT_VERSION \ | 33 | #define LSI_COMMON_MOD_EXT_VERSION \ |
34 | "(Release Date: Fri Jan 21 00:01:03 EST 2005)" | 34 | "(Release Date: Mon Mar 7 00:01:03 EST 2005)" |
35 | 35 | ||
36 | 36 | ||
37 | #define LSI_DBGLVL dbglevel | 37 | #define LSI_DBGLVL dbglevel |