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 @@
 #include <linux/list.h>
 #include <linux/version.h>
 #include <linux/moduleparam.h>
+#include <linux/dma-mapping.h>
 #include <asm/semaphore.h>
 #include <scsi/scsi.h>
 #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 @@
  *         2 of the License, or (at your option) any later version.
  *
  * FILE         : megaraid_mbox.c
- * Version      : v2.20.4.5 (Feb 03 2005)
+ * Version      : v2.20.4.6 (Mar 07 2005)
  *
  * Authors:
  *      Atul Mukker             <Atul.Mukker@lsil.com>
@@ -202,7 +202,7 @@ MODULE_PARM_DESC(debug_level, "Debug level for driver (default=0)");
  * ### global data ###
  */
 static uint8_t megaraid_mbox_version[8] =
-        { 0x02, 0x20, 0x04, 0x05, 2, 3, 20, 5 };
+        { 0x02, 0x20, 0x04, 0x06, 3, 7, 20, 5 };
 
 
 /*
@@ -229,9 +229,9 @@ static struct pci_device_id pci_id_table_g[] =  {
         },
         {
                 PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_PERC4_QC,
-                PCI_VENDOR_ID_DELL,
-                PCI_SUBSYS_ID_PERC4_QC,
+                PCI_DEVICE_ID_VERDE,
+                PCI_ANY_ID,
+                PCI_ANY_ID,
         },
         {
                 PCI_VENDOR_ID_DELL,
@@ -271,15 +271,9 @@ static struct pci_device_id pci_id_table_g[] =  {
         },
         {
                 PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_PERC4E_DC_320_2E,
-                PCI_VENDOR_ID_DELL,
-                PCI_SUBSYS_ID_PERC4E_DC_320_2E,
-        },
-        {
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_PERC4E_SC_320_1E,
-                PCI_VENDOR_ID_DELL,
-                PCI_SUBSYS_ID_PERC4E_SC_320_1E,
+                PCI_DEVICE_ID_DOBSON,
+                PCI_ANY_ID,
+                PCI_ANY_ID,
         },
         {
                 PCI_VENDOR_ID_AMI,
@@ -331,36 +325,6 @@ static struct pci_device_id pci_id_table_g[] =  {
         },
         {
                 PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_MEGARAID_SCSI_320_0x,
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_SUBSYS_ID_MEGARAID_SCSI_320_0x,
-        },
-        {
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_MEGARAID_SCSI_320_2x,
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_SUBSYS_ID_MEGARAID_SCSI_320_2x,
-        },
-        {
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_MEGARAID_SCSI_320_4x,
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_SUBSYS_ID_MEGARAID_SCSI_320_4x,
-        },
-        {
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_MEGARAID_SCSI_320_1E,
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_SUBSYS_ID_MEGARAID_SCSI_320_1E,
-        },
-        {
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_MEGARAID_SCSI_320_2E,
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_SUBSYS_ID_MEGARAID_SCSI_320_2E,
-        },
-        {
-                PCI_VENDOR_ID_LSI_LOGIC,
                 PCI_DEVICE_ID_MEGARAID_I4_133_RAID,
                 PCI_VENDOR_ID_LSI_LOGIC,
                 PCI_SUBSYS_ID_MEGARAID_I4_133_RAID,
@@ -379,21 +343,9 @@ static struct pci_device_id pci_id_table_g[] =  {
         },
         {
                 PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_MEGARAID_SATA_300_4x,
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_SUBSYS_ID_MEGARAID_SATA_300_4x,
-        },
-        {
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_MEGARAID_SATA_300_8x,
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_SUBSYS_ID_MEGARAID_SATA_300_8x,
-        },
-        {
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_INTEL_RAID_SRCU42X,
-                PCI_VENDOR_ID_INTEL,
-                PCI_SUBSYS_ID_INTEL_RAID_SRCU42X,
+                PCI_DEVICE_ID_LINDSAY,
+                PCI_ANY_ID,
+                PCI_ANY_ID,
         },
         {
                 PCI_VENDOR_ID_LSI_LOGIC,
@@ -403,58 +355,10 @@ static struct pci_device_id pci_id_table_g[] =  {
         },
         {
                 PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_INTEL_RAID_SRCU42E,
-                PCI_VENDOR_ID_INTEL,
-                PCI_SUBSYS_ID_INTEL_RAID_SRCU42E,
-        },
-        {
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_INTEL_RAID_SRCZCRX,
-                PCI_VENDOR_ID_INTEL,
-                PCI_SUBSYS_ID_INTEL_RAID_SRCZCRX,
-        },
-        {
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_INTEL_RAID_SRCS28X,
-                PCI_VENDOR_ID_INTEL,
-                PCI_SUBSYS_ID_INTEL_RAID_SRCS28X,
-        },
-        {
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_INTEL_RAID_SROMBU42E_ALIEF,
-                PCI_VENDOR_ID_INTEL,
-                PCI_SUBSYS_ID_INTEL_RAID_SROMBU42E_ALIEF,
-        },
-        {
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_INTEL_RAID_SROMBU42E_HARWICH,
-                PCI_VENDOR_ID_INTEL,
-                PCI_SUBSYS_ID_INTEL_RAID_SROMBU42E_HARWICH,
-        },
-        {
-                PCI_VENDOR_ID_LSI_LOGIC,
                 PCI_DEVICE_ID_INTEL_RAID_SRCU41L_LAKE_SHETEK,
                 PCI_VENDOR_ID_INTEL,
                 PCI_SUBSYS_ID_INTEL_RAID_SRCU41L_LAKE_SHETEK,
         },
-        {
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_FSC_MEGARAID_PCI_EXPRESS_ROMB,
-                PCI_SUBSYS_ID_FSC,
-                PCI_SUBSYS_ID_FSC_MEGARAID_PCI_EXPRESS_ROMB,
-        },
-        {
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_MEGARAID_ACER_ROMB_2E,
-                PCI_VENDOR_ID_AI,
-                PCI_SUBSYS_ID_MEGARAID_ACER_ROMB_2E,
-        },
-        {
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_MEGARAID_NEC_ROMB_2E,
-                PCI_VENDOR_ID_NEC,
-                PCI_SUBSYS_ID_MEGARAID_NEC_ROMB_2E,
-        },
         {0}     /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(pci, pci_id_table_g);
@@ -539,7 +443,8 @@ megaraid_init(void)
 
 
         // register as a PCI hot-plug driver module
-        if ((rval = pci_module_init(&megaraid_pci_driver_g))) {
+        rval = pci_register_driver(&megaraid_pci_driver_g);
+        if (rval < 0) {
                 con_log(CL_ANN, (KERN_WARNING
                         "megaraid: could not register hotplug support.\n"));
         }
@@ -619,7 +524,7 @@ megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 
         // Setup the default DMA mask. This would be changed later on
         // depending on hardware capabilities
-        if (pci_set_dma_mask(adapter->pdev, 0xFFFFFFFF) != 0) {
+        if (pci_set_dma_mask(adapter->pdev, DMA_32BIT_MASK) != 0) {
 
                 con_log(CL_ANN, (KERN_WARNING
                         "megaraid: pci_set_dma_mask failed:%d\n", __LINE__));
@@ -1031,7 +936,7 @@ megaraid_init_mbox(adapter_t *adapter)
 
         // Set the DMA mask to 64-bit. All supported controllers as capable of
         // DMA in this range
-        if (pci_set_dma_mask(adapter->pdev, 0xFFFFFFFFFFFFFFFFULL) != 0) {
+        if (pci_set_dma_mask(adapter->pdev, DMA_64BIT_MASK) != 0) {
 
                 con_log(CL_ANN, (KERN_WARNING
                         "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 @@
 #include "megaraid_ioctl.h"
 
 
-#define MEGARAID_VERSION        "2.20.4.5"
-#define MEGARAID_EXT_VERSION    "(Release Date: Thu Feb 03 12:27:22 EST 2005)"
+#define MEGARAID_VERSION        "2.20.4.6"
+#define MEGARAID_EXT_VERSION    "(Release Date: Mon Mar 07 12:27:22 EST 2005)"
 
 
 /*
@@ -37,8 +37,7 @@
 #define PCI_DEVICE_ID_PERC4_DC                          0x1960
 #define PCI_SUBSYS_ID_PERC4_DC                          0x0518
 
-#define PCI_DEVICE_ID_PERC4_QC                          0x0407
-#define PCI_SUBSYS_ID_PERC4_QC                          0x0531
+#define PCI_DEVICE_ID_VERDE                             0x0407
 
 #define PCI_DEVICE_ID_PERC4_DI_EVERGLADES               0x000F
 #define PCI_SUBSYS_ID_PERC4_DI_EVERGLADES               0x014A
@@ -58,11 +57,7 @@
 #define PCI_DEVICE_ID_PERC4E_DI_GUADALUPE               0x0013
 #define PCI_SUBSYS_ID_PERC4E_DI_GUADALUPE               0x0170
 
-#define PCI_DEVICE_ID_PERC4E_DC_320_2E                  0x0408
-#define PCI_SUBSYS_ID_PERC4E_DC_320_2E                  0x0002
-
-#define PCI_DEVICE_ID_PERC4E_SC_320_1E                  0x0408
-#define PCI_SUBSYS_ID_PERC4E_SC_320_1E                  0x0001
+#define PCI_DEVICE_ID_DOBSON                            0x0408
 
 #define PCI_DEVICE_ID_MEGARAID_SCSI_320_0               0x1960
 #define PCI_SUBSYS_ID_MEGARAID_SCSI_320_0               0xA520
@@ -73,21 +68,6 @@
 #define PCI_DEVICE_ID_MEGARAID_SCSI_320_2               0x1960
 #define PCI_SUBSYS_ID_MEGARAID_SCSI_320_2               0x0518
 
-#define PCI_DEVICE_ID_MEGARAID_SCSI_320_0x              0x0407
-#define PCI_SUBSYS_ID_MEGARAID_SCSI_320_0x              0x0530
-
-#define PCI_DEVICE_ID_MEGARAID_SCSI_320_2x              0x0407
-#define PCI_SUBSYS_ID_MEGARAID_SCSI_320_2x              0x0532
-
-#define PCI_DEVICE_ID_MEGARAID_SCSI_320_4x              0x0407
-#define PCI_SUBSYS_ID_MEGARAID_SCSI_320_4x              0x0531
-
-#define PCI_DEVICE_ID_MEGARAID_SCSI_320_1E              0x0408
-#define PCI_SUBSYS_ID_MEGARAID_SCSI_320_1E              0x0001
-
-#define PCI_DEVICE_ID_MEGARAID_SCSI_320_2E              0x0408
-#define PCI_SUBSYS_ID_MEGARAID_SCSI_320_2E              0x0002
-
 #define PCI_DEVICE_ID_MEGARAID_I4_133_RAID              0x1960
 #define PCI_SUBSYS_ID_MEGARAID_I4_133_RAID              0x0522
 
@@ -97,52 +77,18 @@
 #define PCI_DEVICE_ID_MEGARAID_SATA_150_6               0x1960
 #define PCI_SUBSYS_ID_MEGARAID_SATA_150_6               0x0523
 
-#define PCI_DEVICE_ID_MEGARAID_SATA_300_4x              0x0409
-#define PCI_SUBSYS_ID_MEGARAID_SATA_300_4x              0x3004
-
-#define PCI_DEVICE_ID_MEGARAID_SATA_300_8x              0x0409
-#define PCI_SUBSYS_ID_MEGARAID_SATA_300_8x              0x3008
-
-#define PCI_DEVICE_ID_INTEL_RAID_SRCU42X                0x0407
-#define PCI_SUBSYS_ID_INTEL_RAID_SRCU42X                0x0532
+#define PCI_DEVICE_ID_LINDSAY                           0x0409
 
 #define PCI_DEVICE_ID_INTEL_RAID_SRCS16                 0x1960
 #define PCI_SUBSYS_ID_INTEL_RAID_SRCS16                 0x0523
 
-#define PCI_DEVICE_ID_INTEL_RAID_SRCU42E                0x0408
-#define PCI_SUBSYS_ID_INTEL_RAID_SRCU42E                0x0002
-
-#define PCI_DEVICE_ID_INTEL_RAID_SRCZCRX                0x0407
-#define PCI_SUBSYS_ID_INTEL_RAID_SRCZCRX                0x0530
-
-#define PCI_DEVICE_ID_INTEL_RAID_SRCS28X                0x0409
-#define PCI_SUBSYS_ID_INTEL_RAID_SRCS28X                0x3008
-
-#define PCI_DEVICE_ID_INTEL_RAID_SROMBU42E_ALIEF        0x0408
-#define PCI_SUBSYS_ID_INTEL_RAID_SROMBU42E_ALIEF        0x3431
-
-#define PCI_DEVICE_ID_INTEL_RAID_SROMBU42E_HARWICH      0x0408
-#define PCI_SUBSYS_ID_INTEL_RAID_SROMBU42E_HARWICH      0x3499
-
 #define PCI_DEVICE_ID_INTEL_RAID_SRCU41L_LAKE_SHETEK    0x1960
 #define PCI_SUBSYS_ID_INTEL_RAID_SRCU41L_LAKE_SHETEK    0x0520
 
-#define PCI_DEVICE_ID_FSC_MEGARAID_PCI_EXPRESS_ROMB     0x0408
-#define PCI_SUBSYS_ID_FSC_MEGARAID_PCI_EXPRESS_ROMB     0x1065
-
-#define PCI_DEVICE_ID_MEGARAID_ACER_ROMB_2E             0x0408
-#define PCI_SUBSYS_ID_MEGARAID_ACER_ROMB_2E             0x004D
-
 #define PCI_SUBSYS_ID_PERC3_QC                          0x0471
 #define PCI_SUBSYS_ID_PERC3_DC                          0x0493
 #define PCI_SUBSYS_ID_PERC3_SC                          0x0475
 
-#define PCI_DEVICE_ID_MEGARAID_NEC_ROMB_2E              0x0408
-#define PCI_SUBSYS_ID_MEGARAID_NEC_ROMB_2E              0x8287
-
-#ifndef PCI_SUBSYS_ID_FSC
-#define PCI_SUBSYS_ID_FSC                               0x1734
-#endif
 
 #define MBOX_MAX_SCSI_CMDS      128     // number of cmds reserved for kernel
 #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 @@
  *         2 of the License, or (at your option) any later version.
  *
  * FILE         : megaraid_mm.c
- * Version      : v2.20.2.5 (Jan 21 2005)
+ * Version      : v2.20.2.6 (Mar 7 2005)
  *
  * Common management module
  */
 
 #include "megaraid_mm.h"
