diff options
| author | Mike Miller <mike.miller@hp.com> | 2005-03-09 16:43:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-09 16:43:23 -0800 |
| commit | feb46ab0c5494133b650774da686eb9e6ff36617 (patch) | |
| tree | 71117588ad3b59ea010a605c83f69baef597d59e | |
| parent | ad1aa7145a35803f94a991bf145785eb6d9ae3be (diff) | |
[PATCH] cciss: new controller support
This patch adds support for 2 new SAS controllers due out this summer. It
also bumps the version to 2.6.6.
Signed-off-by: Mike Miller <mike.miller@hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | Documentation/cciss.txt | 2 | ||||
| -rw-r--r-- | drivers/block/cciss.c | 14 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 1 |
3 files changed, 13 insertions, 4 deletions
diff --git a/Documentation/cciss.txt b/Documentation/cciss.txt index 74589c53a0c4..d599beb9df8a 100644 --- a/Documentation/cciss.txt +++ b/Documentation/cciss.txt @@ -15,6 +15,8 @@ This driver is known to work with the following cards: * SA 6400 U320 Expansion Module * SA 6i * SA P600 + * SA P800 + * SA E400 If nodes are not already created in the /dev/cciss directory, run as root: diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 967c0f31edea..281c98540ffe 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -46,14 +46,14 @@ #include <linux/completion.h> #define CCISS_DRIVER_VERSION(maj,min,submin) ((maj<<16)|(min<<8)|(submin)) -#define DRIVER_NAME "HP CISS Driver (v 2.6.4)" -#define DRIVER_VERSION CCISS_DRIVER_VERSION(2,6,4) +#define DRIVER_NAME "HP CISS Driver (v 2.6.6)" +#define DRIVER_VERSION CCISS_DRIVER_VERSION(2,6,6) /* Embedded module documentation macros - see modules.h */ MODULE_AUTHOR("Hewlett-Packard Company"); -MODULE_DESCRIPTION("Driver for HP Controller SA5xxx SA6xxx version 2.6.4"); +MODULE_DESCRIPTION("Driver for HP Controller SA5xxx SA6xxx version 2.6.6"); MODULE_SUPPORTED_DEVICE("HP SA5i SA5i+ SA532 SA5300 SA5312 SA641 SA642 SA6400" - " SA6i P600"); + " SA6i P600 P800 E400"); MODULE_LICENSE("GPL"); #include "cciss_cmd.h" @@ -82,6 +82,10 @@ const struct pci_device_id cciss_pci_device_id[] = { 0x0E11, 0x4091, 0, 0, 0}, { PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSA, 0x103C, 0x3225, 0, 0, 0}, + { PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSB, + 0x103c, 0x3223, 0, 0, 0}, + { PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSB, + 0x103c, 0x3231, 0, 0, 0}, {0,} }; MODULE_DEVICE_TABLE(pci, cciss_pci_device_id); @@ -103,6 +107,8 @@ static struct board_type products[] = { { 0x409D0E11, "Smart Array 6400 EM", &SA5_access}, { 0x40910E11, "Smart Array 6i", &SA5_access}, { 0x3225103C, "Smart Array P600", &SA5_access}, + { 0x3223103C, "Smart Array P800", &SA5_access}, + { 0x3231103C, "Smart Array E400", &SA5_access}, }; /* How long to wait (in millesconds) for board to go into simple mode */ diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 267225831bc2..e8852124fdc9 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -710,6 +710,7 @@ #define PCI_DEVICE_ID_HP_DIVA_EVEREST 0x1282 #define PCI_DEVICE_ID_HP_DIVA_AUX 0x1290 #define PCI_DEVICE_ID_HP_CISSA 0x3220 +#define PCI_DEVICE_ID_HP_CISSB 0x3230 #define PCI_VENDOR_ID_PCTECH 0x1042 #define PCI_DEVICE_ID_PCTECH_RZ1000 0x1000 |