scsi: libsas: Add sas_lu_reset()

Add a generic implementation of LU reset TMF handler, and use in LLDDs.

Link: https://lore.kernel.org/r/1645112566-115804-16-git-send-email-john.garry@huawei.com
Tested-by: Yihang Li <liyihang6@hisilicon.com>
Tested-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
index 6826ddf..3773874 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -1933,9 +1933,7 @@ static int hisi_sas_lu_reset(struct domain_device *device, u8 *lun)
                        hisi_sas_release_task(hisi_hba, device);
                sas_put_local_phy(phy);
        } else {
-               struct sas_tmf_task tmf_task = { .tmf =  TMF_LU_RESET };
-
-               rc = hisi_sas_debug_issue_ssp_tmf(device, lun, &tmf_task);
+               rc = sas_lu_reset(device, lun);
                if (rc == TMF_RESP_FUNC_COMPLETE)
                        hisi_sas_release_task(hisi_hba, device);
        }

diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
index ac66921..d6f29e1 100644 (file)
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -1063,6 +1063,16 @@ int sas_clear_task_set(struct domain_device *dev, u8 *lun)
 }
 EXPORT_SYMBOL_GPL(sas_clear_task_set);
 
+int sas_lu_reset(struct domain_device *dev, u8 *lun)
+{
+       struct sas_tmf_task tmf_task = {
+               .tmf = TMF_LU_RESET,
+       };
+
+       return sas_execute_ssp_tmf(dev, lun, &tmf_task);
+}
+EXPORT_SYMBOL_GPL(sas_lu_reset);
+
 /*
  * Tell an upper layer that it needs to initiate an abort for a given task.
  * This should only ever be called by an LLDD.

diff --git a/drivers/scsi/mvsas/mv_sas.c b/drivers/scsi/mvsas/mv_sas.c
index 37604b1..fdaaa43 100644 (file)
--- a/drivers/scsi/mvsas/mv_sas.c
+++ b/drivers/scsi/mvsas/mv_sas.c
@@ -1381,13 +1381,11 @@ int mvs_lu_reset(struct domain_device *dev, u8 *lun)
 {
        unsigned long flags;
        int rc = TMF_RESP_FUNC_FAILED;
-       struct sas_tmf_task tmf_task;
        struct mvs_device * mvi_dev = dev->lldd_dev;
        struct mvs_info *mvi = mvi_dev->mvi_info;
 
-       tmf_task.tmf = TMF_LU_RESET;
        mvi_dev->dev_status = MVS_DEV_EH;
-       rc = mvs_debug_issue_ssp_tmf(dev, lun, &tmf_task);
+       rc = sas_lu_reset(dev, lun);
        if (rc == TMF_RESP_FUNC_COMPLETE) {
                spin_lock_irqsave(&mvi->lock, flags);
                mvs_release_task(mvi, dev);

diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c
index fd86490..18e8420 100644 (file)
--- a/drivers/scsi/pm8001/pm8001_sas.c
+++ b/drivers/scsi/pm8001/pm8001_sas.c
@@ -1112,7 +1112,6 @@ out:
 int pm8001_lu_reset(struct domain_device *dev, u8 *lun)
 {
        int rc = TMF_RESP_FUNC_FAILED;
-       struct sas_tmf_task tmf_task;
        struct pm8001_device *pm8001_dev = dev->lldd_dev;
        struct pm8001_hba_info *pm8001_ha = pm8001_find_ha_by_dev(dev);
        DECLARE_COMPLETION_ONSTACK(completion_setstate);
@@ -1127,8 +1126,7 @@ int pm8001_lu_reset(struct domain_device *dev, u8 *lun)
                        pm8001_dev, DS_OPERATIONAL);
                wait_for_completion(&completion_setstate);
        } else {
-               tmf_task.tmf = TMF_LU_RESET;
-               rc = pm8001_issue_ssp_tmf(dev, lun, &tmf_task);
+               rc = sas_lu_reset(dev, lun);
        }
        /* If failed, fall-through I_T_Nexus reset */
        pm8001_dbg(pm8001_ha, EH, "for device[%x]:rc=%d\n",

diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index f71a477..7b1e2e7 100644 (file)
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -724,6 +724,7 @@ int sas_request_addr(struct Scsi_Host *shost, u8 *addr);
 
 int sas_abort_task_set(struct domain_device *dev, u8 *lun);
 int sas_clear_task_set(struct domain_device *dev, u8 *lun);
+int sas_lu_reset(struct domain_device *dev, u8 *lun);
 
 int sas_notify_port_event(struct asd_sas_phy *phy, enum port_event event,
                          gfp_t gfp_flags);