| Message ID | 20220927032605.78103-3-yanaijie@huawei.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | scsi: libsas: sas address comparison refactor | expand |
On 27/09/2022 04:25, Jason Yan wrote: > LLDDs are implementing their own attached phy finding code repeatedly. > Factor it out to libsas. > > Signed-off-by: Jason Yan <yanaijie@huawei.com> > Reviewed-by: Jack Wang <jinpu.wang@ionos.com> > Reviewed-by: Damien Le Moal <damien.lemoal@opensource.wdc.com> Apart from nit, below: Reviewed-by: John Garry <john.garry@huawei.com> > --- > drivers/scsi/libsas/sas_expander.c | 16 ++++++++++++++++ > include/scsi/libsas.h | 2 ++ > 2 files changed, 18 insertions(+) > > diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c > index fa2209080cc2..df5a64ad902f 100644 > --- a/drivers/scsi/libsas/sas_expander.c > +++ b/drivers/scsi/libsas/sas_expander.c > @@ -2107,6 +2107,22 @@ int sas_ex_revalidate_domain(struct domain_device *port_dev) > return res; > } > > +int sas_find_attached_phy(struct expander_device *ex_dev, > + struct domain_device *dev) Maybe sas_find_attached_phy_id() is a better name > +{ > + struct ex_phy *phy; > + int phy_id; > + > + for (phy_id = 0; phy_id < ex_dev->num_phys; phy_id++) { > + phy = &ex_dev->ex_phy[phy_id]; > + if (sas_phy_match_dev_addr(dev, phy)) > + return phy_id; > + } > + > + return -ENODEV; > +} > +EXPORT_SYMBOL_GPL(sas_find_attached_phy); > + > void sas_smp_handler(struct bsg_job *job, struct Scsi_Host *shost, > struct sas_rphy *rphy) > { > diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h > index 2dbead74a2af..75faf2308eae 100644 > --- a/include/scsi/libsas.h > +++ b/include/scsi/libsas.h > @@ -750,6 +750,8 @@ int sas_clear_task_set(struct domain_device *dev, u8 *lun); > int sas_lu_reset(struct domain_device *dev, u8 *lun); > int sas_query_task(struct sas_task *task, u16 tag); > int sas_abort_task(struct sas_task *task, u16 tag); > +int sas_find_attached_phy(struct expander_device *ex_dev, > + struct domain_device *dev); > > void sas_notify_port_event(struct asd_sas_phy *phy, enum port_event event, > gfp_t gfp_flags);
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c index fa2209080cc2..df5a64ad902f 100644 --- a/drivers/scsi/libsas/sas_expander.c +++ b/drivers/scsi/libsas/sas_expander.c @@ -2107,6 +2107,22 @@ int sas_ex_revalidate_domain(struct domain_device *port_dev) return res; } +int sas_find_attached_phy(struct expander_device *ex_dev, + struct domain_device *dev) +{ + struct ex_phy *phy; + int phy_id; + + for (phy_id = 0; phy_id < ex_dev->num_phys; phy_id++) { + phy = &ex_dev->ex_phy[phy_id]; + if (sas_phy_match_dev_addr(dev, phy)) + return phy_id; + } + + return -ENODEV; +} +EXPORT_SYMBOL_GPL(sas_find_attached_phy); + void sas_smp_handler(struct bsg_job *job, struct Scsi_Host *shost, struct sas_rphy *rphy) { diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h index 2dbead74a2af..75faf2308eae 100644 --- a/include/scsi/libsas.h +++ b/include/scsi/libsas.h @@ -750,6 +750,8 @@ int sas_clear_task_set(struct domain_device *dev, u8 *lun); int sas_lu_reset(struct domain_device *dev, u8 *lun); int sas_query_task(struct sas_task *task, u16 tag); int sas_abort_task(struct sas_task *task, u16 tag); +int sas_find_attached_phy(struct expander_device *ex_dev, + struct domain_device *dev); void sas_notify_port_event(struct asd_sas_phy *phy, enum port_event event, gfp_t gfp_flags);