diff options
| author | Sean Bruno <sbruno@FreeBSD.org> | 2012-01-26 17:04:17 +0000 |
|---|---|---|
| committer | Sean Bruno <sbruno@FreeBSD.org> | 2012-01-26 17:04:17 +0000 |
| commit | e17ef005281d89e506d628542530ffb964a93ead (patch) | |
| tree | 31a78c97c24bae55d2739b639e047b0721644608 | |
| parent | 7e949c467cda56d24b24fb4b5d23d4299862ab71 (diff) | |
| download | src-e17ef005281d89e506d628542530ffb964a93ead.tar.gz src-e17ef005281d89e506d628542530ffb964a93ead.zip | |
Update PCI IDs for ciss controllers that are supported by this driver.
Submitted by: scott.benesh@hp.com
Obtained from: Yahoo! Inc and HP
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=230588
| -rw-r--r-- | share/man/man4/ciss.4 | 12 | ||||
| -rw-r--r-- | sys/dev/ciss/ciss.c | 11 |
2 files changed, 20 insertions, 3 deletions
diff --git a/share/man/man4/ciss.4 b/share/man/man4/ciss.4 index bf9ce874a0b2..277847b52bb1 100644 --- a/share/man/man4/ciss.4 +++ b/share/man/man4/ciss.4 @@ -2,7 +2,7 @@ .\" Written by Tom Rhodes .\" This file is in the public domain. .\" -.Dd January 18, 2012 +.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 @@ -133,8 +137,14 @@ 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 diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c index 994daa458be1..37af5168cfe4 100644 --- a/sys/dev/ciss/ciss.c +++ b/sys/dev/ciss/ciss.c @@ -329,7 +329,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, 0x3351, CISS_BOARD_SA5, "HP Smart Array P420" }, + { 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 } }; @@ -4536,7 +4542,8 @@ ciss_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int32_t flag, struct thre 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; } |