7 files changed, 46 insertions, 60 deletions

diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
index 563d18f4ff50..c6680348b648 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/drivers/scsi/qla2xxx/qla_dbg.c
@@ -2050,21 +2050,18 @@ qla25xx_fw_dump_failed:
 void
 qla2x00_dump_regs(scsi_qla_host_t *ha)
 {
+        int i;
         struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
+        struct device_reg_24xx __iomem *reg24 = &ha->iobase->isp24;
+        uint16_t __iomem *mbx_reg;
+
+        mbx_reg = IS_FWI2_CAPABLE(ha) ? &reg24->mailbox0:
+            MAILBOX_REG(ha, reg, 0);
 
         printk("Mailbox registers:\n");
-        printk("scsi(%ld): mbox 0 0x%04x \n",
-            ha->host_no, RD_MAILBOX_REG(ha, reg, 0));
-        printk("scsi(%ld): mbox 1 0x%04x \n",
-            ha->host_no, RD_MAILBOX_REG(ha, reg, 1));
-        printk("scsi(%ld): mbox 2 0x%04x \n",
-            ha->host_no, RD_MAILBOX_REG(ha, reg, 2));
-        printk("scsi(%ld): mbox 3 0x%04x \n",
-            ha->host_no, RD_MAILBOX_REG(ha, reg, 3));
-        printk("scsi(%ld): mbox 4 0x%04x \n",
-            ha->host_no, RD_MAILBOX_REG(ha, reg, 4));
-        printk("scsi(%ld): mbox 5 0x%04x \n",
-            ha->host_no, RD_MAILBOX_REG(ha, reg, 5));
+        for (i = 0; i < 6; i++)
+                printk("scsi(%ld): mbox %d 0x%04x \n", ha->host_no, i,
+                    RD_REG_WORD(mbx_reg++));
 }
 
 
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 27ae3a532a55..c1964866a423 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -1502,7 +1502,6 @@ typedef struct {
         uint8_t node_name[WWN_SIZE];
         uint8_t port_name[WWN_SIZE];
         uint8_t fabric_port_name[WWN_SIZE];
-        uint16_t fp_speeds;
         uint16_t fp_speed;
 } sw_info_t;
 
diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index b06cbb8580d3..a7e23583f899 100644
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -295,6 +295,8 @@ qla2x00_gid_pt(scsi_qla_host_t *ha, sw_info_t *list)
                         list[i].d_id.b.domain = gid_data->port_id[0];
                         list[i].d_id.b.area = gid_data->port_id[1];
                         list[i].d_id.b.al_pa = gid_data->port_id[2];
