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