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

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

[SCSI] lpfc: Update to Emulex hba model names 



Update adapter names to match Emulex naming conventions.

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

drivers/scsi/lpfc/lpfc_init.c

+20 −6
Original line number Original line Diff line number Diff line
@@ -766,10 +766,12 @@ lpfc_get_hba_model_desc(struct lpfc_hba * phba, uint8_t * mdp, uint8_t * descp) 
{

{

	lpfc_vpd_t *vp;

	lpfc_vpd_t *vp;

	uint32_t id;

	uint32_t id;

	uint8_t hdrtype;

	char str[16];

	char str[16];





	vp = &phba->vpd;

	vp = &phba->vpd;

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

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

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





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

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

	case PCI_DEVICE_ID_FIREFLY:

	case PCI_DEVICE_ID_FIREFLY:
@@ -797,6 +799,9 @@ lpfc_get_hba_model_desc(struct lpfc_hba * phba, uint8_t * mdp, uint8_t * descp) 
		strcpy(str, "LP9802 2");

		strcpy(str, "LP9802 2");

		break;

		break;

	case PCI_DEVICE_ID_THOR:

	case PCI_DEVICE_ID_THOR:

		if (hdrtype == 0x80)

			strcpy(str, "LP10000DC 2");

		else

			strcpy(str, "LP10000 2");

			strcpy(str, "LP10000 2");

		break;

		break;

	case PCI_DEVICE_ID_VIPER:

	case PCI_DEVICE_ID_VIPER:
@@ -806,9 +811,15 @@ lpfc_get_hba_model_desc(struct lpfc_hba * phba, uint8_t * mdp, uint8_t * descp) 
		strcpy(str, "LP982 2");

		strcpy(str, "LP982 2");

		break;

		break;

	case PCI_DEVICE_ID_TFLY:

	case PCI_DEVICE_ID_TFLY:

		if (hdrtype == 0x80)

			strcpy(str, "LP1050DC 2");

		else

			strcpy(str, "LP1050 2");

			strcpy(str, "LP1050 2");

		break;

		break;

	case PCI_DEVICE_ID_HELIOS:

	case PCI_DEVICE_ID_HELIOS:

		if (hdrtype == 0x80)

			strcpy(str, "LP11002 4");

		else

			strcpy(str, "LP11000 4");

			strcpy(str, "LP11000 4");

		break;

		break;

	case PCI_DEVICE_ID_BMID:

	case PCI_DEVICE_ID_BMID:
@@ -818,13 +829,16 @@ lpfc_get_hba_model_desc(struct lpfc_hba * phba, uint8_t * mdp, uint8_t * descp) 
		strcpy(str, "LP111 4");

		strcpy(str, "LP111 4");

		break;

		break;

	case PCI_DEVICE_ID_ZEPHYR:

	case PCI_DEVICE_ID_ZEPHYR:

		strcpy(str, "LP11000e 4");

		if (hdrtype == 0x80)

			strcpy(str, "LPe11002 4");

		else

			strcpy(str, "LPe11000 4");

		break;

		break;

	case PCI_DEVICE_ID_ZMID:

	case PCI_DEVICE_ID_ZMID:

		strcpy(str, "LP1150e 4");

		strcpy(str, "LPe1150 4");

		break;

		break;

	case PCI_DEVICE_ID_ZSMB:

	case PCI_DEVICE_ID_ZSMB:

		strcpy(str, "LP111e 4");

		strcpy(str, "LPe111 4");

		break;

		break;

	case PCI_DEVICE_ID_LP101:

	case PCI_DEVICE_ID_LP101:

		strcpy(str, "LP101 2");

		strcpy(str, "LP101 2");