diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2011-11-18 03:01:38 +0100 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-02-29 22:15:07 +0100 |
| commit | 687833a03baae8308900486fa6499ef955fd07a9 (patch) | |
| tree | 76da700de1674f42978b58b35dede2b577a6f901 /drivers/scsi | |
| parent | [SCSI] isci: stop interpreting ->lldd_lu_reset() as an ata soft-reset (diff) | |
| download | linux-687833a03baae8308900486fa6499ef955fd07a9.tar.xz linux-687833a03baae8308900486fa6499ef955fd07a9.zip | |
[SCSI] isci: ->lldd_ata_check_ready handler
Report to libata whether the link to the given domain_device is up and the
signature fis has been received.
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/isci/init.c | 3 | ||||
| -rw-r--r-- | drivers/scsi/isci/port.c | 25 | ||||
| -rw-r--r-- | drivers/scsi/isci/port.h | 1 |
3 files changed, 29 insertions, 0 deletions
diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c index c20fda090423..68d9bc23d190 100644 --- a/drivers/scsi/isci/init.c +++ b/drivers/scsi/isci/init.c @@ -193,6 +193,9 @@ static struct sas_domain_function_template isci_transport_ops = { .lldd_lu_reset = isci_task_lu_reset, .lldd_query_task = isci_task_query_task, + /* ata recovery called from ata-eh */ + .lldd_ata_check_ready = isci_ata_check_ready, + /* Port and Adapter management */ .lldd_clear_nexus_port = isci_task_clear_nexus_port, .lldd_clear_nexus_ha = isci_task_clear_nexus_ha, diff --git a/drivers/scsi/isci/port.c b/drivers/scsi/isci/port.c index e55ef65f5212..c5ae94dbef48 100644 --- a/drivers/scsi/isci/port.c +++ b/drivers/scsi/isci/port.c @@ -1675,6 +1675,31 @@ int isci_port_perform_hard_reset(struct isci_host *ihost, struct isci_port *ipor return ret; } +int isci_ata_check_ready(struct domain_device *dev) +{ + struct isci_port *iport = dev->port->lldd_port; + struct isci_host *ihost = dev_to_ihost(dev); + struct isci_remote_device *idev; + unsigned long flags; + int rc = 0; + + spin_lock_irqsave(&ihost->scic_lock, flags); + idev = isci_lookup_device(dev); + spin_unlock_irqrestore(&ihost->scic_lock, flags); + + if (!idev) + goto out; + + if (test_bit(IPORT_RESET_PENDING, &iport->state)) + goto out; + + rc = !!iport->active_phy_mask; + out: + isci_put_device(idev); + + return rc; +} + void isci_port_deformed(struct asd_sas_phy *phy) { struct isci_host *ihost = phy->ha->lldd_ha; diff --git a/drivers/scsi/isci/port.h b/drivers/scsi/isci/port.h index a0dcdaeac3b2..321b987d582f 100644 --- a/drivers/scsi/isci/port.h +++ b/drivers/scsi/isci/port.h @@ -303,4 +303,5 @@ void isci_port_init( int isci_port_perform_hard_reset(struct isci_host *ihost, struct isci_port *iport, struct isci_phy *iphy); +int isci_ata_check_ready(struct domain_device *dev); #endif /* !defined(_ISCI_PORT_H_) */ |