1 files changed, 215 insertions, 185 deletions

diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index a77ab8d693d..d7235f42cf5 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -31,9 +31,9 @@
 #include <linux/slab.h>
 #include <linux/completion.h>
 #include <linux/blkdev.h>
-#include <linux/dma-mapping.h>
 #include <asm/semaphore.h>
 #include <asm/uaccess.h>
+#include <linux/highmem.h> /* For flush_kernel_dcache_page */
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
@@ -56,54 +56,54 @@
 /*
  *      Sense codes
  */
- 
-#define SENCODE_NO_SENSE                        0x00
-#define SENCODE_END_OF_DATA                     0x00
-#define SENCODE_BECOMING_READY                  0x04
-#define SENCODE_INIT_CMD_REQUIRED               0x04
-#define SENCODE_PARAM_LIST_LENGTH_ERROR         0x1A
-#define SENCODE_INVALID_COMMAND                 0x20
-#define SENCODE_LBA_OUT_OF_RANGE                0x21
-#define SENCODE_INVALID_CDB_FIELD               0x24
-#define SENCODE_LUN_NOT_SUPPORTED               0x25
-#define SENCODE_INVALID_PARAM_FIELD             0x26
-#define SENCODE_PARAM_NOT_SUPPORTED             0x26
-#define SENCODE_PARAM_VALUE_INVALID             0x26
-#define SENCODE_RESET_OCCURRED                  0x29
-#define SENCODE_LUN_NOT_SELF_CONFIGURED_YET     0x3E
-#define SENCODE_INQUIRY_DATA_CHANGED            0x3F
-#define SENCODE_SAVING_PARAMS_NOT_SUPPORTED     0x39
-#define SENCODE_DIAGNOSTIC_FAILURE              0x40
-#define SENCODE_INTERNAL_TARGET_FAILURE         0x44
-#define SENCODE_INVALID_MESSAGE_ERROR           0x49
-#define SENCODE_LUN_FAILED_SELF_CONFIG          0x4c
-#define SENCODE_OVERLAPPED_COMMAND              0x4E
+
+#define SENCODE_NO_SENSE                        0x00
+#define SENCODE_END_OF_DATA                     0x00
+#define SENCODE_BECOMING_READY                  0x04
+#define SENCODE_INIT_CMD_REQUIRED               0x04
+#define SENCODE_PARAM_LIST_LENGTH_ERROR         0x1A
+#define SENCODE_INVALID_COMMAND                 0x20
+#define SENCODE_LBA_OUT_OF_RANGE                0x21
+#define SENCODE_INVALID_CDB_FIELD               0x24
+#define SENCODE_LUN_NOT_SUPPORTED               0x25
+#define SENCODE_INVALID_PARAM_FIELD             0x26
+#define SENCODE_PARAM_NOT_SUPPORTED             0x26
+#define SENCODE_PARAM_VALUE_INVALID             0x26
+#define SENCODE_RESET_OCCURRED                  0x29
+#define SENCODE_LUN_NOT_SELF_CONFIGURED_YET     0x3E
+#define SENCODE_INQUIRY_DATA_CHANGED            0x3F
+#define SENCODE_SAVING_PARAMS_NOT_SUPPORTED     0x39
+#define SENCODE_DIAGNOSTIC_FAILURE              0x40
+#define SENCODE_INTERNAL_TARGET_FAILURE         0x44
+#define SENCODE_INVALID_MESSAGE_ERROR           0x49
+#define SENCODE_LUN_FAILED_SELF_CONFIG          0x4c
+#define SENCODE_OVERLAPPED_COMMAND              0x4E
 
 /*
  *      Additional sense codes
  */
- 
-#define ASENCODE_NO_SENSE                       0x00
-#define ASENCODE_END_OF_DATA                    0x05
-#define ASENCODE_BECOMING_READY                 0x01
-#define ASENCODE_INIT_CMD_REQUIRED              0x02
-#define ASENCODE_PARAM_LIST_LENGTH_ERROR        0x00
-#define ASENCODE_INVALID_COMMAND                0x00
-#define ASENCODE_LBA_OUT_OF_RANGE               0x00
-#define ASENCODE_INVALID_CDB_FIELD              0x00
-#define ASENCODE_LUN_NOT_SUPPORTED              0x00
-#define ASENCODE_INVALID_PARAM_FIELD            0x00
-#define ASENCODE_PARAM_NOT_SUPPORTED            0x01
-#define ASENCODE_PARAM_VALUE_INVALID            0x02
-#define ASENCODE_RESET_OCCURRED                 0x00
-#define ASENCODE_LUN_NOT_SELF_CONFIGURED_YET    0x00
-#define ASENCODE_INQUIRY_DATA_CHANGED           0x03
-#define ASENCODE_SAVING_PARAMS_NOT_SUPPORTED    0x00
-#define ASENCODE_DIAGNOSTIC_FAILURE             0x80
-#define ASENCODE_INTERNAL_TARGET_FAILURE        0x00
-#define ASENCODE_INVALID_MESSAGE_ERROR          0x00
-#define ASENCODE_LUN_FAILED_SELF_CONFIG         0x00
-#define ASENCODE_OVERLAPPED_COMMAND             0x00
+
+#define ASENCODE_NO_SENSE                       0x00
+#define ASENCODE_END_OF_DATA                    0x05
+#define ASENCODE_BECOMING_READY                 0x01
+#define ASENCODE_INIT_CMD_REQUIRED              0x02
+#define ASENCODE_PARAM_LIST_LENGTH_ERROR        0x00
+#define ASENCODE_INVALID_COMMAND                0x00
+#define ASENCODE_LBA_OUT_OF_RANGE               0x00
+#define ASENCODE_INVALID_CDB_FIELD              0x00
+#define ASENCODE_LUN_NOT_SUPPORTED              0x00
+#define ASENCODE_INVALID_PARAM_FIELD            0x00
+#define ASENCODE_PARAM_NOT_SUPPORTED            0x01
+#define ASENCODE_PARAM_VALUE_INVALID            0x02
+#define ASENCODE_RESET_OCCURRED                 0x00
+#define ASENCODE_LUN_NOT_SELF_CONFIGURED_YET    0x00
+#define ASENCODE_INQUIRY_DATA_CHANGED           0x03
+#define ASENCODE_SAVING_PARAMS_NOT_SUPPORTED    0x00
+#define ASENCODE_DIAGNOSTIC_FAILURE             0x80
+#define ASENCODE_INTERNAL_TARGET_FAILURE        0x00
+#define ASENCODE_INVALID_MESSAGE_ERROR          0x00
+#define ASENCODE_LUN_FAILED_SELF_CONFIG         0x00
+#define ASENCODE_OVERLAPPED_COMMAND             0x00
 
 #define BYTE0(x) (unsigned char)(x)
 #define BYTE1(x) (unsigned char)((x) >> 8)
