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

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

[SCSI] lpfc 8.3.29: SLI related fixes 



SLI related fixes:

- Fix REG_RPI fails on SLI4 HBA putting NPort into NPR state (126230)
- Fix ELS FDISC failing with local reject / invalid RPI. (126350)
- Fix reset port when reset is needed during fw_dump (125807)
- Fix unbounded firmware revision string from port cause panic (126560)
- Fix driver behavior when receiving an ADISC (126654)
- Fix driver not returning when bad ndlp found in abts error event
  handling (126209)
- Add more driver logs in area of SLI4 port error attention and reset
  recovery (126813, 124466)
- Fix failure in handling large CQ/EQ identifiers in an IOV
  environment (126856)
- Fix for driver using duplicate RPIs after lancer port reset (126723)
- Clear vport->fc_myDID in lpfc_els_issue_fdisc to guarentee a
  zero SID (126779, 126897)
- Fix for SLI4 Port delivery for BLS ABORT ACC (126289)

Signed-off-by: default avatarAlex Iannicelli <alex.iannicelli@emulex.com>
Signed-off-by: default avatarJames Smart <james.smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 3ef6d24c

drivers/scsi/lpfc/lpfc_attr.c

+8 −4
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ lpfc_fwrev_show(struct device *dev, struct device_attribute *attr, 
	struct lpfc_hba   *phba = vport->phba;

	uint32_t if_type;

	uint8_t sli_family;

	char fwrev[32];

	char fwrev[FW_REV_STR_SIZE];

	int len;



	lpfc_decode_firmware_rev(phba, fwrev, 1);
@@ -922,11 +922,15 @@ lpfc_sli4_pdev_reg_request(struct lpfc_hba *phba, uint32_t opcode) 
	rc = lpfc_sli4_pdev_status_reg_wait(phba);



	if (rc == -EPERM) {

		/* no privilage for reset, restore if needed */

		if (before_fc_flag & FC_OFFLINE_MODE)

			goto out;

		/* no privilage for reset */

		lpfc_printf_log(phba, KERN_ERR, LOG_SLI,

				"3150 No privilage to perform the requested "

				"access: x%x\n", reg_val);

	} else if (rc == -EIO) {

		/* reset failed, there is nothing more we can do */

		lpfc_printf_log(phba, KERN_ERR, LOG_SLI,

				"3153 Fail to perform the requested "

				"access: x%x\n", reg_val);

		return rc;

	}

drivers/scsi/lpfc/lpfc_bsg.c

+2 −2
Original line number Diff line number Diff line
@@ -3980,7 +3980,7 @@ lpfc_bsg_handle_sli_cfg_mbox(struct lpfc_hba *phba, struct fc_bsg_job *job, 
			case COMN_OPCODE_GET_CNTL_ADDL_ATTRIBUTES:

				lpfc_printf_log(phba, KERN_INFO, LOG_LIBDFC,

						"3106 Handled SLI_CONFIG "

						"subsys_fcoe, opcode:x%x\n",

						"subsys_comn, opcode:x%x\n",

						opcode);

				rc = lpfc_bsg_sli_cfg_read_cmd_ext(phba, job,

							nemb_mse, dmabuf);
@@ -3988,7 +3988,7 @@ lpfc_bsg_handle_sli_cfg_mbox(struct lpfc_hba *phba, struct fc_bsg_job *job, 
			default:

				lpfc_printf_log(phba, KERN_INFO, LOG_LIBDFC,

						"3107 Reject SLI_CONFIG "

						"subsys_fcoe, opcode:x%x\n",

						"subsys_comn, opcode:x%x\n",

						opcode);

				rc = -EPERM;

				break;

drivers/scsi/lpfc/lpfc_crtn.h

+1 −0
Original line number Diff line number Diff line
@@ -462,3 +462,4 @@ int lpfc_issue_unreg_vfi(struct lpfc_vport *); 
int lpfc_selective_reset(struct lpfc_hba *);

int lpfc_sli4_read_config(struct lpfc_hba *phba);

int lpfc_scsi_buf_update(struct lpfc_hba *phba);

void lpfc_sli4_node_prep(struct lpfc_hba *phba);

drivers/scsi/lpfc/lpfc_ct.c

+2 −2
Original line number Diff line number Diff line
@@ -1076,7 +1076,7 @@ int 
lpfc_vport_symbolic_node_name(struct lpfc_vport *vport, char *symbol,

	size_t size)

{

	char fwrev[16];

	char fwrev[FW_REV_STR_SIZE];

	int n;



	lpfc_decode_firmware_rev(vport->phba, fwrev, 0);
@@ -1834,7 +1834,7 @@ lpfc_decode_firmware_rev(struct lpfc_hba *phba, char *fwrevision, int flag) 
	uint8_t *fwname;



	if (phba->sli_rev == LPFC_SLI_REV4)

		sprintf(fwrevision, "%s", vp->rev.opFwName);

		snprintf(fwrevision, FW_REV_STR_SIZE, "%s", vp->rev.opFwName);

	else if (vp->rev.rBit) {

		if (psli->sli_flag & LPFC_SLI_ACTIVE)

			rev = vp->rev.sli2FwRev;

drivers/scsi/lpfc/lpfc_els.c

+2 −1
Original line number Diff line number Diff line
@@ -7172,7 +7172,7 @@ lpfc_cmpl_els_fdisc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
			goto out;

		/* FDISC failed */

		lpfc_printf_vlog(vport, KERN_ERR, LOG_ELS,

				 "0126 FDISC failed. (%d/%d)\n",

				 "0126 FDISC failed. (x%x/x%x)\n",

				 irsp->ulpStatus, irsp->un.ulpWord[4]);

		goto fdisc_failed;

	}
@@ -7283,6 +7283,7 @@ lpfc_issue_els_fdisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
	int rc;



	vport->port_state = LPFC_FDISC;

	vport->fc_myDID = 0;

	cmdsize = (sizeof(uint32_t) + sizeof(struct serv_parm));

	elsiocb = lpfc_prep_els_iocb(vport, 1, cmdsize, retry, ndlp, did,

				     ELS_CMD_FDISC);