8 files changed, 357 insertions, 125 deletions

diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index 52551662d107..d79457ac8bef 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -135,6 +135,8 @@ struct inquiry_data {
 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);
+static unsigned long aac_build_sgraw2(struct scsi_cmnd *scsicmd, struct aac_raw_io2 *rio2, int sg_max);
+static int aac_convert_sgraw2(struct aac_raw_io2 *rio2, int pages, int nseg, int nseg_new);
 static int aac_send_srb_fib(struct scsi_cmnd* scsicmd);
 #ifdef AAC_DETAILED_STATUS_INFO
 static char *aac_get_status_string(u32 status);
@@ -152,10 +154,14 @@ int aac_commit = -1;
 int startup_timeout = 180;
 int aif_timeout = 120;
 int aac_sync_mode;  /* Only Sync. transfer - disabled */
+int aac_convert_sgl = 1;        /* convert non-conformable s/g list - enabled */
 
 module_param(aac_sync_mode, int, S_IRUGO|S_IWUSR);
 MODULE_PARM_DESC(aac_sync_mode, "Force sync. transfer mode"
         " 0=off, 1=on");
+module_param(aac_convert_sgl, int, S_IRUGO|S_IWUSR);
+MODULE_PARM_DESC(aac_convert_sgl, "Convert non-conformable s/g list"
+        " 0=off, 1=on");
 module_param(nondasd, int, S_IRUGO|S_IWUSR);
 MODULE_PARM_DESC(nondasd, "Control scanning of hba for nondasd devices."
         " 0=off, 1=on");
