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

Commit e4adb204 authored by James.Smart@Emulex.Com's avatar James.Smart@Emulex.Com Committed by James Bottomley
Browse files

[SCSI] lpfc 8.1.1 : Add support for more members of the Light Pulse 11xxx (4Gb) family 



Signed-off-by: default avatarJames Smart <James.Smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 6175c02a

drivers/scsi/lpfc/lpfc_hw.h

+17 −8
Original line number Diff line number Diff line
@@ -1027,23 +1027,32 @@ typedef struct { 
/* Start FireFly Register definitions */

#define PCI_VENDOR_ID_EMULEX        0x10df

#define PCI_DEVICE_ID_FIREFLY       0x1ae5

#define PCI_DEVICE_ID_SUPERFLY      0xf700

#define PCI_DEVICE_ID_DRAGONFLY     0xf800

#define PCI_DEVICE_ID_RFLY          0xf095

#define PCI_DEVICE_ID_PFLY          0xf098

#define PCI_DEVICE_ID_LP101         0xf0a1

#define PCI_DEVICE_ID_TFLY          0xf0a5

#define PCI_DEVICE_ID_BSMB          0xf0d1

#define PCI_DEVICE_ID_BMID          0xf0d5

#define PCI_DEVICE_ID_ZSMB          0xf0e1

#define PCI_DEVICE_ID_ZMID          0xf0e5

#define PCI_DEVICE_ID_NEPTUNE       0xf0f5

#define PCI_DEVICE_ID_NEPTUNE_SCSP  0xf0f6

#define PCI_DEVICE_ID_NEPTUNE_DCSP  0xf0f7

#define PCI_DEVICE_ID_SUPERFLY      0xf700

#define PCI_DEVICE_ID_DRAGONFLY     0xf800

#define PCI_DEVICE_ID_CENTAUR       0xf900

#define PCI_DEVICE_ID_PEGASUS       0xf980

#define PCI_DEVICE_ID_THOR          0xfa00

#define PCI_DEVICE_ID_VIPER         0xfb00

#define PCI_DEVICE_ID_LP10000S      0xfc00

#define PCI_DEVICE_ID_LP11000S      0xfc10

#define PCI_DEVICE_ID_LPE11000S     0xfc20

#define PCI_DEVICE_ID_HELIOS        0xfd00

#define PCI_DEVICE_ID_BMID          0xf0d5

#define PCI_DEVICE_ID_BSMB          0xf0d1

#define PCI_DEVICE_ID_HELIOS_SCSP   0xfd11

#define PCI_DEVICE_ID_HELIOS_DCSP   0xfd12

#define PCI_DEVICE_ID_ZEPHYR        0xfe00

#define PCI_DEVICE_ID_ZMID          0xf0e5

#define PCI_DEVICE_ID_ZSMB          0xf0e1

#define PCI_DEVICE_ID_LP101	    0xf0a1

#define PCI_DEVICE_ID_LP10000S	    0xfc00

#define PCI_DEVICE_ID_ZEPHYR_SCSP   0xfe11

#define PCI_DEVICE_ID_ZEPHYR_DCSP   0xfe12



#define JEDEC_ID_ADDRESS            0x0080001c

#define FIREFLY_JEDEC_ID            0x1ACC

drivers/scsi/lpfc/lpfc_init.c

+57 −3
Original line number Diff line number Diff line
@@ -759,15 +759,15 @@ static void 
lpfc_get_hba_model_desc(struct lpfc_hba * phba, uint8_t * mdp, uint8_t * descp)

{

	lpfc_vpd_t *vp;

	uint32_t id;

	uint16_t dev_id;

	uint8_t hdrtype;

	char str[16];



	vp = &phba->vpd;

	pci_read_config_dword(phba->pcidev, PCI_VENDOR_ID, &id);

	pci_read_config_word(phba->pcidev, PCI_DEVICE_ID, &dev_id);

	pci_read_config_byte(phba->pcidev, PCI_HEADER_TYPE, &hdrtype);



	switch ((id >> 16) & 0xffff) {

	switch (dev_id) {

	case PCI_DEVICE_ID_FIREFLY:

		strcpy(str, "LP6000 1");

		break;
@@ -816,6 +816,24 @@ lpfc_get_hba_model_desc(struct lpfc_hba * phba, uint8_t * mdp, uint8_t * descp) 
		else

			strcpy(str, "LP11000 4");

		break;

	case PCI_DEVICE_ID_HELIOS_SCSP:

		strcpy(str, "LP11000-SP 4");

		break;

	case PCI_DEVICE_ID_HELIOS_DCSP:

		strcpy(str, "LP11002-SP 4");

		break;

	case PCI_DEVICE_ID_NEPTUNE:

		if (hdrtype == 0x80)

			strcpy(str, "LPe1002 4");

		else

			strcpy(str, "LPe1000 4");

		break;

	case PCI_DEVICE_ID_NEPTUNE_SCSP:

		strcpy(str, "LPe1000-SP 4");

		break;

	case PCI_DEVICE_ID_NEPTUNE_DCSP:

		strcpy(str, "LPe1002-SP 4");

		break;

	case PCI_DEVICE_ID_BMID:

		strcpy(str, "LP1150 4");

		break;
@@ -828,6 +846,12 @@ lpfc_get_hba_model_desc(struct lpfc_hba * phba, uint8_t * mdp, uint8_t * descp) 
		else

			strcpy(str, "LPe11000 4");

		break;

	case PCI_DEVICE_ID_ZEPHYR_SCSP:

		strcpy(str, "LPe11000-SP 4");

		break;

	case PCI_DEVICE_ID_ZEPHYR_DCSP:

		strcpy(str, "LPe11002-SP 4");

		break;

	case PCI_DEVICE_ID_ZMID:

		strcpy(str, "LPe1150 4");

		break;
@@ -843,6 +867,18 @@ lpfc_get_hba_model_desc(struct lpfc_hba * phba, uint8_t * mdp, uint8_t * descp) 
	default:

		memset(str, 0, 16);

		break;

	case PCI_DEVICE_ID_LP11000S:

		if (hdrtype == 0x80)

			strcpy(str, "LP11002-S 4");

		else

			strcpy(str, "LP11000-S 4");

		break;

	case PCI_DEVICE_ID_LPE11000S:

		if (hdrtype == 0x80)

			strcpy(str, "LPe11002-S 4");

		else

			strcpy(str, "LPe11000-S 4");

		break;

	}

	if (mdp)

		sscanf(str, "%s", mdp);
@@ -1673,14 +1709,28 @@ static struct pci_device_id lpfc_id_table[] = { 
		PCI_ANY_ID, PCI_ANY_ID, },

	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PFLY,

		PCI_ANY_ID, PCI_ANY_ID, },

	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_NEPTUNE,

		PCI_ANY_ID, PCI_ANY_ID, },

	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_NEPTUNE_SCSP,

		PCI_ANY_ID, PCI_ANY_ID, },

	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_NEPTUNE_DCSP,

		PCI_ANY_ID, PCI_ANY_ID, },

	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HELIOS,

		PCI_ANY_ID, PCI_ANY_ID, },

	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HELIOS_SCSP,

		PCI_ANY_ID, PCI_ANY_ID, },

	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HELIOS_DCSP,

		PCI_ANY_ID, PCI_ANY_ID, },

	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BMID,

		PCI_ANY_ID, PCI_ANY_ID, },

	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BSMB,

		PCI_ANY_ID, PCI_ANY_ID, },

	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR,

		PCI_ANY_ID, PCI_ANY_ID, },

	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR_SCSP,

		PCI_ANY_ID, PCI_ANY_ID, },

	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR_DCSP,

		PCI_ANY_ID, PCI_ANY_ID, },

	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZMID,

		PCI_ANY_ID, PCI_ANY_ID, },

	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZSMB,
@@ -1691,6 +1741,10 @@ static struct pci_device_id lpfc_id_table[] = { 
		PCI_ANY_ID, PCI_ANY_ID, },

	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LP10000S,

		PCI_ANY_ID, PCI_ANY_ID, },

	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LP11000S,

		PCI_ANY_ID, PCI_ANY_ID, },

	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LPE11000S,

		PCI_ANY_ID, PCI_ANY_ID, },

	{ 0 }

};