aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/ciss
diff options
context:
space:
mode:
authorSean Bruno <sbruno@FreeBSD.org>2012-01-26 17:04:17 +0000
committerSean Bruno <sbruno@FreeBSD.org>2012-01-26 17:04:17 +0000
commite17ef005281d89e506d628542530ffb964a93ead (patch)
tree31a78c97c24bae55d2739b639e047b0721644608 /sys/dev/ciss
parent7e949c467cda56d24b24fb4b5d23d4299862ab71 (diff)
downloadsrc-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
Diffstat (limited to 'sys/dev/ciss')
-rw-r--r--sys/dev/ciss/ciss.c11
1 files changed, 9 insertions, 2 deletions
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;
}