[SCSI] ipr: Use PCI-E reset API for new ipr adapter

Use a newly added PCI API to issue a PCI Fundamental reset
(warm reset) to a new ipr PCI-E adapter. Typically, the
ipr adapter uses the start BIST bit in config space to reset
an adapter. Issuing start BIST on this particular adapter
results in the PCI-E logic on the card losing sync, which
causes PCI-E errors, making the card unusable. The only reset
mechanism that exists on this hardware that does not have this
problem is PCI Fundamental reset (warm reset).

Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

2 files changed, 72 insertions, 6 deletions

diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 101e519844df..4baa79e68679 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -6641,6 +6641,48 @@ static int ipr_reset_start_bist(struct ipr_cmnd *ipr_cmd)
 }
 
 /**
+ * ipr_reset_slot_reset_done - Clear PCI reset to the adapter
+ * @ipr_cmd:    ipr command struct
+ *
+ * Description: This clears PCI reset to the adapter and delays two seconds.
+ *
+ * Return value:
+ *      IPR_RC_JOB_RETURN
+ **/
+static int ipr_reset_slot_reset_done(struct ipr_cmnd *ipr_cmd)
+{
+        ENTER;
+        pci_set_pcie_reset_state(ipr_cmd->ioa_cfg->pdev, pcie_deassert_reset);
+        ipr_cmd->job_step = ipr_reset_bist_done;
+        ipr_reset_start_timer(ipr_cmd, IPR_WAIT_FOR_BIST_TIMEOUT);
+        LEAVE;
+        return IPR_RC_JOB_RETURN;
+}
+
+/**
+ * ipr_reset_slot_reset - Reset the PCI slot of the adapter.
+ * @ipr_cmd:    ipr command struct
+ *
+ * Description: This asserts PCI reset to the adapter.
+ *
+ * Return value:
+ *      IPR_RC_JOB_RETURN
+ **/
+static int ipr_reset_slot_reset(struct ipr_cmnd *ipr_cmd)
+{
+        struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
+        struct pci_dev *pdev = ioa_cfg->pdev;
+
+        ENTER;
+        pci_block_user_cfg_access(pdev);
+        pci_set_pcie_reset_state(pdev, pcie_warm_reset);
+        ipr_cmd->job_step = ipr_reset_slot_reset_done;
+        ipr_reset_start_timer(ipr_cmd, IPR_PCI_RESET_TIMEOUT);
+        LEAVE;
+        return IPR_RC_JOB_RETURN;
+}
+
+/**
  * ipr_reset_allowed - Query whether or not IOA can be reset
  * @ioa_cfg:    ioa config struct
  *
@@ -6679,7 +6721,7 @@ static int ipr_reset_wait_to_start_bist(struct ipr_cmnd *ipr_cmd)
                 ipr_cmd->u.time_left -= IPR_CHECK_FOR_RESET_TIMEOUT;
                 ipr_reset_start_timer(ipr_cmd, IPR_CHECK_FOR_RESET_TIMEOUT);
         } else {
-                ipr_cmd->job_step = ipr_reset_start_bist;
+                ipr_cmd->job_step = ioa_cfg->reset;
                 rc = IPR_RC_JOB_CONTINUE;
         }
 
@@ -6712,7 +6754,7 @@ static int ipr_reset_alert(struct ipr_cmnd *ipr_cmd)
                 writel(IPR_UPROCI_RESET_ALERT, ioa_cfg->regs.set_uproc_interrupt_reg);
                 ipr_cmd->job_step = ipr_reset_wait_to_start_bist;
         } else {
-                ipr_cmd->job_step = ipr_reset_start_bist;
+                ipr_cmd->job_step = ioa_cfg->reset;
         }
 
         ipr_cmd->u.time_left = IPR_WAIT_FOR_RESET_TIMEOUT;
@@ -6994,8 +7036,11 @@ static pci_ers_result_t ipr_pci_slot_reset(struct pci_dev *pdev)
         struct ipr_ioa_cfg *ioa_cfg = pci_get_drvdata(pdev);
 
         spin_lock_irqsave(ioa_cfg->host->host_lock, flags);
-        _ipr_initiate_ioa_reset(ioa_cfg, ipr_reset_restore_cfg_space,
-                                         IPR_SHUTDOWN_NONE);
+        if (ioa_cfg->needs_warm_reset)
+                ipr_initiate_ioa_reset(ioa_cfg, IPR_SHUTDOWN_NONE);
+        else
+                _ipr_initiate_ioa_reset(ioa_cfg, ipr_reset_restore_cfg_space,
+                                        IPR_SHUTDOWN_NONE);
         spin_unlock_irqrestore(ioa_cfg->host->host_lock, flags);
         return PCI_ERS_RESULT_RECOVERED;
 }
@@ -7483,6 +7528,14 @@ static int __devinit ipr_probe_ioa(struct pci_dev *pdev,
         else
                 ioa_cfg->transop_timeout = IPR_OPERATIONAL_TIMEOUT;
 
+        rc = pci_read_config_byte(pdev, PCI_REVISION_ID, &ioa_cfg->revid);
+
+        if (rc != PCIBIOS_SUCCESSFUL) {
+                dev_err(&pdev->dev, "Failed to read PCI revision ID\n");
+                rc = -EIO;
+                goto out_scsi_host_put;
+        }
+
         ipr_regs_pci = pci_resource_start(pdev, 0);
 
         rc = pci_request_regions(pdev, IPR_NAME);
@@ -7569,6 +7622,13 @@ static int __devinit ipr_probe_ioa(struct pci_dev *pdev,
                 goto cleanup_nolog;
         }
 
+        if ((dev_id->driver_data & IPR_USE_PCI_WARM_RESET) ||
+            (dev_id->device == PCI_DEVICE_ID_IBM_OBSIDIAN_E && !ioa_cfg->revid)) {
+                ioa_cfg->needs_warm_reset = 1;
+                ioa_cfg->reset = ipr_reset_slot_reset;
+        } else
+                ioa_cfg->reset = ipr_reset_start_bist;
+
         spin_lock(&ipr_driver_lock);
         list_add_tail(&ioa_cfg->queue, &ipr_ioa_head);
         spin_unlock(&ipr_driver_lock);
@@ -7835,7 +7895,7 @@ static struct pci_device_id ipr_pci_table[] __devinitdata = {
               PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B3, 0, 0, 0 },
         { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN_E,
               PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B7, 0, 0,
-              IPR_USE_LONG_TRANSOP_TIMEOUT },
+              IPR_USE_LONG_TRANSOP_TIMEOUT | IPR_USE_PCI_WARM_RESET },
         { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_SNIPE,
                 PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_2780, 0, 0, 0 },
         { PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_SCAMP,
diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h
index daa96ee19d4f..d93156671e93 100644
--- a/drivers/scsi/ipr.h
+++ b/drivers/scsi/ipr.h
@@ -37,7 +37,7 @@
 /*
  * Literals
  */
