1 files changed, 37 insertions, 18 deletions

diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 0ba4c8d37879..b8f226ae2633 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -143,7 +143,7 @@ qla2300_intr_handler(int irq, void *dev_id)
                         WRT_REG_WORD(&reg->hccr, HCCR_RESET_RISC);
                         RD_REG_WORD(&reg->hccr);
 
-                        ha->isp_ops.fw_dump(ha, 1);
+                        ha->isp_ops->fw_dump(ha, 1);
                         set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
                         break;
                 } else if ((stat & HSR_RISC_INT) == 0)
@@ -247,7 +247,7 @@ void
 qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
 {
 #define LS_UNKNOWN      2
-        static char     *link_speeds[5] = { "1", "2", "?", "4", "10" };
+        static char     *link_speeds[5] = { "1", "2", "?", "4", "8" };
         char            *link_speed;
         uint16_t        handle_cnt;
         uint16_t        cnt;
@@ -334,9 +334,9 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
                     "ISP System Error - mbx1=%xh mbx2=%xh mbx3=%xh.\n",
                     mb[1], mb[2], mb[3]);
 
-                ha->isp_ops.fw_dump(ha, 1);
+                ha->isp_ops->fw_dump(ha, 1);
 
-                if (IS_QLA24XX(ha) || IS_QLA54XX(ha)) {
+                if (IS_FWI2_CAPABLE(ha)) {
                         if (mb[1] == 0 && mb[2] == 0) {
                                 qla_printk(KERN_ERR, ha,
                                     "Unrecoverable Hardware Error: adapter "
@@ -601,7 +601,7 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
                     "scsi(%ld): [R|Z]IO update completion.\n",
                     ha->host_no));
 
-                if (IS_QLA24XX(ha) || IS_QLA54XX(ha))
+                if (IS_FWI2_CAPABLE(ha))
                         qla24xx_process_response_queue(ha);
                 else
                         qla2x00_process_response_queue(ha);
@@ -823,7 +823,7 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)
 
         sts = (sts_entry_t *) pkt;
         sts24 = (struct sts_entry_24xx *) pkt;
-        if (IS_QLA24XX(ha) || IS_QLA54XX(ha)) {
+        if (IS_FWI2_CAPABLE(ha)) {
                 comp_status = le16_to_cpu(sts24->comp_status);
                 scsi_status = le16_to_cpu(sts24->scsi_status) & SS_MASK;
         } else {
@@ -872,7 +872,7 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)
         fcport = sp->fcport;
 
         sense_len = rsp_info_len = resid_len = fw_resid_len = 0;
-        if (IS_QLA24XX(ha) || IS_QLA54XX(ha)) {
+        if (IS_FWI2_CAPABLE(ha)) {
                 sense_len = le32_to_cpu(sts24->sense_len);
                 rsp_info_len = le32_to_cpu(sts24->rsp_data_len);
                 resid_len = le32_to_cpu(sts24->rsp_residual_count);
@@ -891,7 +891,7 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)
         /* Check for any FCP transport errors. */
         if (scsi_status & SS_RESPONSE_INFO_LEN_VALID) {
                 /* Sense data lies beyond any FCP RESPONSE data. */
-                if (IS_QLA24XX(ha) || IS_QLA54XX(ha))
+                if (IS_FWI2_CAPABLE(ha))
                         sense_data += rsp_info_len;
                 if (rsp_info_len > 3 && rsp_info[3]) {
                         DEBUG2(printk("scsi(%ld:%d:%d:%d) FCP I/O protocol "
@@ -990,7 +990,7 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)
         case CS_DATA_UNDERRUN:
                 resid = resid_len;
                 /* Use F/W calculated residual length. */
-                if (IS_QLA24XX(ha) || IS_QLA54XX(ha))
+                if (IS_FWI2_CAPABLE(ha))
                         resid = fw_resid_len;
 
                 if (scsi_status & SS_RESIDUAL_UNDER) {
@@ -1062,6 +1062,25 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)
                             cp->device->id, cp->device->lun, cp,
                             cp->serial_number));
 
+                        /*
+                         * In case of a Underrun condition, set both the lscsi
+                         * status and the completion status to appropriate
+                         * values.
+                         */
+                        if (resid &&
+                            ((unsigned)(cp->request_bufflen - resid) <
+                             cp->underflow)) {
+                                DEBUG2(qla_printk(KERN_INFO, ha,
+                                    "scsi(%ld:%d:%d:%d): Mid-layer underflow "
+                                    "detected (%x of %x bytes)...returning "
+                                    "error status.\n", ha->host_no,
+                                    cp->device->channel, cp->device->id,
+                                    cp->device->lun, resid,
+                                    cp->request_bufflen));
+
+                                cp->result = DID_ERROR << 16 | lscsi_status;
+                        }
+
                         if (sense_len)
                                 DEBUG5(qla2x00_dump_buffer(cp->sense_buffer,
                                     CMD_ACTUAL_SNSLEN(cp)));
@@ -1166,7 +1185,7 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)
         case CS_TIMEOUT:
                 cp->result = DID_BUS_BUSY << 16;
 
-                if (IS_QLA24XX(ha) || IS_QLA54XX(ha)) {
+                if (IS_FWI2_CAPABLE(ha)) {
                         DEBUG2(printk(KERN_INFO
                             "scsi(%ld:%d:%d:%d): TIMEOUT status detected "
                             "0x%x-0x%x\n", ha->host_no, cp->device->channel,
@@ -1235,7 +1254,7 @@ qla2x00_status_cont_entry(scsi_qla_host_t *ha, sts_cont_entry_t *pkt)
                 }
 
                 /* Move sense data. */
-                if (IS_QLA24XX(ha) || IS_QLA54XX(ha))
+                if (IS_FWI2_CAPABLE(ha))
                         host_to_fcp_swap(pkt->data, sizeof(pkt->data));
                 memcpy(sp->request_sense_ptr, pkt->data, sense_sz);
                 DEBUG5(qla2x00_dump_buffer(sp->request_sense_ptr, sense_sz));
@@ -1483,7 +1502,7 @@ qla24xx_intr_handler(int irq, void *dev_id)
 
                         qla_printk(KERN_INFO, ha, "RISC paused -- HCCR=%x, "
                             "Dumping firmware!\n", hccr);
-                        ha->isp_ops.fw_dump(ha, 1);
+                        ha->isp_ops->fw_dump(ha, 1);
                         set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
                         break;
                 } else if ((stat & HSRX_RISC_INT) == 0)
@@ -1617,7 +1636,7 @@ qla24xx_msix_default(int irq, void *dev_id)
 
                         qla_printk(KERN_INFO, ha, "RISC paused -- HCCR=%x, "
                             "Dumping firmware!\n", hccr);
-                        ha->isp_ops.fw_dump(ha, 1);
+                        ha->isp_ops->fw_dump(ha, 1);
                         set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
                         break;
                 } else if ((stat & HSRX_RISC_INT) == 0)
@@ -1739,11 +1758,11 @@ qla2x00_request_irqs(scsi_qla_host_t *ha)
         int ret;
 
         /* If possible, enable MSI-X. */
-        if (!IS_QLA2432(ha))
+        if (!IS_QLA2432(ha) && !IS_QLA2532(ha))
                 goto skip_msix;
 
-        if (ha->chip_revision < QLA_MSIX_CHIP_REV_24XX ||
-            !QLA_MSIX_FW_MODE_1(ha->fw_attributes)) {
+        if (IS_QLA2432(ha) && (ha->chip_revision < QLA_MSIX_CHIP_REV_24XX ||
+            !QLA_MSIX_FW_MODE_1(ha->fw_attributes))) {
                 DEBUG2(qla_printk(KERN_WARNING, ha,
                     "MSI-X: Unsupported ISP2432 (0x%X, 0x%X).\n",
                     ha->chip_revision, ha->fw_attributes));
@@ -1762,7 +1781,7 @@ qla2x00_request_irqs(scsi_qla_host_t *ha)
             "MSI-X: Falling back-to INTa mode -- %d.\n", ret);
 skip_msix:
 
-        if (!IS_QLA24XX(ha))
+        if (!IS_QLA24XX(ha) && !IS_QLA2532(ha))
                 goto skip_msi;
 
         ret = pci_enable_msi(ha->pdev);
@@ -1772,7 +1791,7 @@ skip_msix:
         }
 skip_msi:
 
-        ret = request_irq(ha->pdev->irq, ha->isp_ops.intr_handler,
+        ret = request_irq(ha->pdev->irq, ha->isp_ops->intr_handler,
             IRQF_DISABLED|IRQF_SHARED, QLA2XXX_DRIVER_NAME, ha);
         if (!ret) {
                 ha->flags.inta_enabled = 1;