diff options
| author | Gwendal Grignou | 2011-10-20 02:17:02 +0200 |
|---|---|---|
| committer | Jeff Garzik | 2011-11-09 07:38:00 +0100 |
| commit | 7a46c0780babea7d0b3f277a33ea243be38eb942 (patch) | |
| tree | 75d599d93a0f9faeadb421e0c83d8533e293630a /drivers/ata/libata-eh.c | |
| parent | sata_sis.c: trivial spelling fix (diff) | |
| download | kernel-qcow2-linux-7a46c0780babea7d0b3f277a33ea243be38eb942.tar.gz kernel-qcow2-linux-7a46c0780babea7d0b3f277a33ea243be38eb942.tar.xz kernel-qcow2-linux-7a46c0780babea7d0b3f277a33ea243be38eb942.zip | |
[libata] Issue SRST to Sil3726 PMP
Reenable sending SRST to devices connected behind a Sil3726 PMP.
This allow staggered spinups and handles drives that spins up slowly.
While the drives spin up, the PMP will not accept SRST.
Most controller reissues the reset until the drive is ready, while
some [Sil3124] returns an error.
In ata_eh_error, wait 10s before reset the ATA port and try again.
Signed-off-by: Gwendal Grignou <gwendal@google.com>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata/libata-eh.c')
| -rw-r--r-- | drivers/ata/libata-eh.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index f22957c2769a..a9b282038000 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c @@ -2883,7 +2883,7 @@ int ata_eh_reset(struct ata_link *link, int classify, sata_scr_read(link, SCR_STATUS, &sstatus)) rc = -ERESTART; - if (rc == -ERESTART || try >= max_tries) { + if (try >= max_tries) { /* * Thaw host port even if reset failed, so that the port * can be retried on the next phy event. This risks @@ -2909,6 +2909,16 @@ int ata_eh_reset(struct ata_link *link, int classify, ata_eh_acquire(ap); } + /* + * While disks spinup behind PMP, some controllers fail sending SRST. + * They need to be reset - as well as the PMP - before retrying. + */ + if (rc == -ERESTART) { + if (ata_is_host_link(link)) + ata_eh_thaw_port(ap); + goto out; + } + if (try == max_tries - 1) { sata_down_spd_limit(link, 0); if (slave) |