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

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

[SCSI] lpfc 8.3.3 : Fix various SLI-3 vs SLI-4 differences 



Contains the following changes
- Set the CT field of FDISC to 3
- Fixed over allocation of SCSI buffers on SLI4
- Removed unused jump table entries
- Increase LPFC_WQE_DEF_COUNT to 256
- Updated FDISC context to VPI
- Fixed immediate SCSI command for LUN reset translation to WQE
- Extended mailbox handling to allow MBX_POLL commands in between async
  MBQ commands
- Fixed SID used for FDISC
- Fix crash when accessing ctlregs from sysfs for SLI4 HBAs
- Fix SLI4 firmware version not being saved or displayed correctly
- Expand CQID field in WQE structure to 16 bits
- Fix post header template mailbox command timing out
- Removed FCoE PCI device ID 0x0705

Signed-off-by: default avatarJames Smart <James.Smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 43fac4d9

drivers/scsi/lpfc/lpfc.h

+0 −4
Original line number Diff line number Diff line
@@ -457,10 +457,6 @@ struct lpfc_hba { 
	void (*lpfc_scsi_prep_cmnd)

		(struct lpfc_vport *, struct lpfc_scsi_buf *,

		 struct lpfc_nodelist *);

	int (*lpfc_scsi_prep_task_mgmt_cmd)

		(struct lpfc_vport *, struct lpfc_scsi_buf *,

		 unsigned int, uint8_t);



	/* IOCB interface function jump table entries */

	int (*__lpfc_sli_issue_iocb)

		(struct lpfc_hba *, uint32_t,

drivers/scsi/lpfc/lpfc_attr.c

+6 −0
Original line number Diff line number Diff line
@@ -3113,6 +3113,9 @@ sysfs_ctlreg_write(struct kobject *kobj, struct bin_attribute *bin_attr, 
	struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;

	struct lpfc_hba   *phba = vport->phba;



	if (phba->sli_rev >= LPFC_SLI_REV4)

		return -EPERM;



	if ((off + count) > FF_REG_AREA_SIZE)

		return -ERANGE;
@@ -3163,6 +3166,9 @@ sysfs_ctlreg_read(struct kobject *kobj, struct bin_attribute *bin_attr, 
	struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;

	struct lpfc_hba   *phba = vport->phba;



	if (phba->sli_rev >= LPFC_SLI_REV4)

		return -EPERM;



	if (off > FF_REG_AREA_SIZE)

		return -ERANGE;

drivers/scsi/lpfc/lpfc_ct.c

+3 −1
Original line number Diff line number Diff line
@@ -1732,7 +1732,9 @@ lpfc_decode_firmware_rev(struct lpfc_hba *phba, char *fwrevision, int flag) 
	uint32_t *ptr, str[4];

	uint8_t *fwname;



	if (vp->rev.rBit) {

	if (phba->sli_rev == LPFC_SLI_REV4)

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

	else if (vp->rev.rBit) {

		if (psli->sli_flag & LPFC_SLI_ACTIVE)

			rev = vp->rev.sli2FwRev;

		else

drivers/scsi/lpfc/lpfc_els.c

+11 −3
Original line number Diff line number Diff line
@@ -6108,9 +6108,17 @@ lpfc_issue_els_fdisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
	icmd->un.elsreq64.myID = 0;

	icmd->un.elsreq64.fl = 1;



	if  (phba->sli_rev == LPFC_SLI_REV4) {

		/* FDISC needs to be 1 for WQE VPI */

		elsiocb->iocb.ulpCt_h = (SLI4_CT_VPI >> 1) & 1;

		elsiocb->iocb.ulpCt_l = SLI4_CT_VPI & 1 ;

		/* Set the ulpContext to the vpi */

		elsiocb->iocb.ulpContext = vport->vpi + phba->vpi_base;

	} else {

		/* For FDISC, Let FDISC rsp set the NPortID for this VPI */

		icmd->ulpCt_h = 1;

		icmd->ulpCt_l = 0;

	}



	pcmd = (uint8_t *) (((struct lpfc_dmabuf *) elsiocb->context2)->virt);

	*((uint32_t *) (pcmd)) = ELS_CMD_FDISC;

drivers/scsi/lpfc/lpfc_hw.h

+0 −1
Original line number Diff line number Diff line
@@ -1183,7 +1183,6 @@ typedef struct { 
#define PCI_DEVICE_ID_ZEPHYR_DCSP   0xfe12

#define PCI_VENDOR_ID_SERVERENGINE  0x19a2

#define PCI_DEVICE_ID_TIGERSHARK    0x0704

#define PCI_DEVICE_ID_TIGERSHARK_S  0x0705



#define JEDEC_ID_ADDRESS            0x0080001c

#define FIREFLY_JEDEC_ID            0x1ACC