diff options
| author | Himanshu Madani <himanshu.madani@qlogic.com> | 2014-04-11 16:54:40 -0400 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2014-05-19 13:31:05 +0200 |
| commit | 90b604f26131eb3a76a1588538ec96c7148e6507 (patch) | |
| tree | 2df92f13b63e49cf6d7946720728812e149c382b | |
| parent | 03d32f978a758862b6e6ba228d3e28f6dfe9ec68 (diff) | |
| download | linux-90b604f26131eb3a76a1588538ec96c7148e6507.tar.gz linux-90b604f26131eb3a76a1588538ec96c7148e6507.tar.bz2 linux-90b604f26131eb3a76a1588538ec96c7148e6507.zip | |
qla2xxx: Fix beacon blink logic for ISP26xx/83xx.
Signed-off-by: Himanshu Madani <himanshu.madani@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_os.c | 6 | ||||
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_sup.c | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 575404fbcbec..ef6332b61c18 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -5127,8 +5127,10 @@ intr_on_check: ha->isp_ops->enable_intrs(ha); if (test_and_clear_bit(BEACON_BLINK_NEEDED, - &base_vha->dpc_flags)) - ha->isp_ops->beacon_blink(base_vha); + &base_vha->dpc_flags)) { + if (ha->beacon_blink_led == 1) + ha->isp_ops->beacon_blink(base_vha); + } if (!IS_QLAFX00(ha)) qla2x00_do_dpc_all_vps(base_vha); diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c index 5dcaaca7cdf2..bca173e56f16 100644 --- a/drivers/scsi/qla2xxx/qla_sup.c +++ b/drivers/scsi/qla2xxx/qla_sup.c @@ -1727,11 +1727,8 @@ qla83xx_beacon_blink(struct scsi_qla_host *vha) if (IS_QLA2031(ha)) { led_select_value = qla83xx_select_led_port(ha); - qla83xx_wr_reg(vha, led_select_value, 0x40002000); - qla83xx_wr_reg(vha, led_select_value + 4, 0x40002000); - msleep(1000); - qla83xx_wr_reg(vha, led_select_value, 0x40004000); - qla83xx_wr_reg(vha, led_select_value + 4, 0x40004000); + qla83xx_wr_reg(vha, led_select_value, 0x40000230); + qla83xx_wr_reg(vha, led_select_value + 4, 0x40000230); } else if (IS_QLA8031(ha)) { led_select_value = qla83xx_select_led_port(ha); |