fanghuilin / rpms / kernel

Forked from rpms/kernel 3 years ago
Clone
24d93b
From 60eded7faed3769b20a519c65a04d9eb9dd48332 Mon Sep 17 00:00:00 2001
24d93b
From: Suganath Prabu Subramani <suganath-prabu.subramani@broadcom.com>
24d93b
Date: Wed, 26 Oct 2016 13:34:37 +0530
24d93b
Subject: [PATCH 06/11] scsi: mpt3sas: Added Device ID's for SAS35 devices and
24d93b
 updated MPI header.
24d93b
24d93b
Added Device ID's for SAS35 devices (Ventura, Crusader, Harpoon &
24d93b
Tomcat) and updated mpi header file for the same. Also added
24d93b
"is_gen35_ioc" to MPT3SAS_ADAPTER structure for identifying SAS35 adapters.
24d93b
24d93b
Signed-off-by: Chaitra P B <chaitra.basappa@broadcom.com>
24d93b
Signed-off-by: Sathya Prakash <sathya.prakash@broadcom.com>
24d93b
Signed-off-by: Suganath Prabu S <suganath-prabu.subramani@broadcom.com>
24d93b
Reviewed-by: Hannes Reinecke <hare@suse.com>
24d93b
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
24d93b
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
24d93b
---
24d93b
 drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h |  7 +++++++
24d93b
 drivers/scsi/mpt3sas/mpt3sas_base.h  |  1 +
24d93b
 drivers/scsi/mpt3sas/mpt3sas_ctl.c   |  5 ++++-
24d93b
 drivers/scsi/mpt3sas/mpt3sas_ctl.h   |  1 +
24d93b
 drivers/scsi/mpt3sas/mpt3sas_scsih.c | 31 +++++++++++++++++++++++++++++++
24d93b
 5 files changed, 44 insertions(+), 1 deletion(-)
