Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6571c6e authored by James Smart's avatar James Smart Committed by James Bottomley
Browse files

[SCSI] lpfc 8.3.36: Fix bug with Target Resets and FCP2 devices 



Fix bug with Target Resets and FCP2 devices

Create module parameter to disable Target Reset on FCP-Tape devices
when a "bus reset" is requested. Default is to reset all devices on
bus reset.

Signed-off-by: default avatarJames Smart <james.smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent c71ab861

drivers/scsi/lpfc/lpfc.h

+1 −0
Original line number Diff line number Diff line
@@ -689,6 +689,7 @@ struct lpfc_hba { 
#define LPFC_FCF_PRIORITY 2	/* Priority fcf failover */

	uint32_t cfg_fcf_failover_policy;

	uint32_t cfg_fcp_io_sched;

	uint32_t cfg_fcp2_no_tgt_reset;

	uint32_t cfg_cr_delay;

	uint32_t cfg_cr_count;

	uint32_t cfg_multi_ring_support;

drivers/scsi/lpfc/lpfc_attr.c

+12 −0
Original line number Diff line number Diff line
@@ -3858,6 +3858,16 @@ LPFC_ATTR_R(ack0, 0, 0, 1, "Enable ACK0 support"); 
LPFC_ATTR_RW(fcp_io_sched, 0, 0, 1, "Determine scheduling algrithmn for "

		"issuing commands [0] - Round Robin, [1] - Current CPU");



/*

# lpfc_fcp2_no_tgt_reset: Determine bus reset behavior

# range is [0,1]. Default value is 0.

# For [0], bus reset issues target reset to ALL devices

# For [1], bus reset issues target reset to non-FCP2 devices

*/

LPFC_ATTR_RW(fcp2_no_tgt_reset, 0, 0, 1, "Determine bus reset behavior for "

	     "FCP2 devices [0] - issue tgt reset, [1] - no tgt reset");





/*

# lpfc_cr_delay & lpfc_cr_count: Default values for I/O colaesing

# cr_delay (msec) or cr_count outstanding commands. cr_delay can take
@@ -4100,6 +4110,7 @@ struct device_attribute *lpfc_hba_attrs[] = { 
	&dev_attr_lpfc_scan_down,

	&dev_attr_lpfc_link_speed,

	&dev_attr_lpfc_fcp_io_sched,

	&dev_attr_lpfc_fcp2_no_tgt_reset,

	&dev_attr_lpfc_cr_delay,

	&dev_attr_lpfc_cr_count,

	&dev_attr_lpfc_multi_ring_support,
@@ -5091,6 +5102,7 @@ void 
lpfc_get_cfgparam(struct lpfc_hba *phba)

{

	lpfc_fcp_io_sched_init(phba, lpfc_fcp_io_sched);

	lpfc_fcp2_no_tgt_reset_init(phba, lpfc_fcp2_no_tgt_reset);

	lpfc_cr_delay_init(phba, lpfc_cr_delay);

	lpfc_cr_count_init(phba, lpfc_cr_count);

	lpfc_multi_ring_support_init(phba, lpfc_multi_ring_support);

drivers/scsi/lpfc/lpfc_scsi.c

+3 −0
Original line number Diff line number Diff line
@@ -4914,6 +4914,9 @@ lpfc_bus_reset_handler(struct scsi_cmnd *cmnd) 
		list_for_each_entry(ndlp, &vport->fc_nodes, nlp_listp) {

			if (!NLP_CHK_NODE_ACT(ndlp))

				continue;

			if (vport->phba->cfg_fcp2_no_tgt_reset &&

			    (ndlp->nlp_fcp_info & NLP_FCP_2_DEVICE))

				continue;

			if (ndlp->nlp_state == NLP_STE_MAPPED_NODE &&

			    ndlp->nlp_sid == i &&

			    ndlp->rport) {