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>
This commit is contained in:
Shivasharan S 2018-12-17 00:47:38 -08:00 коммит произвёл Martin K. Petersen
Родитель 630d42b70f
Коммит 154a7cde9a
2 изменённых файлов: 13 добавлений и 6 удалений

Просмотреть файл

@ -1570,6 +1570,7 @@ enum MR_ADAPTER_TYPE {
THUNDERBOLT_SERIES = 2,
INVADER_SERIES = 3,
VENTURA_SERIES = 4,
AERO_SERIES = 5,
};
/*

Просмотреть файл

@ -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,11 +6224,13 @@ fail_set_dma_mask:
/*
* megasas_set_adapter_type - Set adapter type.
* Supported controllers can be divided in
* 4 categories- enum MR_ADAPTER_TYPE {
* 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: