diff options
| author | Tejun Heo <htejun@gmail.com> | 2008-04-07 22:47:19 +0900 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-04-17 15:44:23 -0400 |
| commit | 57c9efdfb3cee5d4564fcb5f70555e2edb1bc52a (patch) | |
| tree | c2289500f093736853a94d2d9577036658676498 /drivers/ata/libata-sff.c | |
| parent | 9dadd45b24145d6aee2fabb28d7aef972301892b (diff) | |
| download | lwn-57c9efdfb3cee5d4564fcb5f70555e2edb1bc52a.tar.gz lwn-57c9efdfb3cee5d4564fcb5f70555e2edb1bc52a.zip | |
libata: implement and use sata_std_hardreset()
Implement sata_std_hardreset(), which simply wraps around
sata_link_hardreset(). sata_std_hardreset() becomes new standard
hardreset method for sata_port_ops and sata_sff_hardreset() moves from
ata_base_port_ops to ata_sff_port_ops, which is where it really
belongs.
ata_is_builtin_hardreset() is added so that both
ata_std_error_handler() and ata_sff_error_handler() skip both builtin
hardresets if SCR isn't accessible.
piix_sidpr_hardreset() in ata_piix.c is identical to
sata_std_hardreset() in functionality and got replaced with the
standard function.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Diffstat (limited to 'drivers/ata/libata-sff.c')
| -rw-r--r-- | drivers/ata/libata-sff.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c index 0b97e84d3af6..f464ca1fa261 100644 --- a/drivers/ata/libata-sff.c +++ b/drivers/ata/libata-sff.c @@ -49,6 +49,7 @@ const struct ata_port_operations ata_sff_port_ops = { .thaw = ata_sff_thaw, .prereset = ata_sff_prereset, .softreset = ata_sff_softreset, + .hardreset = sata_sff_hardreset, .postreset = ata_sff_postreset, .error_handler = ata_sff_error_handler, .post_internal_cmd = ata_sff_post_internal_cmd, @@ -2031,14 +2032,12 @@ void ata_sff_error_handler(struct ata_port *ap) /* PIO and DMA engines have been stopped, perform recovery */ - /* ata_sff_softreset and sata_sff_hardreset are inherited to - * all SFF drivers from ata_sff_port_ops. Ignore softreset if - * ctl isn't accessible. Ignore hardreset if SCR access isn't - * available. + /* Ignore ata_sff_softreset if ctl isn't accessible and + * built-in hardresets if SCR access isn't available. */ if (softreset == ata_sff_softreset && !ap->ioaddr.ctl_addr) softreset = NULL; - if (hardreset == sata_sff_hardreset && !sata_scr_valid(&ap->link)) + if (ata_is_builtin_hardreset(hardreset) && !sata_scr_valid(&ap->link)) hardreset = NULL; ata_do_eh(ap, ap->ops->prereset, softreset, hardreset, |