@@ -115,8 +115,8 @@
  *----------------------------------------------------------------------------*/
 /* SCSI inquiry data */
 struct inquiry_data {
-        u8 inqd_pdt;    /* Peripheral qualifier | Peripheral Device Type  */
-        u8 inqd_dtq;    /* RMB | Device Type Qualifier  */
+        u8 inqd_pdt;    /* Peripheral qualifier | Peripheral Device Type */
+        u8 inqd_dtq;    /* RMB | Device Type Qualifier */
         u8 inqd_ver;    /* ISO version | ECMA version | ANSI-approved version */
         u8 inqd_rdf;    /* AENC | TrmIOP | Response data format */
         u8 inqd_len;    /* Additional length (n-4) */
@@ -130,7 +130,7 @@ struct inquiry_data {
 /*
  *              M O D U L E   G L O B A L S
  */
- 
+
 static unsigned long aac_build_sg(struct scsi_cmnd* scsicmd, struct sgmap* sgmap);
 static unsigned long aac_build_sg64(struct scsi_cmnd* scsicmd, struct sgmap64* psg);
 static unsigned long aac_build_sgraw(struct scsi_cmnd* scsicmd, struct sgmapraw* psg);
@@ -141,9 +141,10 @@ static char *aac_get_status_string(u32 status);
 
 /*
  *      Non dasd selection is handled entirely in aachba now
- */     
- 
+ */
+
 static int nondasd = -1;
+static int aac_cache = 0;
 static int dacmode = -1;
 
 int aac_commit = -1;
@@ -152,6 +153,8 @@ int aif_timeout = 120;
 
 module_param(nondasd, int, S_IRUGO|S_IWUSR);
 MODULE_PARM_DESC(nondasd, "Control scanning of hba for nondasd devices. 0=off, 1=on");
+module_param_named(cache, aac_cache, int, S_IRUGO|S_IWUSR);
+MODULE_PARM_DESC(cache, "Disable Queue Flush commands:\n\tbit 0 - Disable FUA in WRITE SCSI commands\n\tbit 1 - Disable SYNCHRONIZE_CACHE SCSI command\n\tbit 2 - Disable only if Battery not protecting Cache");
 module_param(dacmode, int, S_IRUGO|S_IWUSR);
 MODULE_PARM_DESC(dacmode, "Control whether dma addressing is using 64 bit DAC. 0=off, 1=on");
 module_param_named(commit, aac_commit, int, S_IRUGO|S_IWUSR);
@@ -179,7 +182,7 @@ MODULE_PARM_DESC(check_interval, "Interval in seconds between adapter health che
 
 int aac_check_reset = 1;
 module_param_named(check_reset, aac_check_reset, int, S_IRUGO|S_IWUSR);
-MODULE_PARM_DESC(aac_check_reset, "If adapter fails health check, reset the adapter.");
+MODULE_PARM_DESC(aac_check_reset, "If adapter fails health check, reset the adapter. a value of -1 forces the reset to adapters programmed to ignore it.");
 
 int expose_physicals = -1;
 module_param(expose_physicals, int, S_IRUGO|S_IWUSR);
@@ -193,12 +196,12 @@ static inline int aac_valid_context(struct scsi_cmnd *scsicmd,
                 struct fib *fibptr) {
         struct scsi_device *device;
 
-        if (unlikely(!scsicmd || !scsicmd->scsi_done )) {
+        if (unlikely(!scsicmd || !scsicmd->scsi_done)) {
                 dprintk((KERN_WARNING "aac_valid_context: scsi command corrupt\n"));
-                aac_fib_complete(fibptr);
-                aac_fib_free(fibptr);
-                return 0;
-        }
+                aac_fib_complete(fibptr);
+                aac_fib_free(fibptr);
+                return 0;
+        }
         scsicmd->SCp.phase = AAC_OWNER_MIDLEVEL;
         device = scsicmd->device;
         if (unlikely(!device || !scsi_device_online(device))) {
@@ -240,7 +243,7 @@ int aac_get_config_status(struct aac_dev *dev, int commit_flag)
                             FsaNormal,
                             1, 1,
                             NULL, NULL);
-        if (status < 0 ) {
+        if (status < 0) {
                 printk(KERN_WARNING "aac_get_config_status: SendFIB failed.\n");
         } else {
                 struct aac_get_config_status_resp *reply
@@ -264,10 +267,10 @@ int aac_get_config_status(struct aac_dev *dev, int commit_flag)
                         struct aac_commit_config * dinfo;
                         aac_fib_init(fibptr);
                         dinfo = (struct aac_commit_config *) fib_data(fibptr);
-        
+
                         dinfo->command = cpu_to_le32(VM_ContainerConfig);
                         dinfo->type = cpu_to_le32(CT_COMMIT_CONFIG);
-        
+
                         status = aac_fib_send(ContainerCommand,
                                     fibptr,
                                     sizeof (struct aac_commit_config),
@@ -293,7 +296,7 @@ int aac_get_config_status(struct aac_dev *dev, int commit_flag)
 int aac_get_containers(struct aac_dev *dev)
 {
         struct fsa_dev_info *fsa_dev_ptr;
-        u32 index; 
+        u32 index;
         int status = 0;
         struct fib * fibptr;
         struct aac_get_container_count *dinfo;
@@ -363,6 +366,7 @@ static void aac_internal_transfer(struct scsi_cmnd *scsicmd, void *data, unsigne
         if (buf && transfer_len > 0)
                 memcpy(buf + offset, data, transfer_len);
 
+        flush_kernel_dcache_page(kmap_atomic_to_page(buf - sg->offset));
         kunmap_atomic(buf - sg->offset, KM_IRQ0);
 
 }
@@ -395,7 +399,7 @@ static void get_container_name_callback(void *context, struct fib * fibptr)
                         do {
                                 *dp++ = (*sp) ? *sp++ : ' ';
                         } while (--count > 0);
-                        aac_internal_transfer(scsicmd, d, 
+                        aac_internal_transfer(scsicmd, d,
                           offsetof(struct inquiry_data, inqd_pid), sizeof(d));
                 }
         }
@@ -431,13 +435,13 @@ static int aac_get_container_name(struct scsi_cmnd * scsicmd)
         dinfo->count = cpu_to_le32(sizeof(((struct aac_get_name_resp *)NULL)->data));
 
         status = aac_fib_send(ContainerCommand,
-                  cmd_fibcontext, 
+                  cmd_fibcontext,
                   sizeof (struct aac_get_name),
-                  FsaNormal, 
-                  0, 1, 
-                  (fib_callback) get_container_name_callback, 
+                  FsaNormal,
+                  0, 1,
+                  (fib_callback)get_container_name_callback,
                   (void *) scsicmd);
-        
+
         /*
          *      Check that the command queued to the controller
          */
@@ -445,7 +449,7 @@ static int aac_get_container_name(struct scsi_cmnd * scsicmd)
                 scsicmd->SCp.phase = AAC_OWNER_FIRMWARE;
                 return 0;
         }
-                
+
         printk(KERN_WARNING "aac_get_container_name: aac_fib_send failed with status: %d.\n", status);
         aac_fib_complete(cmd_fibcontext);
         aac_fib_free(cmd_fibcontext);
@@ -652,42 +656,47 @@ struct scsi_inq {
  *      @a:     string to copy from
  *      @b:     string to copy to
  *
- *      Copy a String from one location to another
+ *      Copy a String from one location to another
  *      without copying \0
  */
 
 static void inqstrcpy(char *a, char *b)
 {
 
-        while(*a != (char)0) 
+        while (*a != (char)0)
                 *b++ = *a++;
 }
 
 static char *container_types[] = {
-        "None",
-        "Volume",
-        "Mirror",
-        "Stripe",
-        "RAID5",
-        "SSRW",
-        "SSRO",
-        "Morph",
-        "Legacy",
-        "RAID4",
-        "RAID10",             
-        "RAID00",             
-        "V-MIRRORS",          
-        "PSEUDO R4",          
+        "None",
+        "Volume",
+        "Mirror",
+        "Stripe",
+        "RAID5",
+        "SSRW",
+        "SSRO",
+        "Morph",
+        "Legacy",
+        "RAID4",
+        "RAID10",
+        "RAID00",
+        "V-MIRRORS",
+        "PSEUDO R4",
         "RAID50",
         "RAID5D",
         "RAID5D0",
         "RAID1E",
         "RAID6",
         "RAID60",
-        "Unknown"
+        "Unknown"
 };
 
-
+char * get_container_type(unsigned tindex)
+{
+        if (tindex >= ARRAY_SIZE(container_types))
+                tindex = ARRAY_SIZE(container_types) - 1;
+        return container_types[tindex];
+}
 
 /* Function: setinqstr
  *
@@ -707,16 +716,21 @@ static void setinqstr(struct aac_dev *dev, void *data, int tindex)
 
         if (dev->supplement_adapter_info.AdapterTypeText[0]) {
                 char * cp = dev->supplement_adapter_info.AdapterTypeText;
-                int c = sizeof(str->vid);
-                while (*cp && *cp != ' ' && --c)
-                        ++cp;
-                c = *cp;
-                *cp = '\0';
-                inqstrcpy (dev->supplement_adapter_info.AdapterTypeText,
-                  str->vid); 
-                *cp = c;
-                while (*cp && *cp != ' ')
-                        ++cp;
+                int c;
+                if ((cp[0] == 'A') && (cp[1] == 'O') && (cp[2] == 'C'))
+                        inqstrcpy("SMC", str->vid);
+                else {
+                        c = sizeof(str->vid);
+                        while (*cp && *cp != ' ' && --c)
+                                ++cp;
+                        c = *cp;
+                        *cp = '\0';
+                        inqstrcpy (dev->supplement_adapter_info.AdapterTypeText,
+                                   str->vid);
+                        *cp = c;
+                        while (*cp && *cp != ' ')
+                                ++cp;
+                }
                 while (*cp == ' ')
                         ++cp;
                 /* last six chars reserved for vol type */
@@ -898,9 +912,8 @@ static int aac_bounds_32(struct aac_dev * dev, struct scsi_cmnd * cmd, u64 lba)
                             ASENCODE_INTERNAL_TARGET_FAILURE, 0, 0,
                             0, 0);
                 memcpy(cmd->sense_buffer, &dev->fsa_dev[cid].sense_data,
-                  (sizeof(dev->fsa_dev[cid].sense_data) > sizeof(cmd->sense_buffer))
-                    ? sizeof(cmd->sense_buffer)
-                    : sizeof(dev->fsa_dev[cid].sense_data));
+                       min_t(size_t, sizeof(dev->fsa_dev[cid].sense_data),
+                             SCSI_SENSE_BUFFERSIZE));
                 cmd->scsi_done(cmd);
                 return 1;
         }
@@ -981,7 +994,7 @@ static int aac_read_block(struct fib * fib, struct scsi_cmnd * cmd, u64 lba, u32
         aac_fib_init(fib);
         readcmd = (struct aac_read *) fib_data(fib);
         readcmd->command = cpu_to_le32(VM_CtBlockRead);
-        readcmd->cid = cpu_to_le16(scmd_id(cmd));
+        readcmd->cid = cpu_to_le32(scmd_id(cmd));
         readcmd->block = cpu_to_le32((u32)(lba&0xffffffff));
         readcmd->count = cpu_to_le32(count * 512);
 
@@ -1013,7 +1026,8 @@ static int aac_write_raw_io(struct fib * fib, struct scsi_cmnd * cmd, u64 lba, u
         writecmd->block[1] = cpu_to_le32((u32)((lba&0xffffffff00000000LL)>>32));
         writecmd->count = cpu_to_le32(count<<9);
         writecmd->cid = cpu_to_le16(scmd_id(cmd));
-        writecmd->flags = fua ?
+        writecmd->flags = (fua && ((aac_cache & 5) != 1) &&
+          (((aac_cache & 5) != 5) || !fib->dev->cache_protected)) ?
                 cpu_to_le16(IO_TYPE_WRITE|IO_SUREWRITE) :
                 cpu_to_le16(IO_TYPE_WRITE);
         writecmd->bpTotal = 0;
@@ -1072,7 +1086,7 @@ static int aac_write_block(struct fib * fib, struct scsi_cmnd * cmd, u64 lba, u3
         aac_fib_init(fib);
         writecmd = (struct aac_write *) fib_data(fib);
         writecmd->command = cpu_to_le32(VM_CtBlockWrite);
-        writecmd->cid = cpu_to_le16(scmd_id(cmd));
+        writecmd->cid = cpu_to_le32(scmd_id(cmd));
         writecmd->block = cpu_to_le32((u32)(lba&0xffffffff));
         writecmd->count = cpu_to_le32(count * 512);
         writecmd->sg.count = cpu_to_le32(1);
@@ -1190,6 +1204,15 @@ static int aac_scsi_32(struct fib * fib, struct scsi_cmnd * cmd)
                                   (fib_callback) aac_srb_callback, (void *) cmd);
 }
 
+static int aac_scsi_32_64(struct fib * fib, struct scsi_cmnd * cmd)
+{
+        if ((sizeof(dma_addr_t) > 4) &&
+         (num_physpages > (0xFFFFFFFFULL >> PAGE_SHIFT)) &&
+         (fib->dev->adapter_info.options & AAC_OPT_SGMAP_HOST64))
+                return FAILED;
+        return aac_scsi_32(fib, cmd);
+}
+
 int aac_get_adapter_info(struct aac_dev* dev)
 {
         struct fib* fibptr;
@@ -1207,11 +1230,11 @@ int aac_get_adapter_info(struct aac_dev* dev)
         memset(info,0,sizeof(*info));
 
         rcode = aac_fib_send(RequestAdapterInfo,
-                         fibptr, 
+                         fibptr,
                          sizeof(*info),
-                         FsaNormal, 
+                         FsaNormal,
                          -1, 1, /* First `interrupt' command uses special wait */
-                         NULL, 
+                         NULL,
                          NULL);
 
         if (rcode < 0) {
@@ -1222,29 +1245,29 @@ int aac_get_adapter_info(struct aac_dev* dev)
         memcpy(&dev->adapter_info, info, sizeof(*info));
 
         if (dev->adapter_info.options & AAC_OPT_SUPPLEMENT_ADAPTER_INFO) {
-                struct aac_supplement_adapter_info * info;
+                struct aac_supplement_adapter_info * sinfo;
 
                 aac_fib_init(fibptr);
 
-                info = (struct aac_supplement_adapter_info *) fib_data(fibptr);
+                sinfo = (struct aac_supplement_adapter_info *) fib_data(fibptr);
 
-                memset(info,0,sizeof(*info));
+                memset(sinfo,0,sizeof(*sinfo));
 
                 rcode = aac_fib_send(RequestSupplementAdapterInfo,
                                  fibptr,
-                                 sizeof(*info),
+                                 sizeof(*sinfo),
                                  FsaNormal,
                                  1, 1,
                                  NULL,
                                  NULL);
 
                 if (rcode >= 0)
-                        memcpy(&dev->supplement_adapter_info, info, sizeof(*info));
+                        memcpy(&dev->supplement_adapter_info, sinfo, sizeof(*sinfo));
         }
 
 
-        /* 
-         * GetBusInfo 
+        /*
+         * GetBusInfo
          */
 
         aac_fib_init(fibptr);
@@ -1267,6 +1290,8 @@ int aac_get_adapter_info(struct aac_dev* dev)
                          1, 1,
                          NULL, NULL);
 
+        /* reasoned default */
+        dev->maximum_num_physicals = 16;
         if (rcode >= 0 && le32_to_cpu(bus_info->Status) == ST_OK) {
                 dev->maximum_num_physicals = le32_to_cpu(bus_info->TargetsPerBus);
                 dev->maximum_num_channels = le32_to_cpu(bus_info->BusCount);
@@ -1276,7 +1301,7 @@ int aac_get_adapter_info(struct aac_dev* dev)
                 char buffer[16];
                 tmp = le32_to_cpu(dev->adapter_info.kernelrev);
                 printk(KERN_INFO "%s%d: kernel %d.%d-%d[%d] %.*s\n",
-                        dev->name, 
+                        dev->name,
                         dev->id,
                         tmp>>24,
                         (tmp>>16)&0xff,
@@ -1305,19 +1330,21 @@ int aac_get_adapter_info(struct aac_dev* dev)
                           (int)sizeof(dev->supplement_adapter_info.VpdInfo.Tsid),
                           dev->supplement_adapter_info.VpdInfo.Tsid);
                 }
-                if (!aac_check_reset ||
+                if (!aac_check_reset || ((aac_check_reset != 1) &&
                   (dev->supplement_adapter_info.SupportedOptions2 &
-                  le32_to_cpu(AAC_OPTION_IGNORE_RESET))) {
+                  AAC_OPTION_IGNORE_RESET))) {
                         printk(KERN_INFO "%s%d: Reset Adapter Ignored\n",
                           dev->name, dev->id);
                 }
         }
 
+        dev->cache_protected = 0;
+        dev->jbod = ((dev->supplement_adapter_info.FeatureBits &
+                AAC_FEATURE_JBOD) != 0);
         dev->nondasd_support = 0;
         dev->raid_scsi_mode = 0;
-        if(dev->adapter_info.options & AAC_OPT_NONDASD){
+        if(dev->adapter_info.options & AAC_OPT_NONDASD)
                 dev->nondasd_support = 1;
-        }
 
         /*
          * If the firmware supports ROMB RAID/SCSI mode and we are currently
@@ -1338,11 +1365,10 @@ int aac_get_adapter_info(struct aac_dev* dev)
         if (dev->raid_scsi_mode != 0)
                 printk(KERN_INFO "%s%d: ROMB RAID/SCSI mode enabled\n",
                                 dev->name, dev->id);
-                
-        if(nondasd != -1) {  
+
+        if (nondasd != -1)
                 dev->nondasd_support = (nondasd!=0);
-        }
-        if(dev->nondasd_support != 0){
+        if(dev->nondasd_support != 0) {
                 printk(KERN_INFO "%s%d: Non-DASD support enabled.\n",dev->name, dev->id);
         }
 
@@ -1371,12 +1397,14 @@ int aac_get_adapter_info(struct aac_dev* dev)
                         rcode = -ENOMEM;
                 }
         }
-        /* 
+        /*
          * Deal with configuring for the individualized limits of each packet
          * interface.
          */
         dev->a_ops.adapter_scsi = (dev->dac_support)
-                                ? aac_scsi_64
+          ? ((aac_get_driver_ident(dev->cardtype)->quirks & AAC_QUIRK_SCSI_32)
+                                ? aac_scsi_32_64
+                                : aac_scsi_64)
                                 : aac_scsi_32;
         if (dev->raw_io_interface) {
                 dev->a_ops.adapter_bounds = (dev->raw_io_64)
@@ -1393,8 +1421,8 @@ int aac_get_adapter_info(struct aac_dev* dev)
                 if (dev->dac_support) {
                         dev->a_ops.adapter_read = aac_read_block64;
                         dev->a_ops.adapter_write = aac_write_block64;
-                        /* 
-                         * 38 scatter gather elements 
+                        /*
+                         * 38 scatter gather elements
                          */
                         dev->scsi_host_ptr->sg_tablesize =
                                 (dev->max_fib_size -
@@ -1498,9 +1526,8 @@ static void io_callback(void *context, struct fib * fibptr)
                                     ASENCODE_INTERNAL_TARGET_FAILURE, 0, 0,
                                     0, 0);
                 memcpy(scsicmd->sense_buffer, &dev->fsa_dev[cid].sense_data,
-                  (sizeof(dev->fsa_dev[cid].sense_data) > sizeof(scsicmd->sense_buffer))
-                    ? sizeof(scsicmd->sense_buffer)
-                    : sizeof(dev->fsa_dev[cid].sense_data));
+                       min_t(size_t, sizeof(dev->fsa_dev[cid].sense_data),
+                             SCSI_SENSE_BUFFERSIZE));
         }
         aac_fib_complete(fibptr);
         aac_fib_free(fibptr);
@@ -1524,7 +1551,7 @@ static int aac_read(struct scsi_cmnd * scsicmd)
         case READ_6:
                 dprintk((KERN_DEBUG "aachba: received a read(6) command on id %d.\n", scmd_id(scsicmd)));
 
-                lba = ((scsicmd->cmnd[1] & 0x1F) << 16) | 
+                lba = ((scsicmd->cmnd[1] & 0x1F) << 16) |
                         (scsicmd->cmnd[2] << 8) | scsicmd->cmnd[3];
                 count = scsicmd->cmnd[4];
 
@@ -1534,32 +1561,32 @@ static int aac_read(struct scsi_cmnd * scsicmd)
         case READ_16:
                 dprintk((KERN_DEBUG "aachba: received a read(16) command on id %d.\n", scmd_id(scsicmd)));
 
-                lba =   ((u64)scsicmd->cmnd[2] << 56) |
-                        ((u64)scsicmd->cmnd[3] << 48) |
+                lba =   ((u64)scsicmd->cmnd[2] << 56) |
+                        ((u64)scsicmd->cmnd[3] << 48) |
                         ((u64)scsicmd->cmnd[4] << 40) |
                         ((u64)scsicmd->cmnd[5] << 32) |
-                        ((u64)scsicmd->cmnd[6] << 24) | 
+                        ((u64)scsicmd->cmnd[6] << 24) |
                         (scsicmd->cmnd[7] << 16) |
                         (scsicmd->cmnd[8] << 8) | scsicmd->cmnd[9];
-                count = (scsicmd->cmnd[10] << 24) | 
+                count = (scsicmd->cmnd[10] << 24) |
                         (scsicmd->cmnd[11] << 16) |
                         (scsicmd->cmnd[12] << 8) | scsicmd->cmnd[13];
                 break;
         case READ_12:
                 dprintk((KERN_DEBUG "aachba: received a read(12) command on id %d.\n", scmd_id(scsicmd)));
 
-                lba = ((u64)scsicmd->cmnd[2] << 24) | 
+                lba = ((u64)scsicmd->cmnd[2] << 24) |
                         (scsicmd->cmnd[3] << 16) |
-                        (scsicmd->cmnd[4] << 8) | scsicmd->cmnd[5];
-                count = (scsicmd->cmnd[6] << 24) | 
+                        (scsicmd->cmnd[4] << 8) | scsicmd->cmnd[5];
+                count = (scsicmd->cmnd[6] << 24) |
                         (scsicmd->cmnd[7] << 16) |
-                        (scsicmd->cmnd[8] << 8) | scsicmd->cmnd[9];
+                        (scsicmd->cmnd[8] << 8) | scsicmd->cmnd[9];
                 break;
         default:
                 dprintk((KERN_DEBUG "aachba: received a read(10) command on id %d.\n", scmd_id(scsicmd)));
 
-                lba = ((u64)scsicmd->cmnd[2] << 24) | 
-                        (scsicmd->cmnd[3] << 16) | 
+                lba = ((u64)scsicmd->cmnd[2] << 24) |
+                        (scsicmd->cmnd[3] << 16) |
                         (scsicmd->cmnd[4] << 8) | scsicmd->cmnd[5];
                 count = (scsicmd->cmnd[7] << 8) | scsicmd->cmnd[8];
                 break;
@@ -1584,7 +1611,7 @@ static int aac_read(struct scsi_cmnd * scsicmd)
                 scsicmd->SCp.phase = AAC_OWNER_FIRMWARE;
                 return 0;
         }
-                
+
         printk(KERN_WARNING "aac_read: aac_fib_send failed with status: %d.\n", status);
         /*
          *      For some reason, the Fib didn't queue, return QUEUE_FULL
@@ -1619,11 +1646,11 @@ static int aac_write(struct scsi_cmnd * scsicmd)
         } else if (scsicmd->cmnd[0] == WRITE_16) { /* 16 byte command */
                 dprintk((KERN_DEBUG "aachba: received a write(16) command on id %d.\n", scmd_id(scsicmd)));
 
-                lba =   ((u64)scsicmd->cmnd[2] << 56) |
+                lba =   ((u64)scsicmd->cmnd[2] << 56) |
                         ((u64)scsicmd->cmnd[3] << 48) |
                         ((u64)scsicmd->cmnd[4] << 40) |
                         ((u64)scsicmd->cmnd[5] << 32) |
-                        ((u64)scsicmd->cmnd[6] << 24) | 
+                        ((u64)scsicmd->cmnd[6] << 24) |
                         (scsicmd->cmnd[7] << 16) |
                         (scsicmd->cmnd[8] << 8) | scsicmd->cmnd[9];
                 count = (scsicmd->cmnd[10] << 24) | (scsicmd->cmnd[11] << 16) |
@@ -1712,8 +1739,8 @@ static void synchronize_callback(void *context, struct fib *fibptr)
                                     ASENCODE_INTERNAL_TARGET_FAILURE, 0, 0,
                                     0, 0);
                 memcpy(cmd->sense_buffer, &dev->fsa_dev[cid].sense_data,
-                  min(sizeof(dev->fsa_dev[cid].sense_data),
-                          sizeof(cmd->sense_buffer)));
+                       min_t(size_t, sizeof(dev->fsa_dev[cid].sense_data),
+                             SCSI_SENSE_BUFFERSIZE));
         }
 
         aac_fib_complete(fibptr);
@@ -1798,7 +1825,7 @@ static int aac_synchronize(struct scsi_cmnd *scsicmd)
         if (active)
                 return SCSI_MLQUEUE_DEVICE_BUSY;
 
-        aac = (struct aac_dev *)scsicmd->device->host->hostdata;
+        aac = (struct aac_dev *)sdev->host->hostdata;
         if (aac->in_reset)
                 return SCSI_MLQUEUE_HOST_BUSY;
 
@@ -1850,14 +1877,14 @@ static int aac_synchronize(struct scsi_cmnd *scsicmd)
  *      Emulate a SCSI command and queue the required request for the
  *      aacraid firmware.
  */
- 
+
 int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
 {
         u32 cid;
         struct Scsi_Host *host = scsicmd->device->host;
         struct aac_dev *dev = (struct aac_dev *)host->hostdata;
         struct fsa_dev_info *fsa_dev_ptr = dev->fsa_dev;
-        
+
         if (fsa_dev_ptr == NULL)
                 return -1;
         /*
@@ -1898,7 +1925,8 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                                 }
                         }
                 } else {  /* check for physical non-dasd devices */
-                        if ((dev->nondasd_support == 1) || expose_physicals) {
+                        if (dev->nondasd_support || expose_physicals ||
+                                        dev->jbod) {
                                 if (dev->in_reset)
                                         return -1;
                                 return aac_send_srb_fib(scsicmd);
@@ -1913,7 +1941,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
          * else Command for the controller itself
          */
         else if ((scsicmd->cmnd[0] != INQUIRY) &&       /* only INQUIRY & TUR cmnd supported for controller */
-                (scsicmd->cmnd[0] != TEST_UNIT_READY)) 
+                (scsicmd->cmnd[0] != TEST_UNIT_READY))
         {
                 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;
@@ -1922,9 +1950,8 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                             SENCODE_INVALID_COMMAND,
                             ASENCODE_INVALID_COMMAND, 0, 0, 0, 0);
                 memcpy(scsicmd->sense_buffer, &dev->fsa_dev[cid].sense_data,
-                  (sizeof(dev->fsa_dev[cid].sense_data) > sizeof(scsicmd->sense_buffer))
-                    ? sizeof(scsicmd->sense_buffer)
-                    : sizeof(dev->fsa_dev[cid].sense_data));
+                       min_t(size_t, sizeof(dev->fsa_dev[cid].sense_data),
+                             SCSI_SENSE_BUFFERSIZE));
                 scsicmd->scsi_done(scsicmd);
                 return 0;
         }
@@ -1939,7 +1966,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                 dprintk((KERN_DEBUG "INQUIRY command, ID: %d.\n", cid));
                 memset(&inq_data, 0, sizeof (struct inquiry_data));
 
-                if (scsicmd->cmnd[1] & 0x1 ) {
+                if (scsicmd->cmnd[1] & 0x1) {
                         char *arr = (char *)&inq_data;
 
                         /* EVPD bit set */
@@ -1974,10 +2001,9 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                                   ASENCODE_NO_SENSE, 0, 7, 2, 0);
                                 memcpy(scsicmd->sense_buffer,
                                   &dev->fsa_dev[cid].sense_data,
-                                  (sizeof(dev->fsa_dev[cid].sense_data) >
-                                    sizeof(scsicmd->sense_buffer))
-                                       ? sizeof(scsicmd->sense_buffer)
-                                       : sizeof(dev->fsa_dev[cid].sense_data));
+                                  min_t(size_t,
+                                        sizeof(dev->fsa_dev[cid].sense_data),
+                                        SCSI_SENSE_BUFFERSIZE));
                         }
                         scsicmd->scsi_done(scsicmd);
                         return 0;
