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

Commit af7a5647 authored by bo yang's avatar bo yang Committed by James Bottomley
Browse files

[SCSI] megaraid_sas: Add the new controller(1078DE) support to the driver 



Add the new Controller (ID: 007C) support to driver.

Signed-off-by Bo Yang<bo.yang@lsi.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent d532dbe2

drivers/scsi/megaraid/megaraid_sas.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -68,6 +68,8 @@ static struct pci_device_id megasas_pci_table[] = { 
	/* xscale IOP */

	/* xscale IOP */

	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1078R)},

	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1078R)},

	/* ppc IOP */

	/* ppc IOP */

	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1078DE)},

	/* ppc IOP */

	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_VERDE_ZCR)},

	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_VERDE_ZCR)},

	/* xscale IOP, vega */

	/* xscale IOP, vega */

	{PCI_DEVICE(PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_DELL_PERC5)},

	{PCI_DEVICE(PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_DELL_PERC5)},
@@ -1471,7 +1473,7 @@ megasas_transition_to_ready(struct megasas_instance* instance) 
			instance->instancet->disable_intr(instance->reg_set);

			instance->instancet->disable_intr(instance->reg_set);

			writel(MFI_RESET_FLAGS, &instance->reg_set->inbound_doorbell);

			writel(MFI_RESET_FLAGS, &instance->reg_set->inbound_doorbell);





			max_wait = 10;

			max_wait = 60;

			cur_state = MFI_STATE_OPERATIONAL;

			cur_state = MFI_STATE_OPERATIONAL;

			break;

			break;
@@ -1992,6 +1994,7 @@ static int megasas_init_mfi(struct megasas_instance *instance) 
	switch(instance->pdev->device)

	switch(instance->pdev->device)

	{

	{

		case PCI_DEVICE_ID_LSI_SAS1078R:

		case PCI_DEVICE_ID_LSI_SAS1078R:

		case PCI_DEVICE_ID_LSI_SAS1078DE:

			instance->instancet = &megasas_instance_template_ppc;

			instance->instancet = &megasas_instance_template_ppc;

			break;

			break;

		case PCI_DEVICE_ID_LSI_SAS1064R:

		case PCI_DEVICE_ID_LSI_SAS1064R:

drivers/scsi/megaraid/megaraid_sas.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ 
 * Device IDs

 * Device IDs

 */

 */

#define	PCI_DEVICE_ID_LSI_SAS1078R		0x0060

#define	PCI_DEVICE_ID_LSI_SAS1078R		0x0060

#define	PCI_DEVICE_ID_LSI_SAS1078DE		0x007C

#define	PCI_DEVICE_ID_LSI_VERDE_ZCR		0x0413

#define	PCI_DEVICE_ID_LSI_VERDE_ZCR		0x0413





/*

/*