-#include <linux/smp_lock.h>
 
 
 // Entry points for char node driver
@@ -61,7 +60,7 @@ EXPORT_SYMBOL(mraid_mm_unregister_adp);
 EXPORT_SYMBOL(mraid_mm_adapter_app_handle);
 
 static int majorno;
-static uint32_t drvr_ver        = 0x02200201;
+static uint32_t drvr_ver        = 0x02200206;
 
 static int adapters_count_g;
 static struct list_head adapters_list_g;
@@ -1231,9 +1230,9 @@ mraid_mm_compat_ioctl(struct file *filep, unsigned int cmd,
                       unsigned long arg)
 {
         int err;
-        lock_kernel();
+
         err = mraid_mm_ioctl(NULL, filep, cmd, arg);
-        unlock_kernel();
+
         return err;
 }
 #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 @@
 #include "megaraid_ioctl.h"
 
 
-#define LSI_COMMON_MOD_VERSION  "2.20.2.5"
+#define LSI_COMMON_MOD_VERSION  "2.20.2.6"
 #define LSI_COMMON_MOD_EXT_VERSION      \
-                "(Release Date: Fri Jan 21 00:01:03 EST 2005)"
+                "(Release Date: Mon Mar 7 00:01:03 EST 2005)"
 
 
 #define LSI_DBGLVL                      dbglevel