-#define IPR_DRIVER_VERSION "2.4.0"
+#define IPR_DRIVER_VERSION "2.4.1"
 #define IPR_DRIVER_DATE "(April 24, 2007)"
 
 /*
@@ -112,6 +112,7 @@
 
 /* Driver data flags */
 #define IPR_USE_LONG_TRANSOP_TIMEOUT            0x00000001
+#define IPR_USE_PCI_WARM_RESET                  0x00000002
 
 #define IPR_DEFAULT_MAX_ERROR_DUMP                      984
 #define IPR_NUM_LOG_HCAMS                               2
@@ -193,6 +194,7 @@
 #define IPR_WAIT_FOR_RESET_TIMEOUT              (2 * HZ)
 #define IPR_CHECK_FOR_RESET_TIMEOUT             (HZ / 10)
 #define IPR_WAIT_FOR_BIST_TIMEOUT               (2 * HZ)
+#define IPR_PCI_RESET_TIMEOUT                   (HZ / 2)
 #define IPR_DUMP_TIMEOUT                        (15 * HZ)
 
 /*
@@ -1091,6 +1093,9 @@ struct ipr_ioa_cfg {
         u8 allow_ml_add_del:1;
         u8 needs_hard_reset:1;
         u8 dual_raid:1;
+        u8 needs_warm_reset:1;
+
+        u8 revid;
 
         enum ipr_cache_state cache_state;
         u16 type; /* CCIN of the card */
@@ -1184,6 +1189,7 @@ struct ipr_ioa_cfg {
         struct pci_pool *ipr_cmd_pool;
 
         struct ipr_cmnd *reset_cmd;
+        int (*reset) (struct ipr_cmnd *);
 
         struct ata_host ata_host;
         char ipr_cmd_label[8];