+                        memset(list[i].fabric_port_name, 0, WWN_SIZE);
+                        list[i].fp_speed = PORT_SPEED_UNKNOWN;
 
                         /* Last one exit. */
                         if (gid_data->control_byte & BIT_7) {
@@ -1707,8 +1709,6 @@ qla2x00_gfpn_id(scsi_qla_host_t *ha, sw_info_t *list)
 
         for (i = 0; i < MAX_FIBRE_DEVICES; i++) {
                 /* Issue GFPN_ID */
-                memset(list[i].fabric_port_name, 0, WWN_SIZE);
-
                 /* Prepare common MS IOCB */
                 ms_pkt = ha->isp_ops->prep_ms_iocb(ha, GFPN_ID_REQ_SIZE,
                     GFPN_ID_RSP_SIZE);
@@ -1821,8 +1821,6 @@ qla2x00_gpsc(scsi_qla_host_t *ha, sw_info_t *list)
 
         for (i = 0; i < MAX_FIBRE_DEVICES; i++) {
                 /* Issue GFPN_ID */
-                list[i].fp_speeds = list[i].fp_speed = 0;
-
                 /* Prepare common MS IOCB */
                 ms_pkt = qla24xx_prep_ms_fm_iocb(ha, GPSC_REQ_SIZE,
                     GPSC_RSP_SIZE);
@@ -1858,9 +1856,21 @@ qla2x00_gpsc(scsi_qla_host_t *ha, sw_info_t *list)
                         }
                         rval = QLA_FUNCTION_FAILED;
                 } else {
-                        /* Save portname */
-                        list[i].fp_speeds = ct_rsp->rsp.gpsc.speeds;
-                        list[i].fp_speed = ct_rsp->rsp.gpsc.speed;
+                        /* Save port-speed */
+                        switch (be16_to_cpu(ct_rsp->rsp.gpsc.speed)) {
+                        case BIT_15:
+                                list[i].fp_speed = PORT_SPEED_1GB;
+                                break;
+                        case BIT_14:
+                                list[i].fp_speed = PORT_SPEED_2GB;
+                                break;
+                        case BIT_13:
+                                list[i].fp_speed = PORT_SPEED_4GB;
+                                break;
+                        case BIT_11:
+                                list[i].fp_speed = PORT_SPEED_8GB;
+                                break;
+                        }
 
                         DEBUG2_3(printk("scsi(%ld): GPSC ext entry - "
                             "fpn %02x%02x%02x%02x%02x%02x%02x%02x speeds=%04x "
@@ -1873,8 +1883,8 @@ qla2x00_gpsc(scsi_qla_host_t *ha, sw_info_t *list)
                             list[i].fabric_port_name[5],
                             list[i].fabric_port_name[6],
                             list[i].fabric_port_name[7],
-                            be16_to_cpu(list[i].fp_speeds),
-                            be16_to_cpu(list[i].fp_speed)));
+                            be16_to_cpu(ct_rsp->rsp.gpsc.speeds),
+                            be16_to_cpu(ct_rsp->rsp.gpsc.speed)));
                 }
 
                 /* Last device exit. */
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 374abe19b547..1a058ec9bd0c 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -2079,17 +2079,7 @@ qla2x00_configure_local_loop(scsi_qla_host_t *ha)
                 }
 
                 /* Base iIDMA settings on HBA port speed. */
-                switch (ha->link_data_rate) {
-                case PORT_SPEED_1GB:
-                        fcport->fp_speed = cpu_to_be16(BIT_15);
-                        break;
-                case PORT_SPEED_2GB:
-                        fcport->fp_speed = cpu_to_be16(BIT_14);
-                        break;
-                case PORT_SPEED_4GB:
-                        fcport->fp_speed = cpu_to_be16(BIT_13);
-                        break;
-                }
+                fcport->fp_speed = ha->link_data_rate;
 
                 qla2x00_update_fcport(ha, fcport);
 
@@ -2130,38 +2120,25 @@ static void
 qla2x00_iidma_fcport(scsi_qla_host_t *ha, fc_port_t *fcport)
 {
 #define LS_UNKNOWN      2
-        static char *link_speeds[5] = { "1", "2", "?", "4" };
+        static char *link_speeds[5] = { "1", "2", "?", "4", "8" };
         int rval;
-        uint16_t port_speed, mb[6];
+        uint16_t mb[6];
 
         if (!IS_IIDMA_CAPABLE(ha))
                 return;
 
-        switch (be16_to_cpu(fcport->fp_speed)) {
-        case BIT_15:
-                port_speed = PORT_SPEED_1GB;
-                break;
-        case BIT_14:
-                port_speed = PORT_SPEED_2GB;
-                break;
-        case BIT_13:
-                port_speed = PORT_SPEED_4GB;
-                break;
-        default:
+        if (fcport->fp_speed == PORT_SPEED_UNKNOWN) {
                 DEBUG2(printk("scsi(%ld): %02x%02x%02x%02x%02x%02x%02x%02x -- "
-                    "unsupported FM port operating speed (%04x).\n",
+                    "unsupported FM port operating speed.\n",
                     ha->host_no, fcport->port_name[0], fcport->port_name[1],
                     fcport->port_name[2], fcport->port_name[3],
                     fcport->port_name[4], fcport->port_name[5],
-                    fcport->port_name[6], fcport->port_name[7],
-                    be16_to_cpu(fcport->fp_speed)));
-                port_speed = PORT_SPEED_UNKNOWN;
-                break;
-        }
-        if (port_speed == PORT_SPEED_UNKNOWN)
+                    fcport->port_name[6], fcport->port_name[7]));
                 return;
