[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: James Bottomley <James.Bottomley@HansenPartnership.com>

2 files changed, 6 insertions, 2 deletions

diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c
index ffd1390b155b..b937e9cddb23 100644
--- a/drivers/scsi/megaraid/megaraid_sas.c
+++ b/drivers/scsi/megaraid/megaraid_sas.c
@@ -68,6 +68,8 @@ static struct pci_device_id megasas_pci_table[] = {
         /* xscale IOP */
         {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1078R)},
         /* 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)},
         /* xscale IOP, vega */
         {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);
                         writel(MFI_RESET_FLAGS, &instance->reg_set->inbound_doorbell);
 
-                        max_wait = 10;
+                        max_wait = 60;
                         cur_state = MFI_STATE_OPERATIONAL;
                         break;
 
@@ -1991,7 +1993,8 @@ static int megasas_init_mfi(struct megasas_instance *instance)
 
         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;
                         break;
                 case PCI_DEVICE_ID_LSI_SAS1064R:
diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h
index fbbfe2ea049f..3a997eb457bf 100644
--- a/drivers/scsi/megaraid/megaraid_sas.h
+++ b/drivers/scsi/megaraid/megaraid_sas.h
@@ -26,6 +26,7 @@
  * Device IDs
  */
 #define PCI_DEVICE_ID_LSI_SAS1078R              0x0060
+#define PCI_DEVICE_ID_LSI_SAS1078DE             0x007C
 #define PCI_DEVICE_ID_LSI_VERDE_ZCR             0x0413
 
 /*