d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restore PATA device probe order, broken by PMP support implementation,

Browse Source 
requesting IDENTIFY from slave device first. This order is important
for proper cable type detection by master device.

PR:		kern/136438
Approved by:	re (kib)
This commit is contained in:
Alexander Motin 2009-07-26 14:04:48 +00:00
parent d0ea47437a
commit b06555e4fc
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/dev/ata/ata-all.c
View File

@ -711,7 +711,7 @@ ata_identify(device_t dev)
struct ata_channel *ch = device_get_softc(dev);
struct ata_device *atadev;
device_t *children;
device_t child;
device_t child, master = NULL;
int nchildren, i, n = ch->devices;
if (bootverbose)
@ -748,6 +748,15 @@ ata_identify(device_t dev)
unit = (device_get_unit(dev) << 1) + i;
#endif
if ((child = ata_add_child(dev, atadev, unit))) {
/*
* PATA slave should be identified first, to allow
* device cable detection on master to work properly.
*/
if (i == 0 && (n & ATA_PORTMULTIPLIER) == 0 &&
(n & ((ATA_ATA_MASTER | ATA_ATAPI_MASTER) << 1)) != 0) {
master = child;
continue;
}
if (ata_getparam(atadev, 1)) {
device_delete_child(dev, child);
free(atadev, M_ATA);
@ -757,6 +766,13 @@ ata_identify(device_t dev)
free(atadev, M_ATA);
}
}
if (master) {
atadev = device_get_softc(master);
if (ata_getparam(atadev, 1)) {
device_delete_child(dev, master);
free(atadev, M_ATA);
}
}
bus_generic_probe(dev);
bus_generic_attach(dev);
mtx_unlock(&Giant);