scsi: megaraid_sas: Introduce new Aero adapter type

Identify all Aero controller PCI IDs with new adapter type.

Signed-off-by: Shivasharan S <shivasharan.srikanteshwara@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h
index 55f6662ceb5540c25c8ef93c892b349ca3bd0bb3..4064fae7e7ba4dd30e1c45442500c14428160e15 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_sas.h
+++ b/drivers/scsi/megaraid/megaraid_sas.h
@@ -1570,6 +1570,7 @@ enum MR_ADAPTER_TYPE {
        THUNDERBOLT_SERIES = 2,
        INVADER_SERIES = 3,
        VENTURA_SERIES = 4,
+       AERO_SERIES = 5,
 };
 
 /*

diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index 975c8a384ad1bb4b503d712e6964850330a59241..3492ae990b646758f16af2b758b2496c43f94fc2 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -5439,6 +5439,7 @@ static int megasas_init_fw(struct megasas_instance *instance)
                                        if (instance->msix_vectors > 8)
                                                instance->msix_combined = true;
                                        break;
+                               case AERO_SERIES:
                                case VENTURA_SERIES:
                                        if (instance->msix_vectors > 16)
                                                instance->msix_combined = true;
@@ -6223,12 +6224,14 @@ fail_set_dma_mask:
 /*
  * megasas_set_adapter_type -  Set adapter type.
  *                             Supported controllers can be divided in
- *                             4 categories-  enum MR_ADAPTER_TYPE {
- *                                                     MFI_SERIES = 1,
- *                                                     THUNDERBOLT_SERIES = 2,
- *                                                     INVADER_SERIES = 3,
- *                                                     VENTURA_SERIES = 4,
- *                                             };
+ *                             different categories-
+ *                                     enum MR_ADAPTER_TYPE {
+ *                                             MFI_SERIES = 1,
+ *                                             THUNDERBOLT_SERIES = 2,
+ *                                             INVADER_SERIES = 3,
+ *                                             VENTURA_SERIES = 4,
+ *                                             AERO_SERIES = 5,
+ *                                     };
  * @instance:                  Adapter soft state
  * return:                     void
  */
@@ -6243,6 +6246,8 @@ static inline void megasas_set_adapter_type(struct megasas_instance *instance)
                case PCI_DEVICE_ID_LSI_AERO_10E2:
                case PCI_DEVICE_ID_LSI_AERO_10E5:
                case PCI_DEVICE_ID_LSI_AERO_10E6:
+                       instance->adapter_type = AERO_SERIES;
+                       break;
                case PCI_DEVICE_ID_LSI_VENTURA:
                case PCI_DEVICE_ID_LSI_CRUSADER:
                case PCI_DEVICE_ID_LSI_HARPOON:
@@ -6310,6 +6315,7 @@ static int megasas_alloc_ctrl_mem(struct megasas_instance *instance)
                if (megasas_alloc_mfi_ctrl_mem(instance))
                        goto fail;
                break;
+       case AERO_SERIES:
        case VENTURA_SERIES:
        case THUNDERBOLT_SERIES:
        case INVADER_SERIES: