1 files changed, 55 insertions, 27 deletions

diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index d5fb79a88001..789fc576f222 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -275,7 +275,7 @@ void
 qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb)
 {
 #define LS_UNKNOWN      2
-        static char     *link_speeds[5] = { "1", "2", "?", "4", "8" };
+        static char     *link_speeds[] = { "1", "2", "?", "4", "8", "10" };
         char            *link_speed;
         uint16_t        handle_cnt;
         uint16_t        cnt;
@@ -288,6 +288,8 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb)
 
         /* Setup to process RIO completion. */
         handle_cnt = 0;
+        if (IS_QLA81XX(ha))
+                goto skip_rio;
         switch (mb[0]) {
         case MBA_SCSI_COMPLETION:
                 handles[0] = le32_to_cpu((uint32_t)((mb[2] << 16) | mb[1]));
@@ -339,7 +341,7 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb)
         default:
                 break;
         }
-
+skip_rio:
         switch (mb[0]) {
         case MBA_SCSI_COMPLETION:       /* Fast Post */
                 if (!vha->flags.online)
@@ -362,7 +364,6 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb)
                     "ISP System Error - mbx1=%xh mbx2=%xh mbx3=%xh.\n",
                     mb[1], mb[2], mb[3]);
 
-                qla2x00_post_hwe_work(vha, mb[0], mb[1], mb[2], mb[3]);
                 ha->isp_ops->fw_dump(vha, 1);
 
                 if (IS_FWI2_CAPABLE(ha)) {
@@ -387,7 +388,6 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb)
                     vha->host_no));
                 qla_printk(KERN_WARNING, ha, "ISP Request Transfer Error.\n");
 
-                qla2x00_post_hwe_work(vha, mb[0], mb[1], mb[2], mb[3]);
                 set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
                 break;
 
@@ -396,7 +396,6 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb)
                     vha->host_no));
                 qla_printk(KERN_WARNING, ha, "ISP Response Transfer Error.\n");
 
-                qla2x00_post_hwe_work(vha, mb[0], mb[1], mb[2], mb[3]);
                 set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
                 break;
 
@@ -436,6 +435,8 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb)
                         link_speed = link_speeds[LS_UNKNOWN];
                         if (mb[1] < 5)
                                 link_speed = link_speeds[mb[1]];
+                        else if (mb[1] == 0x13)
+                                link_speed = link_speeds[5];
                         ha->link_data_rate = mb[1];
                 }
 
@@ -495,12 +496,17 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb)
                 qla2x00_post_aen_work(vha, FCH_EVT_LIPRESET, mb[1]);
                 break;
 
+        /* case MBA_DCBX_COMPLETE: */
         case MBA_POINT_TO_POINT:        /* Point-to-Point */
                 if (IS_QLA2100(ha))
                         break;
 
-                DEBUG2(printk("scsi(%ld): Asynchronous P2P MODE received.\n",
-                    vha->host_no));
+                if (IS_QLA81XX(ha))
+                        DEBUG2(printk("scsi(%ld): DCBX Completed -- %04x %04x "
+                            "%04x\n", vha->host_no, mb[1], mb[2], mb[3]));
+                else
+                        DEBUG2(printk("scsi(%ld): Asynchronous P2P MODE "
+                            "received.\n", vha->host_no));
 
                 /*
                  * Until there's a transition from loop down to loop up, treat
@@ -641,10 +647,7 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb)
 
         /* case MBA_RIO_RESPONSE: */
         case MBA_ZIO_RESPONSE:
-                DEBUG2(printk("scsi(%ld): [R|Z]IO update completion.\n",
-                    vha->host_no));
-                DEBUG(printk(KERN_INFO
-                    "scsi(%ld): [R|Z]IO update completion.\n",
+                DEBUG3(printk("scsi(%ld): [R|Z]IO update completion.\n",
                     vha->host_no));
 
                 if (IS_FWI2_CAPABLE(ha))
@@ -698,6 +701,35 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb)
                 }
                 spin_unlock_irqrestore(&ha->cs84xx->access_lock, flags);
                 break;
