Commit 9181ce3c authored by Jie Zhan's avatar Jie Zhan Committed by Martin K. Petersen
Browse files

scsi: libsas: Add smp_ata_check_ready_type() 



Create function smp_ata_check_ready_type() for LLDDs to wait for SATA
devices to come up after a link reset.

Signed-off-by: default avatarJie Zhan <zhanjie9@hisilicon.com>
Link: https://lore.kernel.org/r/20221118083714.4034612-4-zhanjie9@hisilicon.com


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 94a3555d

drivers/scsi/libsas/sas_ata.c

+25 −0
Original line number Diff line number Diff line
@@ -287,6 +287,31 @@ static int sas_ata_clear_pending(struct domain_device *dev, struct ex_phy *phy) 
		return 1;

}



int smp_ata_check_ready_type(struct ata_link *link)

{

	struct domain_device *dev = link->ap->private_data;

	struct sas_phy *phy = sas_get_local_phy(dev);

	struct domain_device *ex_dev = dev->parent;

	enum sas_device_type type = SAS_PHY_UNUSED;

	u8 sas_addr[SAS_ADDR_SIZE];

	int res;



	res = sas_get_phy_attached_dev(ex_dev, phy->number, sas_addr, &type);

	sas_put_local_phy(phy);

	if (res)

		return res;



	switch (type) {

	case SAS_SATA_PENDING:

		return 0;

	case SAS_END_DEVICE:

		return 1;

	default:

		return -ENODEV;

	}

}

EXPORT_SYMBOL_GPL(smp_ata_check_ready_type);



static int smp_ata_check_ready(struct ata_link *link)

{

	int res;

drivers/scsi/libsas/sas_expander.c

+2 −2
Original line number Diff line number Diff line
@@ -1688,7 +1688,7 @@ static int sas_get_phy_change_count(struct domain_device *dev, 
	return res;

}



static int sas_get_phy_attached_dev(struct domain_device *dev, int phy_id,

int sas_get_phy_attached_dev(struct domain_device *dev, int phy_id,

			     u8 *sas_addr, enum sas_device_type *type)

{

	int res;

drivers/scsi/libsas/sas_internal.h

+2 −0
Original line number Diff line number Diff line
@@ -88,6 +88,8 @@ struct domain_device *sas_ex_to_ata(struct domain_device *ex_dev, int phy_id); 
int sas_ex_phy_discover(struct domain_device *dev, int single);

int sas_get_report_phy_sata(struct domain_device *dev, int phy_id,

			    struct smp_rps_resp *rps_resp);

int sas_get_phy_attached_dev(struct domain_device *dev, int phy_id,

			     u8 *sas_addr, enum sas_device_type *type);

int sas_try_ata_reset(struct asd_sas_phy *phy);

void sas_hae_reset(struct work_struct *work);

include/scsi/sas_ata.h

+6 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ void sas_ata_device_link_abort(struct domain_device *dev, bool force_reset); 
int sas_execute_ata_cmd(struct domain_device *device, u8 *fis,

			int force_phy_id);

int sas_ata_wait_after_reset(struct domain_device *dev, unsigned long deadline);

int smp_ata_check_ready_type(struct ata_link *link);

#else
@@ -104,6 +105,11 @@ static inline int sas_ata_wait_after_reset(struct domain_device *dev, 
{

	return -ETIMEDOUT;

}



static inline int smp_ata_check_ready_type(struct ata_link *link)

{

	return 0;

}

#endif



#endif /* _SAS_ATA_H_ */