Author: sbruno
Date: Sun Feb 5 19:10:48 2012
New Revision: 231032
URL: http://svn.freebsd.org/changeset/base/231032
Log:
MFC r230313, r230316, r230323, r230588
Support new raid controllers
Modified:
stable/8/share/man/man4/ciss.4
stable/8/sys/dev/ciss/ciss.c
Directory Properties:
stable/8/share/man/man4/ (props changed)
stable/8/sys/ (props changed)
Modified: stable/8/share/man/man4/ciss.4
==============================================================================
--- stable/8/share/man/man4/ciss.4 Sun Feb 5 18:55:20 2012
(r231031)
+++ stable/8/share/man/man4/ciss.4 Sun Feb 5 19:10:48 2012
(r231032)
@@ -2,7 +2,7 @@
.\" Written by Tom Rhodes
.\" This file is in the public domain.
.\"
-.Dd November 3, 2005
+.Dd January 26, 2012
.Dt CISS 4
.Os
.Sh NAME
@@ -121,6 +121,10 @@ HP Smart Array E200i
.It
HP Smart Array P212
.It
+HP Smart Array P220i
+.It
+HP Smart Array P222
+.It
HP Smart Array P400
.It
HP Smart Array P400i
@@ -131,8 +135,16 @@ HP Smart Array P410i
.It
HP Smart Array P411
.It
+HP Smart Array P420
+.It
+HP Smart Array P420i
+.It
+HP Smart Array P421
+.It
HP Smart Array P600
.It
+HP Smart Array P721m
+.It
HP Smart Array P800
.It
HP Smart Array P812
Modified: stable/8/sys/dev/ciss/ciss.c
==============================================================================
--- stable/8/sys/dev/ciss/ciss.c Sun Feb 5 18:55:20 2012
(r231031)
+++ stable/8/sys/dev/ciss/ciss.c Sun Feb 5 19:10:48 2012
(r231032)
@@ -328,6 +328,13 @@ static struct
{ 0x103C, 0x3249, CISS_BOARD_SA5, "HP Smart Array P812" },
{ 0x103C, 0x324A, CISS_BOARD_SA5, "HP Smart Array P712m" },
{ 0x103C, 0x324B, CISS_BOARD_SA5, "HP Smart Array" },
+ { 0x103C, 0x3350, CISS_BOARD_SA5, "HP Smart Array P222" },
+ { 0x103C, 0x3351, CISS_BOARD_SA5, "HP Smart Array P420" },
+ { 0x103C, 0x3352, CISS_BOARD_SA5, "HP Smart Array P421" },
+ { 0x103C, 0x3353, CISS_BOARD_SA5, "HP Smart Array P822" },
+ { 0x103C, 0x3354, CISS_BOARD_SA5, "HP Smart Array P420i" },
+ { 0x103C, 0x3355, CISS_BOARD_SA5, "HP Smart Array P220i" },
+ { 0x103C, 0x3356, CISS_BOARD_SA5, "HP Smart Array P721m" },
{ 0, 0, 0, NULL }
};
@@ -4530,7 +4537,8 @@ ciss_ioctl(struct cdev *dev, u_long cmd,
pis->bus = pci_get_bus(sc->ciss_dev);
pis->dev_fn = pci_get_slot(sc->ciss_dev);
- pis->board_id = pci_get_devid(sc->ciss_dev);
+ pis->board_id = (pci_get_subvendor(sc->ciss_dev) << 16) |
+ pci_get_subdevice(sc->ciss_dev);
break;
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
