[patch 18/24] megaraid: Dell CERC ATA100/4ch support

[patch 18/24] megaraid: Dell CERC ATA100/4ch support

[akpm]

From: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>

Add CERC subsystem ids to the old megaraid driver.  Tested, works.

Cc: James Bottomley <James.Bottomley@steeleye.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

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

diff -puN drivers/scsi/megaraid.c~megaraid-dell-cerc-ata100-4ch-support drivers/scsi/megaraid.c
--- a/drivers/scsi/megaraid.c~megaraid-dell-cerc-ata100-4ch-support
+++ a/drivers/scsi/megaraid.c
@@ -5046,6 +5046,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-dell-cerc-ata100-4ch-support drivers/scsi/megaraid.h
--- a/drivers/scsi/megaraid.h~megaraid-dell-cerc-ata100-4ch-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 18/24] megaraid: Dell CERC ATA100/4ch support

[Ju, Seokmann]

Hi,
On Tuesday, August 15, 2006 2:10 AM, Janusz Krzysztofik wrote:
> Add CERC subsystem ids to the old megaraid driver.  Tested, works.
NACK - This addition will create PCI ID overlapping with megaraid_{mbox,mm} module under driver/scsi/megaraid.
Since 2.6.16, we have removed some IDs in the megaraid module under driver/scsi to address ID overlappijng issue.
Please switch to megaraid_{mbox,mm} module for the controller support. megaraid module under driver/scsi is dedicated to very old products.

Seokmann

> -----Original Message-----
> From: linux-scsi-owner@vger.kernel.org 
> [mailto:linux-scsi-owner@vger.kernel.org] On Behalf Of akpm@osdl.org
> Sent: Tuesday, August 15, 2006 2:10 AM
> To: James.Bottomley@steeleye.com
> Cc: linux-scsi@vger.kernel.org; akpm@osdl.org; jkrzyszt@tis.icnet.pl
> Subject: [patch 18/24] megaraid: Dell CERC ATA100/4ch support
> 
> From: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
> 
> Add CERC subsystem ids to the old megaraid driver.  Tested, works.
> 
> Cc: James Bottomley <James.Bottomley@steeleye.com>
> Signed-off-by: Andrew Morton <akpm@osdl.org>
> ---
> 
>  drivers/scsi/megaraid.c |    2 ++
>  drivers/scsi/megaraid.h |    2 ++
>  2 files changed, 4 insertions(+)
> 
> diff -puN 
> drivers/scsi/megaraid.c~megaraid-dell-cerc-ata100-4ch-support 
> drivers/scsi/megaraid.c
> --- a/drivers/scsi/megaraid.c~megaraid-dell-cerc-ata100-4ch-support
> +++ a/drivers/scsi/megaraid.c
> @@ -5046,6 +5046,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-dell-cerc-ata100-4ch-support 
> drivers/scsi/megaraid.h
> --- a/drivers/scsi/megaraid.h~megaraid-dell-cerc-ata100-4ch-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 18/24] megaraid: Dell CERC ATA100/4ch support

[Janusz Krzysztofik]

Ju, Seokmann wrote:
> Hi,
> On Tuesday, August 15, 2006 2:10 AM, Janusz Krzysztofik wrote:
>> Add CERC subsystem ids to the old megaraid driver.  Tested, works.
> NACK - This addition will create PCI ID overlapping with megaraid_{mbox,mm} module under driver/scsi/megaraid.
> Since 2.6.16, we have removed some IDs in the megaraid module under driver/scsi to address ID overlappijng issue.
> Please switch to megaraid_{mbox,mm} module for the controller support. megaraid module under driver/scsi is dedicated to very old products.
> 
> Seokmann

Hi,

Dell CECR ATA100/4ch does not work with the new megaraid_mbox driver for 
me. The adapter is recognized, but it does not show any virtual nor 
physical drives. I have no skills to correct the problem. Furthermore, I 
have found some comments on this hardware no longer supported by Dell, 
RedHat, etc.

