mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 12:57:53 +00:00
scsi: libsas: Add smp_ata_check_ready_type()
[ Upstream commit9181ce3cb5
] Create function smp_ata_check_ready_type() for LLDDs to wait for SATA devices to come up after a link reset. Signed-off-by: Jie Zhan <zhanjie9@hisilicon.com> Link: https://lore.kernel.org/r/20221118083714.4034612-4-zhanjie9@hisilicon.com Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Stable-dep-of:3c2673a09c
("scsi: hisi_sas: Fix SATA devices missing issue during I_T nexus reset") Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
c7f0f8dab1
commit
b059b4cd43
4 changed files with 35 additions and 2 deletions
|
@ -287,6 +287,31 @@ static int sas_ata_clear_pending(struct domain_device *dev, struct ex_phy *phy)
|
||||||
return 1;
|
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)
|
static int smp_ata_check_ready(struct ata_link *link)
|
||||||
{
|
{
|
||||||
int res;
|
int res;
|
||||||
|
|
|
@ -1693,8 +1693,8 @@ static int sas_get_phy_change_count(struct domain_device *dev,
|
||||||
return res;
|
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)
|
u8 *sas_addr, enum sas_device_type *type)
|
||||||
{
|
{
|
||||||
int res;
|
int res;
|
||||||
struct smp_disc_resp *disc_resp;
|
struct smp_disc_resp *disc_resp;
|
||||||
|
|
|
@ -84,6 +84,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_ex_phy_discover(struct domain_device *dev, int single);
|
||||||
int sas_get_report_phy_sata(struct domain_device *dev, int phy_id,
|
int sas_get_report_phy_sata(struct domain_device *dev, int phy_id,
|
||||||
struct smp_rps_resp *rps_resp);
|
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);
|
int sas_try_ata_reset(struct asd_sas_phy *phy);
|
||||||
void sas_hae_reset(struct work_struct *work);
|
void sas_hae_reset(struct work_struct *work);
|
||||||
|
|
||||||
|
|
|
@ -35,6 +35,7 @@ void sas_ata_end_eh(struct ata_port *ap);
|
||||||
int sas_execute_ata_cmd(struct domain_device *device, u8 *fis,
|
int sas_execute_ata_cmd(struct domain_device *device, u8 *fis,
|
||||||
int force_phy_id);
|
int force_phy_id);
|
||||||
int sas_ata_wait_after_reset(struct domain_device *dev, unsigned long deadline);
|
int sas_ata_wait_after_reset(struct domain_device *dev, unsigned long deadline);
|
||||||
|
int smp_ata_check_ready_type(struct ata_link *link);
|
||||||
#else
|
#else
|
||||||
|
|
||||||
|
|
||||||
|
@ -98,6 +99,11 @@ static inline int sas_ata_wait_after_reset(struct domain_device *dev,
|
||||||
{
|
{
|
||||||
return -ETIMEDOUT;
|
return -ETIMEDOUT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline int smp_ata_check_ready_type(struct ata_link *link)
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif /* _SAS_ATA_H_ */
|
#endif /* _SAS_ATA_H_ */
|
||||||
|
|
Loading…
Reference in a new issue