8 files changed, 152 insertions, 80 deletions

diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index 8df4a0ea3761..642a3b4e5937 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -149,20 +149,20 @@ static int dacmode = -1;
 
 static int commit = -1;
 
-module_param(nondasd, int, 0);
+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(dacmode, int, 0);
+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(commit, int, 0);
+module_param(commit, int, S_IRUGO|S_IWUSR);
 MODULE_PARM_DESC(commit, "Control whether a COMMIT_CONFIG is issued to the adapter for foreign arrays.\nThis is typically needed in systems that do not have a BIOS. 0=off, 1=on");
 
 int numacb = -1;
 module_param(numacb, int, S_IRUGO|S_IWUSR);
-MODULE_PARM_DESC(numacb, "Request a limit to the number of adapter control blocks (FIB) allocated. Valid\nvalues are 512 and down. Default is to use suggestion from Firmware.");
+MODULE_PARM_DESC(numacb, "Request a limit to the number of adapter control blocks (FIB) allocated. Valid values are 512 and down. Default is to use suggestion from Firmware.");
 
 int acbsize = -1;
 module_param(acbsize, int, S_IRUGO|S_IWUSR);
-MODULE_PARM_DESC(acbsize, "Request a specific adapter control block (FIB) size. Valid values are 512,\n2048, 4096 and 8192. Default is to use suggestion from Firmware.");
+MODULE_PARM_DESC(acbsize, "Request a specific adapter control block (FIB) size. Valid values are 512, 2048, 4096 and 8192. Default is to use suggestion from Firmware.");
 /**
  *      aac_get_config_status   -       check the adapter configuration
  *      @common: adapter to query
@@ -387,6 +387,7 @@ static void get_container_name_callback(void *context, struct fib * fibptr)
         struct scsi_cmnd * scsicmd;
 
         scsicmd = (struct scsi_cmnd *) context;
+        scsicmd->SCp.phase = AAC_OWNER_MIDLEVEL;
 
         dprintk((KERN_DEBUG "get_container_name_callback[cpu %d]: t = %ld.\n", smp_processor_id(), jiffies));
         if (fibptr == NULL)
@@ -453,8 +454,10 @@ static int aac_get_container_name(struct scsi_cmnd * scsicmd, int cid)
         /*
          *      Check that the command queued to the controller
          */
-        if (status == -EINPROGRESS) 
+        if (status == -EINPROGRESS) {
+                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);
@@ -907,9 +910,10 @@ static void io_callback(void *context, struct fib * fibptr)
         u32 cid;
 
         scsicmd = (struct scsi_cmnd *) context;
+        scsicmd->SCp.phase = AAC_OWNER_MIDLEVEL;
 
         dev = (struct aac_dev *)scsicmd->device->host->hostdata;
-        cid = ID_LUN_TO_CONTAINER(scsicmd->device->id, scsicmd->device->lun);
+        cid = scmd_id(scsicmd);
 
         if (nblank(dprintk(x))) {
                 u64 lba;
@@ -1151,8 +1155,10 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid)
         /*
          *      Check that the command queued to the controller
          */
-        if (status == -EINPROGRESS) 
+        if (status == -EINPROGRESS) {
+                scsicmd->SCp.phase = AAC_OWNER_FIRMWARE;
                 return 0;
+        }
                 
         printk(KERN_WARNING "aac_read: aac_fib_send failed with status: %d.\n", status);
         /*
@@ -1318,8 +1324,8 @@ static int aac_write(struct scsi_cmnd * scsicmd, int cid)
         /*
          *      Check that the command queued to the controller
          */
