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

[SCSI] lpfc 8.3.13: Misc fixes 



- Change the Max receive size on CIN FCFs to 0x800
- (From linux community) Check boundary before checking for NULL.
- Update last completion time for completed I/O to prevent heartbeat.
- Add Balius PCI Device IDs

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 b92938b4

drivers/scsi/lpfc/lpfc_hw.h

+1 −0
Original line number Diff line number Diff line
@@ -1170,6 +1170,7 @@ typedef struct { 
#define PCI_DEVICE_ID_TIGERSHARK    0x0704

#define PCI_DEVICE_ID_TOMCAT        0x0714

#define PCI_DEVICE_ID_FALCON        0xf180

#define PCI_DEVICE_ID_BALIUS        0xe131



#define JEDEC_ID_ADDRESS            0x0080001c

#define FIREFLY_JEDEC_ID            0x1ACC

drivers/scsi/lpfc/lpfc_init.c

+6 −0
Original line number Diff line number Diff line
@@ -1826,6 +1826,10 @@ lpfc_get_hba_model_desc(struct lpfc_hba *phba, uint8_t *mdp, uint8_t *descp) 
		m = (typeof(m)){"LPSe12002-ML1-E", "PCIe",

				"EmulexSecure Fibre"};

		break;

	case PCI_DEVICE_ID_BALIUS:

		m = (typeof(m)){"LPVe12002", "PCIe Shared I/O",

				"Fibre Channel Adapter"};

		break;

	default:

		m = (typeof(m)){"Unknown", "", ""};

		break;
@@ -8835,6 +8839,8 @@ static struct pci_device_id lpfc_id_table[] = { 
		PCI_ANY_ID, PCI_ANY_ID, },

	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_FALCON,

		PCI_ANY_ID, PCI_ANY_ID, },

	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BALIUS,

		PCI_ANY_ID, PCI_ANY_ID, },

	{ 0 }

};

drivers/scsi/lpfc/lpfc_sli.c

+4 −0
Original line number Diff line number Diff line
@@ -9194,6 +9194,7 @@ lpfc_sli4_fp_handle_wcqe(struct lpfc_hba *phba, struct lpfc_queue *cq, 
{

	struct lpfc_wcqe_release wcqe;

	bool workposted = false;

	unsigned long iflag;



	/* Copy the work queue CQE and convert endian order if needed */

	lpfc_sli_pcimem_bcopy(cqe, &wcqe, sizeof(struct lpfc_cqe));
@@ -9202,6 +9203,9 @@ lpfc_sli4_fp_handle_wcqe(struct lpfc_hba *phba, struct lpfc_queue *cq, 
	switch (bf_get(lpfc_wcqe_c_code, &wcqe)) {

	case CQE_CODE_COMPL_WQE:

		/* Process the WQ complete event */

		spin_lock_irqsave(&phba->hbalock, iflag);

		phba->last_completion_time = jiffies;

		spin_unlock_irqrestore(&phba->hbalock, iflag);

		lpfc_sli4_fp_handle_fcp_wcqe(phba,

				(struct lpfc_wcqe_complete *)&wcqe);

		break;

drivers/scsi/lpfc/lpfc_sli4.h

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
#define LPFC_FCOE_FCF_MAP0	0x0E

#define LPFC_FCOE_FCF_MAP1	0xFC

#define LPFC_FCOE_FCF_MAP2	0x00

#define LPFC_FCOE_MAX_RCV_SIZE	0x5AC

#define LPFC_FCOE_MAX_RCV_SIZE	0x800

#define LPFC_FCOE_FKA_ADV_PER	0

#define LPFC_FCOE_FIP_PRIORITY	0x80

drivers/scsi/lpfc/lpfc_vport.c

+1 −1
Original line number Diff line number Diff line
@@ -782,7 +782,7 @@ lpfc_destroy_vport_work_array(struct lpfc_hba *phba, struct lpfc_vport **vports) 
	int i;

	if (vports == NULL)

		return;

	for (i = 0; vports[i] != NULL && i <= phba->max_vports; i++)

	for (i = 0; i <= phba->max_vports && vports[i] != NULL; i++)

		scsi_host_put(lpfc_shost_from_vport(vports[i]));

	kfree(vports);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE