Author: jimharris
Date: Mon Mar 5 18:20:31 2012
New Revision: 232559
URL: http://svn.freebsd.org/changeset/base/232559
Log:
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
Modified:
releng/8.3/sys/dev/isci/isci.c
Directory Properties:
releng/8.3/sys/ (props changed)
Modified: releng/8.3/sys/dev/isci/isci.c
==============================================================================
--- releng/8.3/sys/dev/isci/isci.c Mon Mar 5 18:15:54 2012
(r232558)
+++ releng/8.3/sys/dev/isci/isci.c Mon Mar 5 18:20:31 2012
(r232559)
@@ -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);
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
