| Message ID | 20120106010001.11464.91347.stgit@localhost6.localdomain6 |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
> +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; > + > + /* snapshot active phy mask */ > + spin_lock_irqsave(&ihost->scic_lock, flags); > + rc = !!iport->active_phy_mask; [Jack Wang] Hi Dan, Could you explain why here you not directly use " rc = !!iport->active_phy_mask; " > + spin_unlock_irqrestore(&ihost->scic_lock, flags); > + 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 78e1e82..b4a733c 100644 > --- a/drivers/scsi/isci/port.h > +++ b/drivers/scsi/isci/port.h > @@ -293,4 +293,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_) */ > > -- > To unsubscribe from this list: send the line "unsubscribe linux-scsi" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sun, Jan 8, 2012 at 5:57 PM, Jack Wang <jack_wang@usish.com> wrote: >> +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; >> + >> + /* snapshot active phy mask */ >> + spin_lock_irqsave(&ihost->scic_lock, flags); >> + rc = !!iport->active_phy_mask; > [Jack Wang] > Hi Dan, > > Could you explain why here you not directly use " > rc = !!iport->active_phy_mask; You are right, it can look at the field outside the lock... and since we have already taken the lock to get a device reference we know we have flushed any recent port events. -- Dan -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c index 59f2ae7..40293b3 100644 --- a/drivers/scsi/isci/init.c +++ b/drivers/scsi/isci/init.c @@ -185,6 +185,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 7e4a9ee..e795645 100644 --- a/drivers/scsi/isci/port.c +++ b/drivers/scsi/isci/port.c @@ -1663,6 +1663,34 @@ 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; + + /* snapshot active phy mask */ + spin_lock_irqsave(&ihost->scic_lock, flags); + rc = !!iport->active_phy_mask; + spin_unlock_irqrestore(&ihost->scic_lock, flags); + 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 78e1e82..b4a733c 100644 --- a/drivers/scsi/isci/port.h +++ b/drivers/scsi/isci/port.h @@ -293,4 +293,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_) */
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> --- drivers/scsi/isci/init.c | 3 +++ drivers/scsi/isci/port.c | 28 ++++++++++++++++++++++++++++ drivers/scsi/isci/port.h | 1 + 3 files changed, 32 insertions(+), 0 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html