1 files changed, 14 insertions, 67 deletions

diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 2003dbb70579..b28ac0a27e25 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -515,47 +515,6 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
 
         case MBA_PORT_UPDATE:           /* Port database update */
                 /*
-                 * If a single remote port just logged into (or logged out of)
-                 * us, create a new entry in our rscn fcports list and handle
-                 * the event like an RSCN.
-                 */
-                if (ql2xprocessrscn &&
-                    !IS_QLA2100(ha) && !IS_QLA2200(ha) && !IS_QLA6312(ha) &&
-                    !IS_QLA6322(ha) && !IS_QLA24XX(ha) && !IS_QLA54XX(ha) &&
-                    ha->flags.init_done && mb[1] != 0xffff &&
-                    ((ha->operating_mode == P2P && mb[1] != 0) ||
-                    (ha->operating_mode != P2P && mb[1] !=
-                        SNS_FIRST_LOOP_ID)) && (mb[2] == 6 || mb[2] == 7)) {
-                        int rval;
-                        fc_port_t *rscn_fcport;
-
-                        /* Create new fcport for login. */
-                        rscn_fcport = qla2x00_alloc_rscn_fcport(ha, GFP_ATOMIC);
-                        if (rscn_fcport) {
-                                DEBUG14(printk("scsi(%ld): Port Update -- "
-                                    "creating RSCN fcport %p for %x/%x/%x.\n",
-                                    ha->host_no, rscn_fcport, mb[1], mb[2],
-                                    mb[3]));
-
-                                rscn_fcport->loop_id = mb[1];
-                                rscn_fcport->d_id.b24 = INVALID_PORT_ID;
-                                atomic_set(&rscn_fcport->state,
-                                    FCS_DEVICE_LOST);
-                                list_add_tail(&rscn_fcport->list,
-                                    &ha->rscn_fcports);
-
-                                rval = qla2x00_handle_port_rscn(ha, 0,
-                                    rscn_fcport, 1);
-                                if (rval == QLA_SUCCESS)
-                                        break;
-                        } else {
-                                DEBUG14(printk("scsi(%ld): Port Update -- "
-                                    "-- unable to allocate RSCN fcport "
-                                    "login.\n", ha->host_no));
-                        }
-                }
-
-                /*
                  * If PORT UPDATE is global (recieved LIP_OCCURED/LIP_RESET
                  * event etc. earlier indicating loop is down) then process
                  * it.  Otherwise ignore it and Wait for RSCN to come in.
@@ -753,25 +712,6 @@ qla2x00_process_response_queue(struct scsi_qla_host *ha)
                 case MS_IOCB_TYPE:
                         qla2x00_ms_entry(ha, (ms_iocb_entry_t *)pkt);
                         break;
-                case MBX_IOCB_TYPE:
-                        if (!IS_QLA2100(ha) && !IS_QLA2200(ha) &&
-                            !IS_QLA6312(ha) && !IS_QLA6322(ha)) {
-                                if (pkt->sys_define == SOURCE_ASYNC_IOCB) {
-                                        qla2x00_process_iodesc(ha,
-                                            (struct mbx_entry *)pkt);
-                                } else {
-                                        /* MBX IOCB Type Not Supported. */
-                                        DEBUG4(printk(KERN_WARNING
-                                            "scsi(%ld): Received unknown MBX "
-                                            "IOCB response pkt type=%x "
-                                            "source=%x entry status=%x.\n",
-                                            ha->host_no, pkt->entry_type,
-                                            pkt->sys_define,
-                                            pkt->entry_status));
-                                }
-                                break;
-                        }
-                        /* Fallthrough. */
                 default:
                         /* Type Not Supported. */
                         DEBUG4(printk(KERN_WARNING
@@ -805,7 +745,7 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)
         uint16_t        scsi_status;
         uint8_t         lscsi_status;
         int32_t         resid;
-        uint32_t        sense_len, rsp_info_len, resid_len;
+        uint32_t        sense_len, rsp_info_len, resid_len, fw_resid_len;
         uint8_t         *rsp_info, *sense_data;
 
         sts = (sts_entry_t *) pkt;
@@ -844,8 +784,7 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)
         cp = sp->cmd;
         if (cp == NULL) {
                 DEBUG2(printk("scsi(%ld): Command already returned back to OS "
-                    "pkt->handle=%d sp=%p sp->state:%d\n",
-                    ha->host_no, sts->handle, sp, sp->state));
+                    "pkt->handle=%d sp=%p.\n", ha->host_no, sts->handle, sp));
                 qla_printk(KERN_WARNING, ha,
                     "Command is NULL: already returned to OS (sp=%p)\n", sp);
 
@@ -859,11 +798,12 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)
 
         fcport = sp->fcport;
 
-        sense_len = rsp_info_len = resid_len = 0;
+        sense_len = rsp_info_len = resid_len = fw_resid_len = 0;
         if (IS_QLA24XX(ha) || IS_QLA54XX(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);
+                fw_resid_len = le32_to_cpu(sts24->residual_len);
                 rsp_info = sts24->data;
                 sense_data = sts24->data;
                 host_to_fcp_swap(sts24->data, sizeof(sts24->data));
@@ -963,14 +903,21 @@ 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))
+                        resid = fw_resid_len;
+
                 if (scsi_status & SS_RESIDUAL_UNDER) {
                         cp->resid = resid;
                         CMD_RESID_LEN(cp) = resid;
                 } else {
                         DEBUG2(printk(KERN_INFO
                             "scsi(%ld:%d:%d) UNDERRUN status detected "
-                            "0x%x-0x%x.\n", ha->host_no, cp->device->id,
-                            cp->device->lun, comp_status, scsi_status));
+                            "0x%x-0x%x. resid=0x%x fw_resid=0x%x cdb=0x%x "
+                            "os_underflow=0x%x\n", ha->host_no,
+                            cp->device->id, cp->device->lun, comp_status,
+                            scsi_status, resid_len, resid, cp->cmnd[0],
+                            cp->underflow));
 
                 }
 
@@ -1181,7 +1128,7 @@ qla2x00_status_cont_entry(scsi_qla_host_t *ha, sts_cont_entry_t *pkt)
                 cp = sp->cmd;
                 if (cp == NULL) {
                         DEBUG2(printk("%s(): Cmd already returned back to OS "
-                            "sp=%p sp->state:%d\n", __func__, sp, sp->state));
+                            "sp=%p.\n", __func__, sp));
                         qla_printk(KERN_INFO, ha,
                             "cmd is NULL: already returned to OS (sp=%p)\n",
                             sp);