Commit 27f4b72f authored by Atul Deshmukh's avatar Atul Deshmukh Committed by Christoph Hellwig

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

Signed-off-by: default avatarAtul Deshmukh <atul.deshmukh@qlogic.com>
Signed-off-by: default avatarSaurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 9929c478
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
* | | | 0x800b,0x8039 | * | | | 0x800b,0x8039 |
* | AER/EEH | 0x9011 | | * | AER/EEH | 0x9011 | |
* | Virtual Port | 0xa007 | | * | Virtual Port | 0xa007 | |
* | ISP82XX Specific | 0xb155 | 0xb002,0xb024 | * | ISP82XX Specific | 0xb157 | 0xb002,0xb024 |
* | | | 0xb09e,0xb0ae | * | | | 0xb09e,0xb0ae |
* | | | 0xb0e0-0xb0ef | * | | | 0xb0e0-0xb0ef |
* | | | 0xb085,0xb0dc | * | | | 0xb085,0xb0dc |
......
...@@ -848,6 +848,7 @@ qla82xx_rom_lock(struct qla_hw_data *ha) ...@@ -848,6 +848,7 @@ qla82xx_rom_lock(struct qla_hw_data *ha)
{ {
int done = 0, timeout = 0; int done = 0, timeout = 0;
uint32_t lock_owner = 0; uint32_t lock_owner = 0;
scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);
while (!done) { while (!done) {
/* acquire semaphore2 from PCI HW block */ /* acquire semaphore2 from PCI HW block */
...@@ -856,6 +857,9 @@ qla82xx_rom_lock(struct qla_hw_data *ha) ...@@ -856,6 +857,9 @@ qla82xx_rom_lock(struct qla_hw_data *ha)
break; break;
if (timeout >= qla82xx_rom_lock_timeout) { if (timeout >= qla82xx_rom_lock_timeout) {
lock_owner = qla82xx_rd_32(ha, QLA82XX_ROM_LOCK_ID); 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; return -1;
} }
timeout++; timeout++;
......
...@@ -448,7 +448,7 @@ qla8044_flash_lock(scsi_qla_host_t *vha) ...@@ -448,7 +448,7 @@ qla8044_flash_lock(scsi_qla_host_t *vha)
lock_owner = qla8044_rd_reg(ha, lock_owner = qla8044_rd_reg(ha,
QLA8044_FLASH_LOCK_ID); QLA8044_FLASH_LOCK_ID);
ql_log(ql_log_warn, vha, 0xb113, ql_log(ql_log_warn, vha, 0xb113,
"%s: flash lock by %d failed, held by %d\n", "%s: Simultaneous flash access by following ports, active port = %d: accessing port = %d",
__func__, ha->portnum, lock_owner); __func__, ha->portnum, lock_owner);
ret_val = QLA_FUNCTION_FAILED; ret_val = QLA_FUNCTION_FAILED;
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment