Commit 154a7cde authored by Shivasharan S's avatar Shivasharan S Committed by Martin K. Petersen

scsi: megaraid_sas: Introduce new Aero adapter type

Identify all Aero controller PCI IDs with new adapter type.
Signed-off-by: default avatarShivasharan S <shivasharan.srikanteshwara@broadcom.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 630d42b7
...@@ -1570,6 +1570,7 @@ enum MR_ADAPTER_TYPE { ...@@ -1570,6 +1570,7 @@ enum MR_ADAPTER_TYPE {
THUNDERBOLT_SERIES = 2, THUNDERBOLT_SERIES = 2,
INVADER_SERIES = 3, INVADER_SERIES = 3,
VENTURA_SERIES = 4, VENTURA_SERIES = 4,
AERO_SERIES = 5,
}; };
/* /*
......
...@@ -5439,6 +5439,7 @@ static int megasas_init_fw(struct megasas_instance *instance) ...@@ -5439,6 +5439,7 @@ static int megasas_init_fw(struct megasas_instance *instance)
if (instance->msix_vectors > 8) if (instance->msix_vectors > 8)
instance->msix_combined = true; instance->msix_combined = true;
break; break;
case AERO_SERIES:
case VENTURA_SERIES: case VENTURA_SERIES:
if (instance->msix_vectors > 16) if (instance->msix_vectors > 16)
instance->msix_combined = true; instance->msix_combined = true;
...@@ -6223,12 +6224,14 @@ megasas_set_dma_mask(struct megasas_instance *instance) ...@@ -6223,12 +6224,14 @@ megasas_set_dma_mask(struct megasas_instance *instance)
/* /*
* megasas_set_adapter_type - Set adapter type. * megasas_set_adapter_type - Set adapter type.
* Supported controllers can be divided in * Supported controllers can be divided in
* 4 categories- enum MR_ADAPTER_TYPE { * different categories-
* MFI_SERIES = 1, * enum MR_ADAPTER_TYPE {
* THUNDERBOLT_SERIES = 2, * MFI_SERIES = 1,
* INVADER_SERIES = 3, * THUNDERBOLT_SERIES = 2,
* VENTURA_SERIES = 4, * INVADER_SERIES = 3,
* }; * VENTURA_SERIES = 4,
* AERO_SERIES = 5,
* };
* @instance: Adapter soft state * @instance: Adapter soft state
* return: void * return: void
*/ */
...@@ -6243,6 +6246,8 @@ static inline void megasas_set_adapter_type(struct megasas_instance *instance) ...@@ -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_10E2:
case PCI_DEVICE_ID_LSI_AERO_10E5: case PCI_DEVICE_ID_LSI_AERO_10E5:
case PCI_DEVICE_ID_LSI_AERO_10E6: case PCI_DEVICE_ID_LSI_AERO_10E6:
instance->adapter_type = AERO_SERIES;
break;
case PCI_DEVICE_ID_LSI_VENTURA: case PCI_DEVICE_ID_LSI_VENTURA:
case PCI_DEVICE_ID_LSI_CRUSADER: case PCI_DEVICE_ID_LSI_CRUSADER:
case PCI_DEVICE_ID_LSI_HARPOON: case PCI_DEVICE_ID_LSI_HARPOON:
...@@ -6310,6 +6315,7 @@ static int megasas_alloc_ctrl_mem(struct megasas_instance *instance) ...@@ -6310,6 +6315,7 @@ static int megasas_alloc_ctrl_mem(struct megasas_instance *instance)
if (megasas_alloc_mfi_ctrl_mem(instance)) if (megasas_alloc_mfi_ctrl_mem(instance))
goto fail; goto fail;
break; break;
case AERO_SERIES:
case VENTURA_SERIES: case VENTURA_SERIES:
case THUNDERBOLT_SERIES: case THUNDERBOLT_SERIES:
case INVADER_SERIES: case INVADER_SERIES:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment