qla2xxx: Correction to function qla26xx_dport_diagnostics().

Orabug: 23755773

Signed-off-by: Joe Carnuccio <joe.carnuccio@qlogic.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@qlogic.com>
Signed-off-by: Ethan Zhao <ethan.zhao@oracle.com>

diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
index 5903d851d0ac080f327907074fd2e71b2a67dfdf..2a0e75e98e95d4392b1c8083828d49951ad59a6d 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/drivers/scsi/qla2xxx/qla_dbg.c
@@ -15,6 +15,7 @@
  * |                              |                    | 0x015b-0x0160 |
  * |                              |                    | 0x016e-0x0170  |
  * | Mailbox commands             |       0x1196       | 0x111a-0x111b |
+ * |                              |                    | 0x1193                |
  * | Device Discovery             |       0x2103       | 0x2020-0x2022, |
  * |                              |                    | 0x2011-0x2012, |
  * |                              |                    | 0x2099-0x20a4  |

diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 4e7384666e2b5b10691d3b130b9858c2bd4e10a7..81368a94973694fce173d5e0ebcdb169d0109150 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -1155,13 +1155,11 @@ global_port_update:
 
        case MBA_DPORT_DIAGNOSTICS:
                ql_dbg(ql_dbg_async, vha, 0x5052,
-                   "D-Port Diagnostics: %04x result=%s index=%u size=%u\n",
+                   "D-Port Diagnostics: %04x result=%s\n",
                    mb[0],
                    mb[1] == 0 ? "start" :
-                   mb[1] == 1 ? "done (ok)" :
-                   mb[1] == 2 ? "done (error)" : "other",
-                   LSB(mb[2]),
-                   mb[3]);
+                   mb[1] == 1 ? "done (pass)" :
+                   mb[1] == 2 ? "done (error)" : "other");
                break;
 
        case MBA_TEMPERATURE_ALERT:

diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 16aa46c1b586d608fa026aff812e40744b858cbd..581b29286ad8a03243096b4ce5b0caaaf3f74d15 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -5530,11 +5530,6 @@ qla26xx_dport_diagnostics(scsi_qla_host_t *vha,
        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1192,
            "Entered %s.\n", __func__);
 
-       if (size < 1024) {
-               ql_log(ql_log_warn, vha, 0x1193, "Failed insufficient size.\n");
-               return QLA_FUNCTION_PARAMETER_ERROR;
-       }
-
        dd_dma = dma_map_single(&vha->hw->pdev->dev,
            dd_buf, size, DMA_FROM_DEVICE);
        if (!dd_dma) {