Will you accept a patch that limits PCI IDs with VID=101E, DID=1960 and 
SSVID=1028 in the new driver to exactly three models specified in its 
source file comments and, on the other hand, adds PCI ID of Dell CERC 
ATA100/4ch to the old driver?

Janusz

RE: [patch 18/24] megaraid: Dell CERC ATA100/4ch support

[Ju, Seokmann]

> Will you accept a patch that limits PCI IDs with VID=101E, 
> DID=1960 and 
> SSVID=1028 in the new driver to exactly three models specified in its 
> source file comments and, on the other hand, adds PCI ID of Dell CERC 
> ATA100/4ch to the old driver?
I've forwarded your request to program management team. But, I don't think it will be accepted.
Technically, I would recommend you to check F/W version and make sure it is not higher than 6.61.
I believe the problem happens with 6.62 or higher.

Thank you, 

> -----Original Message-----
> From: Janusz Krzysztofik [mailto:jkrzyszt@tis.icnet.pl] 
> Sent: Wednesday, September 27, 2006 6:39 AM
> To: Ju, Seokmann
> Cc: akpm@osdl.org; James.Bottomley@steeleye.com; 
> linux-scsi@vger.kernel.org
> Subject: Re: [patch 18/24] megaraid: Dell CERC ATA100/4ch support
> 
> Ju, Seokmann wrote:
> > Hi,
> > On Tuesday, August 15, 2006 2:10 AM, Janusz Krzysztofik wrote:
> >> Add CERC subsystem ids to the old megaraid driver.  Tested, works.
> > NACK - This addition will create PCI ID overlapping with 
> megaraid_{mbox,mm} module under driver/scsi/megaraid.
> > Since 2.6.16, we have removed some IDs in the megaraid 
> module under driver/scsi to address ID overlappijng issue.
> > Please switch to megaraid_{mbox,mm} module for the 
> controller support. megaraid module under driver/scsi is 
> dedicated to very old products.
> > 
> > Seokmann
> 
> Hi,
> 
> Dell CECR ATA100/4ch does not work with the new megaraid_mbox 
> driver for 
> me. The adapter is recognized, but it does not show any virtual nor 
> physical drives. I have no skills to correct the problem. 
> Furthermore, I 
> have found some comments on this hardware no longer supported 
> by Dell, 
> RedHat, etc.
> 
> Will you accept a patch that limits PCI IDs with VID=101E, 
> DID=1960 and 
> SSVID=1028 in the new driver to exactly three models specified in its 
> source file comments and, on the other hand, adds PCI ID of Dell CERC 
> ATA100/4ch to the old driver?
> 
> Janusz
> 
> 

Re: [patch 18/24] megaraid: Dell CERC ATA100/4ch support

[Janusz Krzysztofik]

[-- Attachment #1: Type: text/plain, Size: 424 bytes --]

Ju, Seokmann wrote:
...
> Technically, I would recommend you to check F/W version and make sure it is not higher than 6.61.
> I believe the problem happens with 6.62 or higher.

Bingo! megaraid_mbox works for me with F/W 6.61. How did you know?

I enclose a trivial patch that checks for F/W version and displays a 
warning if too high. It should make life easier for those who may face 
the problem :).

Thank you,
Janusz


[-- Attachment #2: megaraid_mbox-cerc_ata100_4ch.patch --]
[-- Type: text/x-patch, Size: 2052 bytes --]

diff -upr linux-source-2.6.18/drivers/scsi/megaraid/megaraid_mbox.c linux-source-2.6.18-cerc/drivers/scsi/megaraid/megaraid_mbox.c
--- linux-source-2.6.18/drivers/scsi/megaraid/megaraid_mbox.c	2006-09-20 05:42:06.000000000 +0200
+++ linux-source-2.6.18-cerc/drivers/scsi/megaraid/megaraid_mbox.c	2006-09-27 17:53:17.000000000 +0200
@@ -25,6 +25,7 @@
  * Dell PERC3/QC			101E	1960	1028	0471
  * Dell PERC3/DC			101E	1960	1028	0493
  * Dell PERC3/SC			101E	1960	1028	0475
+ * Dell CERC ATA100/4ch with F/W<=6.61	101E	1960	1028	0511
  * Dell PERC3/Di			1028	1960	1028	0123
  * Dell PERC4/SC			1000	1960	1028	0520
  * Dell PERC4/DC			1000	1960	1028	0518
@@ -791,6 +792,21 @@ megaraid_init_mbox(adapter_t *adapter)
 		goto out_alloc_cmds;
 	}
 
