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

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

[SCSI] lpfc 8.3.33: Enable attachment to OCe14000 adapters 



Signed-off-by: default avatarJames Smart <james.smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 9731592b

drivers/scsi/lpfc/lpfc_hw.h

+2 −0
Original line number Diff line number Diff line
@@ -1251,6 +1251,8 @@ typedef struct { 
#define PCI_VENDOR_ID_SERVERENGINE  0x19a2

#define PCI_DEVICE_ID_TIGERSHARK    0x0704

#define PCI_DEVICE_ID_TOMCAT        0x0714

#define PCI_DEVICE_ID_SKYHAWK       0x0724

#define PCI_DEVICE_ID_SKYHAWK_VF    0x072c



#define JEDEC_ID_ADDRESS            0x0080001c

#define FIREFLY_JEDEC_ID            0x1ACC

drivers/scsi/lpfc/lpfc_init.c

+9 −0
Original line number Diff line number Diff line
@@ -2059,6 +2059,11 @@ lpfc_get_hba_model_desc(struct lpfc_hba *phba, uint8_t *mdp, uint8_t *descp) 
		oneConnect = 1;

		m = (typeof(m)){"OCe15100", "PCIe", "FCoE"};

		break;

	case PCI_DEVICE_ID_SKYHAWK:

	case PCI_DEVICE_ID_SKYHAWK_VF:

		oneConnect = 1;

		m = (typeof(m)){"OCe14000", "PCIe", "FCoE"};

		break;

	default:

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

		break;
@@ -10420,6 +10425,10 @@ static struct pci_device_id lpfc_id_table[] = { 
		PCI_ANY_ID, PCI_ANY_ID, },

	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FCOE_VF,

		PCI_ANY_ID, PCI_ANY_ID, },

	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SKYHAWK,

		PCI_ANY_ID, PCI_ANY_ID, },

	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SKYHAWK_VF,

		PCI_ANY_ID, PCI_ANY_ID, },

	{ 0 }

};