+        }
 
-        rval = qla2x00_set_idma_speed(ha, fcport->loop_id, port_speed, mb);
+        rval = qla2x00_set_idma_speed(ha, fcport->loop_id, fcport->fp_speed,
+            mb);
         if (rval != QLA_SUCCESS) {
                 DEBUG2(printk("scsi(%ld): Unable to adjust iIDMA "
                     "%02x%02x%02x%02x%02x%02x%02x%02x -- %04x %x %04x %04x.\n",
@@ -2169,12 +2146,12 @@ qla2x00_iidma_fcport(scsi_qla_host_t *ha, fc_port_t *fcport)
                     fcport->port_name[2], fcport->port_name[3],
                     fcport->port_name[4], fcport->port_name[5],
                     fcport->port_name[6], fcport->port_name[7], rval,
-                    port_speed, mb[0], mb[1]));
+                    fcport->fp_speed, mb[0], mb[1]));
         } else {
                 DEBUG2(qla_printk(KERN_INFO, ha,
                     "iIDMA adjusted to %s GB/s on "
                     "%02x%02x%02x%02x%02x%02x%02x%02x.\n",
-                    link_speeds[port_speed], fcport->port_name[0],
+                    link_speeds[fcport->fp_speed], fcport->port_name[0],
                     fcport->port_name[1], fcport->port_name[2],
                     fcport->port_name[3], fcport->port_name[4],
                     fcport->port_name[5], fcport->port_name[6],
@@ -3354,7 +3331,8 @@ qla2x00_restart_isp(scsi_qla_host_t *ha)
 
                         spin_lock_irqsave(&ha->hardware_lock, flags);
 
-                        if (!IS_QLA24XX(ha) && !IS_QLA54XX(ha)) {
+                        if (!IS_QLA24XX(ha) && !IS_QLA54XX(ha) &&
+                            !IS_QLA25XX(ha)) {
                                 /*
                                  * Disable SRAM, Instruction RAM and GP RAM
                                  * parity.
@@ -3370,7 +3348,8 @@ qla2x00_restart_isp(scsi_qla_host_t *ha)
 
                         spin_lock_irqsave(&ha->hardware_lock, flags);
 
-                        if (!IS_QLA24XX(ha) && !IS_QLA54XX(ha)) {
+                        if (!IS_QLA24XX(ha) && !IS_QLA54XX(ha) &&
+                            !IS_QLA25XX(ha)) {
                                 /* Enable proper parity */
                                 if (IS_QLA2300(ha))
                                         /* SRAM parity */
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 50539da467bf..eecae9905ece 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -490,6 +490,7 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
                 set_bit(REGISTER_FC4_NEEDED, &ha->dpc_flags);
 
                 ha->flags.gpsc_supported = 1;
+                ha->flags.management_server_logged_in = 0;
                 break;
 
         case MBA_CHG_IN_CONNECTION:     /* Change in connection mode */
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 93c0c7e4f08f..acca898ce0a2 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -1564,7 +1564,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
         struct Scsi_Host *host;
         scsi_qla_host_t *ha;
         unsigned long   flags = 0;
-        char pci_info[20];
+        char pci_info[30];
         char fw_str[30];
         struct scsi_host_template *sht;
 
diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h
index dd1f8ceb79c4..18095b9b76f4 100644
--- a/drivers/scsi/qla2xxx/qla_version.h
+++ b/drivers/scsi/qla2xxx/qla_version.h
@@ -7,7 +7,7 @@
 /*
  * Driver version
  */
-#define QLA2XXX_VERSION      "8.02.00-k2"
+#define QLA2XXX_VERSION      "8.02.00-k3"
 
 #define QLA_DRIVER_MAJOR_VER    8
 #define QLA_DRIVER_MINOR_VER    2