scsi: megaraid_sas: Add support for MegaRAID Aero controllers

This patch adds support for MegaRAID Aero controller PCI IDs.  Print a
message when a configurable secure type controller is encountered.

Signed-off-by: Shivasharan S <shivasharan.srikanteshwara@broadcom.com>
Reviewed-by: Hannes Reinecke <hare@suse.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 8edba2227cd3a2665c1f97f44eebcd2f8bac0611..55f6662ceb5540c25c8ef93c892b349ca3bd0bb3 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_sas.h
+++ b/drivers/scsi/megaraid/megaraid_sas.h
@@ -60,6 +60,10 @@
 #define PCI_DEVICE_ID_LSI_TOMCAT                   0x0017
 #define PCI_DEVICE_ID_LSI_VENTURA_4PORT                0x001B
 #define PCI_DEVICE_ID_LSI_CRUSADER_4PORT       0x001C
+#define PCI_DEVICE_ID_LSI_AERO_10E1            0x10e1
+#define PCI_DEVICE_ID_LSI_AERO_10E2            0x10e2
+#define PCI_DEVICE_ID_LSI_AERO_10E5            0x10e5
+#define PCI_DEVICE_ID_LSI_AERO_10E6            0x10e6
 
 /*
  * Intel HBA SSDIDs

diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index 27fab13c55ea9fa77eeacb7f88900e281b78c54c..b7d3fc6fb118537377476c39a7880319bd0bdb70 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -162,6 +162,10 @@ static struct pci_device_id megasas_pci_table[] = {
        {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_TOMCAT)},
        {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_VENTURA_4PORT)},
        {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_CRUSADER_4PORT)},
+       {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_AERO_10E1)},
+       {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_AERO_10E2)},
+       {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_AERO_10E5)},
+       {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_AERO_10E6)},
        {}
 };
 
@@ -6235,6 +6239,10 @@ static inline void megasas_set_adapter_type(struct megasas_instance *instance)
                instance->adapter_type = MFI_SERIES;
        } else {
                switch (instance->pdev->device) {
+               case PCI_DEVICE_ID_LSI_AERO_10E1:
+               case PCI_DEVICE_ID_LSI_AERO_10E2:
+               case PCI_DEVICE_ID_LSI_AERO_10E5:
+               case PCI_DEVICE_ID_LSI_AERO_10E6:
                case PCI_DEVICE_ID_LSI_VENTURA:
                case PCI_DEVICE_ID_LSI_CRUSADER:
                case PCI_DEVICE_ID_LSI_HARPOON:
@@ -6598,6 +6606,13 @@ static int megasas_probe_one(struct pci_dev *pdev,
        struct megasas_instance *instance;
        u16 control = 0;
 
+       switch (pdev->device) {
+       case PCI_DEVICE_ID_LSI_AERO_10E1:
+       case PCI_DEVICE_ID_LSI_AERO_10E5:
+               dev_info(&pdev->dev, "Adapter is in configurable secure mode\n");
+               break;
+       }
+
        /* Reset MSI-X in the kdump kernel */
        if (reset_devices) {
                pos = pci_find_capability(pdev, PCI_CAP_ID_MSIX);