@@ -2092,7 +2118,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                 mode_buf[2] = 0;        /* Device-specific param,
                                            bit 8: 0/1 = write enabled/protected
                                            bit 4: 0/1 = FUA enabled */
-                if (dev->raw_io_interface)
+                if (dev->raw_io_interface && ((aac_cache & 5) != 1))
                         mode_buf[2] = 0x10;
                 mode_buf[3] = 0;        /* Block descriptor length */
                 if (((scsicmd->cmnd[2] & 0x3f) == 8) ||
@@ -2100,7 +2126,8 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                         mode_buf[0] = 6;
                         mode_buf[4] = 8;
                         mode_buf[5] = 1;
-                        mode_buf[6] = 0x04; /* WCE */
+                        mode_buf[6] = ((aac_cache & 6) == 2)
+                                ? 0 : 0x04; /* WCE */
                         mode_buf_length = 7;
                         if (mode_buf_length > scsicmd->cmnd[4])
                                 mode_buf_length = scsicmd->cmnd[4];
@@ -2123,7 +2150,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                 mode_buf[3] = 0;        /* Device-specific param,
                                            bit 8: 0/1 = write enabled/protected
                                            bit 4: 0/1 = FUA enabled */
-                if (dev->raw_io_interface)
+                if (dev->raw_io_interface && ((aac_cache & 5) != 1))
                         mode_buf[3] = 0x10;
                 mode_buf[4] = 0;        /* reserved */
                 mode_buf[5] = 0;        /* reserved */
@@ -2134,7 +2161,8 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                         mode_buf[1] = 9;
                         mode_buf[8] = 8;
                         mode_buf[9] = 1;
-                        mode_buf[10] = 0x04; /* WCE */
+                        mode_buf[10] = ((aac_cache & 6) == 2)
+                                ? 0 : 0x04; /* WCE */
                         mode_buf_length = 11;
                         if (mode_buf_length > scsicmd->cmnd[8])
                                 mode_buf_length = scsicmd->cmnd[8];
@@ -2179,7 +2207,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                 return 0;
         }
 
