svn commit: r199820 - stable/8/sys/dev/ahci
Alexander Motin
mav at FreeBSD.org
Thu Nov 26 08:29:03 UTC 2009
Author: mav
Date: Thu Nov 26 08:29:02 2009
New Revision: 199820
URL: http://svn.freebsd.org/changeset/base/199820
Log:
MFC r199717:
Do not attach JMicrons with single PCI function. They are not working as
AHCI for some reason, even when declaring so. Let atajmicron configure
them for us and provide PATA support.
Modified:
stable/8/sys/dev/ahci/ahci.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/dev/ahci/ahci.c
==============================================================================
--- stable/8/sys/dev/ahci/ahci.c Thu Nov 26 05:16:07 2009 (r199819)
+++ stable/8/sys/dev/ahci/ahci.c Thu Nov 26 08:29:02 2009 (r199820)
@@ -254,6 +254,10 @@ ahci_probe(device_t dev)
for (i = 0; ahci_ids[i].id != 0; i++) {
if (ahci_ids[i].id == devid &&
(valid || !(ahci_ids[i].quirks & AHCI_Q_NOFORCE))) {
+ /* Do not attach JMicrons with single PCI function. */
+ if (pci_get_vendor(dev) == 0x197b &&
+ (pci_read_config(dev, 0xdf, 1) & 0x40) == 0)
+ return (ENXIO);
snprintf(buf, sizeof(buf), "%s AHCI SATA controller",
ahci_ids[i].name);
device_set_desc_copy(dev, buf);
More information about the svn-src-stable-8
mailing list