megaraid_sas: Support for Intruder (12 Gbps) controller (90c204bc) · Commits · 戴 / test

drivers/scsi/megaraid/megaraid_sas.h

+9 −0

Original line number	Diff line number	Diff line
		@@ -52,6 +52,8 @@
		#define PCI_DEVICE_ID_LSI_PLASMA 0x002f
		#define PCI_DEVICE_ID_LSI_INVADER 0x005d
		#define PCI_DEVICE_ID_LSI_FURY 0x005f
		#define PCI_DEVICE_ID_LSI_INTRUDER 0x00ce
		#define PCI_DEVICE_ID_LSI_INTRUDER_24 0x00cf

		/*
		* Intel HBA SSDIDs
		@@ -63,6 +65,13 @@
		#define MEGARAID_INTEL_RS3WC080_SSDID 0x9341
		#define MEGARAID_INTEL_RS3WC040_SSDID 0x9343

		/*
		* Intruder HBA SSDIDs
		*/
		#define MEGARAID_INTRUDER_SSDID1 0x9371
		#define MEGARAID_INTRUDER_SSDID2 0x9390
		#define MEGARAID_INTRUDER_SSDID3 0x9370

		/*
		* Intel HBA branding
		*/

+8 −0

Original line number	Diff line number	Diff line
		@@ -135,6 +135,10 @@ static struct pci_device_id megasas_pci_table[] = {
		/* Invader */
		{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FURY)},
		/* Fury */
		{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_INTRUDER)},
		/* Intruder */
		{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_INTRUDER_24)},
		/* Intruder 24 port*/
		{}
		};

		@@ -4629,6 +4633,8 @@ static int megasas_init_fw(struct megasas_instance *instance)
		case PCI_DEVICE_ID_LSI_PLASMA:
		case PCI_DEVICE_ID_LSI_INVADER:
		case PCI_DEVICE_ID_LSI_FURY:
		case PCI_DEVICE_ID_LSI_INTRUDER:
		case PCI_DEVICE_ID_LSI_INTRUDER_24:
		instance->instancet = &megasas_instance_template_fusion;
		break;
		case PCI_DEVICE_ID_LSI_SAS1078R:
		@@ -5324,6 +5330,8 @@ static int megasas_probe_one(struct pci_dev *pdev,
		case PCI_DEVICE_ID_LSI_PLASMA:
		case PCI_DEVICE_ID_LSI_INVADER:
		case PCI_DEVICE_ID_LSI_FURY:
		case PCI_DEVICE_ID_LSI_INTRUDER:
		case PCI_DEVICE_ID_LSI_INTRUDER_24:
		{
		instance->ctrl_context_pages =
		get_order(sizeof(struct fusion_context));