@@ -963,25 +969,44 @@ static void io_callback(void *context, struct fib * fibptr);
 
 static int aac_read_raw_io(struct fib * fib, struct scsi_cmnd * cmd, u64 lba, u32 count)
 {
-        u16 fibsize;
-        struct aac_raw_io *readcmd;
+        struct aac_dev *dev = fib->dev;
+        u16 fibsize, command;
+
         aac_fib_init(fib);
-        readcmd = (struct aac_raw_io *) fib_data(fib);
-        readcmd->block[0] = cpu_to_le32((u32)(lba&0xffffffff));
-        readcmd->block[1] = cpu_to_le32((u32)((lba&0xffffffff00000000LL)>>32));
-        readcmd->count = cpu_to_le32(count<<9);
-        readcmd->cid = cpu_to_le16(scmd_id(cmd));
-        readcmd->flags = cpu_to_le16(IO_TYPE_READ);
-        readcmd->bpTotal = 0;
-        readcmd->bpComplete = 0;
+        if (dev->comm_interface == AAC_COMM_MESSAGE_TYPE2 && !dev->sync_mode) {
+                struct aac_raw_io2 *readcmd2;
+                readcmd2 = (struct aac_raw_io2 *) fib_data(fib);
+                memset(readcmd2, 0, sizeof(struct aac_raw_io2));
+                readcmd2->blockLow = cpu_to_le32((u32)(lba&0xffffffff));
+                readcmd2->blockHigh = cpu_to_le32((u32)((lba&0xffffffff00000000LL)>>32));
+                readcmd2->byteCount = cpu_to_le32(count<<9);
+                readcmd2->cid = cpu_to_le16(scmd_id(cmd));
+                readcmd2->flags = cpu_to_le16(RIO2_IO_TYPE_READ);
+                aac_build_sgraw2(cmd, readcmd2, dev->scsi_host_ptr->sg_tablesize);
+                command = ContainerRawIo2;
+                fibsize = sizeof(struct aac_raw_io2) +
+                        ((le32_to_cpu(readcmd2->sgeCnt)-1) * sizeof(struct sge_ieee1212));
+        } else {
+                struct aac_raw_io *readcmd;
+                readcmd = (struct aac_raw_io *) fib_data(fib);
+                readcmd->block[0] = cpu_to_le32((u32)(lba&0xffffffff));
+                readcmd->block[1] = cpu_to_le32((u32)((lba&0xffffffff00000000LL)>>32));
+                readcmd->count = cpu_to_le32(count<<9);
+                readcmd->cid = cpu_to_le16(scmd_id(cmd));
+                readcmd->flags = cpu_to_le16(RIO_TYPE_READ);
+                readcmd->bpTotal = 0;
+                readcmd->bpComplete = 0;
+                aac_build_sgraw(cmd, &readcmd->sg);
+                command = ContainerRawIo;
+                fibsize = sizeof(struct aac_raw_io) +
+                        ((le32_to_cpu(readcmd->sg.count)-1) * sizeof(struct sgentryraw));
+        }
 
-        aac_build_sgraw(cmd, &readcmd->sg);
-        fibsize = sizeof(struct aac_raw_io) + ((le32_to_cpu(readcmd->sg.count) - 1) * sizeof (struct sgentryraw));
         BUG_ON(fibsize > (fib->dev->max_fib_size - sizeof(struct aac_fibhdr)));
         /*
          *      Now send the Fib to the adapter
          */
-        return aac_fib_send(ContainerRawIo,
+        return aac_fib_send(command,
                           fib,
                           fibsize,
                           FsaNormal,
@@ -1052,28 +1077,50 @@ static int aac_read_block(struct fib * fib, struct scsi_cmnd * cmd, u64 lba, u32
 
 static int aac_write_raw_io(struct fib * fib, struct scsi_cmnd * cmd, u64 lba, u32 count, int fua)
 {
-        u16 fibsize;
-        struct aac_raw_io *writecmd;
+        struct aac_dev *dev = fib->dev;
+        u16 fibsize, command;
+
         aac_fib_init(fib);
-        writecmd = (struct aac_raw_io *) fib_data(fib);
-        writecmd->block[0] = cpu_to_le32((u32)(lba&0xffffffff));
-        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 && ((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;
-        writecmd->bpComplete = 0;
-
-        aac_build_sgraw(cmd, &writecmd->sg);
-        fibsize = sizeof(struct aac_raw_io) + ((le32_to_cpu(writecmd->sg.count) - 1) * sizeof (struct sgentryraw));
+        if (dev->comm_interface == AAC_COMM_MESSAGE_TYPE2 && !dev->sync_mode) {
+                struct aac_raw_io2 *writecmd2;
+                writecmd2 = (struct aac_raw_io2 *) fib_data(fib);
+                memset(writecmd2, 0, sizeof(struct aac_raw_io2));
+                writecmd2->blockLow = cpu_to_le32((u32)(lba&0xffffffff));
+                writecmd2->blockHigh = cpu_to_le32((u32)((lba&0xffffffff00000000LL)>>32));
+                writecmd2->byteCount = cpu_to_le32(count<<9);
+                writecmd2->cid = cpu_to_le16(scmd_id(cmd));
+                writecmd2->flags = (fua && ((aac_cache & 5) != 1) &&
+                                                   (((aac_cache & 5) != 5) || !fib->dev->cache_protected)) ?
+                        cpu_to_le16(RIO2_IO_TYPE_WRITE|RIO2_IO_SUREWRITE) :
+                        cpu_to_le16(RIO2_IO_TYPE_WRITE);
+                aac_build_sgraw2(cmd, writecmd2, dev->scsi_host_ptr->sg_tablesize);
+                command = ContainerRawIo2;
+                fibsize = sizeof(struct aac_raw_io2) +
+                        ((le32_to_cpu(writecmd2->sgeCnt)-1) * sizeof(struct sge_ieee1212));
+        } else {
+                struct aac_raw_io *writecmd;
+                writecmd = (struct aac_raw_io *) fib_data(fib);
+                writecmd->block[0] = cpu_to_le32((u32)(lba&0xffffffff));
+                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 && ((aac_cache & 5) != 1) &&
+                                                   (((aac_cache & 5) != 5) || !fib->dev->cache_protected)) ?
+                        cpu_to_le16(RIO_TYPE_WRITE|RIO_SUREWRITE) :
+                        cpu_to_le16(RIO_TYPE_WRITE);
+                writecmd->bpTotal = 0;
+                writecmd->bpComplete = 0;
+                aac_build_sgraw(cmd, &writecmd->sg);
+                command = ContainerRawIo;
+                fibsize = sizeof(struct aac_raw_io) +
+                        ((le32_to_cpu(writecmd->sg.count)-1) * sizeof (struct sgentryraw));
+        }
+
         BUG_ON(fibsize > (fib->dev->max_fib_size - sizeof(struct aac_fibhdr)));
         /*
          *      Now send the Fib to the adapter
          */
-        return aac_fib_send(ContainerRawIo,
+        return aac_fib_send(command,
                           fib,
                           fibsize,
                           FsaNormal,
@@ -1492,8 +1539,6 @@ int aac_get_adapter_info(struct aac_dev* dev)
                         dev->a_ops.adapter_write = aac_write_block;
                 }
                 dev->scsi_host_ptr->max_sectors = AAC_MAX_32BIT_SGBCOUNT;
-                if (dev->adapter_info.options & AAC_OPT_NEW_COMM_TYPE1)
-                        dev->adapter_info.options |= AAC_OPT_NEW_COMM;
                 if (!(dev->adapter_info.options & AAC_OPT_NEW_COMM)) {
                         /*
                          * Worst case size that could cause sg overflow when
@@ -2616,12 +2661,18 @@ static void aac_srb_callback(void *context, struct fib * fibptr)