-        if (status == -EINPROGRESS)
-        {
+        if (status == -EINPROGRESS) {
+                scsicmd->SCp.phase = AAC_OWNER_FIRMWARE;
                 return 0;
         }
 
@@ -1341,6 +1347,7 @@ static void synchronize_callback(void *context, struct fib *fibptr)
         struct scsi_cmnd *cmd;
 
         cmd = context;
+        cmd->SCp.phase = AAC_OWNER_MIDLEVEL;
 
         dprintk((KERN_DEBUG "synchronize_callback[cpu %d]: t = %ld.\n", 
                                 smp_processor_id(), jiffies));
@@ -1354,7 +1361,7 @@ static void synchronize_callback(void *context, struct fib *fibptr)
         else {
                 struct scsi_device *sdev = cmd->device;
                 struct aac_dev *dev = (struct aac_dev *)sdev->host->hostdata;
-                u32 cid = ID_LUN_TO_CONTAINER(sdev->id, sdev->lun);
+                u32 cid = sdev_id(sdev);
                 printk(KERN_WARNING 
                      "synchronize_callback: synchronize failed, status = %d\n",
                      le32_to_cpu(synchronizereply->status));
@@ -1386,12 +1393,12 @@ static int aac_synchronize(struct scsi_cmnd *scsicmd, int cid)
         unsigned long flags;
 
         /*
-         * Wait for all commands to complete to this specific
-         * target (block).
+         * Wait for all outstanding queued commands to complete to this
+         * specific target (block).
          */
         spin_lock_irqsave(&sdev->list_lock, flags);
         list_for_each_entry(cmd, &sdev->cmd_list, list)
-                if (cmd != scsicmd && cmd->serial_number != 0) {
+                if (cmd != scsicmd && cmd->SCp.phase == AAC_OWNER_FIRMWARE) {
                         ++active;
                         break;
                 }
@@ -1434,8 +1441,10 @@ static int aac_synchronize(struct scsi_cmnd *scsicmd, int cid)
         /*
          *      Check that the command queued to the controller
          */
-        if (status == -EINPROGRESS)
+        if (status == -EINPROGRESS) {
+                scsicmd->SCp.phase = AAC_OWNER_FIRMWARE;
                 return 0;
+        }
 
         printk(KERN_WARNING 
                 "aac_synchronize: aac_fib_send failed with status: %d.\n", status);
@@ -1458,7 +1467,6 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
         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;
-        int ret;
         
         /*
          *      If the bus, id or lun is out of range, return fail
@@ -1466,13 +1474,14 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
          *      itself.
          */
         if (scmd_id(scsicmd) != host->this_id) {
-                if ((scsicmd->device->channel == CONTAINER_CHANNEL)) {
-                        if( (scsicmd->device->id >= dev->maximum_num_containers) || (scsicmd->device->lun != 0)){ 
+                if ((scmd_channel(scsicmd) == CONTAINER_CHANNEL)) {
+                        if((scmd_id(scsicmd) >= dev->maximum_num_containers) ||
+                                        (scsicmd->device->lun != 0)) {
                                 scsicmd->result = DID_NO_CONNECT << 16;
                                 scsicmd->scsi_done(scsicmd);
                                 return 0;
                         }
-                        cid = ID_LUN_TO_CONTAINER(scsicmd->device->id, scsicmd->device->lun);
+                        cid = scmd_id(scsicmd);
 
                         /*
                          *      If the target container doesn't exist, it may have
@@ -1548,7 +1557,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
         {
                 struct inquiry_data inq_data;
 
-                dprintk((KERN_DEBUG "INQUIRY command, ID: %d.\n", scsicmd->device->id));
+                dprintk((KERN_DEBUG "INQUIRY command, ID: %d.\n", scmd_id(scsicmd)));
                 memset(&inq_data, 0, sizeof (struct inquiry_data));
 
                 inq_data.inqd_ver = 2;  /* claim compliance to SCSI-2 */
@@ -1598,13 +1607,14 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                 cp[11] = 0;
                 cp[12] = 0;
                 aac_internal_transfer(scsicmd, cp, 0,
-                  min((unsigned int)scsicmd->cmnd[13], sizeof(cp)));
+                  min_t(size_t, scsicmd->cmnd[13], sizeof(cp)));
                 if (sizeof(cp) < scsicmd->cmnd[13]) {
                         unsigned int len, offset = sizeof(cp);
 
                         memset(cp, 0, offset);
                         do {
-                                len = min(scsicmd->cmnd[13]-offset, sizeof(cp));
+                                len = min_t(size_t, scsicmd->cmnd[13] - offset,
+                                                sizeof(cp));
                                 aac_internal_transfer(scsicmd, cp, offset, len);
                         } while ((offset += len) < scsicmd->cmnd[13]);
                 }
@@ -1728,24 +1738,19 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                          *      containers to /dev/sd device names
                          */
                          
-                        spin_unlock_irq(host->host_lock);
                         if (scsicmd->request->rq_disk)
                                 strlcpy(fsa_dev_ptr[cid].devname,
                                 scsicmd->request->rq_disk->disk_name,
                                 min(sizeof(fsa_dev_ptr[cid].devname),
                                 sizeof(scsicmd->request->rq_disk->disk_name) + 1));
-                        ret = aac_read(scsicmd, cid);
-                        spin_lock_irq(host->host_lock);
-                        return ret;
+
+                        return aac_read(scsicmd, cid);
 
                 case WRITE_6:
                 case WRITE_10:
                 case WRITE_12:
                 case WRITE_16:
-                        spin_unlock_irq(host->host_lock);
-                        ret = aac_write(scsicmd, cid);
-                        spin_lock_irq(host->host_lock);
-                        return ret;
+                        return aac_write(scsicmd, cid);
 
                 case SYNCHRONIZE_CACHE:
                         /* Issue FIB to tell Firmware to flush it's cache */
@@ -1778,7 +1783,7 @@ static int query_disk(struct aac_dev *dev, void __user *arg)
         if (copy_from_user(&qd, arg, sizeof (struct aac_query_disk)))
                 return -EFAULT;
         if (qd.cnum == -1)
-                qd.cnum = ID_LUN_TO_CONTAINER(qd.id, qd.lun);
+                qd.cnum = qd.id;
         else if ((qd.bus == -1) && (qd.id == -1) && (qd.lun == -1)) 
         {
                 if (qd.cnum < 0 || qd.cnum >= dev->maximum_num_containers)
@@ -1890,6 +1895,7 @@ static void aac_srb_callback(void *context, struct fib * fibptr)
         struct scsi_cmnd *scsicmd;
 
         scsicmd = (struct scsi_cmnd *) context;
+        scsicmd->SCp.phase = AAC_OWNER_MIDLEVEL;
         dev = (struct aac_dev *)scsicmd->device->host->hostdata;
 
         if (fibptr == NULL)
@@ -2068,14 +2074,13 @@ static int aac_send_srb_fib(struct scsi_cmnd* scsicmd)
         u32 timeout;
 
         dev = (struct aac_dev *)scsicmd->device->host->hostdata;
-        if (scsicmd->device->id >= dev->maximum_num_physicals || 
+        if (scmd_id(scsicmd) >= dev->maximum_num_physicals ||
                         scsicmd->device->lun > 7) {
                 scsicmd->result = DID_NO_CONNECT << 16;
                 scsicmd->scsi_done(scsicmd);
                 return 0;
         }
 
-        dev = (struct aac_dev *)scsicmd->device->host->hostdata;
         switch(scsicmd->sc_data_direction){
         case DMA_TO_DEVICE:
                 flag = SRB_DataOut;
@@ -2103,8 +2108,8 @@ static int aac_send_srb_fib(struct scsi_cmnd* scsicmd)
 
         srbcmd = (struct aac_srb*) fib_data(cmd_fibcontext);
         srbcmd->function = cpu_to_le32(SRBF_ExecuteScsi);
-        srbcmd->channel  = cpu_to_le32(aac_logical_to_phys(scsicmd->device->channel));
-        srbcmd->id   = cpu_to_le32(scsicmd->device->id);
+        srbcmd->channel  = cpu_to_le32(aac_logical_to_phys(scmd_channel(scsicmd)));
+        srbcmd->id   = cpu_to_le32(scmd_id(scsicmd));
         srbcmd->lun      = cpu_to_le32(scsicmd->device->lun);
         srbcmd->flags    = cpu_to_le32(flag);
         timeout = scsicmd->timeout_per_command/HZ;
@@ -2161,7 +2166,8 @@ static int aac_send_srb_fib(struct scsi_cmnd* scsicmd)
         /*
          *      Check that the command queued to the controller
          */
-        if (status == -EINPROGRESS){
+        if (status == -EINPROGRESS) {
+                scsicmd->SCp.phase = AAC_OWNER_FIRMWARE;
                 return 0;
         }
 
@@ -2192,8 +2198,6 @@ static unsigned long aac_build_sg(struct scsi_cmnd* scsicmd, struct sgmap* psg)
                         scsicmd->sc_data_direction);
                 psg->count = cpu_to_le32(sg_count);
 
-                byte_count = 0;
-
                 for (i = 0; i < sg_count; i++) {
                         psg->sg[i].addr = cpu_to_le32(sg_dma_address(sg));
                         psg->sg[i].count = cpu_to_le32(sg_dma_len(sg));
@@ -2249,18 +2253,17 @@ static unsigned long aac_build_sg64(struct scsi_cmnd* scsicmd, struct sgmap64* p
 
                 sg_count = pci_map_sg(dev->pdev, sg, scsicmd->use_sg,
                         scsicmd->sc_data_direction);
-                psg->count = cpu_to_le32(sg_count);
-
-                byte_count = 0;
 
                 for (i = 0; i < sg_count; i++) {
+                        int count = sg_dma_len(sg);
                         addr = sg_dma_address(sg);
                         psg->sg[i].addr[0] = cpu_to_le32(addr & 0xffffffff);
                         psg->sg[i].addr[1] = cpu_to_le32(addr>>32);
-                        psg->sg[i].count = cpu_to_le32(sg_dma_len(sg));
-                        byte_count += sg_dma_len(sg);
+                        psg->sg[i].count = cpu_to_le32(count);
+                        byte_count += count;
                         sg++;
                 }
+                psg->count = cpu_to_le32(sg_count);
                 /* hba wants the size to be exact */
                 if(byte_count > scsicmd->request_bufflen){
                         u32 temp = le32_to_cpu(psg->sg[i-1].count) - 
@@ -2275,16 +2278,15 @@ static unsigned long aac_build_sg64(struct scsi_cmnd* scsicmd, struct sgmap64* p
                 }
         }
         else if(scsicmd->request_bufflen) {
-                u64 addr; 
-                addr = pci_map_single(dev->pdev,
+                scsicmd->SCp.dma_handle = pci_map_single(dev->pdev,
                                 scsicmd->request_buffer,
                                 scsicmd->request_bufflen,
                                 scsicmd->sc_data_direction);
+                addr = scsicmd->SCp.dma_handle;
                 psg->count = cpu_to_le32(1);
                 psg->sg[0].addr[0] = cpu_to_le32(addr & 0xffffffff);
                 psg->sg[0].addr[1] = cpu_to_le32(addr >> 32);
                 psg->sg[0].count = cpu_to_le32(scsicmd->request_bufflen);  
-                scsicmd->SCp.dma_handle = addr;
                 byte_count = scsicmd->request_bufflen;
         }
         return byte_count;
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index 9ce7002bd070..f773b0dcfc95 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -10,6 +10,10 @@
  *              D E F I N E S
  *----------------------------------------------------------------------------*/
 
+#ifndef AAC_DRIVER_BUILD
+# define AAC_DRIVER_BUILD 2409
+# define AAC_DRIVER_BRANCH "-mh1"
+#endif
 #define MAXIMUM_NUM_CONTAINERS  32
 
 #define AAC_NUM_MGT_FIB         8
@@ -25,7 +29,6 @@
  * These macros convert from physical channels to virtual channels
  */
 #define CONTAINER_CHANNEL               (0)
-#define ID_LUN_TO_CONTAINER(id, lun)    (id)
 #define CONTAINER_TO_CHANNEL(cont)      (CONTAINER_CHANNEL)
 #define CONTAINER_TO_ID(cont)           (cont)
 #define CONTAINER_TO_LUN(cont)          (0)
@@ -789,6 +792,7 @@ struct fsa_dev_info {
         u64             size;
         u32             type;
         u32             config_waiting_on;
+        unsigned long   config_waiting_stamp;
         u16             queue_depth;
         u8              config_needed;
         u8              valid;
@@ -1771,6 +1775,11 @@ static inline u32 cap_to_cyls(sector_t capacity, u32 divisor)
 }
 
 struct scsi_cmnd;
+/* SCp.phase values */
+#define AAC_OWNER_MIDLEVEL      0x101
+#define AAC_OWNER_LOWLEVEL      0x102
+#define AAC_OWNER_ERROR_HANDLER 0x103
+#define AAC_OWNER_FIRMWARE      0x106
 
 const char *aac_driverinfo(struct Scsi_Host *);
 struct fib *aac_fib_alloc(struct aac_dev *dev);
diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c
index 47fefca72695..9f75144e5247 100644
--- a/drivers/scsi/aacraid/commctrl.c
+++ b/drivers/scsi/aacraid/commctrl.c
@@ -38,6 +38,8 @@
 #include <linux/completion.h>
 #include <linux/dma-mapping.h>
 #include <linux/blkdev.h>
+#include <linux/delay.h>
+#include <linux/kthread.h>
 #include <asm/semaphore.h>
 #include <asm/uaccess.h>
 
@@ -293,6 +295,16 @@ return_fib:
                 status = 0;
         } else {
                 spin_unlock_irqrestore(&dev->fib_lock, flags);
+                /* If someone killed the AIF aacraid thread, restart it */
+                status = !dev->aif_thread;
+                if (status && dev->queues && dev->fsa_dev) {
+                        /* Be paranoid, be very paranoid! */
+                        kthread_stop(dev->thread);
+                        ssleep(1);
+                        dev->aif_thread = 0;
+                        dev->thread = kthread_run(aac_command_thread, dev, dev->name);
+                        ssleep(1);
+                }
                 if (f.wait) {
                         if(down_interruptible(&fibctx->wait_sem) < 0) {
                                 status = -EINTR;
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index c7f80ec7abde..9f9f4aae23c0 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -767,9 +767,9 @@ void aac_printf(struct aac_dev *dev, u32 val)
                 if (cp[length] != 0)
                         cp[length] = 0;
                 if (level == LOG_AAC_HIGH_ERROR)
-                        printk(KERN_WARNING "aacraid:%s", cp);
+                        printk(KERN_WARNING "%s:%s", dev->name, cp);
                 else
-                        printk(KERN_INFO "aacraid:%s", cp);
+                        printk(KERN_INFO "%s:%s", dev->name, cp);
         }
         memset(cp, 0,  256);
 }
@@ -784,6 +784,7 @@ void aac_printf(struct aac_dev *dev, u32 val)
  *      dispatches it to the appropriate routine for handling.
  */
 
+#define AIF_SNIFF_TIMEOUT       (30*HZ)
 static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr)
 {
         struct hw_fib * hw_fib = fibptr->hw_fib;
@@ -837,6 +838,7 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr)
                                 if (device) {
                                         dev->fsa_dev[container].config_needed = CHANGE;
                                         dev->fsa_dev[container].config_waiting_on = AifEnConfigChange;
+                                        dev->fsa_dev[container].config_waiting_stamp = jiffies;
                                         scsi_device_put(device);
                                 }
                         }
@@ -849,13 +851,15 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr)
                 if (container != (u32)-1) {
                         if (container >= dev->maximum_num_containers)
                                 break;
-                        if (dev->fsa_dev[container].config_waiting_on ==
-                            le32_to_cpu(*(u32 *)aifcmd->data))
+                        if ((dev->fsa_dev[container].config_waiting_on ==
+                            le32_to_cpu(*(u32 *)aifcmd->data)) &&
+                         time_before(jiffies, dev->fsa_dev[container].config_waiting_stamp + AIF_SNIFF_TIMEOUT))
                                 dev->fsa_dev[container].config_waiting_on = 0;
                 } else for (container = 0;
                     container < dev->maximum_num_containers; ++container) {
-                        if (dev->fsa_dev[container].config_waiting_on ==
-                            le32_to_cpu(*(u32 *)aifcmd->data))
+                        if ((dev->fsa_dev[container].config_waiting_on ==
+                            le32_to_cpu(*(u32 *)aifcmd->data)) &&
+                         time_before(jiffies, dev->fsa_dev[container].config_waiting_stamp + AIF_SNIFF_TIMEOUT))
                                 dev->fsa_dev[container].config_waiting_on = 0;
                 }
                 break;
@@ -872,6 +876,7 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr)
                         dev->fsa_dev[container].config_needed = ADD;
                         dev->fsa_dev[container].config_waiting_on =
                                 AifEnConfigChange;
+                        dev->fsa_dev[container].config_waiting_stamp = jiffies;
                         break;
 
                 /*
@@ -884,6 +889,7 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr)
                         dev->fsa_dev[container].config_needed = DELETE;
                         dev->fsa_dev[container].config_waiting_on =
                                 AifEnConfigChange;
+                        dev->fsa_dev[container].config_waiting_stamp = jiffies;
                         break;
 
                 /*
@@ -894,11 +900,13 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr)
                         container = le32_to_cpu(((u32 *)aifcmd->data)[1]);
                         if (container >= dev->maximum_num_containers)
                                 break;
-                        if (dev->fsa_dev[container].config_waiting_on)
+                        if (dev->fsa_dev[container].config_waiting_on &&
+                         time_before(jiffies, dev->fsa_dev[container].config_waiting_stamp + AIF_SNIFF_TIMEOUT))
                                 break;
                         dev->fsa_dev[container].config_needed = CHANGE;
                         dev->fsa_dev[container].config_waiting_on =
                                 AifEnConfigChange;
+                        dev->fsa_dev[container].config_waiting_stamp = jiffies;
                         break;
 
                 case AifEnConfigChange:
@@ -913,13 +921,15 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr)
                 if (container != (u32)-1) {
                         if (container >= dev->maximum_num_containers)
                                 break;
-                        if (dev->fsa_dev[container].config_waiting_on ==
-                            le32_to_cpu(*(u32 *)aifcmd->data))
+                        if ((dev->fsa_dev[container].config_waiting_on ==
+                            le32_to_cpu(*(u32 *)aifcmd->data)) &&
+                         time_before(jiffies, dev->fsa_dev[container].config_waiting_stamp + AIF_SNIFF_TIMEOUT))
                                 dev->fsa_dev[container].config_waiting_on = 0;
                 } else for (container = 0;
                     container < dev->maximum_num_containers; ++container) {
-                        if (dev->fsa_dev[container].config_waiting_on ==
-                            le32_to_cpu(*(u32 *)aifcmd->data))
+                        if ((dev->fsa_dev[container].config_waiting_on ==
+                            le32_to_cpu(*(u32 *)aifcmd->data)) &&
+                         time_before(jiffies, dev->fsa_dev[container].config_waiting_stamp + AIF_SNIFF_TIMEOUT))
                                 dev->fsa_dev[container].config_waiting_on = 0;
                 }
                 break;
@@ -946,6 +956,8 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr)
                                 dev->fsa_dev[container].config_waiting_on =
                                         AifEnContainerChange;
                                 dev->fsa_dev[container].config_needed = ADD;
+                                dev->fsa_dev[container].config_waiting_stamp =
+                                        jiffies;
                         }
                 }
                 if ((((u32 *)aifcmd->data)[1] == cpu_to_le32(AifJobCtrZero))
@@ -961,6 +973,8 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr)
                                 dev->fsa_dev[container].config_waiting_on =
                                         AifEnContainerChange;
                                 dev->fsa_dev[container].config_needed = DELETE;
+                                dev->fsa_dev[container].config_waiting_stamp =
+                                        jiffies;
                         }
                 }
                 break;
@@ -969,8 +983,9 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr)
         device_config_needed = NOTHING;
         for (container = 0; container < dev->maximum_num_containers;
             ++container) {
-                if ((dev->fsa_dev[container].config_waiting_on == 0)
-                 && (dev->fsa_dev[container].config_needed != NOTHING)) {
+                if ((dev->fsa_dev[container].config_waiting_on == 0) &&
+                        (dev->fsa_dev[container].config_needed != NOTHING) &&
+                        time_before(jiffies, dev->fsa_dev[container].config_waiting_stamp + AIF_SNIFF_TIMEOUT)) {
                         device_config_needed =
                                 dev->fsa_dev[container].config_needed;
                         dev->fsa_dev[container].config_needed = NOTHING;
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 720330778648..6ef89c99dd12 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -27,12 +27,6 @@
  * Abstract: Linux Driver entry module for Adaptec RAID Array Controller
  */
 
-#define AAC_DRIVER_VERSION              "1.1-4"
-#ifndef AAC_DRIVER_BRANCH
-#define AAC_DRIVER_BRANCH               ""
-#endif
-#define AAC_DRIVER_BUILD_DATE           __DATE__ " " __TIME__
-#define AAC_DRIVERNAME                  "aacraid"
 
 #include <linux/compat.h>
 #include <linux/blkdev.h>
@@ -62,6 +56,13 @@
 
 #include "aacraid.h"
 
+#define AAC_DRIVER_VERSION              "1.1-5"
+#ifndef AAC_DRIVER_BRANCH
+#define AAC_DRIVER_BRANCH               ""
+#endif
+#define AAC_DRIVER_BUILD_DATE           __DATE__ " " __TIME__
+#define AAC_DRIVERNAME                  "aacraid"
+
 #ifdef AAC_DRIVER_BUILD
 #define _str(x) #x
 #define str(x) _str(x)
@@ -73,7 +74,7 @@
 MODULE_AUTHOR("Red Hat Inc and Adaptec");
 MODULE_DESCRIPTION("Dell PERC2, 2/Si, 3/Si, 3/Di, "
                    "Adaptec Advanced Raid Products, "
-                   "and HP NetRAID-4M SCSI driver");
+                   "HP NetRAID-4M, IBM ServeRAID & ICP SCSI driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(AAC_DRIVER_FULL_VERSION);
 
@@ -243,6 +244,7 @@ static struct aac_driver_ident aac_drivers[] = {
 static int aac_queuecommand(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))
 {
         cmd->scsi_done = done;
+        cmd->SCp.phase = AAC_OWNER_LOWLEVEL;
         return (aac_scsi_cmd(cmd) ? FAILED : 0);
 } 
 
@@ -471,7 +473,8 @@ static int aac_eh_reset(struct scsi_cmnd* cmd)
                 __shost_for_each_device(dev, host) {
                         spin_lock_irqsave(&dev->list_lock, flags);
                         list_for_each_entry(command, &dev->cmd_list, list) {
-                                if (command->serial_number) {
+                                if ((command != cmd) &&
+                                    (command->SCp.phase == AAC_OWNER_FIRMWARE)) {
                                         active++;
                                         break;
                                 }
@@ -569,12 +572,12 @@ static long aac_compat_do_ioctl(struct aac_dev *dev, unsigned cmd, unsigned long
                 
                 f = compat_alloc_user_space(sizeof(*f));
                 ret = 0;
-                if (clear_user(f, sizeof(*f) != sizeof(*f)))
+                if (clear_user(f, sizeof(*f)) != sizeof(*f))
                         ret = -EFAULT;
                 if (copy_in_user(f, (void __user *)arg, sizeof(struct fib_ioctl) - sizeof(u32)))
                         ret = -EFAULT;
                 if (!ret)
-                        ret = aac_do_ioctl(dev, cmd, (void __user *)arg);
+                        ret = aac_do_ioctl(dev, cmd, f);
                 break;
         }
 
@@ -687,6 +690,18 @@ static ssize_t aac_show_serial_number(struct class_device *class_dev,
         return len;
 }
 
+static ssize_t aac_show_max_channel(struct class_device *class_dev, char *buf)
+{
+        return snprintf(buf, PAGE_SIZE, "%d\n",
+          class_to_shost(class_dev)->max_channel);
+}
+
+static ssize_t aac_show_max_id(struct class_device *class_dev, char *buf)
+{
+        return snprintf(buf, PAGE_SIZE, "%d\n",
+          class_to_shost(class_dev)->max_id);
+}
+
 
 static struct class_device_attribute aac_model = {
         .attr = {
@@ -730,6 +745,20 @@ static struct class_device_attribute aac_serial_number = {
         },
         .show = aac_show_serial_number,
 };
+static struct class_device_attribute aac_max_channel = {
+        .attr = {
+                .name = "max_channel",
+                .mode = S_IRUGO,
+        },
+        .show = aac_show_max_channel,
+};
+static struct class_device_attribute aac_max_id = {
+        .attr = {
+                .name = "max_id",
+                .mode = S_IRUGO,
+        },
+        .show = aac_show_max_id,
+};
 
 static struct class_device_attribute *aac_attrs[] = {
         &aac_model,
@@ -738,6 +767,8 @@ static struct class_device_attribute *aac_attrs[] = {
         &aac_monitor_version,
         &aac_bios_version,
         &aac_serial_number,
+        &aac_max_channel,
+        &aac_max_id,
         NULL
 };
 
@@ -775,6 +806,7 @@ static struct scsi_host_template aac_driver_template = {
         .cmd_per_lun                    = AAC_NUM_IO_FIB, 
 #endif  
         .use_clustering                 = ENABLE_CLUSTERING,
+        .emulated                       = 1,
 };
 
 
@@ -798,10 +830,11 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
         error = pci_enable_device(pdev);
         if (error)
                 goto out;
+        error = -ENODEV;
 
         if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) || 
                         pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK))
-                goto out;
+                goto out_disable_pdev;
         /*
          * If the quirk31 bit is set, the adapter needs adapter
          * to driver communication memory to be allocated below 2gig
@@ -809,7 +842,7 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
         if (aac_drivers[index].quirks & AAC_QUIRK_31BIT) 
                 if (pci_set_dma_mask(pdev, DMA_31BIT_MASK) ||
                                 pci_set_consistent_dma_mask(pdev, DMA_31BIT_MASK))
-                        goto out;
+                        goto out_disable_pdev;
         
         pci_set_master(pdev);
 
@@ -904,9 +937,9 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
          * physical channels are address by their actual physical number+1
          */
         if (aac->nondasd_support == 1)
-                shost->max_channel = aac->maximum_num_channels + 1;
+                shost->max_channel = aac->maximum_num_channels;
         else
-                shost->max_channel = 1;
+                shost->max_channel = 0;
 
         aac_get_config_status(aac);
         aac_get_containers(aac);
@@ -1020,7 +1053,8 @@ static int __init aac_init(void)
 
 static void __exit aac_exit(void)
 {
-        unregister_chrdev(aac_cfg_major, "aac");
+        if (aac_cfg_major > -1)
+                unregister_chrdev(aac_cfg_major, "aac");
         pci_unregister_driver(&aac_pci_driver);
 }
 
diff --git a/drivers/scsi/aacraid/rkt.c b/drivers/scsi/aacraid/rkt.c
index e9b775d6bec9..7a23e027eb78 100644
--- a/drivers/scsi/aacraid/rkt.c
+++ b/drivers/scsi/aacraid/rkt.c
@@ -183,7 +183,7 @@ static int rkt_sync_cmd(struct aac_dev *dev, u32 command,
                 /*
                  *      Yield the processor in case we are slow 
                  */
-                schedule_timeout_uninterruptible(1);
+                msleep(1);
         }
         if (ok != 1) {
                 /*
@@ -343,7 +343,7 @@ static int aac_rkt_check_health(struct aac_dev *dev)
                   NULL, NULL, NULL, NULL, NULL);
                 pci_free_consistent(dev->pdev, sizeof(struct POSTSTATUS),
                   post, paddr);
-                if ((buffer[0] == '0') && (buffer[1] == 'x')) {
+                if ((buffer[0] == '0') && ((buffer[1] == 'x') || (buffer[1] == 'X'))) {
                         ret = (buffer[2] <= '9') ? (buffer[2] - '0') : (buffer[2] - 'A' + 10);
                         ret <<= 4;
                         ret += (buffer[3] <= '9') ? (buffer[3] - '0') : (buffer[3] - 'A' + 10);
diff --git a/drivers/scsi/aacraid/rx.c b/drivers/scsi/aacraid/rx.c
index 6998bc877dd6..729b9eb268c2 100644
--- a/drivers/scsi/aacraid/rx.c
+++ b/drivers/scsi/aacraid/rx.c
@@ -183,7 +183,7 @@ static int rx_sync_cmd(struct aac_dev *dev, u32 command,
                 /*
                  *      Yield the processor in case we are slow 
                  */
-                schedule_timeout_uninterruptible(1);
+                msleep(1);
         }
         if (ok != 1) {
                 /*
@@ -342,7 +342,7 @@ static int aac_rx_check_health(struct aac_dev *dev)
                   NULL, NULL, NULL, NULL, NULL);
                 pci_free_consistent(dev->pdev, sizeof(struct POSTSTATUS),
                   post, paddr);
-                if ((buffer[0] == '0') && (buffer[1] == 'x')) {
+                if ((buffer[0] == '0') && ((buffer[1] == 'x') || (buffer[1] == 'X'))) {
                         ret = (buffer[2] <= '9') ? (buffer[2] - '0') : (buffer[2] - 'A' + 10);
                         ret <<= 4;
                         ret += (buffer[3] <= '9') ? (buffer[3] - '0') : (buffer[3] - 'A' + 10);
diff --git a/drivers/scsi/aacraid/sa.c b/drivers/scsi/aacraid/sa.c
index 466f05cfbf0c..a53454908205 100644
--- a/drivers/scsi/aacraid/sa.c
+++ b/drivers/scsi/aacraid/sa.c
@@ -189,7 +189,7 @@ static int sa_sync_cmd(struct aac_dev *dev, u32 command,
                         ok = 1;
                         break;
                 }
-                schedule_timeout_uninterruptible(1);
+                msleep(1);
         }
 
         if (ok != 1)