Commit 5777fef7 authored by Quinn Tran's avatar Quinn Tran Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Consolidate zio threshold setting for both FCP & NVMe 

Consolidate zio threshold setting for both FCP & NVMe to prevent one
protocol from clobbering the setting of the other protocol.

Link: https://lore.kernel.org/r/20210329085229.4367-5-njavali@marvell.com


Reviewed-by: default avatarHimanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: default avatarQuinn Tran <qutran@marvell.com>
Signed-off-by: default avatarNilesh Javali <njavali@marvell.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent c358a3d9

drivers/scsi/qla2xxx/qla_def.h

+0 −1
Original line number Diff line number Diff line
@@ -4727,7 +4727,6 @@ typedef struct scsi_qla_host { 
#define FX00_CRITEMP_RECOVERY	25

#define FX00_HOST_INFO_RESEND	26

#define QPAIR_ONLINE_CHECK_NEEDED	27

#define SET_NVME_ZIO_THRESHOLD_NEEDED	28

#define DETECT_SFP_CHANGE	29

#define N2N_LOGIN_NEEDED	30

#define IOCB_WORK_ACTIVE	31

drivers/scsi/qla2xxx/qla_os.c

+14 −20
Original line number Diff line number Diff line
@@ -6968,26 +6968,21 @@ qla2x00_do_dpc(void *data) 
			mutex_unlock(&ha->mq_lock);

		}



		if (test_and_clear_bit(SET_NVME_ZIO_THRESHOLD_NEEDED,

		    &base_vha->dpc_flags)) {

			ql_log(ql_log_info, base_vha, 0xffffff,

				"nvme: SET ZIO Activity exchange threshold to %d.\n",

						ha->nvme_last_rptd_aen);

			if (qla27xx_set_zio_threshold(base_vha,

			    ha->nvme_last_rptd_aen)) {

				ql_log(ql_log_info, base_vha, 0xffffff,

				    "nvme: Unable to SET ZIO Activity exchange threshold to %d.\n",

				    ha->nvme_last_rptd_aen);

			}

		}



		if (test_and_clear_bit(SET_ZIO_THRESHOLD_NEEDED,

				       &base_vha->dpc_flags)) {

			u16 threshold = ha->nvme_last_rptd_aen + ha->last_zio_threshold;



			if (threshold > ha->orig_fw_xcb_count)

				threshold = ha->orig_fw_xcb_count;



			ql_log(ql_log_info, base_vha, 0xffffff,

			       "SET ZIO Activity exchange threshold to %d.\n",

			    ha->last_zio_threshold);

			qla27xx_set_zio_threshold(base_vha,

			    ha->last_zio_threshold);

			       threshold);

			if (qla27xx_set_zio_threshold(base_vha, threshold)) {

				ql_log(ql_log_info, base_vha, 0xffffff,

				       "Unable to SET ZIO Activity exchange threshold to %d.\n",

				       threshold);

			}

		}



		if (!IS_QLAFX00(ha))
@@ -7217,14 +7212,13 @@ qla2x00_timer(struct timer_list *t) 
	index = atomic_read(&ha->nvme_active_aen_cnt);

	if (!vha->vp_idx &&

	    (index != ha->nvme_last_rptd_aen) &&

	    (index >= DEFAULT_ZIO_THRESHOLD) &&

	    ha->zio_mode == QLA_ZIO_MODE_6 &&

	    !ha->flags.host_shutting_down) {

		ha->nvme_last_rptd_aen = atomic_read(&ha->nvme_active_aen_cnt);

		ql_log(ql_log_info, vha, 0x3002,

		    "nvme: Sched: Set ZIO exchange threshold to %d.\n",

		    ha->nvme_last_rptd_aen);

		ha->nvme_last_rptd_aen = atomic_read(&ha->nvme_active_aen_cnt);

		set_bit(SET_NVME_ZIO_THRESHOLD_NEEDED, &vha->dpc_flags);

		set_bit(SET_ZIO_THRESHOLD_NEEDED, &vha->dpc_flags);

		start_dpc++;

	}