scsi: qla2xxx: Allow ABTS, PURX, RIDA on ATIOQ for ISP83XX/27XX

Driver added mechanism to move ABTS/PUREX/RIDA mailbox to
ATIO queue as part of commit id 41dc529a4602ac737020f423f84686a81de38e6d
("qla2xxx: Improve RSCN handling in driver").

This patch adds a check to only allow ABTS/PURX/RIDA
to be moved to ATIO Queue for ISP83XX and ISP27XX.

Cc: <stable@vger.kernel.org> # 4.11
Signed-off-by: Quinn Tran <quinn.tran@cavium.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
Reviewed-by: Bart Van Assche <Bart.VanAssche@sandisk.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 0391fc3170035e10bd5a34423cd58601eca0850e..f6130e8b1ca1e8447f232a0546ef6b53f72111f6 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -2946,7 +2946,8 @@ qla24xx_update_fw_options(scsi_qla_host_t *vha)
        }
 
        /* Move PUREX, ABTS RX & RIDA to ATIOQ */
-       if (ql2xmvasynctoatio) {
+       if (ql2xmvasynctoatio &&
+           (IS_QLA83XX(ha) || IS_QLA27XX(ha))) {
                if (qla_tgt_mode_enabled(vha) ||
                    qla_dual_mode_enabled(vha))
                        ha->fw_options[2] |= BIT_11;
@@ -2958,7 +2959,9 @@ qla24xx_update_fw_options(scsi_qla_host_t *vha)
                "%s, add FW options 1-3 = 0x%04x 0x%04x 0x%04x mode %x\n",
                __func__, ha->fw_options[1], ha->fw_options[2],
                ha->fw_options[3], vha->host->active_mode);
-       qla2x00_set_fw_options(vha, ha->fw_options);
+
+       if (ha->fw_options[1] || ha->fw_options[2] || ha->fw_options[3])
+               qla2x00_set_fw_options(vha, ha->fw_options);
 
        /* Update Serial Link options. */
        if ((le16_to_cpu(ha->fw_seriallink_options24[0]) & BIT_0) == 0)