6 files changed, 15 insertions, 7 deletions

diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index 5d2989754c9f..be8dde4c0f0c 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);
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index f773b0dcfc95..ff5c380eae36 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -1815,3 +1815,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/commsup.c b/drivers/scsi/aacraid/commsup.c
index 9f9f4aae23c0..1c83af3d0f3d 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -1214,7 +1214,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/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..ecc47b605c58 100644
--- a/drivers/scsi/aacraid/sa.c
+++ b/drivers/scsi/aacraid/sa.c
@@ -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) {