mirror of
https://github.com/SCST-project/scst.git
synced 2026-05-20 04:01:26 +00:00
qla2x00t-32gbit: NVME|FCP prefer flag not being honored
Changing of [FCP|NVME] prefer flag in flash has no effect on driver. For device that supports both FCP + NVMe over the same connection, driver continues to connect to this device using the previous successful login mode. On completion of flash update, adapter will be reset. Driver will reset the prefer flag based on setting from flash. Cc: stable@vger.kernel.org Signed-off-by: Quinn Tran <qutran@marvell.com> Signed-off-by: Nilesh Javali <njavali@marvell.com> Link: https://lore.kernel.org/r/20240227164127.36465-6-njavali@marvell.com Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> [ commit 69aecdd41010 upstream ]
This commit is contained in:
@@ -7504,6 +7504,7 @@ qla2x00_abort_isp(scsi_qla_host_t *vha)
|
||||
struct scsi_qla_host *vp, *tvp;
|
||||
struct req_que *req = ha->req_q_map[0];
|
||||
unsigned long flags;
|
||||
fc_port_t *fcport;
|
||||
|
||||
if (vha->flags.online) {
|
||||
qla2x00_abort_isp_cleanup(vha);
|
||||
@@ -7572,6 +7573,15 @@ qla2x00_abort_isp(scsi_qla_host_t *vha)
|
||||
"ISP Abort - ISP reg disconnect post nvmram config, exiting.\n");
|
||||
return status;
|
||||
}
|
||||
|
||||
/* User may have updated [fcp|nvme] prefer in flash */
|
||||
list_for_each_entry(fcport, &vha->vp_fcports, list) {
|
||||
if (NVME_PRIORITY(ha, fcport))
|
||||
fcport->do_prli_nvme = 1;
|
||||
else
|
||||
fcport->do_prli_nvme = 0;
|
||||
}
|
||||
|
||||
if (!qla2x00_restart_isp(vha)) {
|
||||
clear_bit(RESET_MARKER_NEEDED, &vha->dpc_flags);
|
||||
|
||||
@@ -7642,6 +7652,14 @@ qla2x00_abort_isp(scsi_qla_host_t *vha)
|
||||
atomic_inc(&vp->vref_count);
|
||||
spin_unlock_irqrestore(&ha->vport_slock, flags);
|
||||
|
||||
/* User may have updated [fcp|nvme] prefer in flash */
|
||||
list_for_each_entry(fcport, &vp->vp_fcports, list) {
|
||||
if (NVME_PRIORITY(ha, fcport))
|
||||
fcport->do_prli_nvme = 1;
|
||||
else
|
||||
fcport->do_prli_nvme = 0;
|
||||
}
|
||||
|
||||
qla2x00_vp_abort_isp(vp);
|
||||
|
||||
spin_lock_irqsave(&ha->vport_slock, flags);
|
||||
|
||||
Reference in New Issue
Block a user