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

Commit 7364d34b authored by sumit.saxena@avagotech.com's avatar sumit.saxena@avagotech.com Committed by Martin K. Petersen
Browse files

megaraid_sas: Support for Cutlass (12 Gbps) controller 



Signed-off-by: default avatarSumit Saxena <sumit.saxena@avagotech.com>
Signed-off-by: default avatarKashyap Desai <kashyap.desai@avagotech.com>
Reviewed-by: default avatarTomas Henzl <thenzl@redhat.com>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 90c204bc

drivers/scsi/megaraid/megaraid_sas.h

+5 −0
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ 
#define PCI_DEVICE_ID_LSI_FURY			0x005f

#define PCI_DEVICE_ID_LSI_INTRUDER		0x00ce

#define PCI_DEVICE_ID_LSI_INTRUDER_24		0x00cf

#define PCI_DEVICE_ID_LSI_CUTLASS_52		0x0052

#define PCI_DEVICE_ID_LSI_CUTLASS_53		0x0053



/*

 * Intel HBA SSDIDs
@@ -64,6 +66,7 @@ 
#define MEGARAID_INTEL_RS3MC044_SSDID		0x9381

#define MEGARAID_INTEL_RS3WC080_SSDID		0x9341

#define MEGARAID_INTEL_RS3WC040_SSDID		0x9343

#define MEGARAID_INTEL_RMS3BC160_SSDID		0x352B



/*

 * Intruder HBA SSDIDs
@@ -87,6 +90,8 @@ 
	"Intel(R) RAID Controller RS3WC080"

#define MEGARAID_INTEL_RS3WC040_BRANDING	\

	"Intel(R) RAID Controller RS3WC040"

#define MEGARAID_INTEL_RMS3BC160_BRANDING	\

	"Intel(R) Integrated RAID Module RMS3BC160"



/*

 * =====================================

drivers/scsi/megaraid/megaraid_sas_base.c

+6 −0
Original line number Diff line number Diff line
@@ -139,6 +139,8 @@ static struct pci_device_id megasas_pci_table[] = { 
	/* Intruder */

	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_INTRUDER_24)},

	/* Intruder 24 port*/

	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_CUTLASS_52)},

	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_CUTLASS_53)},

	{}

};
@@ -4635,6 +4637,8 @@ static int megasas_init_fw(struct megasas_instance *instance) 
	case PCI_DEVICE_ID_LSI_FURY:

	case PCI_DEVICE_ID_LSI_INTRUDER:

	case PCI_DEVICE_ID_LSI_INTRUDER_24:

	case PCI_DEVICE_ID_LSI_CUTLASS_52:

	case PCI_DEVICE_ID_LSI_CUTLASS_53:

		instance->instancet = &megasas_instance_template_fusion;

		break;

	case PCI_DEVICE_ID_LSI_SAS1078R:
@@ -5332,6 +5336,8 @@ static int megasas_probe_one(struct pci_dev *pdev, 
	case PCI_DEVICE_ID_LSI_FURY:

	case PCI_DEVICE_ID_LSI_INTRUDER:

	case PCI_DEVICE_ID_LSI_INTRUDER_24:

	case PCI_DEVICE_ID_LSI_CUTLASS_52:

	case PCI_DEVICE_ID_LSI_CUTLASS_53:

	{

		instance->ctrl_context_pages =

			get_order(sizeof(struct fusion_context));

drivers/scsi/megaraid/megaraid_sas_fusion.c

+12 −0
Original line number Diff line number Diff line
@@ -1037,6 +1037,18 @@ megasas_display_intel_branding(struct megasas_instance *instance) 
			break;

		}

		break;

	case PCI_DEVICE_ID_LSI_CUTLASS_52:

	case PCI_DEVICE_ID_LSI_CUTLASS_53:

		switch (instance->pdev->subsystem_device) {

		case MEGARAID_INTEL_RMS3BC160_SSDID:

			dev_info(&instance->pdev->dev, "scsi host %d: %s\n",

				instance->host->host_no,

				MEGARAID_INTEL_RMS3BC160_BRANDING);

			break;

		default:

			break;

		}

		break;

	default:

		break;

	}