Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 687833a0 authored by Dan Williams's avatar Dan Williams Committed by James Bottomley
Browse files

[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: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 43a5ab15

drivers/scsi/isci/init.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -193,6 +193,9 @@ static struct sas_domain_function_template isci_transport_ops = { 
	.lldd_lu_reset		= isci_task_lu_reset,

	.lldd_lu_reset		= isci_task_lu_reset,

	.lldd_query_task	= isci_task_query_task,

	.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 */

	/* Port and Adapter management */

	.lldd_clear_nexus_port	= isci_task_clear_nexus_port,

	.lldd_clear_nexus_port	= isci_task_clear_nexus_port,

	.lldd_clear_nexus_ha	= isci_task_clear_nexus_ha,

	.lldd_clear_nexus_ha	= isci_task_clear_nexus_ha,

drivers/scsi/isci/port.c

+25 −0
Original line number Original line Diff line number Diff line
@@ -1675,6 +1675,31 @@ int isci_port_perform_hard_reset(struct isci_host *ihost, struct isci_port *ipor 
	return ret;

	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)

void isci_port_deformed(struct asd_sas_phy *phy)

{

{

	struct isci_host *ihost = phy->ha->lldd_ha;

	struct isci_host *ihost = phy->ha->lldd_ha;

drivers/scsi/isci/port.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -303,4 +303,5 @@ void isci_port_init( 




int isci_port_perform_hard_reset(struct isci_host *ihost, struct isci_port *iport,

int isci_port_perform_hard_reset(struct isci_host *ihost, struct isci_port *iport,

				 struct isci_phy *iphy);

				 struct isci_phy *iphy);

int isci_ata_check_ready(struct domain_device *dev);

#endif /* !defined(_ISCI_PORT_H_) */
 
#endif /* !defined(_ISCI_PORT_H_) */