Merge tag 'iommu-updates-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / aacraid / src.c

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)) {