[SCSI] sym53c8xx: PCI Error Recovery support

This patch adds the PCI error recovery callbacks to the Symbios SCSI device
driver.  It includes support for First Failure Data Capture.

Signed-off-by: Linas Vepstas <linas@austin.ibm.com>

Assorted changes to initial patches, including returning IRQ_NONE from the
interrupt handler if the device is offline and re-using the eh_done completion
in the scsi error handler.

Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 21 insertions, 4 deletions

diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.c b/drivers/scsi/sym53c8xx_2/sym_hipd.c
index 21cd4c7f5289..af24c447b195 100644
--- a/drivers/scsi/sym53c8xx_2/sym_hipd.c
+++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c
@@ -1180,10 +1180,10 @@ static void sym_log_hard_error(struct sym_hcb *np, u_short sist, u_char dstat)
                         scr_to_cpu((int) *(u32 *)(script_base + script_ofs)));
         }
 
-        printf ("%s: regdump:", sym_name(np));
-        for (i=0; i<24;i++)
-            printf (" %02x", (unsigned)INB_OFF(np, i));
-        printf (".\n");
+        printf("%s: regdump:", sym_name(np));
+        for (i = 0; i < 24; i++)
+                printf(" %02x", (unsigned)INB_OFF(np, i));
+        printf(".\n");
 
         /*
          *  PCI BUS error.
@@ -1192,6 +1192,16 @@ static void sym_log_hard_error(struct sym_hcb *np, u_short sist, u_char dstat)
                 sym_log_bus_error(np);
 }
 
+void sym_dump_registers(struct sym_hcb *np)
+{
+        u_short sist;
+        u_char dstat;
+
+        sist = INW(np, nc_sist);
+        dstat = INB(np, nc_dstat);
+        sym_log_hard_error(np, sist, dstat);
+}
+
 static struct sym_chip sym_dev_table[] = {
  {PCI_DEVICE_ID_NCR_53C810, 0x0f, "810", 4, 8, 4, 64,
  FE_ERL}
@@ -2809,6 +2819,13 @@ void sym_interrupt (struct sym_hcb *np)
                         dstat |= INB(np, nc_dstat);
                 istatc = INB(np, nc_istat);
                 istat |= istatc;
+
+                /* Prevent deadlock waiting on a condition that may
+                 * never clear. */
+                if (unlikely(sist == 0xffff && dstat == 0xff)) {
+                        if (pci_channel_offline(np->s.device))
+                                return;
+                }
         } while (istatc & (SIP|DIP));
 
         if (DEBUG_FLAGS & DEBUG_TINY)