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

[SCSI] lpfc 8.3.14: SCSI and SLI API fixes 



- Fixed accounting of allocated SCSI buffers when post sgl fails.
- Restrict scsi buffer allocation based on LUN count (sdev_cnt).
- Create __lpfc_sli_free_rpi that doesn't take out the hbalock.
- Modify lpfc_sli_free_rpi to call __lpfc_sli_free_rpi.
- Call __lpfc_sli_free_rpi in lpfc_cleanup_pending_mbox.
- Do not swap the strings returned in mailbox commands and do
  not swap byte aligned data in VPD.

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 <James.Bottomley@suse.de>
parent dbb6b3ab

drivers/scsi/lpfc/lpfc.h

+1 −0
Original line number Diff line number Diff line
@@ -815,6 +815,7 @@ struct lpfc_hba { 
#define HBA_MENLO_SUPPORT	0x1 /* HBA supports menlo commands */

	uint32_t iocb_cnt;

	uint32_t iocb_max;

	atomic_t sdev_cnt;

};



static inline struct Scsi_Host *

drivers/scsi/lpfc/lpfc_crtn.h

+1 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ irqreturn_t lpfc_sli4_sp_intr_handler(int, void *); 
irqreturn_t lpfc_sli4_fp_intr_handler(int, void *);



void lpfc_read_rev(struct lpfc_hba *, LPFC_MBOXQ_t *);

void lpfc_sli4_swap_str(struct lpfc_hba *, LPFC_MBOXQ_t *);

void lpfc_config_ring(struct lpfc_hba *, int, LPFC_MBOXQ_t *);

void lpfc_config_port(struct lpfc_hba *, LPFC_MBOXQ_t *);

void lpfc_kill_board(struct lpfc_hba *, LPFC_MBOXQ_t *);

drivers/scsi/lpfc/lpfc_hbadisc.c

+1 −0
Original line number Diff line number Diff line
@@ -3845,6 +3845,7 @@ lpfc_unreg_rpi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp) 
				mempool_free(mbox, phba->mbox_mem_pool);

		}

		lpfc_no_rpi(phba, ndlp);



		ndlp->nlp_rpi = 0;

		ndlp->nlp_flag &= ~NLP_RPI_VALID;

		ndlp->nlp_flag &= ~NLP_NPR_ADISC;

drivers/scsi/lpfc/lpfc_init.c

+1 −0
Original line number Diff line number Diff line
@@ -4919,6 +4919,7 @@ lpfc_create_shost(struct lpfc_hba *phba) 
	phba->fc_altov = FF_DEF_ALTOV;

	phba->fc_arbtov = FF_DEF_ARBTOV;



	atomic_set(&phba->sdev_cnt, 0);

	vport = lpfc_create_port(phba, phba->brd_no, &phba->pcidev->dev);

	if (!vport)

		return -ENODEV;

drivers/scsi/lpfc/lpfc_mbox.c

+20 −0
Original line number Diff line number Diff line
@@ -955,6 +955,26 @@ lpfc_read_rev(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb) 
	return;

}



void

lpfc_sli4_swap_str(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)

{

	MAILBOX_t *mb = &pmb->u.mb;

	struct lpfc_mqe *mqe;



	switch (mb->mbxCommand) {

	case  MBX_READ_REV:

		 mqe = &pmb->u.mqe;

		lpfc_sli_pcimem_bcopy(mqe->un.read_rev.fw_name,

				 mqe->un.read_rev.fw_name, 16);

		lpfc_sli_pcimem_bcopy(mqe->un.read_rev.ulp_fw_name,

				 mqe->un.read_rev.ulp_fw_name, 16);

		break;

	default:

		break;

	}

	return;

}



/**

 * lpfc_build_hbq_profile2 - Set up the HBQ Selection Profile 2

 * @hbqmb: pointer to the HBQ configuration data structure in mailbox command.

CRA Git | Maintained and supported by SUSTech CRA and CCSE