diff options
| author | Tejun Heo <htejun@gmail.com> | 2008-01-10 13:41:23 +0900 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2008-01-10 16:53:16 -0500 |
| commit | 2695e36616c3ece5e8e30666868fc7c90dc3fc75 (patch) | |
| tree | 5e37a45c7dbcf70f7947e10180f10515d716b49f /drivers/ata/libata-eh.c | |
| parent | 8048307dbc3cfc30690b131e786fb57157fbdb11 (diff) | |
| download | linux-2695e36616c3ece5e8e30666868fc7c90dc3fc75.tar.gz linux-2695e36616c3ece5e8e30666868fc7c90dc3fc75.tar.bz2 linux-2695e36616c3ece5e8e30666868fc7c90dc3fc75.zip | |
libata-pmp: propagate timeout to host link
Timeout on downstream command may indicate transmission problem on
host link. Propagate timeouts to host link.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/libata-eh.c')
| -rw-r--r-- | drivers/ata/libata-eh.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index f0124a8d3134..74269ed22fb9 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c @@ -1733,11 +1733,15 @@ static void ata_eh_link_autopsy(struct ata_link *link) ehc->i.action &= ~ATA_EH_PERDEV_MASK; } - /* consider speeding down */ + /* propagate timeout to host link */ + if ((all_err_mask & AC_ERR_TIMEOUT) && !ata_is_host_link(link)) + ap->link.eh_context.i.err_mask |= AC_ERR_TIMEOUT; + + /* record error and consider speeding down */ dev = ehc->i.dev; - if (!dev && ata_link_max_devices(link) == 1 && - ata_dev_enabled(link->device)) - dev = link->device; + if (!dev && ((ata_link_max_devices(link) == 1 && + ata_dev_enabled(link->device)))) + dev = link->device; if (dev) ehc->i.action |= ata_eh_speed_down(dev, is_io, all_err_mask); @@ -1759,8 +1763,14 @@ void ata_eh_autopsy(struct ata_port *ap) { struct ata_link *link; - __ata_port_for_each_link(link, ap) + ata_port_for_each_link(link, ap) ata_eh_link_autopsy(link); + + /* Autopsy of fanout ports can affect host link autopsy. + * Perform host link autopsy last. + */ + if (ap->nr_pmp_links) + ata_eh_link_autopsy(&ap->link); } /** |