Commit b2d1453a authored Apr 02, 2019 by Giridhar Malavali Committed by Martin K. Petersen Apr 03, 2019

scsi: qla2xxx: Fix driver unload when FC-NVMe LUNs are connected



This patch allows driver to unload using "modprobe -r" when FC-NVMe LUNs
are connected.

Signed-off-by: Giridhar Malavali <gmalavali@marvell.com>
Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent e39a6645

drivers/scsi/qla2xxx/qla_nvme.c

+23 −6

Original line number	Diff line number	Diff line
		@@ -164,12 +164,13 @@ static void qla_nvme_sp_done(void *ptr, int res)
		if (!atomic_dec_and_test(&sp->ref_count))
		return;

		if (res == QLA_SUCCESS)
		fd->status = 0;
		else
		fd->status = NVME_SC_INTERNAL;

		if (res == QLA_SUCCESS) {
		fd->rcv_rsplen = nvme->u.nvme.rsp_pyld_len;
		} else {
		fd->rcv_rsplen = 0;
		fd->transferred_length = 0;
		}
		fd->status = 0;
		fd->done(fd);
		qla2xxx_rel_qpair_sp(sp->qpair, sp);

		@@ -193,6 +194,22 @@ static void qla_nvme_abort_work(struct work_struct *work)
		if (!ha->flags.fw_started && (fcport && fcport->deleted))
		return;

		if (ha->flags.host_shutting_down) {
		ql_log(ql_log_info, sp->fcport->vha, 0xffff,
		"%s Calling done on sp: %p, type: 0x%x, sp->ref_count: 0x%x\n",
		__func__, sp, sp->type, atomic_read(&sp->ref_count));
		sp->done(sp, 0);
		return;
		}

		if (atomic_read(&sp->ref_count) == 0) {
		WARN_ON(1);
		ql_log(ql_log_info, fcport->vha, 0xffff,
		"%s: command alredy aborted on sp: %p\n",
		__func__, sp);
		return;
		}

		rval = ha->isp_ops->abort_command(sp);

		ql_dbg(ql_dbg_io, fcport->vha, 0x212b,

drivers/scsi/qla2xxx/qla_os.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -6742,8 +6742,10 @@ qla2x00_timer(struct timer_list *t)
		* FC-NVME
		* see if the active AEN count has changed from what was last reported.
		*/
		if (!vha->vp_idx && (atomic_read(&ha->nvme_active_aen_cnt) !=
		ha->nvme_last_rptd_aen) && ha->zio_mode == QLA_ZIO_MODE_6) {
		if (!vha->vp_idx &&
		(atomic_read(&ha->nvme_active_aen_cnt) != ha->nvme_last_rptd_aen) &&
		ha->zio_mode == QLA_ZIO_MODE_6 &&
		!ha->flags.host_shutting_down) {
		ql_log(ql_log_info, vha, 0x3002,
		"nvme: Sched: Set ZIO exchange threshold to %d.\n",
		ha->nvme_last_rptd_aen);