Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757745AbYCQUeI (ORCPT ); Mon, 17 Mar 2008 16:34:08 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753201AbYCQUdz (ORCPT ); Mon, 17 Mar 2008 16:33:55 -0400 Received: from mail0.lsil.com ([147.145.40.20]:51264 "EHLO mail0.lsil.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752400AbYCQUdy (ORCPT ); Mon, 17 Mar 2008 16:33:54 -0400 Subject: [PATCH 3/4] scsi: megaraid_sas - Add the new controller Support to Driver From: bo yang To: James Bottomley Cc: linux-scsi@vger.kernel.org, akpm@osdl.org, linux-kernel@vger.kernel.org, "Patro, Sumant" , neela.kolli@lsi.com, bo.yang@lsi.com In-Reply-To: <1205824386.7238.7.camel@pcp021067pcs.se.lsil.com> References: <9738BCBE884FDB42801FAD8A7769C26501CE50E4@NAMAIL1.ad.lsil.com> <1195251505.3407.30.camel@localhost.localdomain> <9738BCBE884FDB42801FAD8A7769C26501C9A4AF@NAMAIL1.ad.lsil.com> <1205824386.7238.7.camel@pcp021067pcs.se.lsil.com> Content-Type: text/plain Content-Transfer-Encoding: 7bit Date: Mon, 17 Mar 2008 04:13:07 -0400 Message-Id: <1205741587.7479.17.camel@pcp021067pcs.se.lsil.com> Mime-Version: 1.0 X-Mailer: Evolution 2.0.2 (2.0.2-35.0.4.el4) X-OriginalArrivalTime: 17 Mar 2008 20:32:55.0218 (UTC) FILETIME=[14863920:01C8886E] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2294 Lines: 57 Add the new Controller (ID: 007C) support to driver. Signed-off-by Bo Yang --- drivers/scsi/megaraid/megaraid_sas.c | 7 +++++-- drivers/scsi/megaraid/megaraid_sas.h | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff -rupN linux-2.6.24_orig/drivers/scsi/megaraid/megaraid_sas.c linux-2.6.24_new/drivers/scsi/megaraid/megaraid_sas.c --- linux-2.6.24_orig/drivers/scsi/megaraid/megaraid_sas.c 2008-03-17 13:53:49.000000000 -0400 +++ linux-2.6.24_new/drivers/scsi/megaraid/megaraid_sas.c 2008-03-17 13:53:10.000000000 -0400 @@ -68,6 +68,8 @@ static struct pci_device_id megasas_pci_ /* 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 megas 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 megas 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 -rupN linux-2.6.24_orig/drivers/scsi/megaraid/megaraid_sas.h linux-2.6.24_new/drivers/scsi/megaraid/megaraid_sas.h --- linux-2.6.24_orig/drivers/scsi/megaraid/megaraid_sas.h 2008-03-07 14:29:14.000000000 -0500 +++ linux-2.6.24_new/drivers/scsi/megaraid/megaraid_sas.h 2008-03-07 14:10:12.000000000 -0500 @@ -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 /* -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/