[SCSI] qla2xxx: Add support for ISP8044.

[jejb: checkpatch fixes]
Signed-off-by: Atul Deshmukh <atul.deshmukh@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

1 files changed, 14 insertions, 12 deletions

diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index e779506fda75..b4fb8a6b8aa0 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -691,7 +691,8 @@ skip_rio:
         case MBA_LOOP_DOWN:             /* Loop Down Event */
                 mbx = (IS_QLA81XX(ha) || IS_QLA8031(ha))
                         ? RD_REG_WORD(&reg24->mailbox4) : 0;
-                mbx = IS_QLA82XX(ha) ? RD_REG_WORD(&reg82->mailbox_out[4]) : mbx;
+                mbx = (IS_P3P_TYPE(ha)) ? RD_REG_WORD(&reg82->mailbox_out[4])
+                        : mbx;
                 ql_dbg(ql_dbg_async, vha, 0x500b,
                     "LOOP DOWN detected (%x %x %x %x).\n",
                     mb[1], mb[2], mb[3], mbx);
@@ -740,7 +741,7 @@ skip_rio:
                 if (IS_QLA2100(ha))
                         break;
 
-                if (IS_QLA81XX(ha) || IS_QLA82XX(ha) || IS_QLA8031(ha)) {
+                if (IS_CNA_CAPABLE(ha)) {
                         ql_dbg(ql_dbg_async, vha, 0x500d,
                             "DCBX Completed -- %04x %04x %04x.\n",
                             mb[1], mb[2], mb[3]);
@@ -1002,7 +1003,7 @@ skip_rio:
                     mb[1], mb[2], mb[3]);
                 break;
         case MBA_IDC_NOTIFY:
-                if (IS_QLA8031(vha->hw)) {
+                if (IS_QLA8031(vha->hw) || IS_QLA8044(ha)) {
                         mb[4] = RD_REG_WORD(&reg24->mailbox4);
                         if (((mb[2] & 0x7fff) == MBC_PORT_RESET ||
                             (mb[2] & 0x7fff) == MBC_SET_PORT_CONFIG) &&
@@ -1022,7 +1023,8 @@ skip_rio:
                         complete(&ha->lb_portup_comp);
                 /* Fallthru */
         case MBA_IDC_TIME_EXT:
-                if (IS_QLA81XX(vha->hw) || IS_QLA8031(vha->hw))
+                if (IS_QLA81XX(vha->hw) || IS_QLA8031(vha->hw) ||
+                    IS_QLA8044(ha))
                         qla81xx_idc_event(vha, mb[0], mb[1]);
                 break;
 
@@ -1063,7 +1065,7 @@ qla2x00_process_completed_request(struct scsi_qla_host *vha,
                 ql_log(ql_log_warn, vha, 0x3014,
                     "Invalid SCSI command index (%x).\n", index);
 
-                if (IS_QLA82XX(ha))
+                if (IS_P3P_TYPE(ha))
                         set_bit(FCOE_CTX_RESET_NEEDED, &vha->dpc_flags);
                 else
                         set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
@@ -1080,7 +1082,7 @@ qla2x00_process_completed_request(struct scsi_qla_host *vha,
         } else {
                 ql_log(ql_log_warn, vha, 0x3016, "Invalid SCSI SRB.\n");
 
-                if (IS_QLA82XX(ha))
+                if (IS_P3P_TYPE(ha))
                         set_bit(FCOE_CTX_RESET_NEEDED, &vha->dpc_flags);
                 else
                         set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
@@ -1100,7 +1102,7 @@ qla2x00_get_sp_from_handle(scsi_qla_host_t *vha, const char *func,
         if (index >= req->num_outstanding_cmds) {
                 ql_log(ql_log_warn, vha, 0x5031,
                     "Invalid command index (%x).\n", index);
-                if (IS_QLA82XX(ha))
+                if (IS_P3P_TYPE(ha))
                         set_bit(FCOE_CTX_RESET_NEEDED, &vha->dpc_flags);
                 else
                         set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
@@ -1949,7 +1951,7 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)
                 ql_dbg(ql_dbg_io, vha, 0x3017,
                     "Invalid status handle (0x%x).\n", sts->handle);
 
-                if (IS_QLA82XX(ha))
+                if (IS_P3P_TYPE(ha))
                         set_bit(FCOE_CTX_RESET_NEEDED, &vha->dpc_flags);
                 else
                         set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
@@ -2321,7 +2323,7 @@ fatal:
         ql_log(ql_log_warn, vha, 0x5030,
             "Error entry - invalid handle/queue.\n");
 
-        if (IS_QLA82XX(ha))
+        if (IS_P3P_TYPE(ha))
                 set_bit(FCOE_CTX_RESET_NEEDED, &vha->dpc_flags);
         else
                 set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
@@ -2449,7 +2451,7 @@ void qla24xx_process_response_queue(struct scsi_qla_host *vha,
         }
 
         /* Adjust ring index */
-        if (IS_QLA82XX(ha)) {
+        if (IS_P3P_TYPE(ha)) {
                 struct device_reg_82xx __iomem *reg = &ha->iobase->isp82;
                 WRT_REG_DWORD(&reg->rsp_q_out[0], rsp->ring_index);
         } else
@@ -2862,7 +2864,7 @@ msix_failed:
                         ret = request_irq(qentry->vector,
                                 qla83xx_msix_entries[i].handler,
                                 0, qla83xx_msix_entries[i].name, rsp);
-                } else if (IS_QLA82XX(ha)) {
+                } else if (IS_P3P_TYPE(ha)) {
                         ret = request_irq(qentry->vector,
                                 qla82xx_msix_entries[i].handler,
                                 0, qla82xx_msix_entries[i].name, rsp);
@@ -2947,7 +2949,7 @@ qla2x00_request_irqs(struct qla_hw_data *ha, struct rsp_que *rsp)
 skip_msix:
 
         if (!IS_QLA24XX(ha) && !IS_QLA2532(ha) && !IS_QLA8432(ha) &&
-            !IS_QLA8001(ha) && !IS_QLA82XX(ha) && !IS_QLAFX00(ha))
+            !IS_QLA8001(ha) && !IS_P3P_TYPE(ha) && !IS_QLAFX00(ha))
                 goto skip_msi;
 
         ret = pci_enable_msi(ha->pdev);