svn commit: r210281 - stable/8/sys/dev/ata

Alexander Motin mav at FreeBSD.org
Tue Jul 20 05:16:11 UTC 2010


Author: mav
Date: Tue Jul 20 05:16:10 2010
New Revision: 210281
URL: http://svn.freebsd.org/changeset/base/210281

Log:
  MFC r210168:
  Make legacy ATA emulation detection more strict. This should fix false
  positive legacy detection and attach failure/panic for Marvell 88SX6141
  controller and potentially some others.
  
  PR:             kern/145064

Modified:
  stable/8/sys/dev/ata/ata-pci.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/ata/ata-pci.c
==============================================================================
--- stable/8/sys/dev/ata/ata-pci.c	Tue Jul 20 05:14:30 2010	(r210280)
+++ stable/8/sys/dev/ata/ata-pci.c	Tue Jul 20 05:16:10 2010	(r210281)
@@ -769,7 +769,8 @@ DRIVER_MODULE(ata, atapci, ata_pcichanne
 int
 ata_legacy(device_t dev)
 {
-    return (((pci_read_config(dev, PCIR_PROGIF, 1)&PCIP_STORAGE_IDE_MASTERDEV)&&
+    return (((pci_read_config(dev, PCIR_SUBCLASS, 1) == PCIS_STORAGE_IDE) &&
+	     (pci_read_config(dev, PCIR_PROGIF, 1)&PCIP_STORAGE_IDE_MASTERDEV)&&
 	     ((pci_read_config(dev, PCIR_PROGIF, 1) &
 	       (PCIP_STORAGE_IDE_MODEPRIM | PCIP_STORAGE_IDE_MODESEC)) !=
 	      (PCIP_STORAGE_IDE_MODEPRIM | PCIP_STORAGE_IDE_MODESEC))) ||


More information about the svn-src-stable-8 mailing list