Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 3930b8c1f3582d43757cbcc9b7ecaf05f6b4a66e

Authored by Vikas Chaudhary
Committed by James Bottomley
1 parent d56a1f7b39
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[SCSI] qla4xxx: do not reset hba if ql4xdontresethba is set 

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: Ravi Anand <ravi.anand@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

Showing 1 changed file with 9 additions and 7 deletions Side-by-side Diff

drivers/scsi/qla4xxx/ql4_os.c
Diff comments   View file @ 3930b8c
... ... @@ -711,15 +711,17 @@
711 711 test_bit(DPC_RESET_ACTIVE, &ha->dpc_flags))) {
712 712 if (dev_state == QLA82XX_DEV_NEED_RESET &&
713 713 !test_bit(DPC_RESET_HA, &ha->dpc_flags)) {
714   - printk("scsi%ld: %s: HW State: NEED RESET!\n",
715   - ha->host_no, __func__);
716   - set_bit(DPC_RESET_HA, &ha->dpc_flags);
717   - qla4xxx_wake_dpc(ha);
718   - qla4xxx_mailbox_premature_completion(ha);
  714 + if (!ql4xdontresethba) {
  715 + ql4_printk(KERN_INFO, ha, "%s: HW State: "
  716 + "NEED RESET!\n", __func__);
  717 + set_bit(DPC_RESET_HA, &ha->dpc_flags);
  718 + qla4xxx_wake_dpc(ha);
  719 + qla4xxx_mailbox_premature_completion(ha);
  720 + }
719 721 } else if (dev_state == QLA82XX_DEV_NEED_QUIESCENT &&
720 722 !test_bit(DPC_HA_NEED_QUIESCENT, &ha->dpc_flags)) {
721   - printk("scsi%ld: %s: HW State: NEED QUIES!\n",
722   - ha->host_no, __func__);
  723 + ql4_printk(KERN_INFO, ha, "%s: HW State: NEED QUIES!\n",
  724 + __func__);
723 725 set_bit(DPC_HA_NEED_QUIESCENT, &ha->dpc_flags);
724 726 qla4xxx_wake_dpc(ha);
725 727 } else {