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

Commit 1244790d authored by Suganath Prabu S's avatar Suganath Prabu S Committed by Martin K. Petersen
Browse files

scsi: mpt3sas: Rename mpi endpoint device ID macro. 



MPI Endpoint is a PCIe switch based on MPI2.

Renaming device ID macro from MPI2_MFGPAGE_DEVID_SAS2308_MPI_EP to
MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP.

Signed-off-by: default avatarSuganath Prabu S <suganath-prabu.subramani@broadcom.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent f6fe5731

drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h

+1 −1
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ typedef struct _MPI2_CONFIG_REPLY { 
#define MPI2_MFGPAGE_DEVID_SAS2308_1                (0x0086)

#define MPI2_MFGPAGE_DEVID_SAS2308_2                (0x0087)

#define MPI2_MFGPAGE_DEVID_SAS2308_3                (0x006E)

#define MPI2_MFGPAGE_DEVID_SAS2308_MPI_EP           (0x02B0)

#define MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP            (0x02B0)



/*MPI v2.5 SAS products */

#define MPI25_MFGPAGE_DEVID_SAS3004                 (0x0096)

drivers/scsi/mpt3sas/mpt3sas_scsih.c

+3 −3
Original line number Diff line number Diff line
@@ -10256,7 +10256,7 @@ _scsih_determine_hba_mpi_version(struct pci_dev *pdev) 
	case MPI2_MFGPAGE_DEVID_SAS2308_1:

	case MPI2_MFGPAGE_DEVID_SAS2308_2:

	case MPI2_MFGPAGE_DEVID_SAS2308_3:

	case MPI2_MFGPAGE_DEVID_SAS2308_MPI_EP:

	case MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP:

		return MPI2_VERSION;

	case MPI25_MFGPAGE_DEVID_SAS3004:

	case MPI25_MFGPAGE_DEVID_SAS3008:
@@ -10343,7 +10343,7 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
			ioc->is_warpdrive = 1;

			ioc->hide_ir_msg = 1;

			break;

		case MPI2_MFGPAGE_DEVID_SAS2308_MPI_EP:

		case MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP:

			ioc->is_mcpu_endpoint = 1;

			break;

		default:
@@ -10783,7 +10783,7 @@ static const struct pci_device_id mpt3sas_pci_table[] = { 
		PCI_ANY_ID, PCI_ANY_ID },

	{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2308_3,

		PCI_ANY_ID, PCI_ANY_ID },

	{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2308_MPI_EP,

	{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP,

		PCI_ANY_ID, PCI_ANY_ID },

	/* SSS6200 */

	{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SSS6200,