scsi: libsas: Add TMF handler exec complete callback

The pm8001 TMF handler has some special processing when the TMF completes,
so add a callback and fill it in for the pm8001 driver.

Link: https://lore.kernel.org/r/1645112566-115804-12-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/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
index af2dd95a2b282ab9dd849b22b3fce927fd5ad84e..0f599744738ddca845db041f7e00fa6cab577836 100644 (file)
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -957,6 +957,9 @@ int sas_execute_tmf(struct domain_device *device, void *parameter,
 
                wait_for_completion(&task->slow_task->completion);
 
+               if (i->dft->lldd_tmf_exec_complete)
+                       i->dft->lldd_tmf_exec_complete(device);
+
                res = TMF_RESP_FUNC_FAILED;
 
                if ((task->task_state_flags & SAS_TASK_STATE_ABORTED)) {

diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c
index b8cf1bae40406c92fa5f138a5110a637de952547..8eef8f4de42fa9e8da489f84037018e8a6960459 100644 (file)
--- a/drivers/scsi/pm8001/pm8001_init.c
+++ b/drivers/scsi/pm8001/pm8001_init.c
@@ -128,6 +128,7 @@ static struct sas_domain_function_template pm8001_transport_ops = {
        .lldd_lu_reset          = pm8001_lu_reset,
        .lldd_query_task        = pm8001_query_task,
        .lldd_port_formed       = pm8001_port_formed,
+       .lldd_tmf_exec_complete = pm8001_setds_completion,
 };
 
 /**

diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c
index a53e4b54154fc225c0ade809b5b0baa4e04e04e3..69da7246ea2011d365218a07dee8cac6eb56f33b 100644 (file)
--- a/drivers/scsi/pm8001/pm8001_sas.c
+++ b/drivers/scsi/pm8001/pm8001_sas.c
@@ -1376,3 +1376,17 @@ void pm8001_port_formed(struct asd_sas_phy *sas_phy)
        }
        sas_port->lldd_port = port;
 }
+
+void pm8001_setds_completion(struct domain_device *dev)
+{
+       struct pm8001_hba_info *pm8001_ha = pm8001_find_ha_by_dev(dev);
+       struct pm8001_device *pm8001_dev = dev->lldd_dev;
+       DECLARE_COMPLETION_ONSTACK(completion_setstate);
+
+       if (pm8001_ha->chip_id != chip_8001) {
+               pm8001_dev->setds_completion = &completion_setstate;
+               PM8001_CHIP_DISP->set_dev_state_req(pm8001_ha,
+                       pm8001_dev, DS_OPERATIONAL);
+               wait_for_completion(&completion_setstate);
+       }
+}

diff --git a/drivers/scsi/pm8001/pm8001_sas.h b/drivers/scsi/pm8001/pm8001_sas.h
index 0b1086042ca6c74ed7fa3a056ea8fa6e3657dd26..c19c9c80206c8031c932f83f29da29f1ca6a9dd4 100644 (file)
--- a/drivers/scsi/pm8001/pm8001_sas.h
+++ b/drivers/scsi/pm8001/pm8001_sas.h
@@ -742,6 +742,7 @@ pm8001_ccb_task_free_done(struct pm8001_hba_info *pm8001_ha,
        smp_mb(); /*in order to force CPU ordering*/
        task->task_done(task);
 }
+void pm8001_setds_completion(struct domain_device *dev);
 
 #endif
 

diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index 9c181ebccfeefff8f4913d099731a2b89563095b..dd6551e809a0fd1cfa1869132407c7503f286779 100644 (file)
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -652,6 +652,9 @@ struct sas_domain_function_template {
        int (*lldd_lu_reset)(struct domain_device *, u8 *lun);
        int (*lldd_query_task)(struct sas_task *);
 
+       /* Special TMF callbacks */
+       void (*lldd_tmf_exec_complete)(struct domain_device *dev);
+
        /* Port and Adapter management */
        int (*lldd_clear_nexus_port)(struct asd_sas_port *);
        int (*lldd_clear_nexus_ha)(struct sas_ha_struct *);