[SCSI] aacraid: add user initiated reset

Add the ability for an application to issue a hardware reset to the
adapter via sysfs. Typical uses include restarting the adapter after it
has been flashed. Bumped revision number for the driver and added a
feature to periodically check the adapter's health (check_interval),
update the adapter's concept of time (update_interval) and block
checking/resetting of the adapter (check_reset).

Signed-off-by: Mark Salyzyn <aacraid@adaptec.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 18 insertions, 15 deletions

diff --git a/drivers/scsi/aacraid/rx.c b/drivers/scsi/aacraid/rx.c
index ae978a373c56..ebc65b9fea92 100644
--- a/drivers/scsi/aacraid/rx.c
+++ b/drivers/scsi/aacraid/rx.c
@@ -464,21 +464,24 @@ static int aac_rx_restart_adapter(struct aac_dev *dev, int bled)
 {
         u32 var;
 
-        if (bled)
-                printk(KERN_ERR "%s%d: adapter kernel panic'd %x.\n",
-                        dev->name, dev->id, bled);
-        else {
-                bled = aac_adapter_sync_cmd(dev, IOP_RESET_ALWAYS,
-                  0, 0, 0, 0, 0, 0, &var, NULL, NULL, NULL, NULL);
-                if (!bled && (var != 0x00000001))
-                        bled = -EINVAL;
-        }
-        if (bled && (bled != -ETIMEDOUT))
-                bled = aac_adapter_sync_cmd(dev, IOP_RESET,
-                  0, 0, 0, 0, 0, 0, &var, NULL, NULL, NULL, NULL);
+        if (!(dev->supplement_adapter_info.SupportedOptions2 &
+          le32_to_cpu(AAC_OPTION_MU_RESET)) || (bled >= 0) || (bled == -2)) {
+                if (bled)
+                        printk(KERN_ERR "%s%d: adapter kernel panic'd %x.\n",
+                                dev->name, dev->id, bled);
+                else {
+                        bled = aac_adapter_sync_cmd(dev, IOP_RESET_ALWAYS,
+                          0, 0, 0, 0, 0, 0, &var, NULL, NULL, NULL, NULL);
+                        if (!bled && (var != 0x00000001))
+                                bled = -EINVAL;
+                }
+                if (bled && (bled != -ETIMEDOUT))
+                        bled = aac_adapter_sync_cmd(dev, IOP_RESET,
+                          0, 0, 0, 0, 0, 0, &var, NULL, NULL, NULL, NULL);
 
-        if (bled && (bled != -ETIMEDOUT))
-                return -EINVAL;
+                if (bled && (bled != -ETIMEDOUT))
+                        return -EINVAL;
+        }
         if (bled || (var == 0x3803000F)) { /* USE_OTHER_METHOD */
                 rx_writel(dev, MUnit.reserved2, 3);
                 msleep(5000); /* Delay 5 seconds */
@@ -596,7 +599,7 @@ int _aac_rx_init(struct aac_dev *dev)
                 }
                 msleep(1);
         }
-        if (restart)
+        if (restart && aac_commit)
                 aac_commit = 1;
         /*
          *      Fill in the common function dispatch table.