Add HP Gen9 Smart Array/Smart HBA devices.

Untested, but there doesn't seem to have been any changes to
the firmware interface so these should work without additional
changes, as was the case with the last few generations.

2 files changed, 23 insertions, 6 deletions

diff --git a/share/man/man4/ciss.4 b/share/man/man4/ciss.4
index c76d57e9d9d..378f8533501 100644
--- a/share/man/man4/ciss.4
+++ b/share/man/man4/ciss.4
@@ -1,8 +1,8 @@
-.\"	$OpenBSD: ciss.4,v 1.16 2013/08/25 02:15:09 jsg Exp $
+.\"	$OpenBSD: ciss.4,v 1.17 2014/09/13 05:17:48 jsg Exp $
 .\"
 .\" Michael Shalayeff, 2005. Public Domain.
 .\"
-.Dd $Mdocdate: August 25 2013 $
+.Dd $Mdocdate: September 13 2014 $
 .Dt CISS 4
 .Os
 .Sh NAME
@@ -22,9 +22,11 @@ Compaq 532, 5300, 5312, 5i
 .It
 Compaq 641, 642, 6400, 6400EM, 6422
 .It
-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
+Hewlett-Packard 6i, E200, E200i, E500, H240, H240ar, H240tr, H241, H244br,
+P212, P220i, P222, P224br, P230i, P240tr, P246br, P400, P400i, P410, P410i,
+P411, P420, P420i, P421, P430, P430i, P431, P440, P440ar, P441, P530, P531,
+P542t, P600, P700m, P711m, P712m, P721m, P731m, P741m, P800, P812, P822, P830,
+P830i, P840, P841, 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 cf1396abb2f..1de303833bc 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.18 2013/08/25 02:15:10 jsg Exp $	*/
+/*	$OpenBSD: ciss_pci.c,v 1.19 2014/09/13 05:17:48 jsg Exp $	*/
 
 /*
  * Copyright (c) 2005 Michael Shalayeff
@@ -67,10 +67,18 @@ const struct pci_matchid ciss_pci_devices[] = {
 	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAE200I_4 },
 	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAE500_1 },
 	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAE500_2 },
+	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAH240 },
+	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAH240AR },
+	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAH240TR },
+	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAH241 },
+	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAH244BR },
 	{ 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_HPSAP224BR },
 	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP230I },
+	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP240TR },
+	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP246BR },
 	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP410 },
 	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP410I },
 	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP411 },
@@ -80,19 +88,26 @@ const struct pci_matchid ciss_pci_devices[] = {
 	{ 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_HPSAP440 },
+	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP440AR },
+	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP441 },
 	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP530 },
 	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP531 },
+	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP542T },
 	{ 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_HPSAP741M },
 	{ 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_HPSAP840 },
+	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAP841 },
 	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSAV100 },
 	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSA_1 },
 	{ PCI_VENDOR_HP,	PCI_PRODUCT_HP_HPSA_2 },