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: (170 commits)
  [SCSI] scsi_dh_rdac: Add MD36xxf into device list
  [SCSI] scsi_debug: add consecutive medium errors
  [SCSI] libsas: fix ata list corruption issue
  [SCSI] hpsa: export resettable host attribute
  [SCSI] hpsa: move device attributes to avoid forward declarations
  [SCSI] scsi_debug: Logical Block Provisioning (SBC3r26)
  [SCSI] sd: Logical Block Provisioning update
  [SCSI] Include protection operation in SCSI command trace
  [SCSI] hpsa: fix incorrect PCI IDs and add two new ones (2nd try)
  [SCSI] target: Fix volume size misreporting for volumes > 2TB
  [SCSI] bnx2fc: Broadcom FCoE offload driver
  [SCSI] fcoe: fix broken fcoe interface reset
  [SCSI] fcoe: precedence bug in fcoe_filter_frames()
  [SCSI] libfcoe: Remove stale fcoe-netdev entries
  [SCSI] libfcoe: Move FCOE_MTU definition from fcoe.h to libfcoe.h
  [SCSI] libfc: introduce __fc_fill_fc_hdr that accepts fc_hdr as an argument
  [SCSI] fcoe, libfc: initialize EM anchors list and then update npiv EMs
  [SCSI] Revert "[SCSI] libfc: fix exchange being deleted when the abort itself is timed out"
  [SCSI] libfc: Fixing a memory leak when destroying an interface
  [SCSI] megaraid_sas: Version and Changelog update
  ...

Fix up trivial conflicts due to whitespace differences in
drivers/scsi/libsas/{sas_ata.c,sas_scsi_host.c}

1 files changed, 33 insertions, 8 deletions

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index d9479c3fe5f8..8575808dbae0 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1967,7 +1967,7 @@ qla2x00_fw_ready(scsi_qla_host_t *vha)
                 } else {
                         /* Mailbox cmd failed. Timeout on min_wait. */
                         if (time_after_eq(jiffies, mtime) ||
-                            (IS_QLA82XX(ha) && ha->flags.fw_hung))
+                                ha->flags.isp82xx_fw_hung)
                                 break;
                 }
 
@@ -3945,8 +3945,13 @@ qla2x00_abort_isp_cleanup(scsi_qla_host_t *vha)
         struct qla_hw_data *ha = vha->hw;
         struct scsi_qla_host *vp;
         unsigned long flags;
+        fc_port_t *fcport;
 
-        vha->flags.online = 0;
+        /* For ISP82XX, driver waits for completion of the commands.
+         * online flag should be set.
+         */
+        if (!IS_QLA82XX(ha))
+                vha->flags.online = 0;
         ha->flags.chip_reset_done = 0;
         clear_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
         ha->qla_stats.total_isp_aborts++;
@@ -3954,7 +3959,10 @@ qla2x00_abort_isp_cleanup(scsi_qla_host_t *vha)
         qla_printk(KERN_INFO, ha,
             "Performing ISP error recovery - ha= %p.\n", ha);
 
-        /* Chip reset does not apply to 82XX */
+        /* For ISP82XX, reset_chip is just disabling interrupts.
+         * Driver waits for the completion of the commands.
+         * the interrupts need to be enabled.
+         */
         if (!IS_QLA82XX(ha))
                 ha->isp_ops->reset_chip(vha);
 
@@ -3980,14 +3988,31 @@ qla2x00_abort_isp_cleanup(scsi_qla_host_t *vha)
                             LOOP_DOWN_TIME);
         }
 
+        /* Clear all async request states across all VPs. */
+        list_for_each_entry(fcport, &vha->vp_fcports, list)
+                fcport->flags &= ~(FCF_LOGIN_NEEDED | FCF_ASYNC_SENT);
+        spin_lock_irqsave(&ha->vport_slock, flags);
+        list_for_each_entry(vp, &ha->vp_list, list) {
+                atomic_inc(&vp->vref_count);
+                spin_unlock_irqrestore(&ha->vport_slock, flags);
+
+                list_for_each_entry(fcport, &vp->vp_fcports, list)
+                        fcport->flags &= ~(FCF_LOGIN_NEEDED | FCF_ASYNC_SENT);
+
+                spin_lock_irqsave(&ha->vport_slock, flags);
+                atomic_dec(&vp->vref_count);
+        }
+        spin_unlock_irqrestore(&ha->vport_slock, flags);
+
         if (!ha->flags.eeh_busy) {
                 /* Make sure for ISP 82XX IO DMA is complete */
                 if (IS_QLA82XX(ha)) {
-                        if (qla2x00_eh_wait_for_pending_commands(vha, 0, 0,
-                                WAIT_HOST) == QLA_SUCCESS) {
-                                DEBUG2(qla_printk(KERN_INFO, ha,
-                                "Done wait for pending commands\n"));
-                        }
+                        qla82xx_chip_reset_cleanup(vha);
+
+                        /* Done waiting for pending commands.
+                         * Reset the online flag.
+                         */
+                        vha->flags.online = 0;
                 }
 
                 /* Requeue all commands in outstanding command list. */