1 files changed, 46 insertions, 114 deletions

diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
index 138fa4815833..cbe430246276 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>
@@ -124,7 +124,7 @@ static irqreturn_t megaraid_isr(int, void *, struct pt_regs *);
 static void megaraid_mbox_dpc(unsigned long);
 
 static ssize_t megaraid_sysfs_show_app_hndl(struct class_device *, char *);
-static ssize_t megaraid_sysfs_show_ldnum(struct device *, char *);
+static ssize_t megaraid_sysfs_show_ldnum(struct device *, struct device_attribute *attr, char *);
 
 static int megaraid_cmm_register(adapter_t *);
 static int megaraid_cmm_unregister(adapter_t *);
@@ -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"));
@@ -2661,7 +2566,7 @@ megaraid_mbox_dpc(unsigned long devp)
  * aborted. All the commands issued to the F/W must complete.
  **/
 static int
-megaraid_abort_handler(struct scsi_cmnd *scp)
+__megaraid_abort_handler(struct scsi_cmnd *scp)
 {
         adapter_t               *adapter;
         mraid_device_t          *raid_dev;
@@ -2794,6 +2699,21 @@ megaraid_abort_handler(struct scsi_cmnd *scp)
         return FAILED;
 }
 
+static int
+megaraid_abort_handler(struct scsi_cmnd *scp)
+{
+        adapter_t       *adapter;
+        int rc;
+
+        adapter         = SCP2ADAPTER(scp);
+
+        spin_lock_irq(adapter->host_lock);
+        rc = __megaraid_abort_handler(scp);
+        spin_unlock_irq(adapter->host_lock);
+
+        return rc;
+}
+
 
 /**
  * megaraid_reset_handler - device reset hadler for mailbox based driver
@@ -2806,7 +2726,7 @@ megaraid_abort_handler(struct scsi_cmnd *scp)
  * host
  **/
 static int
-megaraid_reset_handler(struct scsi_cmnd *scp)
+__megaraid_reset_handler(struct scsi_cmnd *scp)
 {
         adapter_t       *adapter;
         scb_t           *scb;
@@ -2927,6 +2847,18 @@ megaraid_reset_handler(struct scsi_cmnd *scp)
         return rval;
 }
 
+static int
+megaraid_reset_handler(struct scsi_cmnd *cmd)
+{
+        int rc;
+
+        spin_lock_irq(cmd->device->host->host_lock);
+        rc = __megaraid_reset_handler(cmd);
+        spin_unlock_irq(cmd->device->host->host_lock);
+
+        return rc;
+}
+
 
 /*
  * START: internal commands library
@@ -4213,7 +4145,7 @@ megaraid_sysfs_show_app_hndl(struct class_device *cdev, char *buf)
  * @param buf   : buffer to send data to
  */
 static ssize_t
-megaraid_sysfs_show_ldnum(struct device *dev, char *buf)
+megaraid_sysfs_show_ldnum(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct scsi_device *sdev = to_scsi_device(dev);
         adapter_t       *adapter = (adapter_t *)SCSIHOST2ADAP(sdev->host);