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

Orabug: 25639713

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: Chaitra P B <chaitra.basappa@broadcom.com>
Signed-off-by: Sathya Prakash <sathya.prakash@broadcom.com>
Signed-off-by: Suganath Prabu S <suganath-prabu.subramani@broadcom.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
(cherry picked from commit 998f26aedf41bc5cdce3b3c9233ac0e0672fa307)
Signed-off-by: Brian Maly <brian.maly@oracle.com>

diff --git a/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h b/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h
index 95356a82ee99bc09d730e2e918e34ce40ee65766..fa61baf7c74dd409d1733b27e3c7b1d460dcfe7f 100644 (file)
--- a/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h
+++ b/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h
@@ -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 {

diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.h b/drivers/scsi/mpt3sas/mpt3sas_base.h
index f05f7b0ff8bd2ebcc3bf70592fcc6aecd5dddc64..2abc37a28e4a6616e7e7e77f08457497ef79d61a 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_base.h
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.h
@@ -1206,6 +1206,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,

diff --git a/drivers/scsi/mpt3sas/mpt3sas_ctl.c b/drivers/scsi/mpt3sas/mpt3sas_ctl.c
index 974282036a1885643974d9d7965029a61a83108a..d1bcdfabd73301e3917cb153750c2582c204a6fe 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_ctl.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_ctl.c
@@ -1096,7 +1096,10 @@ _ctl_getiocinfo(struct MPT3SAS_ADAPTER *ioc, void __user *arg)
                break;
        case MPI25_VERSION:
        case MPI26_VERSION:
-               karg.adapter_type = MPT3_IOCTL_INTERFACE_SAS3;
+               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;
        }

diff --git a/drivers/scsi/mpt3sas/mpt3sas_ctl.h b/drivers/scsi/mpt3sas/mpt3sas_ctl.h
index 89408356d252432b4d57f9ae3964ec4d1381b14a..f3e17a8c1b07ba08e1ea4ca559ef0e7b5b598f89 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_ctl.h
+++ b/drivers/scsi/mpt3sas/mpt3sas_ctl.h
@@ -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)
 
 /**

diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index 43374e414a4ae2efeae9c946b635618594ff2c52..9fdd92a88192ed1ad920f4c3635cd9b7130d8afb 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -8711,6 +8711,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;
@@ -8781,6 +8787,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))
@@ -9212,6 +9230,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);