+	// Compatibility check
+	if (adapter->pdev->vendor == PCI_VENDOR_ID_AMI &&
+			adapter->pdev->device == PCI_DEVICE_ID_AMI_MEGARAID3 &&
+			adapter->pdev->subsystem_vendor == PCI_VENDOR_ID_DELL &&
+			adapter->pdev->subsystem_device == PCI_SUBSYS_ID_CERC_ATA100_4CH &&
+			(adapter->fw_version[0] > '6' ||
+			 (adapter->fw_version[0] == '6' &&
+			  adapter->fw_version[2] > '6') ||
+			 (adapter->fw_version[0] == '6'
+			  && adapter->fw_version[2] == '6'
+			  && adapter->fw_version[3] > '1'))) {
+		con_log(CL_ANN, (KERN_WARNING
+			"megaraid: problems? downgrade F/W to version 6.61\n"));
+	}
+
 	// Do we support extended CDBs
 	adapter->max_cdb_sz = 10;
 	if (megaraid_mbox_extended_cdb(adapter) == 0) {
diff -upr linux-source-2.6.18/drivers/scsi/megaraid/megaraid_mbox.h linux-source-2.6.18-cerc/drivers/scsi/megaraid/megaraid_mbox.h
--- linux-source-2.6.18/drivers/scsi/megaraid/megaraid_mbox.h	2006-09-20 05:42:06.000000000 +0200
+++ linux-source-2.6.18-cerc/drivers/scsi/megaraid/megaraid_mbox.h	2006-09-27 17:45:25.000000000 +0200
@@ -88,6 +88,7 @@
 #define PCI_SUBSYS_ID_PERC3_QC				0x0471
 #define PCI_SUBSYS_ID_PERC3_DC				0x0493
 #define PCI_SUBSYS_ID_PERC3_SC				0x0475
+#define PCI_SUBSYS_ID_CERC_ATA100_4CH			0x0511
 
 
 #define MBOX_MAX_SCSI_CMDS	128	// number of cmds reserved for kernel

Re: [patch 18/24] megaraid: Dell CERC ATA100/4ch support

[Janusz Krzysztofik]

Hi Seokmann,

Janusz Krzysztofik wrote:
> Ju, Seokmann wrote:
>> Technically, I would recommend you to check F/W version and make sure 
>> it is not higher than 6.61.
>> I believe the problem happens with 6.62 or higher.
> 
> Bingo! megaraid_mbox works for me with F/W 6.61. How did you know?

Then, akpm@osdl.org wrote:
> The patch titled
> 
>      magaraid: check for firmware version
> 
> has been added to the -mm tree.  Its filename is
> 
>      megaraid-check-for-firmware-version.patch

But "stephane matis" <s.matis@gmail.com> wrote:
 > Unfortunately, FW 6.61 doesn't seem to support disks capacity over
 > 128G, a condition I noted after downgrading from 6.67.  I confirmed
 > the same behavior with two brands of 200G disks.

So the patch does not really solve the problem and probably should be
removed from the -mm tree.

However, Ju, Seokmann wrote:
> Janusz Krzysztofik wrote:
 >> Will you accept a patch that limits PCI IDs with VID=101E, DID=1960 and
>> SSVID=1028 in the new driver to exactly three models specified in its 
>> source file comments and, on the other hand, adds PCI ID of Dell CERC 
>> ATA100/4ch to the old driver?
> I've forwarded your request to program management team. But, I don't think it will be accepted.

So I ask the question again: could a patch like described above be accepted
until the problem with F/W >6.61 is solved in the new megaraid_mbox driver?

Cheers,
Janusz