3 files changed, 57 insertions, 78 deletions

diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index d7235f42cf5f..bfd0e64964ac 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -859,44 +859,31 @@ static int setinqserial(struct aac_dev *dev, void *data, int cid)
                         le32_to_cpu(dev->adapter_info.serial[0]), cid);
 }
 
-static void set_sense(u8 *sense_buf, u8 sense_key, u8 sense_code,
-                      u8 a_sense_code, u8 incorrect_length,
-                      u8 bit_pointer, u16 field_pointer,
-                      u32 residue)
+static inline void set_sense(struct sense_data *sense_data, u8 sense_key,
+        u8 sense_code, u8 a_sense_code, u8 bit_pointer, u16 field_pointer)
 {
-        sense_buf[0] = 0xF0;    /* Sense data valid, err code 70h (current error) */
+        u8 *sense_buf = (u8 *)sense_data;
+        /* Sense data valid, err code 70h */
+        sense_buf[0] = 0x70; /* No info field */
         sense_buf[1] = 0;       /* Segment number, always zero */
 
-        if (incorrect_length) {
-                sense_buf[2] = sense_key | 0x20;/* Set ILI bit | sense key */
-                sense_buf[3] = BYTE3(residue);
-                sense_buf[4] = BYTE2(residue);
-                sense_buf[5] = BYTE1(residue);
-                sense_buf[6] = BYTE0(residue);
-        } else
-                sense_buf[2] = sense_key;       /* Sense key */
-
-        if (sense_key == ILLEGAL_REQUEST)
-                sense_buf[7] = 10;      /* Additional sense length */
-        else
-                sense_buf[7] = 6;       /* Additional sense length */
+        sense_buf[2] = sense_key;       /* Sense key */
 
         sense_buf[12] = sense_code;     /* Additional sense code */
         sense_buf[13] = a_sense_code;   /* Additional sense code qualifier */
+
         if (sense_key == ILLEGAL_REQUEST) {
-                sense_buf[15] = 0;
+                sense_buf[7] = 10;      /* Additional sense length */
 
-                if (sense_code == SENCODE_INVALID_PARAM_FIELD)
-                        sense_buf[15] = 0x80;/* Std sense key specific field */
+                sense_buf[15] = bit_pointer;
                 /* Illegal parameter is in the parameter block */
-
                 if (sense_code == SENCODE_INVALID_CDB_FIELD)
-                        sense_buf[15] = 0xc0;/* Std sense key specific field */
+                        sense_buf[15] |= 0xc0;/* Std sense key specific field */
                 /* Illegal parameter is in the CDB block */
-                sense_buf[15] |= bit_pointer;
                 sense_buf[16] = field_pointer >> 8;     /* MSB */
                 sense_buf[17] = field_pointer;          /* LSB */
-        }
+        } else
+                sense_buf[7] = 6;       /* Additional sense length */
 }
 
 static int aac_bounds_32(struct aac_dev * dev, struct scsi_cmnd * cmd, u64 lba)
@@ -906,11 +893,9 @@ static int aac_bounds_32(struct aac_dev * dev, struct scsi_cmnd * cmd, u64 lba)
                 dprintk((KERN_DEBUG "aacraid: Illegal lba\n"));
                 cmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 |
                         SAM_STAT_CHECK_CONDITION;
-                set_sense((u8 *) &dev->fsa_dev[cid].sense_data,
-                            HARDWARE_ERROR,
-                            SENCODE_INTERNAL_TARGET_FAILURE,
-                            ASENCODE_INTERNAL_TARGET_FAILURE, 0, 0,
-                            0, 0);
+                set_sense(&dev->fsa_dev[cid].sense_data,
+                  HARDWARE_ERROR, SENCODE_INTERNAL_TARGET_FAILURE,
+                  ASENCODE_INTERNAL_TARGET_FAILURE, 0, 0);
                 memcpy(cmd->sense_buffer, &dev->fsa_dev[cid].sense_data,
                        min_t(size_t, sizeof(dev->fsa_dev[cid].sense_data),
                              SCSI_SENSE_BUFFERSIZE));
@@ -1520,11 +1505,9 @@ static void io_callback(void *context, struct fib * fibptr)
                   le32_to_cpu(readreply->status));
 #endif
                 scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_CHECK_CONDITION;
-                set_sense((u8 *) &dev->fsa_dev[cid].sense_data,
-                                    HARDWARE_ERROR,
-                                    SENCODE_INTERNAL_TARGET_FAILURE,
-                                    ASENCODE_INTERNAL_TARGET_FAILURE, 0, 0,
-                                    0, 0);
+                set_sense(&dev->fsa_dev[cid].sense_data,
+                  HARDWARE_ERROR, SENCODE_INTERNAL_TARGET_FAILURE,
+                  ASENCODE_INTERNAL_TARGET_FAILURE, 0, 0);
                 memcpy(scsicmd->sense_buffer, &dev->fsa_dev[cid].sense_data,
                        min_t(size_t, sizeof(dev->fsa_dev[cid].sense_data),
                              SCSI_SENSE_BUFFERSIZE));
