[patch 10/30] megaraid: add CERC_ATA100 support

[patch 10/30] megaraid: add CERC_ATA100 support

[akpm]

From: Torsten Krah <tkrah@fachschaft.imn.htwk-leipzig.de>

Taken from http://bugzilla.kernel.org/show_bug.cgi?id=6695

Add support for this device to the old megaraid driver.

Cc: Natalie Protasevich <protasnb@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/scsi/megaraid.c |    2 ++
 drivers/scsi/megaraid.h |    2 ++
 2 files changed, 4 insertions(+)

diff -puN drivers/scsi/megaraid.c~megaraid-add-cerc_ata100-support drivers/scsi/megaraid.c
--- a/drivers/scsi/megaraid.c~megaraid-add-cerc_ata100-support
+++ a/drivers/scsi/megaraid.c
@@ -4967,6 +4967,8 @@ static struct pci_device_id megaraid_pci
 		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	{PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID2,
 		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+	{PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID3,
+		PCI_VENDOR_ID_DELL, PCI_SUBSYS_ID_CERC_ATA100, 0, 0, 0},
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_AMI_MEGARAID3,
 		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	{0,}
diff -puN drivers/scsi/megaraid.h~megaraid-add-cerc_ata100-support drivers/scsi/megaraid.h
--- a/drivers/scsi/megaraid.h~megaraid-add-cerc_ata100-support
+++ a/drivers/scsi/megaraid.h
@@ -84,6 +84,8 @@
 #define LSI_SUBSYS_VID			0x1000
 #define INTEL_SUBSYS_VID		0x8086
 
+#define PCI_SUBSYS_ID_CERC_ATA100	0x0511
+
 #define HBA_SIGNATURE	      		0x3344
 #define HBA_SIGNATURE_471	  	0xCCCC
 #define HBA_SIGNATURE_64BIT		0x0299
_

RE: [patch 10/30] megaraid: add CERC_ATA100 support

[Patro, Sumant]

NACK. 

ID being added is already supported in megaraid_mbox driver.

--Sumant

-----Original Message-----
From: linux-scsi-owner@vger.kernel.org
[mailto:linux-scsi-owner@vger.kernel.org] On Behalf Of
akpm@linux-foundation.org
Sent: Friday, August 10, 2007 2:51 PM
To: James.Bottomley@steeleye.com
Cc: linux-scsi@vger.kernel.org; akpm@linux-foundation.org;
tkrah@fachschaft.imn.htwk-leipzig.de; protasnb@gmail.com
Subject: [patch 10/30] megaraid: add CERC_ATA100 support

From: Torsten Krah <tkrah@fachschaft.imn.htwk-leipzig.de>

Taken from http://bugzilla.kernel.org/show_bug.cgi?id=6695

Add support for this device to the old megaraid driver.

Cc: Natalie Protasevich <protasnb@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/scsi/megaraid.c |    2 ++
 drivers/scsi/megaraid.h |    2 ++
 2 files changed, 4 insertions(+)

diff -puN drivers/scsi/megaraid.c~megaraid-add-cerc_ata100-support
drivers/scsi/megaraid.c
--- a/drivers/scsi/megaraid.c~megaraid-add-cerc_ata100-support
+++ a/drivers/scsi/megaraid.c
@@ -4967,6 +4967,8 @@ static struct pci_device_id megaraid_pci
 		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	{PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID2,
 		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+	{PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID3,
+		PCI_VENDOR_ID_DELL, PCI_SUBSYS_ID_CERC_ATA100, 0, 0, 0},
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_AMI_MEGARAID3,
 		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	{0,}
diff -puN drivers/scsi/megaraid.h~megaraid-add-cerc_ata100-support
drivers/scsi/megaraid.h
--- a/drivers/scsi/megaraid.h~megaraid-add-cerc_ata100-support
+++ a/drivers/scsi/megaraid.h
@@ -84,6 +84,8 @@
 #define LSI_SUBSYS_VID			0x1000
 #define INTEL_SUBSYS_VID		0x8086
 
+#define PCI_SUBSYS_ID_CERC_ATA100	0x0511
+
 #define HBA_SIGNATURE	      		0x3344
 #define HBA_SIGNATURE_471	  	0xCCCC
 #define HBA_SIGNATURE_64BIT		0x0299
_
-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org More majordomo info
at  http://vger.kernel.org/majordomo-info.html

Re: [patch 10/30] megaraid: add CERC_ATA100 support

[Andrew Morton]

On Fri, 10 Aug 2007 16:20:54 -0600
"Patro, Sumant" <Sumant.Patro@lsi.com> wrote:

> ID being added is already supported in megaraid_mbox driver.

umm, why should that cause us to avoid supporting it in the old driver?

RE: [patch 10/30] megaraid: add CERC_ATA100 support

[Patro, Sumant]

 

> -----Original Message-----
> From: Andrew Morton [mailto:akpm@linux-foundation.org] 
> Sent: Friday, August 10, 2007 3:36 PM
> To: Patro, Sumant
> Cc: James.Bottomley@steeleye.com; linux-scsi@vger.kernel.org; 
> tkrah@fachschaft.imn.htwk-leipzig.de; protasnb@gmail.com; 
> Kolli, Neela; Yang, Bo
> Subject: Re: [patch 10/30] megaraid: add CERC_ATA100 support
> 
> On Fri, 10 Aug 2007 16:20:54 -0600
> "Patro, Sumant" <Sumant.Patro@lsi.com> wrote:
> 
> > ID being added is already supported in megaraid_mbox driver.
> 
> umm, why should that cause us to avoid supporting it in the 
> old driver?
> 

With overlapping ids it will be indeterminate which one (megaraid
legacy/mbox) claims the device.
All overlapping IDS were removed from megaraid legacy/megaraid_mbox
driver about 2 years back.  

--Sumant

Re: [patch 10/30] megaraid: add CERC_ATA100 support

[James Bottomley]

On Fri, 2007-08-10 at 15:36 -0700, Andrew Morton wrote:
> On Fri, 10 Aug 2007 16:20:54 -0600
> "Patro, Sumant" <Sumant.Patro@lsi.com> wrote:
> 
> > ID being added is already supported in megaraid_mbox driver.
> 
> umm, why should that cause us to avoid supporting it in the old driver?

Because we'll have the identical ID exported from two drivers and the
automatic matching logic in the bootloaders will get confused.

If there's evidence that megaraid_mbox doesn't work for this, then we
can move the id across, but really the legacy megaraid driver isn't very
well maintained at this point so its in our interest to move as many
devices as possible to it not away.

James