qla2xxx: Use proper log message for flash lock failed error.

Signed-off-by: Atul Deshmukh <atul.deshmukh@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
index 08572b9cff7548d3437f9d96869e1043a49157dd..e48084f2fb248fcf2f8e448096df61d8604d8223 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/drivers/scsi/qla2xxx/qla_dbg.c
@@ -49,7 +49,7 @@
  * |                              |                    | 0x800b,0x8039  |
  * | AER/EEH                      |       0x9011       |               |
  * | Virtual Port                 |       0xa007       |               |
- * | ISP82XX Specific             |       0xb155       | 0xb002,0xb024  |
+ * | ISP82XX Specific             |       0xb157       | 0xb002,0xb024  |
  * |                              |                    | 0xb09e,0xb0ae  |
  * |                              |                    | 0xb0e0-0xb0ef  |
  * |                              |                    | 0xb085,0xb0dc  |

diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index c268b3f62ea08569ed072e16f6642bc918a41216..190283eba481a177d448e51f5b8b581d63ea7862 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -848,6 +848,7 @@ qla82xx_rom_lock(struct qla_hw_data *ha)
 {
        int done = 0, timeout = 0;
        uint32_t lock_owner = 0;
+       scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);
 
        while (!done) {
                /* acquire semaphore2 from PCI HW block */
@@ -856,6 +857,9 @@ qla82xx_rom_lock(struct qla_hw_data *ha)
                        break;
                if (timeout >= qla82xx_rom_lock_timeout) {
                        lock_owner = qla82xx_rd_32(ha, QLA82XX_ROM_LOCK_ID);
+                       ql_log(ql_log_warn, vha, 0xb157,
+                           "%s: Simultaneous flash access by following ports, active port = %d: accessing port = %d",
+                           __func__, ha->portnum, lock_owner);
                        return -1;
                }
                timeout++;

diff --git a/drivers/scsi/qla2xxx/qla_nx2.c b/drivers/scsi/qla2xxx/qla_nx2.c
index e38d84c785a0dd458ff0be4259fa945c74803cba..e631db4d60a82b637515e3e692d59c6ff424fb3e 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_nx2.c
+++ b/drivers/scsi/qla2xxx/qla_nx2.c
@@ -448,8 +448,8 @@ qla8044_flash_lock(scsi_qla_host_t *vha)
                        lock_owner = qla8044_rd_reg(ha,
                            QLA8044_FLASH_LOCK_ID);
                        ql_log(ql_log_warn, vha, 0xb113,
-                           "%s: flash lock by %d failed, held by %d\n",
-                               __func__, ha->portnum, lock_owner);
+                           "%s: Simultaneous flash access by following ports, active port = %d: accessing port = %d",
+                           __func__, ha->portnum, lock_owner);
                        ret_val = QLA_FUNCTION_FAILED;
                        break;
                }