scsi: mpt3sas: Introduce flag for aero based controllers

Adding flag "is_aero_ioc" to differentiate aero based controllers from
other gen35 controllers.

Signed-off-by: Suganath Prabu <suganath-prabu.subramani@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.h b/drivers/scsi/mpt3sas/mpt3sas_base.h
index 4b8b602bf3f55b0f9cfe7264e95071f1da2562e3..f200929d400da5049d4e2dcfc33842b1ba46eb64 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_base.h
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.h
@@ -1399,6 +1399,7 @@ struct MPT3SAS_ADAPTER {
        void            *device_remove_in_progress;
        u16             device_remove_in_progress_sz;
        u8              is_gen35_ioc;
+       u8              is_aero_ioc;
        PUT_SMID_IO_FP_HIP put_smid_scsi_io;
 
 };

diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index 5b9806d0719e75176173a0172aaf73e1291a4309..039dee49c06e09bb6c6ae258b713a0f2c2816409 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -10366,10 +10366,6 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                ioc->id = mpt3_ids++;
                sprintf(ioc->driver_name, "%s", MPT3SAS_DRIVER_NAME);
                switch (pdev->device) {
-               case MPI26_MFGPAGE_DEVID_CFG_SEC_3816:
-               case MPI26_MFGPAGE_DEVID_CFG_SEC_3916:
-                       dev_info(&pdev->dev,
-                           "HBA is in Configurable Secure mode\n");
                case MPI26_MFGPAGE_DEVID_SAS3508:
                case MPI26_MFGPAGE_DEVID_SAS3508_1:
                case MPI26_MFGPAGE_DEVID_SAS3408:
@@ -10377,12 +10373,18 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                case MPI26_MFGPAGE_DEVID_SAS3516_1:
                case MPI26_MFGPAGE_DEVID_SAS3416:
                case MPI26_MFGPAGE_DEVID_SAS3616:
+                       ioc->is_gen35_ioc = 1;
+                       break;
+               case MPI26_MFGPAGE_DEVID_CFG_SEC_3816:
+               case MPI26_MFGPAGE_DEVID_CFG_SEC_3916:
+                       dev_info(&pdev->dev,
+                           "HBA is in Configurable Secure mode\n");
                case MPI26_MFGPAGE_DEVID_HARD_SEC_3816:
                case MPI26_MFGPAGE_DEVID_HARD_SEC_3916:
-                       ioc->is_gen35_ioc = 1;
+                       ioc->is_aero_ioc = ioc->is_gen35_ioc = 1;
                        break;
                default:
-                       ioc->is_gen35_ioc = 0;
+                       ioc->is_gen35_ioc = ioc->is_aero_ioc = 0;
                }
                if ((ioc->hba_mpi_version_belonged == MPI25_VERSION &&
                        pdev->revision >= SAS3_PCI_DEVICE_C0_REVISION) ||