[SCSI] aacraid: Dual firmware image support

This patch adds dual flash firmware support for Series 7 and above controllers.

[thenzl: used ssleep(10) instead udelay]
Signed-off-by: Mahesh Rajashekhara <Mahesh.Rajashekhara@pmcs.com>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index a6f7190c09a469b878f2bd9a0db84b3767c38557..9323d058706b9987f3cba212928912c29060bb16 100644 (file)
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -12,7 +12,7 @@
  *----------------------------------------------------------------------------*/
 
 #ifndef AAC_DRIVER_BUILD
-# define AAC_DRIVER_BUILD 30000
+# define AAC_DRIVER_BUILD 30200
 # define AAC_DRIVER_BRANCH "-ms"
 #endif
 #define MAXIMUM_NUM_CONTAINERS 32
@@ -1918,6 +1918,10 @@ extern struct aac_common aac_config;
 #define        MONITOR_PANIC                   0x00000020
 #define        KERNEL_UP_AND_RUNNING           0x00000080
 #define        KERNEL_PANIC                    0x00000100
+#define        FLASH_UPD_PENDING               0x00002000
+#define        FLASH_UPD_SUCCESS               0x00004000
+#define        FLASH_UPD_FAILED                0x00008000
+#define        FWUPD_TIMEOUT                   (5 * 60)
 
 /*
  *     Doorbell bit defines

diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
index 3f759957f4b476ef86c067af0d366922ea28615d..177b094c7792133d25b550ff7522b54f92dc1950 100644 (file)
--- a/drivers/scsi/aacraid/comminit.c
+++ b/drivers/scsi/aacraid/comminit.c
@@ -214,7 +214,7 @@ int aac_send_shutdown(struct aac_dev * dev)
        cmd = (struct aac_close *) fib_data(fibctx);
 
        cmd->command = cpu_to_le32(VM_CloseAll);
-       cmd->cid = cpu_to_le32(0xffffffff);
+       cmd->cid = cpu_to_le32(0xfffffffe);
 
        status = aac_fib_send(ContainerCommand,
                          fibctx,

diff --git a/drivers/scsi/aacraid/src.c b/drivers/scsi/aacraid/src.c
index e2e349204e7df752da9317da19ea5f3875df57a9..0f56d8d7524ff783709fef8797508ea8ce0bcbcb 100644 (file)
--- a/drivers/scsi/aacraid/src.c
+++ b/drivers/scsi/aacraid/src.c
@@ -702,6 +702,28 @@ int aac_srcv_init(struct aac_dev *dev)
        if ((aac_reset_devices || reset_devices) &&
                !aac_src_restart_adapter(dev, 0))
                ++restart;
+       /*
+        *      Check to see if flash update is running.
+        *      Wait for the adapter to be up and running. Wait up to 5 minutes
+        */
+       status = src_readl(dev, MUnit.OMR);
+       if (status & FLASH_UPD_PENDING) {
+               start = jiffies;
+               do {
+                       status = src_readl(dev, MUnit.OMR);
+                       if (time_after(jiffies, start+HZ*FWUPD_TIMEOUT)) {
+                               printk(KERN_ERR "%s%d: adapter flash update failed.\n",
+                                       dev->name, instance);
+                               goto error_iounmap;
+                       }
+               } while (!(status & FLASH_UPD_SUCCESS) &&
+                        !(status & FLASH_UPD_FAILED));
+               /* Delay 10 seconds.
+                * Because right now FW is doing a soft reset,
+                * do not read scratch pad register at this time
+                */
+               ssleep(10);
+       }
        /*
         *      Check to see if the board panic'd while booting.
         */
@@ -730,7 +752,9 @@ int aac_srcv_init(struct aac_dev *dev)
        /*
         *      Wait for the adapter to be up and running. Wait up to 3 minutes
         */
-       while (!((status = src_readl(dev, MUnit.OMR)) & KERNEL_UP_AND_RUNNING)) {
+       while (!((status = src_readl(dev, MUnit.OMR)) &
+               KERNEL_UP_AND_RUNNING) ||
+               status == 0xffffffff) {
                if ((restart &&
                  (status & (KERNEL_PANIC|SELF_TEST_FAILED|MONITOR_PANIC))) ||
                  time_after(jiffies, start+HZ*startup_timeout)) {