diff options
| author | Alexander Yurchenko <grange@cvs.openbsd.org> | 2009-03-06 08:04:32 +0000 |
|---|---|---|
| committer | Alexander Yurchenko <grange@cvs.openbsd.org> | 2009-03-06 08:04:32 +0000 |
| commit | 45d97da207f0956c434198ce598b01a0b4e5fb88 (patch) | |
| tree | 87fed6ce372a59cc72188a4b255042e08a080d32 | |
| parent | 78cf3a47f9b91ad0e232e937e44f7a37dce3f491 (diff) | |
Bring a few more PCI IDs from freebsd to match IBM ServeRAID 8i and 8s.
Not tested but should work.
| -rw-r--r-- | share/man/man4/aac.4 | 6 | ||||
| -rw-r--r-- | sys/dev/pci/aac_pci.c | 16 |
2 files changed, 17 insertions, 5 deletions
diff --git a/share/man/man4/aac.4 b/share/man/man4/aac.4 index 4e63a022dcf..26c269b648a 100644 --- a/share/man/man4/aac.4 +++ b/share/man/man4/aac.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: aac.4,v 1.23 2009/03/05 21:19:04 grange Exp $ +.\" $OpenBSD: aac.4,v 1.24 2009/03/06 08:04:31 grange Exp $ .\" .\" Copyright (c) 2000 Michael Smith .\" Copyright (c) 2000 BSDi @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: March 5 2009 $ +.Dd $Mdocdate: March 6 2009 $ .Dt AAC 4 .Os .Sh NAME @@ -47,7 +47,7 @@ including: .It Dell CERC-SATA, PERC 320/DC .It Dell PERC 2/QC, PERC 2/Si, PERC 3/Si, PERC 3/Di .It HP NetRaid-4M -.It IBM ServeRAID-8k +.It IBM ServeRAID-8i/8k/8s .El .Pp All the RAID set volume management is done via the card BIOS. diff --git a/sys/dev/pci/aac_pci.c b/sys/dev/pci/aac_pci.c index eff5372ba51..d849d9ce2b3 100644 --- a/sys/dev/pci/aac_pci.c +++ b/sys/dev/pci/aac_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aac_pci.c,v 1.22 2009/03/05 21:19:04 grange Exp $ */ +/* $OpenBSD: aac_pci.c,v 1.23 2009/03/06 08:04:31 grange Exp $ */ /*- * Copyright (c) 2000 Michael Smith @@ -80,7 +80,10 @@ void aac_pci_attach(struct device *, struct device *, void *); #define PCI_PRODUCT_ADP2_AACPERC320DC 0x0287 /* IBM */ +#define PCI_PRODUCT_ADP2_AACSERVERAID8I 0x02f2 +#define PCI_PRODUCT_ADP2_AACSERVERAID8I_2 0x0312 #define PCI_PRODUCT_ADP2_AACSERVERAID8K 0x9580 +#define PCI_PRODUCT_ADP2_AACSERVERAID8S 0x034d struct aac_sub_ident { u_int16_t subvendor; @@ -98,7 +101,10 @@ struct aac_sub_ident { { PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_AACASR2200S, "Adaptec 2200S" }, { PCI_VENDOR_DELL, PCI_PRODUCT_ADP2_AACCERCSATA6C, "Dell CERC-SATA" }, { PCI_VENDOR_DELL, PCI_PRODUCT_ADP2_AACPERC320DC, "Dell PERC 320/DC" }, + { PCI_VENDOR_IBM, PCI_PRODUCT_ADP2_AACSERVERAID8I, "IBM ServeRAID-8i" }, + { PCI_VENDOR_IBM, PCI_PRODUCT_ADP2_AACSERVERAID8I_2, "IBM ServeRAID-8i" }, { PCI_VENDOR_IBM, PCI_PRODUCT_ADP2_AACSERVERAID8K, "IBM ServeRAID-8k" }, + { PCI_VENDOR_IBM, PCI_PRODUCT_ADP2_AACSERVERAID8S, "IBM ServeRAID-8s" }, { 0, 0, "" } }; @@ -176,9 +182,15 @@ struct aac_ident { PCI_PRODUCT_ADP2_AACASR2130S, AAC_HWIF_RKT }, { PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_AACASR2120S, PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_AACASR2230S, AAC_HWIF_RKT }, - /* IBM ServeRAID */ + /* IBM ServeRAID-8i/8k/8s */ + { PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_AACASR2200S, PCI_VENDOR_IBM, + PCI_PRODUCT_ADP2_AACSERVERAID8I, AAC_HWIF_I960RX }, + { PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_AACASR2200S, PCI_VENDOR_IBM, + PCI_PRODUCT_ADP2_AACSERVERAID8I_2, AAC_HWIF_I960RX }, { PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_AACASR2120S, PCI_VENDOR_IBM, PCI_PRODUCT_ADP2_AACSERVERAID8K, AAC_HWIF_RKT }, + { PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_AACASR2200S, PCI_VENDOR_IBM, + PCI_PRODUCT_ADP2_AACSERVERAID8S, AAC_HWIF_I960RX }, { 0, 0, 0, 0 } }; |