diff options
| author | Alexander Yurchenko <grange@cvs.openbsd.org> | 2009-03-05 21:19:05 +0000 |
|---|---|---|
| committer | Alexander Yurchenko <grange@cvs.openbsd.org> | 2009-03-05 21:19:05 +0000 |
| commit | d3b9476aa558126b0c908cadde87172b078ee26f (patch) | |
| tree | 9d0d643defe3a687ea0f2b010b816e838bd9c9d4 | |
| parent | 1a7a296ce7a9d723430bf700a4492762d0331656 (diff) | |
Add support for IBM ServeRAID-8k. Thanks to Sergey Prysiazhnyi
<apelsin@atmnis.com> for patiently testing my numerous diffs.
ok deraadt@
| -rw-r--r-- | share/man/man4/aac.4 | 5 | ||||
| -rw-r--r-- | sys/dev/pci/aac_pci.c | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/share/man/man4/aac.4 b/share/man/man4/aac.4 index 07f720cb0e3..4e63a022dcf 100644 --- a/share/man/man4/aac.4 +++ b/share/man/man4/aac.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: aac.4,v 1.22 2007/05/31 19:19:48 jmc Exp $ +.\" $OpenBSD: aac.4,v 1.23 2009/03/05 21:19:04 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: May 31 2007 $ +.Dd $Mdocdate: March 5 2009 $ .Dt AAC 4 .Os .Sh NAME @@ -47,6 +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 .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 4cd46bef05d..eff5372ba51 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.21 2008/06/03 10:32:19 brad Exp $ */ +/* $OpenBSD: aac_pci.c,v 1.22 2009/03/05 21:19:04 grange Exp $ */ /*- * Copyright (c) 2000 Michael Smith @@ -79,6 +79,9 @@ void aac_pci_attach(struct device *, struct device *, void *); #define PCI_PRODUCT_ADP2_AACCERCSATA6C 0x0291 #define PCI_PRODUCT_ADP2_AACPERC320DC 0x0287 +/* IBM */ +#define PCI_PRODUCT_ADP2_AACSERVERAID8K 0x9580 + struct aac_sub_ident { u_int16_t subvendor; u_int16_t subdevice; @@ -95,6 +98,7 @@ 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_AACSERVERAID8K, "IBM ServeRAID-8k" }, { 0, 0, "" } }; @@ -172,6 +176,9 @@ 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 */ + { PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_AACASR2120S, PCI_VENDOR_IBM, + PCI_PRODUCT_ADP2_AACSERVERAID8K, AAC_HWIF_RKT }, { 0, 0, 0, 0 } }; |