aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Harris <jimharris@FreeBSD.org>2012-03-05 18:20:31 +0000
committerJim Harris <jimharris@FreeBSD.org>2012-03-05 18:20:31 +0000
commit93d8e2065b1ed367edc7b97fc6b267345dd3c76c (patch)
tree39530c5b5d8191d994b9b48f614c806b61f5a317
parent81bca8e615d787428c691c568f2d9b07b0eb23d9 (diff)
downloadsrc-93d8e2065b1ed367edc7b97fc6b267345dd3c76c.tar.gz
src-93d8e2065b1ed367edc7b97fc6b267345dd3c76c.zip
Merge r232554 from stable/8 (r232225 from head):
Include missing device IDs for isci(4) driver. The C600 chipset will surface one of device IDs 0x1D6C-0x1D6F for the integrated SAS controller on systems that are shipped with a 3rd party (i.e. non-Intel) device driver. These changes add the 0x1D6C-0x1D6F device IDs, as well as change isci_probe() to return a value that would allow a 3rd-party FreeBSD driver to load against this device, should such a driver ever come to fruition. Approved by: re (kib), sbruno
Notes
Notes: svn path=/releng/8.3/; revision=232559
-rw-r--r--sys/dev/isci/isci.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/dev/isci/isci.c b/sys/dev/isci/isci.c
index a62f7066822a..6a1b4a8d57cc 100644
--- a/sys/dev/isci/isci.c
+++ b/sys/dev/isci/isci.c
@@ -98,7 +98,11 @@ static struct _pcsid
{ 0x1d688086, "Intel(R) C600 Series Chipset SAS Controller" },
{ 0x1d698086, "Intel(R) C600 Series Chipset SAS Controller" },
{ 0x1d6a8086, "Intel(R) C600 Series Chipset SAS Controller (SATA mode)" },
- { 0x1d6b8086, "Intel(R) C600 Series Chipset SAS Controller (SATA mode)" },
+ { 0x1d6b8086, "Intel(R) C600 Series Chipset SAS Controller (SATA mode)" },
+ { 0x1d6c8086, "Intel(R) C600 Series Chipset SAS Controller" },
+ { 0x1d6d8086, "Intel(R) C600 Series Chipset SAS Controller" },
+ { 0x1d6e8086, "Intel(R) C600 Series Chipset SAS Controller" },
+ { 0x1d6f8086, "Intel(R) C600 Series Chipset SAS Controller (SATA mode)" },
{ 0x00000000, NULL }
};
@@ -114,7 +118,7 @@ isci_probe (device_t device)
if (ep->desc)
{
device_set_desc(device, ep->desc);
- return (0);
+ return (BUS_PROBE_DEFAULT);
}
else
return (ENXIO);