diff options
| author | Joe Carnuccio <joe.carnuccio@qlogic.com> | 2016-07-06 17:14:30 +0200 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2016-07-15 21:35:49 +0200 |
| commit | ef55e5133c3120ec07434b16d09a7c7f026d8c80 (patch) | |
| tree | d8cba59cb7e05c4dfd0eecdbff2803088b1fc1c7 /drivers/scsi | |
| parent | qla2xxx: Add support to handle Loop Init error Asynchronus event. (diff) | |
| download | linux-ef55e5133c3120ec07434b16d09a7c7f026d8c80.tar.xz linux-ef55e5133c3120ec07434b16d09a7c7f026d8c80.zip | |
qla2xxx: Correction to function qla26xx_dport_diagnostics().
Signed-off-by: Joe Carnuccio <joe.carnuccio@qlogic.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@qlogic.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_dbg.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_isr.c | 8 | ||||
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_mbx.c | 5 |
3 files changed, 4 insertions, 11 deletions
diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c index 288338d59327..1a042702d34a 100644 --- a/drivers/scsi/qla2xxx/qla_dbg.c +++ b/drivers/scsi/qla2xxx/qla_dbg.c @@ -14,7 +14,7 @@ * | Module Init and Probe | 0x0191 | 0x0146 | * | | | 0x015b-0x0160 | * | | | 0x016e | - * | Mailbox commands | 0x1196 | | + * | Mailbox commands | 0x1196 | 0x1193 | * | | | | * | Device Discovery | 0x2003 | 0x2016 | * | | | 0x2011-0x2012, | diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index 6be2ab4f19a6..4c800d6ad514 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c @@ -1159,13 +1159,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 0f7b83a37a36..bf16e6f5dbf5 100644 --- a/drivers/scsi/qla2xxx/qla_mbx.c +++ b/drivers/scsi/qla2xxx/qla_mbx.c @@ -5764,11 +5764,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) { |