scsi: libsas: Add sas_clear_task_set()

Add a generic implementation of clear task set TMF handler, and use in
LLDDs.

Link: https://lore.kernel.org/r/1645112566-115804-15-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 54fe25ddac5b2ffed47d2c3831fd927cdd5689f1..6826ddfeaca5156617e850ad48b9bd25fd6e1472 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -690,7 +690,6 @@ static int hisi_sas_init_device(struct domain_device *device)
 {
        int rc = TMF_RESP_FUNC_COMPLETE;
        struct scsi_lun lun;
-       struct sas_tmf_task tmf_task;
        int retry = HISI_SAS_DISK_RECOVER_CNT;
        struct hisi_hba *hisi_hba = dev_to_hisi_hba(device);
        struct device *dev = hisi_hba->dev;
@@ -700,10 +699,8 @@ static int hisi_sas_init_device(struct domain_device *device)
        case SAS_END_DEVICE:
                int_to_scsilun(0, &lun);
 
-               tmf_task.tmf = TMF_CLEAR_TASK_SET;
                while (retry-- > 0) {
-                       rc = hisi_sas_debug_issue_ssp_tmf(device, lun.scsi_lun,
-                                                         &tmf_task);
+                       rc = sas_clear_task_set(device, lun.scsi_lun);
                        if (rc == TMF_RESP_FUNC_COMPLETE) {
                                hisi_sas_release_task(hisi_hba, device);
                                break;

diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
index 06bc7221ac3aa8eb328ef521591cc491ed7da0b5..ac669215c3bca705e8aebd2c24bb5358127ac089 100644 (file)
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -1053,6 +1053,16 @@ int sas_abort_task_set(struct domain_device *dev, u8 *lun)
 }
 EXPORT_SYMBOL_GPL(sas_abort_task_set);
 
+int sas_clear_task_set(struct domain_device *dev, u8 *lun)
+{
+       struct sas_tmf_task tmf_task = {
+               .tmf = TMF_CLEAR_TASK_SET,
+       };
+
+       return sas_execute_ssp_tmf(dev, lun, &tmf_task);
+}
+EXPORT_SYMBOL_GPL(sas_clear_task_set);
+
 /*
  * 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_init.c b/drivers/scsi/mvsas/mv_init.c
index 13a002e08a12525796f4ad600f26007c98ba5edd..d12fb210c86864018606800a9d2cfa0d9e559a42 100644 (file)
--- a/drivers/scsi/mvsas/mv_init.c
+++ b/drivers/scsi/mvsas/mv_init.c
@@ -64,7 +64,7 @@ static struct sas_domain_function_template mvs_transport_ops = {
 
        .lldd_abort_task        = mvs_abort_task,
        .lldd_abort_task_set    = sas_abort_task_set,
-       .lldd_clear_task_set    = mvs_clear_task_set,
+       .lldd_clear_task_set    = sas_clear_task_set,
        .lldd_I_T_nexus_reset   = mvs_I_T_nexus_reset,
        .lldd_lu_reset          = mvs_lu_reset,
        .lldd_query_task        = mvs_query_task,

diff --git a/drivers/scsi/mvsas/mv_sas.c b/drivers/scsi/mvsas/mv_sas.c
index 0cdbba31f327ccd718f45722a345af0893e96b72..37604b1ebd463ae27d705fcd75aba5367be18307 100644 (file)
--- a/drivers/scsi/mvsas/mv_sas.c
+++ b/drivers/scsi/mvsas/mv_sas.c
@@ -1536,17 +1536,6 @@ out:
        return rc;
 }
 
-int mvs_clear_task_set(struct domain_device *dev, u8 *lun)
-{
-       int rc = TMF_RESP_FUNC_FAILED;
-       struct sas_tmf_task tmf_task;
-
-       tmf_task.tmf = TMF_CLEAR_TASK_SET;
-       rc = mvs_debug_issue_ssp_tmf(dev, lun, &tmf_task);
-
-       return rc;
-}
-
 static int mvs_sata_done(struct mvs_info *mvi, struct sas_task *task,
                        u32 slot_idx, int err)
 {

diff --git a/drivers/scsi/mvsas/mv_sas.h b/drivers/scsi/mvsas/mv_sas.h
index 0bee635962089396146f2a0178eb374aacf34d04..509d8f32a04ffd23e3c657a59caa8f9148576c86 100644 (file)
--- a/drivers/scsi/mvsas/mv_sas.h
+++ b/drivers/scsi/mvsas/mv_sas.h
@@ -440,7 +440,6 @@ void mvs_scan_start(struct Scsi_Host *shost);
 int mvs_scan_finished(struct Scsi_Host *shost, unsigned long time);
 int mvs_queue_command(struct sas_task *task, gfp_t gfp_flags);
 int mvs_abort_task(struct sas_task *task);
-int mvs_clear_task_set(struct domain_device *dev, u8 * lun);
 void mvs_port_formed(struct asd_sas_phy *sas_phy);
 void mvs_port_deformed(struct asd_sas_phy *sas_phy);
 int mvs_dev_found(struct domain_device *dev);

diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c
index 543113564a584093d9838896190443c215918eed..fd86490616e822d909f97bb2aad9c4c84ec1ef7e 100644 (file)
--- a/drivers/scsi/pm8001/pm8001_sas.c
+++ b/drivers/scsi/pm8001/pm8001_sas.c
@@ -1344,14 +1344,12 @@ out:
 
 int pm8001_clear_task_set(struct domain_device *dev, u8 *lun)
 {
-       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);
 
        pm8001_dbg(pm8001_ha, EH, "I_T_L_Q clear task set[%x]\n",
                   pm8001_dev->device_id);
-       tmf_task.tmf = TMF_CLEAR_TASK_SET;
-       return pm8001_issue_ssp_tmf(dev, lun, &tmf_task);
+       return sas_clear_task_set(dev, lun);
 }
 
 void pm8001_port_formed(struct asd_sas_phy *sas_phy)

diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index 53fdc18bdd09f52e48d9adde4a1048c0da229103..f71a47740ff8b9904e5ff866fc3dffb1af5ae63e 100644 (file)
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -723,6 +723,7 @@ struct sas_phy *sas_get_local_phy(struct domain_device *dev);
 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_notify_port_event(struct asd_sas_phy *phy, enum port_event event,
                          gfp_t gfp_flags);