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

Commit 998f26ae authored by Suganath Prabu Subramani's avatar Suganath Prabu Subramani Committed by Martin K. Petersen
Browse files

scsi: mpt3sas: Added Device ID's for SAS35 devices and updated MPI header. 



Added Device ID's for SAS35 devices (Ventura, Crusader, Harpoon &
Tomcat) and updated mpi header file for the same. Also added
"is_gen35_ioc" to MPT3SAS_ADAPTER structure for identifying SAS35 adapters.

Signed-off-by: default avatarChaitra P B <chaitra.basappa@broadcom.com>
Signed-off-by: default avatarSathya Prakash <sathya.prakash@broadcom.com>
Signed-off-by: default avatarSuganath Prabu S <suganath-prabu.subramani@broadcom.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarTomas Henzl <thenzl@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent e270263e

drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h

+7 −0
Original line number Diff line number Diff line
@@ -478,6 +478,13 @@ typedef struct _MPI2_CONFIG_REPLY { 
#define MPI26_MFGPAGE_DEVID_SAS3324_3               (0x00C2)

#define MPI26_MFGPAGE_DEVID_SAS3324_4               (0x00C3)



#define MPI26_MFGPAGE_DEVID_SAS3516                 (0x00AA)

#define MPI26_MFGPAGE_DEVID_SAS3516_1               (0x00AB)

#define MPI26_MFGPAGE_DEVID_SAS3416                 (0x00AC)

#define MPI26_MFGPAGE_DEVID_SAS3508                 (0x00AD)

#define MPI26_MFGPAGE_DEVID_SAS3508_1               (0x00AE)

#define MPI26_MFGPAGE_DEVID_SAS3408                 (0x00AF)



/*Manufacturing Page 0 */



typedef struct _MPI2_CONFIG_PAGE_MAN_0 {

drivers/scsi/mpt3sas/mpt3sas_base.h

+1 −0
Original line number Diff line number Diff line
@@ -1191,6 +1191,7 @@ struct MPT3SAS_ADAPTER { 
	struct SL_WH_MPI_TRIGGERS_T diag_trigger_mpi;

	void		*device_remove_in_progress;

	u16		device_remove_in_progress_sz;

	u8		is_gen35_ioc;

};



typedef u8 (*MPT_CALLBACK)(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 msix_index,

drivers/scsi/mpt3sas/mpt3sas_ctl.c

+4 −1
Original line number Diff line number Diff line
@@ -1096,6 +1096,9 @@ _ctl_getiocinfo(struct MPT3SAS_ADAPTER *ioc, void __user *arg) 
		break;

	case MPI25_VERSION:

	case MPI26_VERSION:

		if (ioc->is_gen35_ioc)

			karg.adapter_type = MPT3_IOCTL_INTERFACE_SAS35;

		else

			karg.adapter_type = MPT3_IOCTL_INTERFACE_SAS3;

		strcat(karg.driver_version, MPT3SAS_DRIVER_VERSION);

		break;

drivers/scsi/mpt3sas/mpt3sas_ctl.h

+1 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ struct mpt3_ioctl_pci_info { 
#define MPT2_IOCTL_INTERFACE_SAS2	(0x04)

#define MPT2_IOCTL_INTERFACE_SAS2_SSS6200	(0x05)

#define MPT3_IOCTL_INTERFACE_SAS3	(0x06)

#define MPT3_IOCTL_INTERFACE_SAS35	(0x07)

#define MPT2_IOCTL_VERSION_LENGTH	(32)



/**

drivers/scsi/mpt3sas/mpt3sas_scsih.c

+31 −0
Original line number Diff line number Diff line
@@ -8660,6 +8660,12 @@ _scsih_determine_hba_mpi_version(struct pci_dev *pdev) 
	case MPI26_MFGPAGE_DEVID_SAS3324_2:

	case MPI26_MFGPAGE_DEVID_SAS3324_3:

	case MPI26_MFGPAGE_DEVID_SAS3324_4:

	case MPI26_MFGPAGE_DEVID_SAS3508:

	case MPI26_MFGPAGE_DEVID_SAS3508_1:

	case MPI26_MFGPAGE_DEVID_SAS3408:

	case MPI26_MFGPAGE_DEVID_SAS3516:

	case MPI26_MFGPAGE_DEVID_SAS3516_1:

	case MPI26_MFGPAGE_DEVID_SAS3416:

		return MPI26_VERSION;

	}

	return 0;
@@ -8728,6 +8734,18 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		ioc->hba_mpi_version_belonged = hba_mpi_version;

		ioc->id = mpt3_ids++;

		sprintf(ioc->driver_name, "%s", MPT3SAS_DRIVER_NAME);

		switch (pdev->device) {

		case MPI26_MFGPAGE_DEVID_SAS3508:

		case MPI26_MFGPAGE_DEVID_SAS3508_1:

		case MPI26_MFGPAGE_DEVID_SAS3408:

		case MPI26_MFGPAGE_DEVID_SAS3516:

		case MPI26_MFGPAGE_DEVID_SAS3516_1:

		case MPI26_MFGPAGE_DEVID_SAS3416:

			ioc->is_gen35_ioc = 1;

			break;

		default:

			ioc->is_gen35_ioc = 0;

		}

		if ((ioc->hba_mpi_version_belonged == MPI25_VERSION &&

			pdev->revision >= SAS3_PCI_DEVICE_C0_REVISION) ||

			(ioc->hba_mpi_version_belonged == MPI26_VERSION))
@@ -9134,6 +9152,19 @@ static const struct pci_device_id mpt3sas_pci_table[] = { 
		PCI_ANY_ID, PCI_ANY_ID },

	{ MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_SAS3324_4,

		PCI_ANY_ID, PCI_ANY_ID },

	/* Ventura, Crusader, Harpoon & Tomcat ~ 3516, 3416, 3508 & 3408*/

	{ MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_SAS3508,

		PCI_ANY_ID, PCI_ANY_ID },

	{ MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_SAS3508_1,

		PCI_ANY_ID, PCI_ANY_ID },

	{ MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_SAS3408,

		PCI_ANY_ID, PCI_ANY_ID },

	{ MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_SAS3516,

		PCI_ANY_ID, PCI_ANY_ID },

	{ MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_SAS3516_1,

		PCI_ANY_ID, PCI_ANY_ID },

	{ MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_SAS3416,

		PCI_ANY_ID, PCI_ANY_ID },

	{0}     /* Terminating entry */

};

MODULE_DEVICE_TABLE(pci, mpt3sas_pci_table);