Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 754f1bae authored by Shivasharan S's avatar Shivasharan S Committed by Martin K. Petersen
Browse files

scsi: megaraid_sas: Add support for Crusader controllers 



Add support for PCI VID/DID 0x1000/0x0015 based MegaRAID controllers.
Since the DID 0x0015 conflicts with DELL PERC5 controllers,
add vendor ID based check specific for DELL PERC5.

Signed-off-by: default avatarKashyap Desai <kashyap.desai@broadcom.com>
Signed-off-by: default avatarShivasharan S <shivasharan.srikanteshwara@broadcom.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent c365178f

drivers/scsi/megaraid/megaraid_sas.h

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
#define PCI_DEVICE_ID_LSI_CUTLASS_52		0x0052

#define PCI_DEVICE_ID_LSI_CUTLASS_53		0x0053

#define PCI_DEVICE_ID_LSI_VENTURA		    0x0014

#define PCI_DEVICE_ID_LSI_CRUSADER		    0x0015

#define PCI_DEVICE_ID_LSI_HARPOON		    0x0016

#define PCI_DEVICE_ID_LSI_TOMCAT		    0x0017

#define PCI_DEVICE_ID_LSI_VENTURA_4PORT		0x001B

drivers/scsi/megaraid/megaraid_sas_base.c

+29 −22
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ static struct pci_device_id megasas_pci_table[] = { 
	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_CUTLASS_53)},

	/* VENTURA */

	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_VENTURA)},

	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_CRUSADER)},

	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_HARPOON)},

	{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)},
@@ -5980,8 +5981,13 @@ megasas_set_dma_mask(struct pci_dev *pdev) 
 */

static inline void megasas_set_adapter_type(struct megasas_instance *instance)

{

	if ((instance->pdev->vendor == PCI_VENDOR_ID_DELL) &&

	    (instance->pdev->device == PCI_DEVICE_ID_DELL_PERC5)) {

		instance->adapter_type = MFI_SERIES;

	} else {

		switch (instance->pdev->device) {

		case PCI_DEVICE_ID_LSI_VENTURA:

		case PCI_DEVICE_ID_LSI_CRUSADER:

		case PCI_DEVICE_ID_LSI_HARPOON:

		case PCI_DEVICE_ID_LSI_TOMCAT:

		case PCI_DEVICE_ID_LSI_VENTURA_4PORT:
@@ -6005,6 +6011,7 @@ static inline void megasas_set_adapter_type(struct megasas_instance *instance) 
			break;

		}

	}

}



/**

 * megasas_probe_one -	PCI hotplug entry point