-        switch (scsicmd->cmnd[0]) 
+        switch (scsicmd->cmnd[0])
         {
                 case READ_6:
                 case READ_10:
@@ -2192,11 +2220,11 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                          *      corresponds to a container. Needed to convert
                          *      containers to /dev/sd device names
                          */
-                         
+
                         if (scsicmd->request->rq_disk)
                                 strlcpy(fsa_dev_ptr[cid].devname,
                                 scsicmd->request->rq_disk->disk_name,
-                                min(sizeof(fsa_dev_ptr[cid].devname),
+                                min(sizeof(fsa_dev_ptr[cid].devname),
                                 sizeof(scsicmd->request->rq_disk->disk_name) + 1));
 
                         return aac_read(scsicmd);
@@ -2210,9 +2238,16 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                         return aac_write(scsicmd);
 
                 case SYNCHRONIZE_CACHE:
+                        if (((aac_cache & 6) == 6) && dev->cache_protected) {
+                                scsicmd->result = DID_OK << 16 |
+                                        COMMAND_COMPLETE << 8 | SAM_STAT_GOOD;
+                                scsicmd->scsi_done(scsicmd);
+                                return 0;
+                        }
                         /* Issue FIB to tell Firmware to flush it's cache */
-                        return aac_synchronize(scsicmd);
-                        
+                        if ((aac_cache & 6) != 2)
+                                return aac_synchronize(scsicmd);
+                        /* FALLTHRU */
                 default:
                         /*
                          *      Unhandled commands
@@ -2223,9 +2258,9 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                                 ILLEGAL_REQUEST, SENCODE_INVALID_COMMAND,
                                 ASENCODE_INVALID_COMMAND, 0, 0, 0, 0);
                         memcpy(scsicmd->sense_buffer, &dev->fsa_dev[cid].sense_data,
-                          (sizeof(dev->fsa_dev[cid].sense_data) > sizeof(scsicmd->sense_buffer))
-                            ? sizeof(scsicmd->sense_buffer)
-                            : sizeof(dev->fsa_dev[cid].sense_data));
+                                min_t(size_t,
+                                      sizeof(dev->fsa_dev[cid].sense_data),
+                                      SCSI_SENSE_BUFFERSIZE));
                         scsicmd->scsi_done(scsicmd);
                         return 0;
         }
@@ -2243,7 +2278,7 @@ static int query_disk(struct aac_dev *dev, void __user *arg)
                 return -EFAULT;
         if (qd.cnum == -1)
                 qd.cnum = qd.id;
-        else if ((qd.bus == -1) && (qd.id == -1) && (qd.lun == -1)) 
+        else if ((qd.bus == -1) && (qd.id == -1) && (qd.lun == -1))
         {
                 if (qd.cnum < 0 || qd.cnum >= dev->maximum_num_containers)
                         return -EINVAL;
@@ -2370,7 +2405,7 @@ static void aac_srb_callback(void *context, struct fib * fibptr)
 
         scsicmd->sense_buffer[0] = '\0';  /* Initialize sense valid flag to false */
         /*
-         *      Calculate resid for sg 
+         *      Calculate resid for sg
          */
 
         scsi_set_resid(scsicmd, scsi_bufflen(scsicmd)
@@ -2385,10 +2420,8 @@ static void aac_srb_callback(void *context, struct fib * fibptr)
         if (le32_to_cpu(srbreply->status) != ST_OK){
                 int len;
                 printk(KERN_WARNING "aac_srb_callback: srb failed, status = %d\n", le32_to_cpu(srbreply->status));
-                len = (le32_to_cpu(srbreply->sense_data_size) > 
-                                sizeof(scsicmd->sense_buffer)) ?
-                                sizeof(scsicmd->sense_buffer) : 
-                                le32_to_cpu(srbreply->sense_data_size);
+                len = min_t(u32, le32_to_cpu(srbreply->sense_data_size),
+                            SCSI_SENSE_BUFFERSIZE);
                 scsicmd->result = DID_ERROR << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_CHECK_CONDITION;
                 memcpy(scsicmd->sense_buffer, srbreply->sense_data, len);
         }
@@ -2412,7 +2445,7 @@ static void aac_srb_callback(void *context, struct fib * fibptr)
                 case  WRITE_12:
                 case  READ_16:
                 case  WRITE_16:
-                        if(le32_to_cpu(srbreply->data_xfer_length) < scsicmd->underflow ) {
+                        if (le32_to_cpu(srbreply->data_xfer_length) < scsicmd->underflow) {
                                 printk(KERN_WARNING"aacraid: SCSI CMD underflow\n");
                         } else {
                                 printk(KERN_WARNING"aacraid: SCSI CMD Data Overrun\n");
@@ -2481,26 +2514,23 @@ static void aac_srb_callback(void *context, struct fib * fibptr)
                 printk("aacraid: SRB ERROR(%u) %s scsi cmd 0x%x - scsi status 0x%x\n",
                         le32_to_cpu(srbreply->srb_status) & 0x3F,
                         aac_get_status_string(
-                                le32_to_cpu(srbreply->srb_status) & 0x3F), 
-                        scsicmd->cmnd[0], 
+                                le32_to_cpu(srbreply->srb_status) & 0x3F),
+                        scsicmd->cmnd[0],
                         le32_to_cpu(srbreply->scsi_status));
 #endif
                 scsicmd->result = DID_ERROR << 16 | COMMAND_COMPLETE << 8;
                 break;
         }
-        if (le32_to_cpu(srbreply->scsi_status) == 0x02 ){  // Check Condition
+        if (le32_to_cpu(srbreply->scsi_status) == SAM_STAT_CHECK_CONDITION) {
                 int len;
                 scsicmd->result |= SAM_STAT_CHECK_CONDITION;
-                len = (le32_to_cpu(srbreply->sense_data_size) > 
-                                sizeof(scsicmd->sense_buffer)) ?
-                                sizeof(scsicmd->sense_buffer) :
-                                le32_to_cpu(srbreply->sense_data_size);
+                len = min_t(u32, le32_to_cpu(srbreply->sense_data_size),
+                            SCSI_SENSE_BUFFERSIZE);
 #ifdef AAC_DETAILED_STATUS_INFO
                 printk(KERN_WARNING "aac_srb_callback: check condition, status = %d len=%d\n",
                                         le32_to_cpu(srbreply->status), len);
 #endif
                 memcpy(scsicmd->sense_buffer, srbreply->sense_data, len);
-                
         }
         /*
          * OR in the scsi status (already shifted up a bit)
@@ -2517,7 +2547,7 @@ static void aac_srb_callback(void *context, struct fib * fibptr)
  * aac_send_scb_fib
  * @scsicmd: the scsi command block
  *
- * This routine will form a FIB and fill in the aac_srb from the 
+ * This routine will form a FIB and fill in the aac_srb from the
  * scsicmd passed in.
  */
 
@@ -2731,7 +2761,7 @@ static struct aac_srb_status_info srb_status_info[] = {
         { SRB_STATUS_ERROR_RECOVERY,    "Error Recovery"},
         { SRB_STATUS_NOT_STARTED,       "Not Started"},
         { SRB_STATUS_NOT_IN_USE,        "Not In Use"},
-        { SRB_STATUS_FORCE_ABORT,       "Force Abort"},
+        { SRB_STATUS_FORCE_ABORT,       "Force Abort"},
         { SRB_STATUS_DOMAIN_VALIDATION_FAIL,"Domain Validation Failure"},
         { 0xff,                         "Unknown Error"}
 };