2002-12-04 22:16:11

by White, Charles

Subject: [PATCH] 2.4.20 cciss patch 01 - adds support for the SA641, SA642 and SA6400 controllers.

The following patch adds support for the SA641, SA642 and SA6400
controllers to the cciss driver in the 2.2.20 tree.



diff -urN linux-2.4.20.orig/Documentation/cciss.txt
linux-2.4.20.cciss_p01/Documentation/cciss.txt
--- linux-2.4.20.orig/Documentation/cciss.txt Fri Aug 2 20:39:42 2002
+++ linux-2.4.20.cciss_p01/Documentation/cciss.txt Wed Dec 4
15:05:43 2002
@@ -9,6 +9,9 @@
* SA 5i
* SA 532
* SA 5312
+ * SA 641
+ * SA 642
+ * SA 6400

If nodes are not already created in the /dev/cciss directory

diff -urN linux-2.4.20.orig/drivers/block/cciss.c
linux-2.4.20.cciss_p01/drivers/block/cciss.c
--- linux-2.4.20.orig/drivers/block/cciss.c Thu Nov 28 18:53:12 2002
+++ linux-2.4.20.cciss_p01/drivers/block/cciss.c Wed Dec 4
15:09:39 2002
@@ -56,6 +56,11 @@
#include "cciss.h"
#include <linux/cciss_ioctl.h>

+/* remove when PCI_DEVICE_ID_COMPAQ_CCISSC is in pci_ids.h */
+#ifndef PCI_DEVICE_ID_COMPAQ_CCISSC
+#define PCI_DEVICE_ID_COMPAQ_CCISSC 0x46
+#endif
+
/* define the PCI info for the cards we can control */
const struct pci_device_id cciss_pci_device_id[] = {
{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISS,
@@ -66,6 +71,12 @@
0x0E11, 0x4082, 0, 0, 0},
{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSB,
0x0E11, 0x4083, 0, 0, 0},
+ { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CCISSC,
+ 0x0E11, 0x409A, 0, 0, 0},
+ { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CCISSC,
+ 0x0E11, 0x409B, 0, 0, 0},
+ { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CCISSC,
+ 0x0E11, 0x409C, 0, 0, 0},
{0,}
};
MODULE_DEVICE_TABLE(pci, cciss_pci_device_id);
@@ -81,6 +92,9 @@
{ 0x40800E11, "Smart Array 5i", &SA5B_access},
{ 0x40820E11, "Smart Array 532", &SA5B_access},
{ 0x40830E11, "Smart Array 5312", &SA5B_access},
+ { 0x409A0E11, "Smart Array 641", &SA5_access},
+ { 0x409B0E11, "Smart Array 642", &SA5_access},
+ { 0x409C0E11, "Smart Array 6400", &SA5_access},
};

/* How long to wait (in millesconds) for board to go into simple mode
*/

2002-12-04 22:40:47

by Adrian Bunk

Subject: Re: [PATCH] 2.4.20 cciss patch 01 - adds support for the SA641, SA642 and SA6400 controllers.

On Wed, Dec 04, 2002 at 04:23:37PM -0600, White, Charles wrote:

>...
> --- linux-2.4.20.orig/drivers/block/cciss.c Thu Nov 28 18:53:12 2002
> +++ linux-2.4.20.cciss_p01/drivers/block/cciss.c Wed Dec 4
> 15:09:39 2002
> @@ -56,6 +56,11 @@
> #include "cciss.h"
> #include <linux/cciss_ioctl.h>
>
> +/* remove when PCI_DEVICE_ID_COMPAQ_CCISSC is in pci_ids.h */
> +#ifndef PCI_DEVICE_ID_COMPAQ_CCISSC
> +#define PCI_DEVICE_ID_COMPAQ_CCISSC 0x46
> +#endif
> +
>...

Why doesn't your patch include it into pci_ids.h?

cu
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed

2002-12-04 22:56:06

by Jeff Garzik

Subject: Re: [PATCH] 2.4.20 cciss patch 01 - adds support for the SA641, SA642 and SA6400 controllers.

White, Charles wrote:
> linux-2.4.20.cciss_p01/drivers/block/cciss.c
> --- linux-2.4.20.orig/drivers/block/cciss.c Thu Nov 28 18:53:12 2002
> +++ linux-2.4.20.cciss_p01/drivers/block/cciss.c Wed Dec 4
> 15:09:39 2002
> @@ -56,6 +56,11 @@
> #include "cciss.h"
> #include <linux/cciss_ioctl.h>
>
> +/* remove when PCI_DEVICE_ID_COMPAQ_CCISSC is in pci_ids.h */
> +#ifndef PCI_DEVICE_ID_COMPAQ_CCISSC
> +#define PCI_DEVICE_ID_COMPAQ_CCISSC 0x46
> +#endif
> +


the patch looks simple and obvious, though I have one objection: as the
comment indicates, this patch hunk should instead be in
include/linux/pci_ids.h. There is no rule against modifying pci_ids.h
-- please do so, and not crap up drivers with tons of these ifdefs...