24d93b
24d93b
diff --git a/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h b/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h
24d93b
index 95356a8..fa61baf 100644
24d93b
--- a/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h
24d93b
+++ b/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h
24d93b
@@ -478,6 +478,13 @@ typedef struct _MPI2_CONFIG_REPLY {
24d93b
 #define MPI26_MFGPAGE_DEVID_SAS3324_3               (0x00C2)
24d93b
 #define MPI26_MFGPAGE_DEVID_SAS3324_4               (0x00C3)
24d93b
 
24d93b
+#define MPI26_MFGPAGE_DEVID_SAS3516                 (0x00AA)
24d93b
+#define MPI26_MFGPAGE_DEVID_SAS3516_1               (0x00AB)
24d93b
+#define MPI26_MFGPAGE_DEVID_SAS3416                 (0x00AC)
24d93b
+#define MPI26_MFGPAGE_DEVID_SAS3508                 (0x00AD)
24d93b
+#define MPI26_MFGPAGE_DEVID_SAS3508_1               (0x00AE)
24d93b
+#define MPI26_MFGPAGE_DEVID_SAS3408                 (0x00AF)
24d93b
+
24d93b
 /*Manufacturing Page 0 */
24d93b
 
24d93b
 typedef struct _MPI2_CONFIG_PAGE_MAN_0 {
24d93b
diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.h b/drivers/scsi/mpt3sas/mpt3sas_base.h
24d93b
index 66cfa0f..c3a39e8 100644
24d93b
--- a/drivers/scsi/mpt3sas/mpt3sas_base.h
24d93b
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.h
24d93b
@@ -1205,6 +1205,7 @@ struct MPT3SAS_ADAPTER {
24d93b
 	struct SL_WH_MPI_TRIGGERS_T diag_trigger_mpi;
24d93b
 	void		*device_remove_in_progress;
24d93b
 	u16		device_remove_in_progress_sz;
24d93b
+	u8		is_gen35_ioc;
24d93b
 };
24d93b
 
24d93b
 typedef u8 (*MPT_CALLBACK)(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 msix_index,
24d93b
diff --git a/drivers/scsi/mpt3sas/mpt3sas_ctl.c b/drivers/scsi/mpt3sas/mpt3sas_ctl.c
24d93b
index a75f8a3..a66c0c8 100644
24d93b
--- a/drivers/scsi/mpt3sas/mpt3sas_ctl.c
24d93b
+++ b/drivers/scsi/mpt3sas/mpt3sas_ctl.c
24d93b
@@ -1101,7 +1101,10 @@ _ctl_getiocinfo(struct MPT3SAS_ADAPTER *ioc, void __user *arg)
24d93b
 		break;
24d93b
 	case MPI25_VERSION:
24d93b
 	case MPI26_VERSION:
24d93b
-		karg.adapter_type = MPT3_IOCTL_INTERFACE_SAS3;
24d93b
+		if (ioc->is_gen35_ioc)
24d93b
+			karg.adapter_type = MPT3_IOCTL_INTERFACE_SAS35;
24d93b
+		else
24d93b
+			karg.adapter_type = MPT3_IOCTL_INTERFACE_SAS3;
24d93b
 		strcat(karg.driver_version, MPT3SAS_DRIVER_VERSION);
24d93b
 		break;
24d93b
 	}
24d93b
diff --git a/drivers/scsi/mpt3sas/mpt3sas_ctl.h b/drivers/scsi/mpt3sas/mpt3sas_ctl.h
24d93b
index 8940835..f3e17a8 100644
24d93b
--- a/drivers/scsi/mpt3sas/mpt3sas_ctl.h
24d93b
+++ b/drivers/scsi/mpt3sas/mpt3sas_ctl.h
24d93b
@@ -143,6 +143,7 @@ struct mpt3_ioctl_pci_info {
24d93b
 #define MPT2_IOCTL_INTERFACE_SAS2	(0x04)
24d93b
 #define MPT2_IOCTL_INTERFACE_SAS2_SSS6200	(0x05)
24d93b
 #define MPT3_IOCTL_INTERFACE_SAS3	(0x06)
24d93b
+#define MPT3_IOCTL_INTERFACE_SAS35	(0x07)
24d93b
 #define MPT2_IOCTL_VERSION_LENGTH	(32)
24d93b
 
24d93b
 /**
24d93b
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
24d93b
index c6aa172..eaef45c 100644
24d93b
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
24d93b
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
24d93b
@@ -8722,6 +8722,12 @@ _scsih_determine_hba_mpi_version(struct pci_dev *pdev)
24d93b
 	case MPI26_MFGPAGE_DEVID_SAS3324_2:
24d93b
 	case MPI26_MFGPAGE_DEVID_SAS3324_3:
24d93b
 	case MPI26_MFGPAGE_DEVID_SAS3324_4:
24d93b
+	case MPI26_MFGPAGE_DEVID_SAS3508:
24d93b
+	case MPI26_MFGPAGE_DEVID_SAS3508_1:
24d93b
+	case MPI26_MFGPAGE_DEVID_SAS3408:
24d93b
+	case MPI26_MFGPAGE_DEVID_SAS3516:
24d93b
+	case MPI26_MFGPAGE_DEVID_SAS3516_1:
24d93b
+	case MPI26_MFGPAGE_DEVID_SAS3416:
24d93b
 		return MPI26_VERSION;
24d93b
 	}
24d93b
 	return 0;
24d93b
@@ -8777,6 +8783,18 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)
24d93b
 		ioc->hba_mpi_version_belonged = hba_mpi_version;
24d93b
 		ioc->id = mpt3_ids++;
24d93b
 		sprintf(ioc->driver_name, "%s", MPT3SAS_DRIVER_NAME);
24d93b
+		switch (pdev->device) {
24d93b
+		case MPI26_MFGPAGE_DEVID_SAS3508:
24d93b
+		case MPI26_MFGPAGE_DEVID_SAS3508_1:
24d93b
+		case MPI26_MFGPAGE_DEVID_SAS3408:
24d93b
+		case MPI26_MFGPAGE_DEVID_SAS3516:
24d93b
+		case MPI26_MFGPAGE_DEVID_SAS3516_1:
24d93b
+		case MPI26_MFGPAGE_DEVID_SAS3416:
24d93b
+			ioc->is_gen35_ioc = 1;
24d93b
+			break;
24d93b
+		default:
24d93b
+			ioc->is_gen35_ioc = 0;
24d93b
+		}
24d93b
 		if ((ioc->hba_mpi_version_belonged == MPI25_VERSION &&
24d93b
 			pdev->revision >= SAS3_PCI_DEVICE_C0_REVISION) ||
24d93b
 			(ioc->hba_mpi_version_belonged == MPI26_VERSION))
24d93b
@@ -9186,6 +9204,19 @@ static const struct pci_device_id mpt3sas_pci_table[] = {
24d93b
 		PCI_ANY_ID, PCI_ANY_ID },
24d93b
 	{ MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_SAS3324_4,
24d93b
 		PCI_ANY_ID, PCI_ANY_ID },
24d93b
+	/* Ventura, Crusader, Harpoon & Tomcat ~ 3516, 3416, 3508 & 3408*/
24d93b
+	{ MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_SAS3508,
24d93b
+		PCI_ANY_ID, PCI_ANY_ID },
24d93b
+	{ MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_SAS3508_1,
24d93b
+		PCI_ANY_ID, PCI_ANY_ID },
24d93b
+	{ MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_SAS3408,
24d93b
+		PCI_ANY_ID, PCI_ANY_ID },
24d93b
+	{ MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_SAS3516,
24d93b
+		PCI_ANY_ID, PCI_ANY_ID },
24d93b
+	{ MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_SAS3516_1,
24d93b
+		PCI_ANY_ID, PCI_ANY_ID },
24d93b
+	{ MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_SAS3416,
24d93b
+		PCI_ANY_ID, PCI_ANY_ID },
24d93b
 #endif /* MPT2SAS_SCSI */
24d93b
 	{0}     /* Terminating entry */
24d93b
 };
24d93b
-- 
24d93b
1.8.3.1
24d93b