diff options
author | Atul Deshmukh <atul.deshmukh@qlogic.com> | 2014-04-11 16:54:26 -0400 |
---|---|---|
committer | Christoph Hellwig <hch@lst.de> | 2014-05-19 07:31:02 -0400 |
commit | 27f4b72f94208f9f82589214d5dfdae57d74f580 (patch) | |
tree | 02b554a9bb02c28abb714dbefbe76a3f33827dc5 /drivers/scsi | |
parent | 9929c478123d3ce6020c5b771c8e8524ebb636fb (diff) |
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>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_dbg.c | 2 | ||||
-rw-r--r-- | drivers/scsi/qla2xxx/qla_nx.c | 4 | ||||
-rw-r--r-- | drivers/scsi/qla2xxx/qla_nx2.c | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c index 08572b9cff75..e48084f2fb24 100644 --- a/drivers/scsi/qla2xxx/qla_dbg.c +++ b/drivers/scsi/qla2xxx/qla_dbg.c | |||
@@ -49,7 +49,7 @@ | |||
49 | * | | | 0x800b,0x8039 | | 49 | * | | | 0x800b,0x8039 | |
50 | * | AER/EEH | 0x9011 | | | 50 | * | AER/EEH | 0x9011 | | |
51 | * | Virtual Port | 0xa007 | | | 51 | * | Virtual Port | 0xa007 | | |
52 | * | ISP82XX Specific | 0xb155 | 0xb002,0xb024 | | 52 | * | ISP82XX Specific | 0xb157 | 0xb002,0xb024 | |
53 | * | | | 0xb09e,0xb0ae | | 53 | * | | | 0xb09e,0xb0ae | |
54 | * | | | 0xb0e0-0xb0ef | | 54 | * | | | 0xb0e0-0xb0ef | |
55 | * | | | 0xb085,0xb0dc | | 55 | * | | | 0xb085,0xb0dc | |
diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c index c268b3f62ea0..190283eba481 100644 --- 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) | |||
848 | { | 848 | { |
849 | int done = 0, timeout = 0; | 849 | int done = 0, timeout = 0; |
850 | uint32_t lock_owner = 0; | 850 | uint32_t lock_owner = 0; |
851 | scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev); | ||
851 | 852 | ||
852 | while (!done) { | 853 | while (!done) { |
853 | /* acquire semaphore2 from PCI HW block */ | 854 | /* acquire semaphore2 from PCI HW block */ |
@@ -856,6 +857,9 @@ qla82xx_rom_lock(struct qla_hw_data *ha) | |||
856 | break; | 857 | break; |
857 | if (timeout >= qla82xx_rom_lock_timeout) { | 858 | if (timeout >= qla82xx_rom_lock_timeout) { |
858 | lock_owner = qla82xx_rd_32(ha, QLA82XX_ROM_LOCK_ID); | 859 | lock_owner = qla82xx_rd_32(ha, QLA82XX_ROM_LOCK_ID); |
860 | ql_log(ql_log_warn, vha, 0xb157, | ||
861 | "%s: Simultaneous flash access by following ports, active port = %d: accessing port = %d", | ||
862 | __func__, ha->portnum, lock_owner); | ||
859 | return -1; | 863 | return -1; |
860 | } | 864 | } |
861 | timeout++; | 865 | timeout++; |
diff --git a/drivers/scsi/qla2xxx/qla_nx2.c b/drivers/scsi/qla2xxx/qla_nx2.c index e38d84c785a0..e631db4d60a8 100644 --- 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) | |||
448 | lock_owner = qla8044_rd_reg(ha, | 448 | lock_owner = qla8044_rd_reg(ha, |
449 | QLA8044_FLASH_LOCK_ID); | 449 | QLA8044_FLASH_LOCK_ID); |
450 | ql_log(ql_log_warn, vha, 0xb113, | 450 | ql_log(ql_log_warn, vha, 0xb113, |
451 | "%s: flash lock by %d failed, held by %d\n", | 451 | "%s: Simultaneous flash access by following ports, active port = %d: accessing port = %d", |
452 | __func__, ha->portnum, lock_owner); | 452 | __func__, ha->portnum, lock_owner); |
453 | ret_val = QLA_FUNCTION_FAILED; | 453 | ret_val = QLA_FUNCTION_FAILED; |
454 | break; | 454 | break; |
455 | } | 455 | } |