Commit cecb3540 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi 

Pull SCSI fixes from James Bottomley:
 "Driver fixes and and one core patch.

  Nine of the driver patches are minor fixes and reworks to lpfc and the
  rest are trivial and minor fixes elsewhere"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: pmcraid: Fix missing resource cleanup in error case
  scsi: ipr: Fix missing/incorrect resource cleanup in error case
  scsi: mpt3sas: Fix out-of-bounds compiler warning
  scsi: lpfc: Update lpfc version to 14.2.0.4
  scsi: lpfc: Allow reduced polling rate for nvme_admin_async_event cmd completion
  scsi: lpfc: Add more logging of cmd and cqe information for aborted NVMe cmds
  scsi: lpfc: Fix port stuck in bypassed state after LIP in PT2PT topology
  scsi: lpfc: Resolve NULL ptr dereference after an ELS LOGO is aborted
  scsi: lpfc: Address NULL pointer dereference after starget_to_rport()
  scsi: lpfc: Resolve some cleanup issues following SLI path refactoring
  scsi: lpfc: Resolve some cleanup issues following abort path refactoring
  scsi: lpfc: Correct BDE type for XMIT_SEQ64_WQE in lpfc_ct_reject_event()
  scsi: vmw_pvscsi: Expand vcpuHint to 16 bits
  scsi: sd: Fix interpretation of VPD B9h length
parents abe71eb3 ec1e8adc

drivers/scsi/ipr.c

+2 −2
Original line number Diff line number Diff line
@@ -9795,7 +9795,7 @@ static int ipr_alloc_mem(struct ipr_ioa_cfg *ioa_cfg) 
					GFP_KERNEL);



		if (!ioa_cfg->hrrq[i].host_rrq)  {

			while (--i > 0)

			while (--i >= 0)

				dma_free_coherent(&pdev->dev,

					sizeof(u32) * ioa_cfg->hrrq[i].size,

					ioa_cfg->hrrq[i].host_rrq,
@@ -10068,7 +10068,7 @@ static int ipr_request_other_msi_irqs(struct ipr_ioa_cfg *ioa_cfg, 
			ioa_cfg->vectors_info[i].desc,

			&ioa_cfg->hrrq[i]);

		if (rc) {

			while (--i >= 0)

			while (--i > 0)

				free_irq(pci_irq_vector(pdev, i),

					&ioa_cfg->hrrq[i]);

			return rc;

drivers/scsi/lpfc/lpfc_crtn.h

+1 −3
Original line number Diff line number Diff line
@@ -420,8 +420,6 @@ int lpfc_sli_issue_iocb_wait(struct lpfc_hba *, uint32_t, 
			     uint32_t);

void lpfc_sli_abort_fcp_cmpl(struct lpfc_hba *, struct lpfc_iocbq *,

			     struct lpfc_iocbq *);

void lpfc_sli4_abort_fcp_cmpl(struct lpfc_hba *h, struct lpfc_iocbq *i,

			      struct lpfc_wcqe_complete *w);



void lpfc_sli_free_hbq(struct lpfc_hba *, struct hbq_dmabuf *);
@@ -630,7 +628,7 @@ void lpfc_nvmet_invalidate_host(struct lpfc_hba *phba, 
			struct lpfc_nodelist *ndlp);

void lpfc_nvme_abort_fcreq_cmpl(struct lpfc_hba *phba,

				struct lpfc_iocbq *cmdiocb,

				struct lpfc_wcqe_complete *abts_cmpl);

				struct lpfc_iocbq *rspiocb);

void lpfc_create_multixri_pools(struct lpfc_hba *phba);

void lpfc_create_destroy_pools(struct lpfc_hba *phba);

void lpfc_move_xri_pvt_to_pbl(struct lpfc_hba *phba, u32 hwqid);

drivers/scsi/lpfc/lpfc_ct.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ lpfc_ct_reject_event(struct lpfc_nodelist *ndlp, 
	memset(bpl, 0, sizeof(struct ulp_bde64));

	bpl->addrHigh = le32_to_cpu(putPaddrHigh(mp->phys));

	bpl->addrLow = le32_to_cpu(putPaddrLow(mp->phys));

	bpl->tus.f.bdeFlags = BUFF_TYPE_BLP_64;

	bpl->tus.f.bdeFlags = BUFF_TYPE_BDE_64;

	bpl->tus.f.bdeSize = (LPFC_CT_PREAMBLE - 4);

	bpl->tus.w = le32_to_cpu(bpl->tus.w);

drivers/scsi/lpfc/lpfc_els.c

+9 −12
Original line number Diff line number Diff line
@@ -2998,10 +2998,7 @@ lpfc_cmpl_els_logo(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
				 ndlp->nlp_DID, ulp_status,

				 ulp_word4);



		/* Call NLP_EVT_DEVICE_RM if link is down or LOGO is aborted */

		if (lpfc_error_lost_link(ulp_status, ulp_word4)) {

			lpfc_disc_state_machine(vport, ndlp, cmdiocb,

						NLP_EVT_DEVICE_RM);

			skip_recovery = 1;

			goto out;

		}
@@ -3021,18 +3018,10 @@ lpfc_cmpl_els_logo(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
		spin_unlock_irq(&ndlp->lock);

		lpfc_disc_state_machine(vport, ndlp, cmdiocb,

					NLP_EVT_DEVICE_RM);

		lpfc_els_free_iocb(phba, cmdiocb);

		lpfc_nlp_put(ndlp);



		/* Presume the node was released. */

		return;

		goto out_rsrc_free;

	}



out:

	/* Driver is done with the IO.  */

	lpfc_els_free_iocb(phba, cmdiocb);

	lpfc_nlp_put(ndlp);



	/* At this point, the LOGO processing is complete. NOTE: For a

	 * pt2pt topology, we are assuming the NPortID will only change

	 * on link up processing. For a LOGO / PLOGI initiated by the
@@ -3059,6 +3048,10 @@ lpfc_cmpl_els_logo(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
				 ndlp->nlp_DID, ulp_status,

				 ulp_word4, tmo,

				 vport->num_disc_nodes);



		lpfc_els_free_iocb(phba, cmdiocb);

		lpfc_nlp_put(ndlp);



		lpfc_disc_start(vport);

		return;

	}
@@ -3075,6 +3068,10 @@ lpfc_cmpl_els_logo(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
		lpfc_disc_state_machine(vport, ndlp, cmdiocb,

					NLP_EVT_DEVICE_RM);

	}

out_rsrc_free:

	/* Driver is done with the I/O. */

	lpfc_els_free_iocb(phba, cmdiocb);

	lpfc_nlp_put(ndlp);

}



/**

drivers/scsi/lpfc/lpfc_hw4.h

+3 −0
Original line number Diff line number Diff line
@@ -4487,6 +4487,9 @@ struct wqe_common { 
#define wqe_sup_SHIFT         6

#define wqe_sup_MASK          0x00000001

#define wqe_sup_WORD          word11

#define wqe_ffrq_SHIFT         6

#define wqe_ffrq_MASK          0x00000001

#define wqe_ffrq_WORD          word11

#define wqe_wqec_SHIFT        7

#define wqe_wqec_MASK         0x00000001

#define wqe_wqec_WORD         word11