[SCSI] lpfc 8.3.34: Fix parameter field in CQE to mask for LOCAL_REJECT status (e3d2b802) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/scsi/lpfc/lpfc_bsg.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -195,7 +195,7 @@ lpfc_bsg_send_mgmt_cmd_cmp(struct lpfc_hba *phba,

		if (rsp->ulpStatus) {
		if (rsp->ulpStatus == IOSTAT_LOCAL_REJECT) {
		switch (rsp->un.ulpWord[4] & 0xff) {
		switch (rsp->un.ulpWord[4] & IOERR_PARAM_MASK) {
		case IOERR_SEQUENCE_TIMEOUT:
		rc = -ETIMEDOUT;
		break;
		@@ -1234,7 +1234,7 @@ lpfc_issue_ct_rsp_cmp(struct lpfc_hba *phba,

		if (rsp->ulpStatus) {
		if (rsp->ulpStatus == IOSTAT_LOCAL_REJECT) {
		switch (rsp->un.ulpWord[4] & 0xff) {
		switch (rsp->un.ulpWord[4] & IOERR_PARAM_MASK) {
		case IOERR_SEQUENCE_TIMEOUT:
		rc = -ETIMEDOUT;
		break;
		@@ -4798,7 +4798,7 @@ lpfc_bsg_menlo_cmd_cmp(struct lpfc_hba *phba,
		menlo_resp->xri = rsp->ulpContext;
		if (rsp->ulpStatus) {
		if (rsp->ulpStatus == IOSTAT_LOCAL_REJECT) {
		switch (rsp->un.ulpWord[4] & 0xff) {
		switch (rsp->un.ulpWord[4] & IOERR_PARAM_MASK) {
		case IOERR_SEQUENCE_TIMEOUT:
		rc = -ETIMEDOUT;
		break;

drivers/scsi/lpfc/lpfc_ct.c

+11 −5

Original line number	Diff line number	Diff line
		@@ -104,7 +104,8 @@ lpfc_ct_unsol_event(struct lpfc_hba phba, struct lpfc_sli_ring pring,
		if (unlikely(icmd->ulpStatus == IOSTAT_NEED_BUFFER)) {
		lpfc_sli_hbqbuf_add_hbqs(phba, LPFC_ELS_HBQ);
		} else if ((icmd->ulpStatus == IOSTAT_LOCAL_REJECT) &&
		((icmd->un.ulpWord[4] & 0xff) == IOERR_RCV_BUFFER_WAITING)) {
		((icmd->un.ulpWord[4] & IOERR_PARAM_MASK) ==
		IOERR_RCV_BUFFER_WAITING)) {
		/* Not enough posted buffers; Try posting more buffers */
		phba->fc_stat.NoRcvBuf++;
		if (!(phba->sli3_options & LPFC_SLI3_HBQ_ENABLED))
		@@ -633,7 +634,8 @@ lpfc_cmpl_ct_cmd_gid_ft(struct lpfc_hba phba, struct lpfc_iocbq cmdiocb,
		/* Check for retry */
		if (vport->fc_ns_retry < LPFC_MAX_NS_RETRY) {
		if (irsp->ulpStatus != IOSTAT_LOCAL_REJECT \|\|
		irsp->un.ulpWord[4] != IOERR_NO_RESOURCES)
		(irsp->un.ulpWord[4] && IOERR_PARAM_MASK) !=
		IOERR_NO_RESOURCES)
		vport->fc_ns_retry++;

		/* CT command is being retried */
		@@ -783,7 +785,9 @@ lpfc_cmpl_ct_cmd_gff_id(struct lpfc_hba phba, struct lpfc_iocbq cmdiocb,
		if (cmdiocb->retry < LPFC_MAX_NS_RETRY) {
		retry = 1;
		if (irsp->ulpStatus == IOSTAT_LOCAL_REJECT) {
		switch (irsp->un.ulpWord[4]) {
		switch ((irsp->un.ulpWord[4] &
		IOERR_PARAM_MASK)) {

		case IOERR_NO_RESOURCES:
		/* We don't increment the retry
		* count for this case.
		@@ -908,8 +912,10 @@ lpfc_cmpl_ct(struct lpfc_hba phba, struct lpfc_iocbq cmdiocb,
		cmdcode, irsp->ulpStatus, irsp->un.ulpWord[4]);

		if ((irsp->ulpStatus == IOSTAT_LOCAL_REJECT) &&
		((irsp->un.ulpWord[4] == IOERR_SLI_DOWN) \|\|
		(irsp->un.ulpWord[4] == IOERR_SLI_ABORTED)))
		(((irsp->un.ulpWord[4] & IOERR_PARAM_MASK) ==
		IOERR_SLI_DOWN) \|\|
		((irsp->un.ulpWord[4] & IOERR_PARAM_MASK) ==
		IOERR_SLI_ABORTED)))
		goto out;

		retry = cmdiocb->retry;

drivers/scsi/lpfc/lpfc_els.c

+11 −6

Original line number	Diff line number	Diff line
		@@ -962,7 +962,8 @@ lpfc_cmpl_els_flogi(struct lpfc_hba phba, struct lpfc_iocbq cmdiocb,
		if ((phba->fcoe_cvl_eventtag_attn ==
		phba->fcoe_cvl_eventtag) &&
		(irsp->ulpStatus == IOSTAT_LOCAL_REJECT) &&
		(irsp->un.ulpWord[4] == IOERR_SLI_ABORTED))
		((irsp->un.ulpWord[4] & IOERR_PARAM_MASK) ==
		IOERR_SLI_ABORTED))
		goto stop_rr_fcf_flogi;
		else
		phba->fcoe_cvl_eventtag_attn =
		@@ -1108,8 +1109,10 @@ lpfc_cmpl_els_flogi(struct lpfc_hba phba, struct lpfc_iocbq cmdiocb,
		/* Start discovery */
		lpfc_disc_start(vport);
		} else if (((irsp->ulpStatus != IOSTAT_LOCAL_REJECT) \|\|
		((irsp->un.ulpWord[4] != IOERR_SLI_ABORTED) &&
		(irsp->un.ulpWord[4] != IOERR_SLI_DOWN))) &&
		(((irsp->un.ulpWord[4] & IOERR_PARAM_MASK) !=
		IOERR_SLI_ABORTED) &&
		((irsp->un.ulpWord[4] & IOERR_PARAM_MASK) !=
		IOERR_SLI_DOWN))) &&
		(phba->link_state != LPFC_CLEAR_LA)) {
		/* If FLOGI failed enable link interrupt. */
		lpfc_issue_clear_la(phba, vport);
		@@ -3070,7 +3073,7 @@ lpfc_els_retry(struct lpfc_hba phba, struct lpfc_iocbq cmdiocb,
		}
		break;
		case IOSTAT_LOCAL_REJECT:
		switch ((irsp->un.ulpWord[4] & 0xff)) {
		switch ((irsp->un.ulpWord[4] & IOERR_PARAM_MASK)) {
		case IOERR_LOOP_OPEN_FAILURE:
		if (cmd == ELS_CMD_FLOGI) {
		if (PCI_DEVICE_ID_HORNET ==
		@@ -3277,7 +3280,8 @@ lpfc_els_retry(struct lpfc_hba phba, struct lpfc_iocbq cmdiocb,

		if (((cmd == ELS_CMD_PLOGI) \|\| (cmd == ELS_CMD_ADISC)) &&
		((irsp->ulpStatus != IOSTAT_LOCAL_REJECT) \|\|
		((irsp->un.ulpWord[4] & 0xff) != IOERR_NO_RESOURCES))) {
		((irsp->un.ulpWord[4] & IOERR_PARAM_MASK) !=
		IOERR_NO_RESOURCES))) {
		/* Don't reset timer for no resources */

		/* If discovery / RSCN timer is running, reset it */
		@@ -6870,7 +6874,8 @@ lpfc_els_unsol_event(struct lpfc_hba phba, struct lpfc_sli_ring pring,
		if (icmd->ulpStatus == IOSTAT_NEED_BUFFER) {
		lpfc_sli_hbqbuf_add_hbqs(phba, LPFC_ELS_HBQ);
		} else if (icmd->ulpStatus == IOSTAT_LOCAL_REJECT &&
		(icmd->un.ulpWord[4] & 0xff) == IOERR_RCV_BUFFER_WAITING) {
		(icmd->un.ulpWord[4] & IOERR_PARAM_MASK) ==
		IOERR_RCV_BUFFER_WAITING) {
		phba->fc_stat.NoRcvBuf++;
		/* Not enough posted buffers; Try posting more buffers */
		if (!(phba->sli3_options & LPFC_SLI3_HBQ_ENABLED))

drivers/scsi/lpfc/lpfc_hw.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -3245,6 +3245,7 @@ typedef struct {
		#define IOERR_SLI_DOWN 0x101 /* ulpStatus - Driver defined */
		#define IOERR_SLI_BRESET 0x102
		#define IOERR_SLI_ABORTED 0x103
		#define IOERR_PARAM_MASK 0x1ff
		} PARM_ERR;

		typedef union {

drivers/scsi/lpfc/lpfc_hw4.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -344,7 +344,7 @@ struct lpfc_cqe {
		* Define mask value for xri_aborted and wcqe completed CQE extended status.
		* Currently, extended status is limited to 9 bits (0x0 -> 0x103) .
		*/
		#define WCQE_PARAM_MASK 0x1FF;
		#define WCQE_PARAM_MASK 0x1FF

		/* completion queue entry for wqe completions */
		struct lpfc_wcqe_complete {