Author: mav
Date: Fri Jul 16 17:27:43 2010
New Revision: 210168
URL: http://svn.freebsd.org/changeset/base/210168
Log:
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:
head/sys/dev/ata/ata-pci.c
Modified: head/sys/dev/ata/ata-pci.c
==============================================================================
--- head/sys/dev/ata/ata-pci.c Fri Jul 16 17:01:36 2010 (r210167)
+++ head/sys/dev/ata/ata-pci.c Fri Jul 16 17:27:43 2010 (r210168)
@@ -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))) ||
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
