Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (55 commits)
  [SCSI] tcm_loop: Add multi-fabric Linux/SCSI LLD fabric module
  [SCSI] qla4xxx: Use polling mode for disable interrupt mailbox completion
  [SCSI] Revert "[SCSI] Retrieve the Caching mode page"
  [SCSI] bnx2fc: IO completion not processed due to missed wakeup
  [SCSI] qla4xxx: Update driver version to 5.02.00-k6
  [SCSI] qla4xxx: masking required bits of add_fw_options during initialization
  [SCSI] qla4xxx: added new function qla4xxx_relogin_all_devices
  [SCSI] qla4xxx: add support for ql4xsess_recovery_tmo cmd line param
  [SCSI] qla4xxx: Add support for ql4xmaxqdepth command line parameter
  [SCSI] qla4xxx: cleanup function qla4xxx_process_ddb_changed
  [SCSI] qla4xxx: Prevent other port reinitialization during remove_adapter
  [SCSI] qla4xxx: remove unused ddb flag DF_NO_RELOGIN
  [SCSI] qla4xxx: cleanup DDB relogin logic during initialization
  [SCSI] qla4xxx: Do not retry ISP82XX initialization if H/W state is failed
  [SCSI] qla4xxx: Do not send mbox command if FW is in failed state
  [SCSI] qla4xxx: cleanup qla4xxx_initialize_ddb_list()
  [SCSI] ses: add subenclosure support
  [SCSI] bnx2fc: Bump version to 1.0.1
  [SCSI] bnx2fc: Remove unnecessary module state checks
  [SCSI] bnx2fc: Fix MTU issue by using static MTU
  ...

1 files changed, 21 insertions, 6 deletions

diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
index b64c6da870d3..60e98a62f308 100644
--- a/drivers/scsi/lpfc/lpfc.h
+++ b/drivers/scsi/lpfc/lpfc.h
@@ -539,6 +539,8 @@ struct lpfc_hba {
                 (struct lpfc_hba *, uint32_t);
         int (*lpfc_hba_down_link)
                 (struct lpfc_hba *, uint32_t);
+        int (*lpfc_selective_reset)
+                (struct lpfc_hba *);
 
         /* SLI4 specific HBA data structure */
         struct lpfc_sli4_hba sli4_hba;
@@ -895,7 +897,18 @@ lpfc_worker_wake_up(struct lpfc_hba *phba)
         return;
 }
 
-static inline void
+static inline int
+lpfc_readl(void __iomem *addr, uint32_t *data)
+{
+        uint32_t temp;
+        temp = readl(addr);
+        if (temp == 0xffffffff)
+                return -EIO;
+        *data = temp;
+        return 0;
+}
+
+static inline int
 lpfc_sli_read_hs(struct lpfc_hba *phba)
 {
         /*
@@ -904,15 +917,17 @@ lpfc_sli_read_hs(struct lpfc_hba *phba)
          */
         phba->sli.slistat.err_attn_event++;
 
-        /* Save status info */
-        phba->work_hs = readl(phba->HSregaddr);
-        phba->work_status[0] = readl(phba->MBslimaddr + 0xa8);
-        phba->work_status[1] = readl(phba->MBslimaddr + 0xac);
+        /* Save status info and check for unplug error */
+        if (lpfc_readl(phba->HSregaddr, &phba->work_hs) ||
+                lpfc_readl(phba->MBslimaddr + 0xa8, &phba->work_status[0]) ||
+                lpfc_readl(phba->MBslimaddr + 0xac, &phba->work_status[1])) {
+                return -EIO;
+        }
 
         /* Clear chip Host Attention error bit */
         writel(HA_ERATT, phba->HAregaddr);
         readl(phba->HAregaddr); /* flush */
         phba->pport->stopped = 1;
 
-        return;
+        return 0;
 }