← Back to branch summary

~ubuntu-branches/ubuntu/quantal/linux-linaro-mx51/quantal

« back to all changes in this revision

Viewing changes to drivers/scsi/qla2xxx/qla_isr.c

  • Committer: Package Import Robot
  • Author(s): John Rigby, John Rigby
  • Date: 2011-09-26 10:44:23 UTC
  • Revision ID: package-import@ubuntu.com-20110926104423-3o58a3c1bj7x00rs
Tags: 3.0.0-1007.9
https://launchpad.net/bugs/826021
[ John Rigby ]

Enable crypto modules and remove crypto-modules from
exclude-module files
LP: #826021

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/scsi/qla2xxx/qla_isr.c
1
1
/*
2
2
 * QLogic Fibre Channel HBA Driver
3
 
 * Copyright (c)  2003-2010 QLogic Corporation
 
3
 * Copyright (c)  2003-2011 QLogic Corporation
4
4
 *
5
5
 * See LICENSE.qla2xxx for copyright and licensing details.
6
6
 */
843
843
                qla_printk(KERN_WARNING, ha,
844
844
                    "Invalid SCSI completion handle %d.\n", index);
845
845
 
846
 
                set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
 
846
                if (IS_QLA82XX(ha))
 
847
                        set_bit(FCOE_CTX_RESET_NEEDED, &vha->dpc_flags);
 
848
                else
 
849
                        set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
847
850
                return;
848
851
        }
849
852
 
861
864
                qla_printk(KERN_WARNING, ha,
862
865
                    "Invalid ISP SCSI completion handle\n");
863
866
 
864
 
                set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
 
867
                if (IS_QLA82XX(ha))
 
868
                        set_bit(FCOE_CTX_RESET_NEEDED, &vha->dpc_flags);
 
869
                else
 
870
                        set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
865
871
        }
866
872
}
867
873
 
878
884
        if (index >= MAX_OUTSTANDING_COMMANDS) {
879
885
                qla_printk(KERN_WARNING, ha,
880
886
                    "%s: Invalid completion handle (%x).\n", func, index);
881
 
                set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
 
887
                if (IS_QLA82XX(ha))
 
888
                        set_bit(FCOE_CTX_RESET_NEEDED, &vha->dpc_flags);
 
889
                else
 
890
                        set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
882
891
                goto done;
883
892
        }
884
893
        sp = req->outstanding_cmds[index];
1051
1060
                }
1052
1061
                DEBUG2(qla2x00_dump_buffer((uint8_t *)pkt, sizeof(*pkt)));
1053
1062
        } else {
1054
 
                bsg_job->reply->result =  DID_OK << 16;;
 
1063
                bsg_job->reply->result =  DID_OK << 16;
1055
1064
                bsg_job->reply->reply_payload_rcv_len =
1056
1065
                    bsg_job->reply_payload.payload_len;
1057
1066
                bsg_job->reply_len = 0;
1146
1155
                DEBUG2(qla2x00_dump_buffer((uint8_t *)pkt, sizeof(*pkt)));
1147
1156
        }
1148
1157
        else {
1149
 
                bsg_job->reply->result =  DID_OK << 16;;
 
1158
                bsg_job->reply->result =  DID_OK << 16;
1150
1159
                bsg_job->reply->reply_payload_rcv_len = bsg_job->reply_payload.payload_len;
1151
1160
                bsg_job->reply_len = 0;
1152
1161
        }
1564
1573
                    "scsi(%ld): Invalid status handle (0x%x).\n", vha->host_no,
1565
1574
                    sts->handle);
1566
1575
 
1567
 
                set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
 
1576
                if (IS_QLA82XX(ha))
 
1577
                        set_bit(FCOE_CTX_RESET_NEEDED, &vha->dpc_flags);
 
1578
                else
 
1579
                        set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
1568
1580
                qla2xxx_wake_dpc(vha);
1569
1581
                return;
1570
1582
        }
1794
1806
        if (logit)
1795
1807
                DEBUG2(qla_printk(KERN_INFO, ha,
1796
1808
                    "scsi(%ld:%d:%d) FCP command status: 0x%x-0x%x (0x%x) "
1797
 
                    "oxid=0x%x cdb=%02x%02x%02x len=0x%x "
 
1809
                    "portid=%02x%02x%02x oxid=0x%x cdb=%02x%02x%02x len=0x%x "
1798
1810
                    "rsp_info=0x%x resid=0x%x fw_resid=0x%x\n", vha->host_no,
1799
1811
                    cp->device->id, cp->device->lun, comp_status, scsi_status,
1800
 
                    cp->result, ox_id, cp->cmnd[0],
1801
 
                    cp->cmnd[1], cp->cmnd[2], scsi_bufflen(cp), rsp_info_len,
1802
 
                    resid_len, fw_resid_len));
 
1812
                    cp->result, fcport->d_id.b.domain, fcport->d_id.b.area,
 
1813
                    fcport->d_id.b.al_pa, ox_id, cp->cmnd[0], cp->cmnd[1],
 
1814
                    cp->cmnd[2], scsi_bufflen(cp), rsp_info_len, resid_len,
 
1815
                    fw_resid_len));
1803
1816
 
1804
1817
        if (rsp->status_srb == NULL)
1805
1818
                qla2x00_sp_compl(ha, sp);
1908
1921
                qla2x00_sp_compl(ha, sp);
1909
1922
 
1910
1923
        } else if (pkt->entry_type == COMMAND_A64_TYPE || pkt->entry_type ==
1911
 
            COMMAND_TYPE || pkt->entry_type == COMMAND_TYPE_7) {
 
1924
                COMMAND_TYPE || pkt->entry_type == COMMAND_TYPE_7
 
1925
                || pkt->entry_type == COMMAND_TYPE_6) {
1912
1926
                DEBUG2(printk("scsi(%ld): Error entry - invalid handle\n",
1913
 
                    vha->host_no));
 
1927
                        vha->host_no));
1914
1928
                qla_printk(KERN_WARNING, ha,
1915
 
                    "Error entry - invalid handle\n");
 
1929
                        "Error entry - invalid handle\n");
1916
1930
 
1917
 
                set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
 
1931
                if (IS_QLA82XX(ha))
 
1932
                        set_bit(FCOE_CTX_RESET_NEEDED, &vha->dpc_flags);
 
1933
                else
 
1934
                        set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
1918
1935
                qla2xxx_wake_dpc(vha);
1919
1936
        }
1920
1937
}