10 files changed, 40 insertions, 55 deletions

diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index 642a3b4e5937..ea9e038813eb 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -148,6 +148,8 @@ static int nondasd = -1;
 static int dacmode = -1;
 
 static int commit = -1;
+int startup_timeout = 180;
+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");
@@ -155,6 +157,10 @@ 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, 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");
+module_param(startup_timeout, int, S_IRUGO|S_IWUSR);
+MODULE_PARM_DESC(startup_timeout, "The duration of time in seconds to wait for adapter to have it's kernel up and\nrunning. This is typically adjusted for large systems that do not have a BIOS.");
+module_param(aif_timeout, int, S_IRUGO|S_IWUSR);
+MODULE_PARM_DESC(aif_timeout, "The duration of time in seconds to wait for applications to pick up AIFs before\nderegistering them. This is typically adjusted for heavily burdened systems.");
 
 int numacb = -1;
 module_param(numacb, int, S_IRUGO|S_IWUSR);
@@ -635,13 +641,13 @@ static void setinqstr(struct aac_dev *dev, void *data, int tindex)
                         cp[sizeof(str->pid)] = c;
         } else {
                 struct aac_driver_ident *mp = aac_get_driver_ident(dev->cardtype);
-   
-                inqstrcpy (mp->vname, str->vid); 
+
+                inqstrcpy (mp->vname, str->vid);
                 /* last six chars reserved for vol type */
                 inqstrcpy (mp->model, str->pid);
         }
 
