new ciss devices from Scott Benesh of HP via FreeBSD

3 files changed, 25 insertions, 7 deletions

diff --git a/share/man/man4/ciss.4 b/share/man/man4/ciss.4
index b1cc439764e..c76d57e9d9d 100644
--- a/share/man/man4/ciss.4
+++ b/share/man/man4/ciss.4
@@ -1,8 +1,8 @@
-.\"	$OpenBSD: ciss.4,v 1.15 2013/07/16 16:05:48 schwarze Exp $
+.\"	$OpenBSD: ciss.4,v 1.16 2013/08/25 02:15:09 jsg Exp $
 .\"
 .\" Michael Shalayeff, 2005. Public Domain.
 .\"
-.Dd $Mdocdate: July 16 2013 $
+.Dd $Mdocdate: August 25 2013 $
 .Dt CISS 4
 .Os
 .Sh NAME
@@ -22,9 +22,9 @@ Compaq 532, 5300, 5312, 5i
 .It
 Compaq 641, 642, 6400, 6400EM, 6422
 .It
-Hewlett-Packard 6i, E200, E200i, E500, P212, P400, P400i, P410, P410i,
-P411, P220i, P222, P420, P420i, P421, P600, P700m, P711m, P712m, P721m, P800,
-P812, P822, V100
+Hewlett-Packard 6i, E200, E200i, E500, P212, P220i, P222, P230i, P400, P400i,
+P410, P410i, P411, P420, P420i, P421, P430, P430i, P431, P530, P531, P600,
+P700m, P711m, P712m, P721m, P731m, P800, P812, P822, P830, P830i, V100
 .El
 .Pp
 These controllers support RAID 0, RAID 1, RAID 5, JBOD,
diff --git a/sys/dev/pci/ciss_pci.c b/sys/dev/pci/ciss_pci.c
index 3c6d58c0324..cf1396abb2f 100644
--- a/sys/dev/pci/ciss_pci.c
+++ b/sys/dev/pci/ciss_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ciss_pci.c,v 1.17 2013/05/30 16:15:02 deraadt Exp $	*/
+/*	$OpenBSD: ciss_pci.c,v 1.18 2013/08/25 02:15:10 jsg Exp $	*/
 
 /*
  * Copyright (c) 2005 Michael Shalayeff
@@ -70,20 +70,29 @@ const struct pci_matchid ciss_pci_devices[] = {
 	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP212 },
 	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP220I },
 	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP222 },
+	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP230I },
 	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP410 },
 	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP410I },
 	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP411 },
 	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP420 },
 	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP420I },
 	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP421 },
+	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP430 },
+	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP430I },
+	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP431 },
+	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP530 },
+	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP531 },
 	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP600 },
 	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP700M },
 	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP711M },
 	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP712M },
 	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP721M },
+	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP731M },
 	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP800 },
 	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP812 },
 	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP822 },
+	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP830 },
+	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP830I },
 	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAV100 },
 	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSA_1 },
 	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSA_2 },
diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index 5cc57035e14..51fa68c47b6 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.1683 2013/08/01 09:18:52 kettenis Exp $
+$OpenBSD: pcidevs,v 1.1684 2013/08/25 02:11:46 jsg Exp $
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
 /*
@@ -2523,6 +2523,15 @@ product HP PLUTO		0x1229	Pluto MIO
 product HP ZX1_IOC		0x122a	zx1 IOC
 product HP MERCURY		0x122e	Mercury Ropes-PCI
 product HP QUICKSILVER		0x12b4	QuickSilver Ropes-PCI
+product HP HPSAP430I		0x1920	Smart Array P430i
+product HP HPSAP830I		0x1921	Smart Array P830i
+product HP HPSAP430		0x1922	Smart Array P430
+product HP HPSAP431		0x1923	Smart Array P431
+product HP HPSAP830		0x1924	Smart Array P830
+product HP HPSAP731M		0x1926	Smart Array P731m
+product HP HPSAP230I		0x1928	Smart Array P230i
+product HP HPSAP530		0x1929	Smart Array P530
+product HP HPSAP531		0x192a	Smart Array P531
 product HP HPSAV100		0x3210	Smart Array V100
 product HP HPSAE200I_1		0x3211	Smart Array E200i
 product HP HPSAE200		0x3212	Smart Array E200