+        case MBA_DCBX_START:
+                DEBUG2(printk("scsi(%ld): DCBX Started -- %04x %04x %04x\n",
+                    vha->host_no, mb[1], mb[2], mb[3]));
+                break;
+        case MBA_DCBX_PARAM_UPDATE:
+                DEBUG2(printk("scsi(%ld): DCBX Parameters Updated -- "
+                    "%04x %04x %04x\n", vha->host_no, mb[1], mb[2], mb[3]));
+                break;
+        case MBA_FCF_CONF_ERR:
+                DEBUG2(printk("scsi(%ld): FCF Configuration Error -- "
+                    "%04x %04x %04x\n", vha->host_no, mb[1], mb[2], mb[3]));
+                break;
+        case MBA_IDC_COMPLETE:
+                DEBUG2(printk("scsi(%ld): Inter-Driver Commucation "
+                    "Complete -- %04x %04x %04x\n", vha->host_no, mb[1], mb[2],
+                    mb[3]));
+                break;
+        case MBA_IDC_NOTIFY:
+                DEBUG2(printk("scsi(%ld): Inter-Driver Commucation "
+                    "Request Notification -- %04x %04x %04x\n", vha->host_no,
+                    mb[1], mb[2], mb[3]));
+                /**** Mailbox registers 4 - 7 valid!!! */
+                break;
+        case MBA_IDC_TIME_EXT:
+                DEBUG2(printk("scsi(%ld): Inter-Driver Commucation "
+                    "Time Extension -- %04x %04x %04x\n", vha->host_no, mb[1],
+                    mb[2], mb[3]));
+                /**** Mailbox registers 4 - 7 valid!!! */
+                break;
         }
 
         if (!vha->vp_idx && ha->num_vhosts)
@@ -1510,7 +1542,7 @@ qla2xxx_check_risc_status(scsi_qla_host_t *vha)
         struct qla_hw_data *ha = vha->hw;
         struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;
 
-        if (!IS_QLA25XX(ha))
+        if (!IS_QLA25XX(ha) && !IS_QLA81XX(ha))
                 return;
 
         rval = QLA_SUCCESS;
@@ -1590,12 +1622,6 @@ qla24xx_intr_handler(int irq, void *dev_id)
                         if (pci_channel_offline(ha->pdev))
                                 break;
 
-                        if (ha->hw_event_pause_errors == 0)
-                                qla2x00_post_hwe_work(vha, HW_EVENT_PARITY_ERR,
-                                    0, MSW(stat), LSW(stat));
-                        else if (ha->hw_event_pause_errors < 0xffffffff)
-                                ha->hw_event_pause_errors++;
-
                         hccr = RD_REG_DWORD(&reg->hccr);
 
                         qla_printk(KERN_INFO, ha, "RISC paused -- HCCR=%x, "
@@ -1740,12 +1766,6 @@ qla24xx_msix_default(int irq, void *dev_id)
                         if (pci_channel_offline(ha->pdev))
                                 break;
 
-                        if (ha->hw_event_pause_errors == 0)
-                                qla2x00_post_hwe_work(vha, HW_EVENT_PARITY_ERR,
-                                    0, MSW(stat), LSW(stat));
-                        else if (ha->hw_event_pause_errors < 0xffffffff)
-                                ha->hw_event_pause_errors++;
-
                         hccr = RD_REG_DWORD(&reg->hccr);
 
                         qla_printk(KERN_INFO, ha, "RISC paused -- HCCR=%x, "
@@ -1944,7 +1964,8 @@ qla2x00_request_irqs(struct qla_hw_data *ha, struct rsp_que *rsp)
         device_reg_t __iomem *reg = ha->iobase;
 
         /* If possible, enable MSI-X. */
-        if (!IS_QLA2432(ha) && !IS_QLA2532(ha) && !IS_QLA8432(ha))
+        if (!IS_QLA2432(ha) && !IS_QLA2532(ha) &&
+            !IS_QLA8432(ha) && !IS_QLA8001(ha))
                 goto skip_msix;
 
         if (IS_QLA2432(ha) && (ha->pdev->revision < QLA_MSIX_CHIP_REV_24XX ||
@@ -1979,7 +2000,8 @@ qla2x00_request_irqs(struct qla_hw_data *ha, struct rsp_que *rsp)
             "MSI-X: Falling back-to INTa mode -- %d.\n", ret);
 skip_msix:
 
-        if (!IS_QLA24XX(ha) && !IS_QLA2532(ha) && !IS_QLA8432(ha))
+        if (!IS_QLA24XX(ha) && !IS_QLA2532(ha) && !IS_QLA8432(ha) &&
+            !IS_QLA8001(ha))
                 goto skip_msi;
 
         ret = pci_enable_msi(ha->pdev);
@@ -2000,6 +2022,12 @@ skip_msi:
         ha->flags.inta_enabled = 1;
 clear_risc_ints:
 
+        /*
+         * FIXME: Noted that 8014s were being dropped during NK testing.
+         * Timing deltas during MSI-X/INTa transitions?
+         */
+        if (IS_QLA81XX(ha))
+                goto fail;
         spin_lock_irq(&ha->hardware_lock);
         if (IS_FWI2_CAPABLE(ha)) {
                 WRT_REG_DWORD(&reg->isp24.hccr, HCCRX_CLR_HOST_INT);
@@ -2044,7 +2072,7 @@ qla2x00_get_rsp_host(struct rsp_que *rsp)
                 if (pkt && pkt->handle < MAX_OUTSTANDING_COMMANDS) {
                         sp = req->outstanding_cmds[pkt->handle];
                         if (sp)
-                                vha = sp->vha;
+                                vha = sp->fcport->vha;
                 }
         }
         if (!vha)