-        if (tindex < (sizeof(container_types)/sizeof(char *))){
+        if (tindex < ARRAY_SIZE(container_types)){
                 char *findit = str->pid;
 
                 for ( ; *findit != ' '; findit++); /* walk till we find a space */
@@ -955,7 +961,7 @@ static void io_callback(void *context, struct fib * fibptr)
                 
         if(scsicmd->use_sg)
                 pci_unmap_sg(dev->pdev, 
-                        (struct scatterlist *)scsicmd->buffer,
+                        (struct scatterlist *)scsicmd->request_buffer,
                         scsicmd->use_sg,
                         scsicmd->sc_data_direction);
         else if(scsicmd->request_bufflen)
@@ -1570,7 +1576,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                  *      see: <vendor>.c i.e. aac.c
                  */
                 if (scmd_id(scsicmd) == host->this_id) {
-                        setinqstr(dev, (void *) (inq_data.inqd_vid), (sizeof(container_types)/sizeof(char *)));
+                        setinqstr(dev, (void *) (inq_data.inqd_vid), ARRAY_SIZE(container_types));
                         inq_data.inqd_pdt = INQD_PDT_PROC;      /* Processor device */
                         aac_internal_transfer(scsicmd, &inq_data, 0, sizeof(inq_data));
                         scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_GOOD;
@@ -1913,7 +1919,7 @@ static void aac_srb_callback(void *context, struct fib * fibptr)
 
         if(scsicmd->use_sg)
                 pci_unmap_sg(dev->pdev, 
-                        (struct scatterlist *)scsicmd->buffer,
+                        (struct scatterlist *)scsicmd->request_buffer,
                         scsicmd->use_sg,
                         scsicmd->sc_data_direction);
         else if(scsicmd->request_bufflen)
@@ -2218,15 +2224,15 @@ static unsigned long aac_build_sg(struct scsi_cmnd* scsicmd, struct sgmap* psg)
                 }
         }
         else if(scsicmd->request_bufflen) {
-                dma_addr_t addr; 
-                addr = pci_map_single(dev->pdev,
+                u32 addr;
+                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 = cpu_to_le32(addr);
                 psg->sg[0].count = cpu_to_le32(scsicmd->request_bufflen);  
-                scsicmd->SCp.dma_handle = addr;
                 byte_count = scsicmd->request_bufflen;
         }
         return byte_count;
@@ -2375,7 +2381,7 @@ static struct aac_srb_status_info srb_status_info[] = {
         { SRB_STATUS_SUCCESS,           "Success"},
         { SRB_STATUS_ABORTED,           "Aborted Command"},
         { SRB_STATUS_ABORT_FAILED,      "Abort Failed"},
-        { SRB_STATUS_ERROR,             "Error Event"}, 
+        { SRB_STATUS_ERROR,             "Error Event"},
         { SRB_STATUS_BUSY,              "Device Busy"},
         { SRB_STATUS_INVALID_REQUEST,   "Invalid Request"},
         { SRB_STATUS_INVALID_PATH_ID,   "Invalid Path ID"},
@@ -2394,7 +2400,7 @@ static struct aac_srb_status_info srb_status_info[] = {
         { SRB_STATUS_BAD_SRB_BLOCK_LENGTH,"Bad Srb Block Length"},
         { SRB_STATUS_REQUEST_FLUSHED,   "Request Flushed"},
         { SRB_STATUS_DELAYED_RETRY,     "Delayed Retry"},
-        { SRB_STATUS_INVALID_LUN,       "Invalid LUN"}, 
+        { SRB_STATUS_INVALID_LUN,       "Invalid LUN"},
         { SRB_STATUS_INVALID_TARGET_ID, "Invalid TARGET ID"},
         { SRB_STATUS_BAD_FUNCTION,      "Bad Function"},
         { SRB_STATUS_ERROR_RECOVERY,    "Error Recovery"},
@@ -2409,11 +2415,9 @@ char *aac_get_status_string(u32 status)
 {
         int i;
 
-        for(i=0; i < (sizeof(srb_status_info)/sizeof(struct aac_srb_status_info)); i++ ){
-                if(srb_status_info[i].status == status){
+        for (i = 0; i < ARRAY_SIZE(srb_status_info); i++)
+                if (srb_status_info[i].status == status)
                         return srb_status_info[i].str;
-                }
-        }
 
         return "Bad Status Code";
 }
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index f773b0dcfc95..d0eecd4bec83 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -12,7 +12,7 @@
 
 #ifndef AAC_DRIVER_BUILD
 # define AAC_DRIVER_BUILD 2409
-# define AAC_DRIVER_BRANCH "-mh1"
+# define AAC_DRIVER_BRANCH "-mh2"
 #endif
 #define MAXIMUM_NUM_CONTAINERS  32
 
@@ -563,7 +563,6 @@ struct aac_queue {
         spinlock_t              lockdata;       /* Actual lock (used only on one side of the lock) */
         struct list_head        cmdq;           /* A queue of FIBs which need to be prcessed by the FS thread. This is */
                                                 /* only valid for command queues which receive entries from the adapter. */
-        struct list_head        pendingq;       /* A queue of outstanding fib's to the adapter. */
         u32                     numpending;     /* Number of entries on outstanding queue. */
         struct aac_dev *        dev;            /* Back pointer to adapter structure */
 };
@@ -823,11 +822,6 @@ struct fib {
         void                    *callback_data;
         u32                     flags; // u32 dmb was ulong
         /*
-         *      The following is used to put this fib context onto the 
-         *      Outstanding I/O queue.
-         */
-        struct list_head        queue;
-        /*
          *      And for the internal issue/reply queues (we may be able
          *      to merge these two)
          */
@@ -1815,3 +1809,5 @@ int aac_probe_container(struct aac_dev *dev, int cid);
 extern int numacb;
 extern int acbsize;
 extern char aac_driver_version[];
+extern int startup_timeout;
+extern int aif_timeout;
diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c
index 9f75144e5247..255421de9d1a 100644
--- a/drivers/scsi/aacraid/commctrl.c
+++ b/drivers/scsi/aacraid/commctrl.c
@@ -535,7 +535,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
         default:
                 data_dir = DMA_NONE;
         }
-        if (user_srbcmd->sg.count > (sizeof(sg_list)/sizeof(sg_list[0]))) {
+        if (user_srbcmd->sg.count > ARRAY_SIZE(sg_list)) {
                 dprintk((KERN_DEBUG"aacraid: too many sg entries %d\n",
                   le32_to_cpu(srbcmd->sg.count)));
                 rcode = -EINVAL;
diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
index 19397453bae7..35b0a6ebd3f5 100644
--- a/drivers/scsi/aacraid/comminit.c
+++ b/drivers/scsi/aacraid/comminit.c
@@ -103,7 +103,7 @@ static int aac_alloc_comm(struct aac_dev *dev, void **commaddr, unsigned long co
          * This assumes the memory is mapped zero->n, which isnt
          * always true on real computers. It also has some slight problems
          * with the GART on x86-64. I've btw never tried DMA from PCI space
-         * on this platform but don't be suprised if its problematic.
+         * on this platform but don't be surprised if its problematic.
          */
 #ifndef CONFIG_GART_IOMMU
         if ((num_physpages << (PAGE_SHIFT - 12)) <= AAC_MAX_HOSTPHYSMEMPAGES) {
@@ -159,7 +159,6 @@ static void aac_queue_init(struct aac_dev * dev, struct aac_queue * q, u32 *mem,
 {
         q->numpending = 0;
         q->dev = dev;
-        INIT_LIST_HEAD(&q->pendingq);
         init_waitqueue_head(&q->cmdready);
         INIT_LIST_HEAD(&q->cmdq);
         init_waitqueue_head(&q->qfull);
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index 9f9f4aae23c0..d2ef17ea44fa 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -472,7 +472,6 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,
         spin_lock_irqsave(q->lock, qflags);
         if (dev->new_comm_interface) {
                 unsigned long count = 10000000L; /* 50 seconds */
-                list_add_tail(&fibptr->queue, &q->pendingq);
                 q->numpending++;
                 spin_unlock_irqrestore(q->lock, qflags);
                 while (aac_adapter_send(fibptr) != 0) {
@@ -481,7 +480,6 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,
                                         spin_unlock_irqrestore(&fibptr->event_lock, flags);
                                 spin_lock_irqsave(q->lock, qflags);
                                 q->numpending--;
-                                list_del(&fibptr->queue);
                                 spin_unlock_irqrestore(q->lock, qflags);
                                 return -ETIMEDOUT;
                         }
@@ -492,7 +490,6 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,
                 unsigned long nointr = 0;
                 aac_queue_get( dev, &index, AdapNormCmdQueue, hw_fib, 1, fibptr, &nointr);
 
-                list_add_tail(&fibptr->queue, &q->pendingq);
                 q->numpending++;
                 *(q->headers.producer) = cpu_to_le32(index + 1);
                 spin_unlock_irqrestore(q->lock, qflags);
@@ -520,7 +517,6 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,
                                 if (--count == 0) {
                                         spin_lock_irqsave(q->lock, qflags);
                                         q->numpending--;
-                                        list_del(&fibptr->queue);
                                         spin_unlock_irqrestore(q->lock, qflags);
                                         if (wait == -1) {
                                                 printk(KERN_ERR "aacraid: aac_fib_send: first asynchronous command timed out.\n"
@@ -1214,7 +1210,7 @@ int aac_command_thread(void *data)
                                                  * since the last read off
                                                  * the queue?
                                                  */
-                                                if ((time_now - time_last) > 120) {
+                                                if ((time_now - time_last) > aif_timeout) {
                                                         entry = entry->next;
                                                         aac_close_fib_context(dev, fibctx);
                                                         continue;
diff --git a/drivers/scsi/aacraid/dpcsup.c b/drivers/scsi/aacraid/dpcsup.c
index f6bcb9486f85..b2a5c7262f36 100644
--- a/drivers/scsi/aacraid/dpcsup.c
+++ b/drivers/scsi/aacraid/dpcsup.c
@@ -85,10 +85,9 @@ unsigned int aac_response_normal(struct aac_queue * q)
                  *      continue. The caller has already been notified that
                  *      the fib timed out.
                  */
-                if (!(fib->flags & FIB_CONTEXT_FLAG_TIMED_OUT)) {
-                        list_del(&fib->queue);
+                if (!(fib->flags & FIB_CONTEXT_FLAG_TIMED_OUT))
                         dev->queues->queue[AdapNormCmdQueue].numpending--;
-                } else {
+                else {
                         printk(KERN_WARNING "aacraid: FIB timeout (%x).\n", fib->flags);
                         printk(KERN_DEBUG"aacraid: hwfib=%p fib index=%i fib=%p\n",hwfib, hwfib->header.SenderData,fib);
                         continue;
@@ -284,7 +283,6 @@ unsigned int aac_intr_normal(struct aac_dev * dev, u32 Index)
                         return 0;
                 }
 
-                list_del(&fib->queue);
                 dev->queues->queue[AdapNormCmdQueue].numpending--;
 
                 if (fast) {
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 6ef89c99dd12..e42a479ce64a 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -119,7 +119,7 @@ static struct pci_device_id aac_pci_tbl[] = {
         { 0x9005, 0x0286, 0x9005, 0x029f, 0, 0, 26 }, /* ICP9014R0 (Lancer) */
         { 0x9005, 0x0286, 0x9005, 0x02a0, 0, 0, 27 }, /* ICP9047MA (Lancer) */
         { 0x9005, 0x0286, 0x9005, 0x02a1, 0, 0, 28 }, /* ICP9087MA (Lancer) */
-        { 0x9005, 0x0286, 0x9005, 0x02a3, 0, 0, 29 }, /* ICP5085AU (Hurricane) */
+        { 0x9005, 0x0286, 0x9005, 0x02a3, 0, 0, 29 }, /* ICP5445AU (Hurricane44) */
         { 0x9005, 0x0285, 0x9005, 0x02a4, 0, 0, 30 }, /* ICP9085LI (Marauder-X) */
         { 0x9005, 0x0285, 0x9005, 0x02a5, 0, 0, 31 }, /* ICP5085BR (Marauder-E) */
         { 0x9005, 0x0286, 0x9005, 0x02a6, 0, 0, 32 }, /* ICP9067MA (Intruder-6) */
@@ -143,7 +143,7 @@ static struct pci_device_id aac_pci_tbl[] = {
         { 0x9005, 0x0285, 0x9005, 0x0298, 0, 0, 48 }, /* ASR-4000SAS (BlackBird) */
         { 0x9005, 0x0285, 0x9005, 0x0299, 0, 0, 49 }, /* ASR-4800SAS (Marauder-X) */
         { 0x9005, 0x0285, 0x9005, 0x029a, 0, 0, 50 }, /* ASR-4805SAS (Marauder-E) */
-        { 0x9005, 0x0286, 0x9005, 0x02a2, 0, 0, 51 }, /* ASR-4810SAS (Hurricane */
+        { 0x9005, 0x0286, 0x9005, 0x02a2, 0, 0, 51 }, /* ASR-3800SAS (Hurricane44) */
 
         { 0x9005, 0x0285, 0x1028, 0x0287, 0, 0, 52 }, /* Perc 320/DC*/
         { 0x1011, 0x0046, 0x9005, 0x0365, 0, 0, 53 }, /* Adaptec 5400S (Mustang)*/
@@ -195,7 +195,7 @@ static struct aac_driver_ident aac_drivers[] = {
         { aac_rkt_init, "aacraid",  "ICP     ", "ICP9014R0       ", 1 }, /* ICP9014R0 (Lancer) */
         { aac_rkt_init, "aacraid",  "ICP     ", "ICP9047MA       ", 1 }, /* ICP9047MA (Lancer) */
         { aac_rkt_init, "aacraid",  "ICP     ", "ICP9087MA       ", 1 }, /* ICP9087MA (Lancer) */
-        { aac_rkt_init, "aacraid",  "ICP     ", "ICP5085AU       ", 1 }, /* ICP5085AU (Hurricane) */
+        { aac_rkt_init, "aacraid",  "ICP     ", "ICP5445AU       ", 1 }, /* ICP5445AU (Hurricane44) */
         { aac_rx_init, "aacraid",  "ICP     ", "ICP9085LI       ", 1 }, /* ICP9085LI (Marauder-X) */
         { aac_rx_init, "aacraid",  "ICP     ", "ICP5085BR       ", 1 }, /* ICP5085BR (Marauder-E) */
         { aac_rkt_init, "aacraid",  "ICP     ", "ICP9067MA       ", 1 }, /* ICP9067MA (Intruder-6) */
@@ -217,7 +217,7 @@ static struct aac_driver_ident aac_drivers[] = {
         { aac_rx_init, "aacraid",  "ADAPTEC ", "ASR-4000SAS     ", 1 }, /* ASR-4000SAS (BlackBird & AvonPark) */
         { aac_rx_init, "aacraid",  "ADAPTEC ", "ASR-4800SAS     ", 1 }, /* ASR-4800SAS (Marauder-X) */
         { aac_rx_init, "aacraid",  "ADAPTEC ", "ASR-4805SAS     ", 1 }, /* ASR-4805SAS (Marauder-E) */
-        { aac_rkt_init, "aacraid",  "ADAPTEC ", "ASR-4810SAS     ", 1 }, /* ASR-4810SAS (Hurricane) */
+        { aac_rkt_init, "aacraid",  "ADAPTEC ", "ASR-3800SAS     ", 1 }, /* ASR-3800SAS (Hurricane44) */
 
         { aac_rx_init, "percraid", "DELL    ", "PERC 320/DC     ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG }, /* Perc 320/DC*/
         { aac_sa_init, "aacraid",  "ADAPTEC ", "Adaptec 5400S   ", 4, AAC_QUIRK_34SG }, /* Adaptec 5400S (Mustang)*/
@@ -453,15 +453,10 @@ static int aac_eh_reset(struct scsi_cmnd* cmd)
 
         printk(KERN_ERR "%s: Host adapter reset request. SCSI hang ?\n", 
                                         AAC_DRIVERNAME);
-
-
-        spin_lock_irq(host->host_lock);
-
         aac = (struct aac_dev *)host->hostdata;
         if (aac_adapter_check_health(aac)) {
                 printk(KERN_ERR "%s: Host adapter appears dead\n", 
                                 AAC_DRIVERNAME);
-                spin_unlock_irq(host->host_lock);
                 return -ENODEV;
         }
         /*
@@ -487,13 +482,10 @@ static int aac_eh_reset(struct scsi_cmnd* cmd)
                 /*
                  * We can exit If all the commands are complete
                  */
-                spin_unlock_irq(host->host_lock);
                 if (active == 0)
                         return SUCCESS;
                 ssleep(1);
-                spin_lock_irq(host->host_lock);
         }
-        spin_unlock_irq(host->host_lock);
         printk(KERN_ERR "%s: SCSI bus appears hung\n", AAC_DRIVERNAME);
         return -ETIMEDOUT;
 }
@@ -572,7 +564,7 @@ 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)))
                         ret = -EFAULT;
                 if (copy_in_user(f, (void __user *)arg, sizeof(struct fib_ioctl) - sizeof(u32)))
                         ret = -EFAULT;
diff --git a/drivers/scsi/aacraid/rkt.c b/drivers/scsi/aacraid/rkt.c
index 7a23e027eb78..5b52966bbbf3 100644
--- a/drivers/scsi/aacraid/rkt.c
+++ b/drivers/scsi/aacraid/rkt.c
@@ -444,14 +444,14 @@ int aac_rkt_init(struct aac_dev *dev)
          */
         while (!(rkt_readl(dev, MUnit.OMRx[0]) & KERNEL_UP_AND_RUNNING))
         {
-                if(time_after(jiffies, start+180*HZ))
+                if(time_after(jiffies, start+startup_timeout*HZ))
                 {
                         status = rkt_readl(dev, MUnit.OMRx[0]);
                         printk(KERN_ERR "%s%d: adapter kernel failed to start, init status = %lx.\n", 
                                         dev->name, instance, status);
                         goto error_iounmap;
                 }
-                schedule_timeout_uninterruptible(1);
+                msleep(1);
         }
         if (request_irq(dev->scsi_host_ptr->irq, aac_rkt_intr, SA_SHIRQ|SA_INTERRUPT, "aacraid", (void *)dev)<0) 
         {
diff --git a/drivers/scsi/aacraid/rx.c b/drivers/scsi/aacraid/rx.c
index 729b9eb268c2..9dadfb28b3f1 100644
--- a/drivers/scsi/aacraid/rx.c
+++ b/drivers/scsi/aacraid/rx.c
@@ -444,14 +444,14 @@ int aac_rx_init(struct aac_dev *dev)
         while ((!(rx_readl(dev, IndexRegs.Mailbox[7]) & KERNEL_UP_AND_RUNNING))
                 || (!(rx_readl(dev, MUnit.OMRx[0]) & KERNEL_UP_AND_RUNNING)))
         {
-                if(time_after(jiffies, start+180*HZ))
+                if(time_after(jiffies, start+startup_timeout*HZ))
                 {
                         status = rx_readl(dev, IndexRegs.Mailbox[7]);
                         printk(KERN_ERR "%s%d: adapter kernel failed to start, init status = %lx.\n", 
                                         dev->name, instance, status);
                         goto error_iounmap;
                 }
-                schedule_timeout_uninterruptible(1);
+                msleep(1);
         }
         if (request_irq(dev->scsi_host_ptr->irq, aac_rx_intr, SA_SHIRQ|SA_INTERRUPT, "aacraid", (void *)dev)<0) 
         {
diff --git a/drivers/scsi/aacraid/sa.c b/drivers/scsi/aacraid/sa.c
index a53454908205..88d400fccc94 100644
--- a/drivers/scsi/aacraid/sa.c
+++ b/drivers/scsi/aacraid/sa.c
@@ -66,11 +66,11 @@ static irqreturn_t aac_sa_intr(int irq, void *dev_id, struct pt_regs *regs)
                         sa_writew(dev, DoorbellClrReg_p, PrintfReady); /* clear PrintfReady */
                         sa_writew(dev, DoorbellReg_s, PrintfDone);
                 } else if (intstat & DOORBELL_1) {      // dev -> Host Normal Command Ready
-                        aac_command_normal(&dev->queues->queue[HostNormCmdQueue]);
                         sa_writew(dev, DoorbellClrReg_p, DOORBELL_1);
+                        aac_command_normal(&dev->queues->queue[HostNormCmdQueue]);
                 } else if (intstat & DOORBELL_2) {      // dev -> Host Normal Response Ready
-                        aac_response_normal(&dev->queues->queue[HostNormRespQueue]);
                         sa_writew(dev, DoorbellClrReg_p, DOORBELL_2);
+                        aac_response_normal(&dev->queues->queue[HostNormRespQueue]);
                 } else if (intstat & DOORBELL_3) {      // dev -> Host Normal Command Not Full
                         sa_writew(dev, DoorbellClrReg_p, DOORBELL_3);
                 } else if (intstat & DOORBELL_4) {      // dev -> Host Normal Response Not Full
@@ -318,13 +318,13 @@ int aac_sa_init(struct aac_dev *dev)
          *      Wait for the adapter to be up and running. Wait up to 3 minutes.
          */
         while (!(sa_readl(dev, Mailbox7) & KERNEL_UP_AND_RUNNING)) {
-                if (time_after(jiffies, start+180*HZ)) {
+                if (time_after(jiffies, start+startup_timeout*HZ)) {
                         status = sa_readl(dev, Mailbox7);
                         printk(KERN_WARNING "%s%d: adapter kernel failed to start, init status = %lx.\n", 
                                         name, instance, status);
                         goto error_iounmap;
                 }
-                schedule_timeout_uninterruptible(1);
+                msleep(1);
         }
 
         if (request_irq(dev->scsi_host_ptr->irq, aac_sa_intr, SA_SHIRQ|SA_INTERRUPT, "aacraid", (void *)dev ) < 0) {