OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libata: IDENTIFY backwards for drive side cable detection 

For drive side cable detection to work correctly, drives need to be
identified backwards such that the slave device releases PDIAG- before
the mater drive tries to detect cable type.  ata_bus_probe() was fixed
by commit f31f0cc2f0 but the new EH path
wasn't fixed.  This patch makes new EH path do IDENTIFY backwards.

ata_dev_configure() for new devices are still performed master first.
This is to keep the detection messages in forward order.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Tejun Heo 2007-03-22 22:24:19 +09:00 committed by Jeff Garzik
parent 55a61604cd
commit 8c3c52a8f0
1 changed files with 43 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
drivers/ata/libata-eh.c
View File

@ -1743,12 +1743,17 @@ static int ata_eh_revalidate_and_attach(struct ata_port *ap,
{ {
struct ata_eh_context *ehc = &ap->eh_context; struct ata_eh_context *ehc = &ap->eh_context;
struct ata_device *dev; struct ata_device *dev;
unsigned int new_mask = 0;
unsigned long flags; unsigned long flags;
int i, rc = 0; int i, rc = 0;
DPRINTK("ENTER\n"); DPRINTK("ENTER\n");
for (i = 0; i < ATA_MAX_DEVICES; i++) { /* For PATA drive side cable detection to work, IDENTIFY must
* be done backwards such that PDIAG- is released by the slave
* device before the master device is identified.
*/
for (i = ATA_MAX_DEVICES - 1; i >= 0; i--) {
unsigned int action, readid_flags = 0; unsigned int action, readid_flags = 0;
dev = &ap->device[i]; dev = &ap->device[i];
@ -1760,13 +1765,13 @@ static int ata_eh_revalidate_and_attach(struct ata_port *ap,
if (action & ATA_EH_REVALIDATE && ata_dev_ready(dev)) { if (action & ATA_EH_REVALIDATE && ata_dev_ready(dev)) {
if (ata_port_offline(ap)) { if (ata_port_offline(ap)) {
rc = -EIO; rc = -EIO;
break; goto err;
} }
ata_eh_about_to_do(ap, dev, ATA_EH_REVALIDATE); ata_eh_about_to_do(ap, dev, ATA_EH_REVALIDATE);
rc = ata_dev_revalidate(dev, readid_flags); rc = ata_dev_revalidate(dev, readid_flags);
if (rc) if (rc)
break; goto err;
ata_eh_done(ap, dev, ATA_EH_REVALIDATE); ata_eh_done(ap, dev, ATA_EH_REVALIDATE);
@ -1784,40 +1789,53 @@ static int ata_eh_revalidate_and_attach(struct ata_port *ap,
rc = ata_dev_read_id(dev, &dev->class, readid_flags, rc = ata_dev_read_id(dev, &dev->class, readid_flags,
dev->id); dev->id);
if (rc == 0) { switch (rc) {
ehc->i.flags |= ATA_EHI_PRINTINFO; case 0:
rc = ata_dev_configure(dev); new_mask |= 1 << i;
ehc->i.flags &= ~ATA_EHI_PRINTINFO; break;
} else if (rc == -ENOENT) { case -ENOENT:
/* IDENTIFY was issued to non-existent /* IDENTIFY was issued to non-existent
* device. No need to reset. Just * device. No need to reset. Just
* thaw and kill the device. * thaw and kill the device.
*/ */
ata_eh_thaw_port(ap); ata_eh_thaw_port(ap);
dev->class = ATA_DEV_UNKNOWN;
rc = 0;
}
if (rc) {
dev->class = ATA_DEV_UNKNOWN; dev->class = ATA_DEV_UNKNOWN;
break; break;
} default:
dev->class = ATA_DEV_UNKNOWN;
if (ata_dev_enabled(dev)) { goto err;
spin_lock_irqsave(ap->lock, flags);
ap->pflags |= ATA_PFLAG_SCSI_HOTPLUG;
spin_unlock_irqrestore(ap->lock, flags);
/* new device discovered, configure xfermode */
ehc->i.flags |= ATA_EHI_SETMODE;
} }
} }
} }
if (rc) /* Configure new devices forward such that user doesn't see
*r_failed_dev = dev; * device detection messages backwards.
*/
for (i = 0; i < ATA_MAX_DEVICES; i++) {
dev = &ap->device[i];
DPRINTK("EXIT\n"); if (!(new_mask & (1 << i)))
continue;
ehc->i.flags |= ATA_EHI_PRINTINFO;
rc = ata_dev_configure(dev);
ehc->i.flags &= ~ATA_EHI_PRINTINFO;
if (rc)
goto err;
spin_lock_irqsave(ap->lock, flags);
ap->pflags |= ATA_PFLAG_SCSI_HOTPLUG;
spin_unlock_irqrestore(ap->lock, flags);
/* new device discovered, configure xfermode */
ehc->i.flags |= ATA_EHI_SETMODE;
}
return 0;
err:
*r_failed_dev = dev;
DPRINTK("EXIT rc=%d\n", rc);
return rc; return rc;
} }