@@ -1733,11 +1716,9 @@ static void synchronize_callback(void *context, struct fib *fibptr)
                      le32_to_cpu(synchronizereply->status));
                 cmd->result = DID_OK << 16 |
                         COMMAND_COMPLETE << 8 | SAM_STAT_CHECK_CONDITION;
-                set_sense((u8 *)&dev->fsa_dev[cid].sense_data,
-                                    HARDWARE_ERROR,
-                                    SENCODE_INTERNAL_TARGET_FAILURE,
-                                    ASENCODE_INTERNAL_TARGET_FAILURE, 0, 0,
-                                    0, 0);
+                set_sense(&dev->fsa_dev[cid].sense_data,
+                  HARDWARE_ERROR, SENCODE_INTERNAL_TARGET_FAILURE,
+                  ASENCODE_INTERNAL_TARGET_FAILURE, 0, 0);
                 memcpy(cmd->sense_buffer, &dev->fsa_dev[cid].sense_data,
                        min_t(size_t, sizeof(dev->fsa_dev[cid].sense_data),
                              SCSI_SENSE_BUFFERSIZE));
@@ -1945,10 +1926,9 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
         {
                 dprintk((KERN_WARNING "Only INQUIRY & TUR command supported for controller, rcvd = 0x%x.\n", scsicmd->cmnd[0]));
                 scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_CHECK_CONDITION;
-                set_sense((u8 *) &dev->fsa_dev[cid].sense_data,
-                            ILLEGAL_REQUEST,
-                            SENCODE_INVALID_COMMAND,
-                            ASENCODE_INVALID_COMMAND, 0, 0, 0, 0);
+                set_sense(&dev->fsa_dev[cid].sense_data,
+                  ILLEGAL_REQUEST, SENCODE_INVALID_COMMAND,
+                  ASENCODE_INVALID_COMMAND, 0, 0);
                 memcpy(scsicmd->sense_buffer, &dev->fsa_dev[cid].sense_data,
                        min_t(size_t, sizeof(dev->fsa_dev[cid].sense_data),
                              SCSI_SENSE_BUFFERSIZE));
@@ -1995,10 +1975,9 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                                 scsicmd->result = DID_OK << 16 |
                                   COMMAND_COMPLETE << 8 |
                                   SAM_STAT_CHECK_CONDITION;
-                                set_sense((u8 *) &dev->fsa_dev[cid].sense_data,
-                                  ILLEGAL_REQUEST,
-                                  SENCODE_INVALID_CDB_FIELD,
-                                  ASENCODE_NO_SENSE, 0, 7, 2, 0);
+                                set_sense(&dev->fsa_dev[cid].sense_data,
+                                  ILLEGAL_REQUEST, SENCODE_INVALID_CDB_FIELD,
+                                  ASENCODE_NO_SENSE, 7, 2);
                                 memcpy(scsicmd->sense_buffer,
                                   &dev->fsa_dev[cid].sense_data,
                                   min_t(size_t,
@@ -2254,9 +2233,9 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                          */
                         dprintk((KERN_WARNING "Unhandled SCSI Command: 0x%x.\n", scsicmd->cmnd[0]));
                         scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_CHECK_CONDITION;
-                        set_sense((u8 *) &dev->fsa_dev[cid].sense_data,
-                                ILLEGAL_REQUEST, SENCODE_INVALID_COMMAND,
-                                ASENCODE_INVALID_COMMAND, 0, 0, 0, 0);
+                        set_sense(&dev->fsa_dev[cid].sense_data,
+                          ILLEGAL_REQUEST, SENCODE_INVALID_COMMAND,
+                          ASENCODE_INVALID_COMMAND, 0, 0);
                         memcpy(scsicmd->sense_buffer, &dev->fsa_dev[cid].sense_data,
                                 min_t(size_t,
                                       sizeof(dev->fsa_dev[cid].sense_data),
diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c
index f8afa358b6b6..abef05146d75 100644
--- a/drivers/scsi/aacraid/commctrl.c
+++ b/drivers/scsi/aacraid/commctrl.c
@@ -243,6 +243,7 @@ static int next_getadapter_fib(struct aac_dev * dev, void __user *arg)
          *      Search the list of AdapterFibContext addresses on the adapter
          *      to be sure this is a valid address
          */
+        spin_lock_irqsave(&dev->fib_lock, flags);
         entry = dev->fib_list.next;
         fibctx = NULL;
 
@@ -251,24 +252,25 @@ static int next_getadapter_fib(struct aac_dev * dev, void __user *arg)
                 /*
                  *      Extract the AdapterFibContext from the Input parameters.
                  */
-                if (fibctx->unique == f.fibctx) {   /* We found a winner */
+                if (fibctx->unique == f.fibctx) { /* We found a winner */
                         break;
                 }
                 entry = entry->next;
                 fibctx = NULL;
         }
         if (!fibctx) {
+                spin_unlock_irqrestore(&dev->fib_lock, flags);
                 dprintk ((KERN_INFO "Fib Context not found\n"));
                 return -EINVAL;
         }
 
         if((fibctx->type != FSAFS_NTC_GET_ADAPTER_FIB_CONTEXT) ||
                  (fibctx->size != sizeof(struct aac_fib_context))) {
+                spin_unlock_irqrestore(&dev->fib_lock, flags);
                 dprintk ((KERN_INFO "Fib Context corrupt?\n"));
                 return -EINVAL;
         }
         status = 0;
-        spin_lock_irqsave(&dev->fib_lock, flags);
         /*
          *      If there are no fibs to send back, then either wait or return
          *      -EAGAIN
@@ -414,8 +416,8 @@ static int close_getadapter_fib(struct aac_dev * dev, void __user *arg)
  *      @arg: ioctl arguments
  *
  *      This routine returns the driver version.
- *      Under Linux, there have been no version incompatibilities, so this is
- *      simple!
+ *      Under Linux, there have been no version incompatibilities, so this is
+ *      simple!
  */
 
 static int check_revision(struct aac_dev *dev, void __user *arg)
@@ -463,7 +465,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
         u32 data_dir;
         void __user *sg_user[32];
         void *sg_list[32];
-        u32   sg_indx = 0;
+        u32 sg_indx = 0;
         u32 byte_count = 0;
         u32 actual_fibsize64, actual_fibsize = 0;
         int i;
@@ -517,11 +519,11 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
         // Fix up srb for endian and force some values
 
         srbcmd->function = cpu_to_le32(SRBF_ExecuteScsi);       // Force this
-        srbcmd->channel  = cpu_to_le32(user_srbcmd->channel);
+        srbcmd->channel  = cpu_to_le32(user_srbcmd->channel);
         srbcmd->id       = cpu_to_le32(user_srbcmd->id);
-        srbcmd->lun      = cpu_to_le32(user_srbcmd->lun);
-        srbcmd->timeout  = cpu_to_le32(user_srbcmd->timeout);
-        srbcmd->flags    = cpu_to_le32(flags);
+        srbcmd->lun      = cpu_to_le32(user_srbcmd->lun);
+        srbcmd->timeout  = cpu_to_le32(user_srbcmd->timeout);
+        srbcmd->flags    = cpu_to_le32(flags);
         srbcmd->retry_limit = 0; // Obsolete parameter
         srbcmd->cdb_size = cpu_to_le32(user_srbcmd->cdb_size);
         memcpy(srbcmd->cdb, user_srbcmd->cdb, sizeof(srbcmd->cdb));
@@ -786,9 +788,9 @@ static int aac_get_pci_info(struct aac_dev* dev, void __user *arg)
         pci_info.bus = dev->pdev->bus->number;
         pci_info.slot = PCI_SLOT(dev->pdev->devfn);
 
-       if (copy_to_user(arg, &pci_info, sizeof(struct aac_pci_info))) {
-               dprintk((KERN_DEBUG "aacraid: Could not copy pci info\n"));
-               return -EFAULT;
+        if (copy_to_user(arg, &pci_info, sizeof(struct aac_pci_info))) {
+                dprintk((KERN_DEBUG "aacraid: Could not copy pci info\n"));
+                return -EFAULT;
         }
         return 0;
 }
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index fb0886140dd7..e80d2a0c46af 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -1130,31 +1130,29 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
         if (error < 0)
                 goto out_deinit;
 
-        if (!(aac->adapter_info.options & AAC_OPT_NEW_COMM)) {
-                error = pci_set_dma_max_seg_size(pdev, 65536);
-                if (error)
-                        goto out_deinit;
-        }
-
         /*
          * Lets override negotiations and drop the maximum SG limit to 34
          */
         if ((aac_drivers[index].quirks & AAC_QUIRK_34SG) &&
-                        (aac->scsi_host_ptr->sg_tablesize > 34)) {
-                aac->scsi_host_ptr->sg_tablesize = 34;
-                aac->scsi_host_ptr->max_sectors
-                  = (aac->scsi_host_ptr->sg_tablesize * 8) + 112;
+                        (shost->sg_tablesize > 34)) {
+                shost->sg_tablesize = 34;
+                shost->max_sectors = (shost->sg_tablesize * 8) + 112;
         }
 
         if ((aac_drivers[index].quirks & AAC_QUIRK_17SG) &&
-                        (aac->scsi_host_ptr->sg_tablesize > 17)) {
-                aac->scsi_host_ptr->sg_tablesize = 17;
-                aac->scsi_host_ptr->max_sectors
-                  = (aac->scsi_host_ptr->sg_tablesize * 8) + 112;
+                        (shost->sg_tablesize > 17)) {
+                shost->sg_tablesize = 17;
+                shost->max_sectors = (shost->sg_tablesize * 8) + 112;
         }
 
+        error = pci_set_dma_max_seg_size(pdev,
+                (aac->adapter_info.options & AAC_OPT_NEW_COMM) ?
+                        (shost->max_sectors << 9) : 65536);
+        if (error)
+                goto out_deinit;
+
         /*
-         * Firware printf works only with older firmware.
+         * Firmware printf works only with older firmware.
          */
         if (aac_drivers[index].quirks & AAC_QUIRK_34SG)
                 aac->printf_enabled = 1;