diff options
author | Nigel Kirkland <nigel.kirkland@qlogic.com> | 2015-04-09 14:59:58 -0400 |
---|---|---|
committer | James Bottomley <JBottomley@Odin.com> | 2015-04-10 11:41:40 -0400 |
commit | b21ba319dc4c68045a982b64b710c84f482f32d8 (patch) | |
tree | 4630266767429fc1ff9da7aa75a8511217cb2b74 | |
parent | 334614912b252b49f2e218e3efaddf86edd7f91a (diff) |
qla2xxx: Fix beacon blink for ISP27XX.
Signed-off-by: Nigel Kirkland <nigel.kirkland@qlogic.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@qlogic.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
-rw-r--r-- | drivers/scsi/qla2xxx/qla_sup.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c index b656a05613e8..028e8c8a7de9 100644 --- a/drivers/scsi/qla2xxx/qla_sup.c +++ b/drivers/scsi/qla2xxx/qla_sup.c | |||
@@ -1718,13 +1718,16 @@ qla83xx_beacon_blink(struct scsi_qla_host *vha) | |||
1718 | uint16_t orig_led_cfg[6]; | 1718 | uint16_t orig_led_cfg[6]; |
1719 | uint32_t led_10_value, led_43_value; | 1719 | uint32_t led_10_value, led_43_value; |
1720 | 1720 | ||
1721 | if (!IS_QLA83XX(ha) && !IS_QLA81XX(ha)) | 1721 | if (!IS_QLA83XX(ha) && !IS_QLA81XX(ha) && !IS_QLA27XX(ha)) |
1722 | return; | 1722 | return; |
1723 | 1723 | ||
1724 | if (!ha->beacon_blink_led) | 1724 | if (!ha->beacon_blink_led) |
1725 | return; | 1725 | return; |
1726 | 1726 | ||
1727 | if (IS_QLA2031(ha)) { | 1727 | if (IS_QLA27XX(ha)) { |
1728 | qla2x00_write_ram_word(vha, 0x1003, 0x40000230); | ||
1729 | qla2x00_write_ram_word(vha, 0x1004, 0x40000230); | ||
1730 | } else if (IS_QLA2031(ha)) { | ||
1728 | led_select_value = qla83xx_select_led_port(ha); | 1731 | led_select_value = qla83xx_select_led_port(ha); |
1729 | 1732 | ||
1730 | qla83xx_wr_reg(vha, led_select_value, 0x40000230); | 1733 | qla83xx_wr_reg(vha, led_select_value, 0x40000230); |
@@ -1811,7 +1814,7 @@ qla24xx_beacon_on(struct scsi_qla_host *vha) | |||
1811 | return QLA_FUNCTION_FAILED; | 1814 | return QLA_FUNCTION_FAILED; |
1812 | } | 1815 | } |
1813 | 1816 | ||
1814 | if (IS_QLA2031(ha)) | 1817 | if (IS_QLA2031(ha) || IS_QLA27XX(ha)) |
1815 | goto skip_gpio; | 1818 | goto skip_gpio; |
1816 | 1819 | ||
1817 | spin_lock_irqsave(&ha->hardware_lock, flags); | 1820 | spin_lock_irqsave(&ha->hardware_lock, flags); |
@@ -1848,7 +1851,7 @@ qla24xx_beacon_off(struct scsi_qla_host *vha) | |||
1848 | 1851 | ||
1849 | ha->beacon_blink_led = 0; | 1852 | ha->beacon_blink_led = 0; |
1850 | 1853 | ||
1851 | if (IS_QLA2031(ha)) | 1854 | if (IS_QLA2031(ha) || IS_QLA27XX(ha)) |
1852 | goto set_fw_options; | 1855 | goto set_fw_options; |
1853 | 1856 | ||
1854 | if (IS_QLA8031(ha) || IS_QLA81XX(ha)) | 1857 | if (IS_QLA8031(ha) || IS_QLA81XX(ha)) |